diff --git a/hosts/luci/files/lockscreen.png b/hosts/luci/files/lockscreen.png new file mode 100644 index 0000000..4094671 Binary files /dev/null and b/hosts/luci/files/lockscreen.png differ diff --git a/hosts/luci/files/wallpaper.png b/hosts/luci/files/wallpaper.png new file mode 100644 index 0000000..cc73b58 Binary files /dev/null and b/hosts/luci/files/wallpaper.png differ diff --git a/hosts/luci/home-config.nix b/hosts/luci/home-config.nix index b8f7836..d09db33 100644 --- a/hosts/luci/home-config.nix +++ b/hosts/luci/home-config.nix @@ -25,6 +25,8 @@ 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 new file mode 100644 index 0000000..5ebec63 --- /dev/null +++ b/hosts/luci/includes/home-manager.nix @@ -0,0 +1,19 @@ +_: +{ + ## 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 4ea96f4..4e1d418 100644 --- a/modules/home-manager/desktop/sway/default.nix +++ b/modules/home-manager/desktop/sway/default.nix @@ -13,6 +13,19 @@ 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; @@ -130,7 +143,7 @@ in qt = { enable = true; - platformTheme = "gnome"; + platformTheme.name = "adwaita"; 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 4fad68c..c398807 100644 --- a/modules/home-manager/desktop/sway/includes/sway.nix +++ b/modules/home-manager/desktop/sway/includes/sway.nix @@ -1,5 +1,8 @@ { config, pkgs, lib, ... }: with lib; +let + cfg = config.modules.desktop.sway; +in { config = mkIf config.modules.desktop.sway.enable { wayland.windowManager.sway = { @@ -20,6 +23,11 @@ with lib; 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 a8890a4..527f777 100644 --- a/modules/home-manager/desktop/sway/includes/swaylock.nix +++ b/modules/home-manager/desktop/sway/includes/swaylock.nix @@ -1,11 +1,14 @@ { config, lib, ... }: with lib; +let + cfg = config.modules.desktop.sway; +in { config = mkIf config.modules.desktop.sway.enable { programs.swaylock = { enable = true; settings = { - image = "~/medias/images/wallpapers/lockscreen.png"; + image = "${cfg.wallpapers.lockscreen}"; scaling = "center"; color = "000000"; indicator-radius = 70; diff --git a/nixos/default.nix b/nixos/default.nix index ac970c6..a32272a 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 ../home-manager/hosts/${hostname}.nix - ) ../home-manager/hosts/${hostname}.nix; + builtins.pathExists ../hosts/${hostname}/includes/home-manager.nix + ) ../hosts/${hostname}/includes/home-manager.nix; }; };