commit 66cad71849184b35f1f7dc7d8b3e3d29bd27fd63
parent c5328a4c77fdb3947aac5ec22e1f8088013abbc4
Author: Chris <chris@echoz.io>
Date: Wed, 28 Jan 2026 23:50:08 +0100
chore: update inputs
Diffstat:
13 files changed, 100 insertions(+), 69 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -29,11 +29,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1765213096,
- "narHash": "sha256-oB53W60RNIT4bMS6KfWyBZmNAPmn5ID8wZacBbKQUcY=",
+ "lastModified": 1769329000,
+ "narHash": "sha256-0vibWqmCsG1t4xL2euR6PScB3M4QZigB5JGl+BIH4NY=",
"owner": "abenz1267",
"repo": "elephant",
- "rev": "d12f52fe47e919160afc2cf534f50f15a1e49da1",
+ "rev": "1988112d1f54dd76e8a90f551945df763586bdad",
"type": "github"
},
"original": {
@@ -50,11 +50,11 @@
]
},
"locked": {
- "lastModified": 1763759067,
- "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
+ "lastModified": 1765835352,
+ "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
+ "rev": "a34fae9c08a15ad73f295041fec82323541400a9",
"type": "github"
},
"original": {
@@ -75,11 +75,11 @@
]
},
"locked": {
- "lastModified": 1763182882,
- "narHash": "sha256-jZi+9yKmeTMsJ4ZNqRei/wL16+QwYGrCl4EJ3QHfoDU=",
+ "lastModified": 1765774562,
+ "narHash": "sha256-UQhfCggNGDc7eam+EittlYmeW89CZVT1KkFIHZWBH7k=",
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
- "rev": "b0585849abe7d02a774a853f7952d07bb910fd9e",
+ "rev": "edcbb19948b6caf1700434e369fde6ff9e6a3c93",
"type": "github"
},
"original": {
@@ -95,11 +95,32 @@
]
},
"locked": {
- "lastModified": 1765337252,
- "narHash": "sha256-HuWQp8fM25fyWflbuunQkQI62Hg0ecJxWD52FAgmxqY=",
+ "lastModified": 1769579508,
+ "narHash": "sha256-EE2bs7xFrC64qrj0N2zP6E6e/nmhcdw6v/grdYi+BiY=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "13cc1efd78b943b98c08d74c9060a5b59bf86921",
+ "rev": "eec72f127831326b042d1f35003767a4ab6a9516",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "repo": "home-manager",
+ "type": "github"
+ }
+ },
+ "home-manager_2": {
+ "inputs": {
+ "nixpkgs": [
+ "impermanence",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1768598210,
+ "narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=",
+ "owner": "nix-community",
+ "repo": "home-manager",
+ "rev": "c47b2cc64a629f8e075de52e4742de688f930dc6",
"type": "github"
},
"original": {
@@ -109,12 +130,16 @@
}
},
"impermanence": {
+ "inputs": {
+ "home-manager": "home-manager_2",
+ "nixpkgs": "nixpkgs"
+ },
"locked": {
- "lastModified": 1737831083,
- "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=",
+ "lastModified": 1769548169,
+ "narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=",
"owner": "nix-community",
"repo": "impermanence",
- "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170",
+ "rev": "7b1d382faf603b6d264f58627330f9faa5cba149",
"type": "github"
},
"original": {
@@ -168,11 +193,11 @@
]
},
"locked": {
- "lastModified": 1764815157,
- "narHash": "sha256-uLQkI049ABZ6bksyy1f75Of9YQIW1BysbVoCx4L3seo=",
+ "lastModified": 1769288622,
+ "narHash": "sha256-GaDPnzDQAx5WRi12XVttCHsVw0VkOMYNpniT7KHYNfk=",
"owner": "nixpak",
"repo": "nixpak",
- "rev": "456d7600a35c63837dca8096c8faacead0be16fc",
+ "rev": "4276954ad4f877d79801fd8952af38a3370bcb65",
"type": "github"
},
"original": {
@@ -183,11 +208,27 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1765186076,
- "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=",
+ "lastModified": 1768564909,
+ "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_2": {
+ "locked": {
+ "lastModified": 1769461804,
+ "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8",
+ "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
"type": "github"
},
"original": {
@@ -196,7 +237,7 @@
"type": "indirect"
}
},
- "nixpkgs_2": {
+ "nixpkgs_3": {
"locked": {
"lastModified": 1759036355,
"narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=",
@@ -220,7 +261,7 @@
"imsh-clients": "imsh-clients",
"nix-flatpak": "nix-flatpak",
"nixpak": "nixpak",
- "nixpkgs": "nixpkgs",
+ "nixpkgs": "nixpkgs_2",
"sec": "sec",
"sops-nix": "sops-nix",
"walker": "walker"
@@ -228,7 +269,7 @@
},
"sec": {
"inputs": {
- "nixpkgs": "nixpkgs_2"
+ "nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1765542014,
@@ -251,11 +292,11 @@
]
},
"locked": {
- "lastModified": 1765231718,
- "narHash": "sha256-qdBzo6puTgG4G2RHG0PkADg22ZnQo1JmSVFRxrD4QM4=",
+ "lastModified": 1769469829,
+ "narHash": "sha256-wFcr32ZqspCxk4+FvIxIL0AZktRs6DuF8oOsLt59YBU=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "7fd1416aba1865eddcdec5bb11339b7222c2363e",
+ "rev": "c5eebd4eb2e3372fe12a8d70a248a6ee9dd02eff",
"type": "github"
},
"original": {
@@ -305,11 +346,11 @@
"systems": "systems_2"
},
"locked": {
- "lastModified": 1765305269,
- "narHash": "sha256-2OQsyZaO2Uy6EnDLcDZGBbDEa0X1WuZ4NoZ5kW52OeA=",
+ "lastModified": 1769093508,
+ "narHash": "sha256-ccwJ1ADGNFd5LDF2JWdfP7+f1Hs2EvJ+2o6sUOdYi7w=",
"owner": "abenz1267",
"repo": "walker",
- "rev": "132004947c5c877f510177d8c68f754e37169ecc",
+ "rev": "e427025bdda667712b08dd56f1a0a23667f1364c",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
@@ -118,7 +118,7 @@
settings = {
on-unmatched = "info";
formatter.nixfmt = {
- command = lib.getExe pkgs.nixfmt-rfc-style;
+ command = lib.getExe pkgs.nixfmt;
includes = [ "*.nix" ];
};
};
diff --git a/hosts/ws/default.nix b/hosts/ws/default.nix
@@ -46,6 +46,7 @@
boot = {
kernelPackages = pkgs.linuxPackages_lqx;
+ zfs.package = pkgs.zfs_2_4;
initrd.availableKernelModules = [
"nvme"
"thunderbolt"
diff --git a/modules/default.nix b/modules/default.nix
@@ -8,7 +8,7 @@
lib.filterAttrs (path: type: type == "directory") (builtins.readDir ./.)
);
- system.stateVersion = lib.mkDefault "25.05";
+ system.stateVersion = lib.mkDefault "26.05";
nixpkgs = {
hostPlatform = lib.mkDefault "x86_64-linux";
diff --git a/modules/dunst/default.nix b/modules/dunst/default.nix
@@ -8,8 +8,7 @@
{
home-manager.users.${user} = {
wayland.windowManager.hyprland.settings.layerrule = [
- "blur,notifications"
- "ignorezero,notifications"
+ "blur on, ignore_alpha 0, match:namespace notifications"
];
home.packages = [ pkgs.libnotify ];
diff --git a/modules/ephemeral-root/default.nix b/modules/ephemeral-root/default.nix
@@ -1,5 +1,4 @@
{
- lib,
config,
pkgs,
...
@@ -11,7 +10,7 @@
after = [ "zfs-import-system.service" ];
before = [ "sysroot.mount" ];
path = with pkgs; [
- zfs
+ config.boot.zfs.package
coreutils
];
description = "rotate root dataset";
diff --git a/modules/greetd/default.nix b/modules/greetd/default.nix
@@ -37,8 +37,8 @@ in
decoration
animations
;
- windowrule = "float, class:gtkgreet";
- layerrule = "blur,waybar";
+ windowrule = "float on, match:class ^gtkgreet$";
+ layerrule = "blur on, match:namespace waybar";
exec-once = "${lib.getExe pkgs.gtkgreet} -s ${pkgs.writeText "gtkgreet-style.css" ''
window, button, entry {
background: ${style.colors.bg.rgba};
@@ -62,12 +62,7 @@ in
services.hyprpaper = {
enable = true;
- settings = {
- inherit (hmUserCfg.services.hyprpaper.settings)
- preload
- wallpaper
- ;
- };
+ settings = hmUserCfg.services.hyprpaper.settings;
};
programs.waybar = {
diff --git a/modules/hypr/hyprland.nix b/modules/hypr/hyprland.nix
@@ -160,18 +160,16 @@
bindnir = [ ", Alt_L, sendkeystate, , Alt_L, up, class:discord" ];
windowrule = [
- "noblur, xwayland:1"
- "workspace special:special silent, class:^kitty-special$"
- "size 827 555, class:^kitty-special$"
- "float, onworkspace:special:special"
- "workspace 4 silent, class:^steam$"
- "workspace 2 silent, class:^steam_app_[0-9]+$"
- "workspace 5 silent, class:^firefox$"
- "workspace 3 silent, class:^discord$"
- "workspace 3 silent, class:^Slack$"
- "workspace 3 silent, class:^Spotify$"
- "workspace 5 silent, class:^steam_app_2694490"
- "tile, class:^steam_app_2694490"
+ "no_blur on, match:xwayland 1"
+ "workspace special:special silent, size 827 555, match:class ^kitty-special$"
+ "float on, match:workspace special:special"
+ "workspace 4 silent, match:class ^steam$"
+ "workspace 2 silent, match:class ^steam_app_[0-9]+$"
+ "workspace 5 silent, match:class ^firefox$"
+ "workspace 3 silent, match:class ^discord$"
+ "workspace 3 silent, match:class ^Slack$"
+ "workspace 3 silent, match:class ^Spotify$"
+ "workspace 5 silent, tile on, match:class ^steam_app_2694490"
];
};
};
diff --git a/modules/hypr/hyprpaper.nix b/modules/hypr/hyprpaper.nix
@@ -4,10 +4,12 @@
home-manager.users.${user}.services.hyprpaper = {
enable = true;
- settings = {
- preload = [ style.wallpaper ];
- wallpaper = [ ",${style.wallpaper}" ];
- };
+ settings.wallpaper = [
+ {
+ monitor = "";
+ path = style.wallpaper;
+ }
+ ];
};
};
}
diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix
@@ -22,7 +22,7 @@ let
"flake.nix"
".git"
];
- settings.nixd.formatting.command = [ (lib.getExe pkgs.nixfmt-rfc-style) ];
+ settings.nixd.formatting.command = [ (lib.getExe pkgs.nixfmt) ];
};
gopls = {
@@ -98,7 +98,7 @@ let
lib.filterAttrs (
_: drv:
lib.isDerivation drv
- && builtins.elem (builtins.head (builtins.match "^tree-sitter-(.*)-grammar$" drv.pname)) languages
+ && builtins.elem (builtins.head (builtins.match "^tree-sitter-(.*)$" drv.pname)) languages
) pkgs.tree-sitter-grammars
);
};
diff --git a/modules/walker/default.nix b/modules/walker/default.nix
@@ -10,10 +10,7 @@
wayland.windowManager.hyprland.settings = {
bind = [ "$mod, Escape, exec, uwsm app -- walker" ];
- layerrule = [
- "blur,walker"
- "ignorezero,walker"
- ];
+ layerrule = [ "blur on, ignore_alpha 0, match:namespace walker" ];
};
programs.walker = {
diff --git a/modules/waybar/default.nix b/modules/waybar/default.nix
@@ -1,7 +1,7 @@
{ style, user, ... }:
{
home-manager.users.${user} = {
- wayland.windowManager.hyprland.settings.layerrule = [ "blur,waybar" ];
+ wayland.windowManager.hyprland.settings.layerrule = [ "blur on, match:namespace waybar" ];
programs.waybar = {
enable = true;
diff --git a/modules/wayprompt/default.nix b/modules/wayprompt/default.nix
@@ -6,8 +6,7 @@
{
home-manager.users.${user} = {
wayland.windowManager.hyprland.settings.layerrule = [
- "blur,wayprompt"
- "ignorezero,wayprompt"
+ "blur on, ignore_alpha 0, match:namespace wayprompt"
];
programs.wayprompt = {
