diff --git a/hosts/luci/files/lockscreen.png b/hosts/luci/files/lockscreen.png deleted file mode 100644 index 4094671..0000000 Binary files a/hosts/luci/files/lockscreen.png and /dev/null differ diff --git a/hosts/luci/files/wallpaper.png b/hosts/luci/files/wallpaper.png deleted file mode 100644 index cc73b58..0000000 Binary files a/hosts/luci/files/wallpaper.png and /dev/null differ diff --git a/hosts/luci/home-config.nix b/hosts/luci/home-config.nix index d09db33..b8f7836 100644 --- a/hosts/luci/home-config.nix +++ b/hosts/luci/home-config.nix @@ -25,8 +25,6 @@ desktop.sway = { enable = true; kanshi = true; - wallpapers.lockscreen = "${./files/lockscreen.png}"; - wallpapers.desktop = "${./files/wallpaper.png} center #000000"; waybar = { laptop = true; gpuThermal = { diff --git a/hosts/luci/includes/home-manager.nix b/hosts/luci/includes/home-manager.nix deleted file mode 100644 index 5ebec63..0000000 --- a/hosts/luci/includes/home-manager.nix +++ /dev/null @@ -1,19 +0,0 @@ -_: -{ - ## Specific host home manager configuration - wayland.windowManager.sway.config = { - input = { - "1:1:AT_Translated_Set_2_keyboard" = { - xkb_layout = "us"; - xkb_variant = "altgr-intl"; - }; - - "2:7:SynPS/2_Synaptics_TouchPad" = { - "tap" = "enable"; - "accel_profile" = "adaptive"; - "dwt" = "enable"; - "pointer_accel" = "0.3"; - }; - }; - }; -} diff --git a/modules/home-manager/desktop/sway/default.nix b/modules/home-manager/desktop/sway/default.nix index 4e1d418..4ea96f4 100644 --- a/modules/home-manager/desktop/sway/default.nix +++ b/modules/home-manager/desktop/sway/default.nix @@ -13,19 +13,6 @@ in description = "configure laptop mode"; }; - wallpapers = { - lockscreen = mkOption { - type = types.path; - default = ""; - description = "path for lockscreen wallpaper"; - }; - desktop = mkOption { - type = types.path; - default = ""; - description = "path for desktop wallpaper"; - }; - }; - waybar = { laptop = mkOption { type = types.bool; @@ -143,7 +130,7 @@ in qt = { enable = true; - platformTheme.name = "adwaita"; + platformTheme = "gnome"; style.name = "adwaita-dark"; }; xdg = { diff --git a/modules/home-manager/desktop/sway/includes/sway.nix b/modules/home-manager/desktop/sway/includes/sway.nix index c398807..4fad68c 100644 --- a/modules/home-manager/desktop/sway/includes/sway.nix +++ b/modules/home-manager/desktop/sway/includes/sway.nix @@ -1,8 +1,5 @@ { config, pkgs, lib, ... }: with lib; -let - cfg = config.modules.desktop.sway; -in { config = mkIf config.modules.desktop.sway.enable { wayland.windowManager.sway = { @@ -23,11 +20,6 @@ in xkb_variant = "altgr-intl"; }; }; - output = { - "*" = { - bg = "${cfg.wallpapers.desktop}"; - }; - }; seat = { "*".hide_cursor = "when-typing enable"; }; diff --git a/modules/home-manager/desktop/sway/includes/swaylock.nix b/modules/home-manager/desktop/sway/includes/swaylock.nix index 527f777..a8890a4 100644 --- a/modules/home-manager/desktop/sway/includes/swaylock.nix +++ b/modules/home-manager/desktop/sway/includes/swaylock.nix @@ -1,14 +1,11 @@ { config, lib, ... }: with lib; -let - cfg = config.modules.desktop.sway; -in { config = mkIf config.modules.desktop.sway.enable { programs.swaylock = { enable = true; settings = { - image = "${cfg.wallpapers.lockscreen}"; + image = "~/medias/images/wallpapers/lockscreen.png"; scaling = "center"; color = "000000"; indicator-radius = 70; diff --git a/nixos/default.nix b/nixos/default.nix index a32272a..ac970c6 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -55,8 +55,8 @@ ../hosts/${hostname}/home-config.nix ../modules/home-manager/default.nix ] ++ lib.optional ( - builtins.pathExists ../hosts/${hostname}/includes/home-manager.nix - ) ../hosts/${hostname}/includes/home-manager.nix; + builtins.pathExists ../home-manager/hosts/${hostname}.nix + ) ../home-manager/hosts/${hostname}.nix; }; };