From 2e04c479c311436e2000853f69b21d752f1ad5e4 Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Thu, 22 Jan 2026 12:40:17 -0500 Subject: [PATCH] switch to unstable --- flake.lock | 220 ++++++++++------------------------- flake.nix | 6 +- home/hosts/peach/default.nix | 2 +- home/tiling/niri.nix | 34 ++++++ home/tiling/noctalia.nix | 1 - system/default.nix | 2 +- 6 files changed, 100 insertions(+), 165 deletions(-) diff --git a/flake.lock b/flake.lock index 9b37ad7..accac18 100644 --- a/flake.lock +++ b/flake.lock @@ -58,11 +58,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1768669154, - "narHash": "sha256-n9peTL7TAv1FIsboTEE1nWvuY2HYB67Jhh8o4O/JGfY=", + "lastModified": 1768843787, + "narHash": "sha256-z5WdKQAV/P2QzGrtDfM9k6qpAZGnP5nN9rBtKjl0bHY=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "4d7506c820f0d18fc0bbc36ecfec8ed126aee682", + "rev": "c2a381ae3d7dc148bb78d42677ec08974f3511fb", "type": "github" }, "original": { @@ -74,11 +74,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1768668945, - "narHash": "sha256-XKQ3DHUnaa/00BfIaY6K8xCZgx0Sy2wXQbNYE/AmWSk=", + "lastModified": 1768803975, + "narHash": "sha256-VV0AMYlSIVYbJNzKymnGGSlBcPoahMxeASbVi+fTtHo=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "cba022ec33a81d60a1e2c9fe4622196e3fef2b54", + "rev": "cec2d1841baae411313742083ef2bc0b29855b4d", "type": "github" }, "original": { @@ -178,24 +178,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "fromYaml": { "flake": false, "locked": { @@ -219,52 +201,27 @@ ] }, "locked": { - "lastModified": 1768603898, - "narHash": "sha256-vRV1dWJOCpCal3PRr86wE2WTOMfAhTu6G7bSvOsryUo=", + "lastModified": 1769102673, + "narHash": "sha256-/qvRFjn1s3bIJdSKG6IpaE6ML3j9anQKUqGhmt4Qe+E=", "owner": "nix-community", "repo": "home-manager", - "rev": "2a63d0e9d2c72ac4d4150ebb242cf8d86f488c8c", + "rev": "b0491fe55680bd19be8e74847969dad9d7784658", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", "repo": "home-manager", "type": "github" } }, - "ixx": { - "inputs": { - "flake-utils": [ - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "nixvim", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1754860581, - "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.1.1", - "repo": "ixx", - "type": "github" - } - }, "niri": { "inputs": { - "niri-stable": "niri-stable", - "niri-unstable": "niri-unstable", + "niri-stable": [ + "niri-blur" + ], + "niri-unstable": [ + "niri-blur" + ], "nixpkgs": [ "nixpkgs" ], @@ -273,48 +230,32 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1768669983, - "narHash": "sha256-OGl180QZ1QIirJ7Cy9Tqrgn/XEglaKGBeb5pys/sS7Y=", - "owner": "sodiboo", + "lastModified": 1769235082, + "narHash": "sha256-d+J0aA6ENaLyqbbaf9LNSKWQnX5at5NBIiFVTUoKGhc=", + "owner": "sckova", "repo": "niri-flake", - "rev": "b90da048a6ae94b49ff489bacac4a49206670c18", + "rev": "aab759b017937226563131da036392b26a7fe75c", "type": "github" }, "original": { - "owner": "sodiboo", + "owner": "sckova", "repo": "niri-flake", "type": "github" } }, - "niri-stable": { + "niri-blur": { "flake": false, "locked": { - "lastModified": 1756556321, - "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=", - "owner": "YaLTeR", + "lastModified": 1769119684, + "narHash": "sha256-e+0PeGvsQNz8o/lhOEe6dHdaap2AMOQUC/buH91QAtI=", + "owner": "visualglitch91", "repo": "niri", - "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294", + "rev": "8756d0aff313617fc2af014d9bc43561532278ae", "type": "github" }, "original": { - "owner": "YaLTeR", - "ref": "v25.08", - "repo": "niri", - "type": "github" - } - }, - "niri-unstable": { - "flake": false, - "locked": { - "lastModified": 1768653140, - "narHash": "sha256-8/u6/KHghsTHb3zmw8hYbwRQIp7UgMyQyqn4zVFN1S0=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "3ccb06f5644c4bcdf74ad2e4d388a13ac65207af", - "type": "github" - }, - "original": { - "owner": "YaLTeR", + "owner": "visualglitch91", + "ref": "feat/blur", "repo": "niri", "type": "github" } @@ -328,11 +269,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1768671945, - "narHash": "sha256-c+eJggWzQKYze1S/fQtW4xD+MD5FvCwyiLq4Ig1hIrA=", + "lastModified": 1769019098, + "narHash": "sha256-UpIgzUjr60Doko7FnJFRrvurXA2t9N4dwLW4w+I+Gek=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "0deadd1965740f6c9eb51254156af2914e1c0d50", + "rev": "e050edf2588a62d16462af7a23f4eaaf2c9c413d", "type": "github" }, "original": { @@ -343,11 +284,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1768640357, - "narHash": "sha256-NRmPViu76stpOUahRWuR3zMKfY2dKr/qAxRlcqfyps4=", + "lastModified": 1768975286, + "narHash": "sha256-Q7rQct5wdjRX7KtKD9vccmHVXdCZuBmdj6GraFemWYY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d157866bc6cc1a986f88f6e78a6884efeeec6187", + "rev": "203f2ddbe3a48ede1b20b3b86bc8664b311b512d", "type": "github" }, "original": { @@ -374,11 +315,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1768484090, - "narHash": "sha256-HBIfbB9MF9oqQTxs/W5440mzVaYDBWU9tuX95aZ8h64=", + "lastModified": 1769089682, + "narHash": "sha256-9yA/LIuAVQq0lXelrZPjLuLVuZdm03p8tfmHhnDIkms=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d4fa45dc2d4d32c10cb7c6b530a6b4b7d2429442", + "rev": "078d69f03934859a181e81ba987c2bb033eebfc5", "type": "github" }, "original": { @@ -390,11 +331,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1768564909, - "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", + "lastModified": 1769018530, + "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", + "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", "type": "github" }, "original": { @@ -406,16 +347,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1768484090, - "narHash": "sha256-HBIfbB9MF9oqQTxs/W5440mzVaYDBWU9tuX95aZ8h64=", + "lastModified": 1769018530, + "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d4fa45dc2d4d32c10cb7c6b530a6b4b7d2429442", + "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -426,20 +367,18 @@ "nixpkgs": [ "nixpkgs" ], - "nuschtosSearch": "nuschtosSearch", - "systems": "systems_2" + "systems": "systems" }, "locked": { - "lastModified": 1768486829, - "narHash": "sha256-G621Q9cB1roQxK0C6guNjmWX0CmPA5xN46VD2kTdDEk=", + "lastModified": 1768910181, + "narHash": "sha256-YRU0IHMzXluZxr0JDfq9jtblb4DV7MIB5wj2jYMFKQc=", "owner": "nix-community", "repo": "nixvim", - "rev": "503259b749971f431cb4aca7099cd60eadd7a613", + "rev": "5b138edcb2f1c3ed4b29eca3658f04f0639b98b3", "type": "github" }, "original": { "owner": "nix-community", - "ref": "nixos-25.11", "repo": "nixvim", "type": "github" } @@ -451,11 +390,11 @@ ] }, "locked": { - "lastModified": 1768675584, - "narHash": "sha256-YcQRhf1AQv0jHey5DMek5UQvkqSs+Q/yktXEm8ymaRA=", + "lastModified": 1769099505, + "narHash": "sha256-b8TRdxE4JU6zoN+e1pZoskikGSRVY9Nn/BUzZSPfDHM=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "1d792b01b4cf2160000f7ef6e9388843cf5106d3", + "rev": "2cb1daf9ac9a8d8516dec2a98a1b6a0f71d5f3da", "type": "github" }, "original": { @@ -472,11 +411,11 @@ ] }, "locked": { - "lastModified": 1768678623, - "narHash": "sha256-MyrKCHIZp64SBXOKBpn2SpR/xXtXnmd+aEneLC8jzA0=", + "lastModified": 1769095486, + "narHash": "sha256-VvZZTIlojW3aybUIwzSLsztcaCl0GkYiTOql9ywmS+w=", "owner": "nix-community", "repo": "NUR", - "rev": "82551fa3d3324211956ce513c4ca50f9beea20af", + "rev": "0d452746b8efbbb4400a6e91addd4e2468dd2eba", "type": "github" }, "original": { @@ -485,37 +424,14 @@ "type": "github" } }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils", - "ixx": "ixx", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1761730856, - "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=", - "owner": "NuschtOS", - "repo": "search", - "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "openmw": { "flake": false, "locked": { - "lastModified": 1768594407, - "narHash": "sha256-jACd+r0ZULYrnFCjHg+I4uXmlXNB4lPNrvQt5UpSuIc=", + "lastModified": 1769032922, + "narHash": "sha256-u2oGQji+7hmvwREL+cUNRiwzl4Nlkdlz2TqigmLy2Ck=", "owner": "OpenMW", "repo": "openmw", - "rev": "74387b469455348449454fdf913af478f13bab67", + "rev": "851f69609f9e10d66c478d23ff608b42f66f7bc7", "type": "gitlab" }, "original": { @@ -554,6 +470,7 @@ "base16-discord": "base16-discord", "home-manager": "home-manager", "niri": "niri", + "niri-blur": "niri-blur", "nix-cachyos-kernel": "nix-cachyos-kernel", "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", @@ -571,7 +488,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1768656845, @@ -617,21 +534,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tt-schemes": { "flake": false, "locked": { @@ -668,11 +570,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1768106915, - "narHash": "sha256-HlLo9zH4ULRXlmlIK948cHmdVhxyHgTHxGaoCRlW4k8=", + "lastModified": 1768765571, + "narHash": "sha256-C1JbyJ3ftogmN3vmLNfyPtnJw2wY64TiUTIhFtk1Leg=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "72245e108f3b03c3c4474d2de9de2d1830849603", + "rev": "ed1cef792b4def3321ff9ab5479df09609f17a69", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 545461c..c84bac7 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "My NixOS Configuration"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel"; @@ -22,7 +22,7 @@ }; home-manager = { - url = "github:nix-community/home-manager/release-25.11"; + url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -53,7 +53,7 @@ }; nixvim = { - url = "github:nix-community/nixvim/nixos-25.11"; + url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home/hosts/peach/default.nix b/home/hosts/peach/default.nix index 7e1ee13..1028171 100644 --- a/home/hosts/peach/default.nix +++ b/home/hosts/peach/default.nix @@ -1,7 +1,7 @@ { pkgs, config, ... }: { colors = { - scheme = "catppuccin-mocha"; + scheme = "espresso"; accent = "base09"; }; diff --git a/home/tiling/niri.nix b/home/tiling/niri.nix index 2e8080f..437dc41 100644 --- a/home/tiling/niri.nix +++ b/home/tiling/niri.nix @@ -199,6 +199,7 @@ ]; allow-when-locked = true; }; + "Shift+XF86AudioRaiseVolume" = { action.spawn = [ "wpctl" @@ -217,6 +218,39 @@ ]; allow-when-locked = true; }; + + "MouseForward" = { + action.spawn-sh = [ + "noctalia-shell ipc call volume increase" + ]; + allow-when-locked = true; + }; + "MouseBack" = { + action.spawn-sh = [ + "noctalia-shell ipc call volume decrease" + ]; + allow-when-locked = true; + }; + + "Shift+MouseForward" = { + action.spawn = [ + "wpctl" + "set-volume" + "@DEFAULT_AUDIO_SINK@" + "0.01+" + ]; + allow-when-locked = true; + }; + "Shift+MouseBack" = { + action.spawn = [ + "wpctl" + "set-volume" + "@DEFAULT_AUDIO_SINK@" + "0.01-" + ]; + allow-when-locked = true; + }; + "XF86AudioMute" = { action.spawn-sh = [ "noctalia-shell ipc call volume muteOutput" diff --git a/home/tiling/noctalia.nix b/home/tiling/noctalia.nix index 05f6f15..e68fdc6 100644 --- a/home/tiling/noctalia.nix +++ b/home/tiling/noctalia.nix @@ -45,7 +45,6 @@ brightness = { brightnessStep = 5; enforceMinimum = false; - enableDdcSupport = true; }; bar = { position = "top"; diff --git a/system/default.nix b/system/default.nix index dc4e748..a39cb19 100755 --- a/system/default.nix +++ b/system/default.nix @@ -76,7 +76,7 @@ services = { displayManager = { - cosmic-greeter.enable = true; + gdm.enable = true; defaultSession = "niri"; };