diff --git a/_typos.toml b/_typos.toml index a44fcd3..a2f7f59 100644 --- a/_typos.toml +++ b/_typos.toml @@ -5,7 +5,3 @@ extend-ignore-re = ['[a-fA-F0-9]{6}'] [default.extend-words] doas = "doas" edn = "edn" - -[type.images] -extend-glob = ["*.png"] -check-file = false diff --git a/flake.lock b/flake.lock index 9e24a79..b2a27c6 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1714515075, - "narHash": "sha256-azMK7aWH0eUc3IqU4Fg5rwZdB9WZBvimOGG3piqvtsY=", + "lastModified": 1713077896, + "narHash": "sha256-Noot8H0EZEAFRQWyGxh9ryvhK96xpIqKbh78X447JWs=", "owner": "nix-community", "repo": "home-manager", - "rev": "6d3b6dc9222c12b951169becdf4b0592ee9576ef", + "rev": "630a0992b3627c64e34f179fab68e3d48c6991c0", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1714253743, - "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", + "lastModified": 1712963716, + "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", + "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", "type": "github" }, "original": { @@ -37,11 +37,11 @@ }, "nur": { "locked": { - "lastModified": 1714596740, - "narHash": "sha256-V3ZR38xu3JSUrg04wMTp0fzDSP+ogNJOOU5ckreCzLQ=", + "lastModified": 1713113175, + "narHash": "sha256-E/WxD3Nh4kd3AYYLk8UyMnkUm9AMT3zUk/rBI4Qjk04=", "owner": "nix-community", "repo": "NUR", - "rev": "c8456769a0904ac761020a76bf0bb72a92c27c7c", + "rev": "90060445d9ee7b731c147b2caa53dc45d557bce9", "type": "github" }, "original": { diff --git a/hosts/luci/includes/home-manager.nix b/home-manager/hosts/luci.nix similarity index 74% rename from hosts/luci/includes/home-manager.nix rename to home-manager/hosts/luci.nix index 5ebec63..d4b03b6 100644 --- a/hosts/luci/includes/home-manager.nix +++ b/home-manager/hosts/luci.nix @@ -1,6 +1,4 @@ -_: -{ - ## Specific host home manager configuration +_: { wayland.windowManager.sway.config = { input = { "1:1:AT_Translated_Set_2_keyboard" = { @@ -15,5 +13,11 @@ _: "pointer_accel" = "0.3"; }; }; + + output = { + "*" = { + bg = "~/medias/images/wallpapers/wallpaper.png center #000000"; + }; + }; }; } 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/modules/home-manager/desktop/sway/default.nix b/modules/home-manager/desktop/sway/default.nix index f7d40e0..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.str; - default = ""; - description = "path for lockscreen wallpaper"; - }; - desktop = mkOption { - type = types.str; - 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; }; };