From 6ddd24804ddf0b01922b82762f200b75968f0e59 Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Mon, 26 Jan 2026 15:41:31 -0500 Subject: [PATCH] update flake --- flake.lock | 157 ++++++++++++++++++--------------- flake.nix | 18 ++-- home/tiling/niri.nix | 14 +-- system/default.nix | 2 + system/hosts/peach/default.nix | 10 +++ 5 files changed, 112 insertions(+), 89 deletions(-) diff --git a/flake.lock b/flake.lock index cd3e4db..f2fa1de 100644 --- a/flake.lock +++ b/flake.lock @@ -8,15 +8,15 @@ ] }, "locked": { - "lastModified": 1768564560, - "narHash": "sha256-YyIzhZoFVE4C5P9e0wZGjx4P9IT/OTUMFF3r6iKd3UY=", - "owner": "nix-community", + "lastModified": 1769531604, + "narHash": "sha256-/3Hk9YEI+9vA2+4AFErByc1V3LcCDNThmXYhFWlkQiU=", + "owner": "sckova", "repo": "nixos-apple-silicon", - "rev": "83a2bb509972148aa6d3f75c65103b6bfb7898af", + "rev": "acb98b0ef8b622079f2a5e4f8de9344fa7da516b", "type": "github" }, "original": { - "owner": "nix-community", + "owner": "sckova", "repo": "nixos-apple-silicon", "type": "github" } @@ -58,11 +58,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1768843787, - "narHash": "sha256-z5WdKQAV/P2QzGrtDfM9k6qpAZGnP5nN9rBtKjl0bHY=", + "lastModified": 1769435645, + "narHash": "sha256-xxIqw5x8U+13ya2BUcwmAW6BdpCpMhrMTn6Pd0bzocE=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "c2a381ae3d7dc148bb78d42677ec08974f3511fb", + "rev": "e8675eeb9b48a23167b3e43f84e3be76e321935e", "type": "github" }, "original": { @@ -74,11 +74,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1768803975, - "narHash": "sha256-VV0AMYlSIVYbJNzKymnGGSlBcPoahMxeASbVi+fTtHo=", + "lastModified": 1769420040, + "narHash": "sha256-OsO2Pi2oDE2hZoxCJ40mx9/wag9XXQ5FkcwIUcJN4Go=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "cec2d1841baae411313742083ef2bc0b29855b4d", + "rev": "d2f1d070c0303b3b2bcb71df73c623a274258e22", "type": "github" }, "original": { @@ -90,11 +90,11 @@ "catppuccin-discord": { "flake": false, "locked": { - "lastModified": 1768037813, - "narHash": "sha256-ExRNnxvG2PSGmpuaPxzCKL6GK6ETs7Gq4Roa74HXp+s=", + "lastModified": 1769446491, + "narHash": "sha256-7v1Hu6QofOyFOGnHeqHFK0JsxUxdJ9uTjI7nM7mdTsg=", "owner": "catppuccin", "repo": "discord", - "rev": "0fcfe2e15ed91f8c5f1f3c6855f3b2024f78d86c", + "rev": "f235754322320211a8646d963466fac402e5c297", "type": "github" }, "original": { @@ -160,11 +160,11 @@ ] }, "locked": { - "lastModified": 1765835352, - "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -217,11 +217,11 @@ ] }, "locked": { - "lastModified": 1769102673, - "narHash": "sha256-/qvRFjn1s3bIJdSKG6IpaE6ML3j9anQKUqGhmt4Qe+E=", + "lastModified": 1769450270, + "narHash": "sha256-pdVm/zJazDUAasTyHFX/Pbrlk9Upjxi0yzgn7GjGe4g=", "owner": "nix-community", "repo": "home-manager", - "rev": "b0491fe55680bd19be8e74847969dad9d7784658", + "rev": "a10c1e8f5ad2589414407f4851c221cb66270257", "type": "github" }, "original": { @@ -232,12 +232,8 @@ }, "niri": { "inputs": { - "niri-stable": [ - "niri-blur" - ], - "niri-unstable": [ - "niri-blur" - ], + "niri-stable": "niri-stable", + "niri-unstable": "niri-unstable", "nixpkgs": [ "nixpkgs" ], @@ -246,32 +242,48 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1769237340, - "narHash": "sha256-cwgQEMkroNOTY2AtYqMuHeLc5BKZQWwYc0Voiv4d7Uo=", - "owner": "sckova", + "lastModified": 1769500166, + "narHash": "sha256-ycYlPMg7WIWAh+Ni9+g4ZGdWGIFmBjCz+hFUVQMmBS8=", + "owner": "sodiboo", "repo": "niri-flake", - "rev": "6711fb7ee71eb965abd4c61349f4a6d680502679", + "rev": "f23ab93b35dbc90e666327310767edeed622e431", "type": "github" }, "original": { - "owner": "sckova", + "owner": "sodiboo", "repo": "niri-flake", "type": "github" } }, - "niri-blur": { + "niri-stable": { "flake": false, "locked": { - "lastModified": 1769119684, - "narHash": "sha256-e+0PeGvsQNz8o/lhOEe6dHdaap2AMOQUC/buH91QAtI=", - "owner": "visualglitch91", + "lastModified": 1756556321, + "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=", + "owner": "YaLTeR", "repo": "niri", - "rev": "8756d0aff313617fc2af014d9bc43561532278ae", + "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294", "type": "github" }, "original": { - "owner": "visualglitch91", - "ref": "feat/blur", + "owner": "YaLTeR", + "ref": "v25.08", + "repo": "niri", + "type": "github" + } + }, + "niri-unstable": { + "flake": false, + "locked": { + "lastModified": 1769494881, + "narHash": "sha256-tWgA1QwSbabVaBAT7eU6qmiYH19jIn5D9pQb/uUFs0c=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "e1015ac92f07dba4d030358642d1920a324a8629", + "type": "github" + }, + "original": { + "owner": "YaLTeR", "repo": "niri", "type": "github" } @@ -285,11 +297,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1769019098, - "narHash": "sha256-UpIgzUjr60Doko7FnJFRrvurXA2t9N4dwLW4w+I+Gek=", + "lastModified": 1769501793, + "narHash": "sha256-+2S8eESJcN8N/GhsPGJ3qirU0Wi4TcnnsddduIxncRs=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "e050edf2588a62d16462af7a23f4eaaf2c9c413d", + "rev": "0cce43fce4fc95cceb94ba1da9f1609022411cd1", "type": "github" }, "original": { @@ -300,11 +312,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1768975286, - "narHash": "sha256-Q7rQct5wdjRX7KtKD9vccmHVXdCZuBmdj6GraFemWYY=", + "lastModified": 1769434638, + "narHash": "sha256-4NVXUmdbTTZa13qX1MFCVbPxiMT1nzF7OnuRbPMk0lI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "203f2ddbe3a48ede1b20b3b86bc8664b311b512d", + "rev": "9c2822d7024c032e66000a8b8a47e91b4e63ffc8", "type": "github" }, "original": { @@ -331,11 +343,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1769089682, - "narHash": "sha256-9yA/LIuAVQq0lXelrZPjLuLVuZdm03p8tfmHhnDIkms=", + "lastModified": 1769318308, + "narHash": "sha256-Mjx6p96Pkefks3+aA+72lu1xVehb6mv2yTUUqmSet6Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "078d69f03934859a181e81ba987c2bb033eebfc5", + "rev": "1cd347bf3355fce6c64ab37d3967b4a2cb4b878c", "type": "github" }, "original": { @@ -347,27 +359,27 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1769018530, - "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", + "lastModified": 1769529101, + "narHash": "sha256-D9kq6f/Pk8fBX3i/pf8LjgaK935XpBmr/5NZD0Hb7eQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", + "rev": "c066ab53a57f471734a532c64b9f1259a6bb953c", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "master", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1769018530, - "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", + "lastModified": 1769170682, + "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", + "rev": "c5296fdd05cfa2c187990dd909864da9658df755", "type": "github" }, "original": { @@ -386,11 +398,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1768910181, - "narHash": "sha256-YRU0IHMzXluZxr0JDfq9jtblb4DV7MIB5wj2jYMFKQc=", + "lastModified": 1769418848, + "narHash": "sha256-jLSg9IkglcIw64kU1utXxsxXhiVdD45dkh9ZJKaFQ7U=", "owner": "nix-community", "repo": "nixvim", - "rev": "5b138edcb2f1c3ed4b29eca3658f04f0639b98b3", + "rev": "c19a0517ddeed4c1548611e42e187048fc2e5dcf", "type": "github" }, "original": { @@ -406,11 +418,11 @@ ] }, "locked": { - "lastModified": 1769099505, - "narHash": "sha256-b8TRdxE4JU6zoN+e1pZoskikGSRVY9Nn/BUzZSPfDHM=", + "lastModified": 1769526114, + "narHash": "sha256-Snq5+73FxHeCtx78unS7g/921tDhRjiPkAIuiJgLe5s=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "2cb1daf9ac9a8d8516dec2a98a1b6a0f71d5f3da", + "rev": "0b983e2a94db2ef0cc3c0b6926ffde7742cfbdc4", "type": "github" }, "original": { @@ -427,11 +439,11 @@ ] }, "locked": { - "lastModified": 1769095486, - "narHash": "sha256-VvZZTIlojW3aybUIwzSLsztcaCl0GkYiTOql9ywmS+w=", + "lastModified": 1769527653, + "narHash": "sha256-d/i6dRAmrKex+i8dBcrWRcn2ca+vmmHyESDD40eOAQA=", "owner": "nix-community", "repo": "NUR", - "rev": "0d452746b8efbbb4400a6e91addd4e2468dd2eba", + "rev": "a93fa977b8cecb4280b444d63d30abab82e61fa3", "type": "github" }, "original": { @@ -443,11 +455,11 @@ "openmw": { "flake": false, "locked": { - "lastModified": 1769032922, - "narHash": "sha256-u2oGQji+7hmvwREL+cUNRiwzl4Nlkdlz2TqigmLy2Ck=", + "lastModified": 1769529403, + "narHash": "sha256-ZOQlIFEH2Qm8SanQj1ip4jUBijf6lkgBmCIA5vLLxbw=", "owner": "OpenMW", "repo": "openmw", - "rev": "851f69609f9e10d66c478d23ff608b42f66f7bc7", + "rev": "74ed52411439008723343ba8b090888965a074fb", "type": "gitlab" }, "original": { @@ -487,7 +499,6 @@ "catppuccin-discord": "catppuccin-discord", "home-manager": "home-manager", "niri": "niri", - "niri-blur": "niri-blur", "nix-cachyos-kernel": "nix-cachyos-kernel", "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", @@ -508,11 +519,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1768656845, - "narHash": "sha256-xNlXMyn7yc3Z/NOsz4NchO7gWFwsoCvtJ26pys4s2/M=", + "lastModified": 1769316930, + "narHash": "sha256-4EOGHYLpIscwr+6drHE28Qj7NDjjowp2Vd8QkXjdBBE=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "8bd7e49d5ac62756bee6e4b02221fb96bfc3c99a", + "rev": "b2ce438f386943ef611e196a178af2d79042903b", "type": "github" }, "original": { @@ -587,11 +598,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1769233250, - "narHash": "sha256-PIcvKgmr69UTPXuT/t3YnsxNxY5joxOGYQb0KG0Ws3E=", + "lastModified": 1769356222, + "narHash": "sha256-Q0BVubV9ZnmLs506EhBSPglM+YJK56wsQNbeecvWPUo=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "7af39ce41986feee45a91acbe4d417482c9b6458", + "rev": "cf14278b92b0a91d01587f09b4b00ea655ae24e6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6d0e6b4..d590f56 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs-unstable.url = "github:NixOS/nixpkgs/master"; nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel"; @@ -33,16 +33,16 @@ }; niri = { - url = "github:sckova/niri-flake"; + url = "github:sodiboo/niri-flake"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.niri-stable.follows = "niri-blur"; - inputs.niri-unstable.follows = "niri-blur"; + # inputs.niri-stable.follows = "niri-blur"; + # inputs.niri-unstable.follows = "niri-blur"; }; - niri-blur = { - url = "github:visualglitch91/niri/feat/blur"; - flake = false; - }; + # niri-blur = { + # url = "github:visualglitch91/niri/feat/blur"; + # flake = false; + # }; noctalia = { url = "github:noctalia-dev/noctalia-shell"; @@ -65,7 +65,7 @@ }; apple-silicon = { - url = "github:nix-community/nixos-apple-silicon"; + url = "github:sckova/nixos-apple-silicon"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home/tiling/niri.nix b/home/tiling/niri.nix index a5c826a..038c451 100644 --- a/home/tiling/niri.nix +++ b/home/tiling/niri.nix @@ -122,12 +122,12 @@ softness = 30; color = base00 + "77"; }; - blur = { - enable = true; - passes = 4; - radius = 4; - noise = 0.1; - }; + # blur = { + # enable = true; + # passes = 4; + # radius = 4; + # noise = 0.1; + # }; }; window-rules = [ { @@ -138,7 +138,7 @@ bottom-right = 16.0; }; clip-to-geometry = true; - opacity = 0.975; + opacity = 1.0; } { matches = [ diff --git a/system/default.nix b/system/default.nix index d7361c9..4ea308f 100755 --- a/system/default.nix +++ b/system/default.nix @@ -99,6 +99,8 @@ }; udisks2.enable = true; gvfs.enable = true; + + upower.enable = true; }; environment = { diff --git a/system/hosts/peach/default.nix b/system/hosts/peach/default.nix index 70c24ae..219ae68 100644 --- a/system/hosts/peach/default.nix +++ b/system/hosts/peach/default.nix @@ -20,6 +20,16 @@ ''; hardware.i2c.enable = true; + virtualisation.docker = { + enable = true; + # Use the rootless mode - run Docker daemon as non-root user + rootless = { + enable = true; + setSocketVariable = true; + }; + }; + users.users.sckova.extraGroups = [ "docker" ]; + hardware.asahi = { enable = true; setupAsahiSound = true;