From 53855172d326e1b58febd3c7b1327e5322fb46c6 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Sat, 7 Jun 2025 17:54:53 +0200 Subject: [PATCH 1/6] flake.lock: bump inputs --- flake.lock | 148 ++++++++++++++++++++++++++--------------------------- 1 file changed, 74 insertions(+), 74 deletions(-) diff --git a/flake.lock b/flake.lock index 20f2973..e6484b5 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1747864449, - "narHash": "sha256-PIjVAWghZhr3L0EFM2UObhX84UQxIACbON0IC0zzSKA=", + "lastModified": 1749155310, + "narHash": "sha256-t0HfHg/1+TbSra5s6nNM0o4tnb3uqWedShSpZXsUMYY=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "389372c5f4dc1ac0e7645ed29a35fd6d71672ef5", + "rev": "94981cf75a9f11da0b6dd6a1abbd7c50a36ab2d3", "type": "github" }, "original": { @@ -35,11 +35,11 @@ }, "crane": { "locked": { - "lastModified": 1748047550, - "narHash": "sha256-t0qLLqb4C1rdtiY8IFRH5KIapTY/n3Lqt57AmxEv9mk=", + "lastModified": 1748970125, + "narHash": "sha256-UDyigbDGv8fvs9aS95yzFfOKkEjx1LO3PL3DsKopohA=", "owner": "ipetkov", "repo": "crane", - "rev": "b718a78696060df6280196a6f992d04c87a16aef", + "rev": "323b5746d89e04b22554b061522dfce9e4c49b18", "type": "github" }, "original": { @@ -119,11 +119,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -312,11 +312,11 @@ ] }, "locked": { - "lastModified": 1745948457, - "narHash": "sha256-lzTV10FJTCGNtMdgW5YAhCAqezeAzKOd/97HbQK8GTU=", + "lastModified": 1749155331, + "narHash": "sha256-XR9fsI0zwLiFWfqi/pdS/VD+YNorKb3XIykgTg4l1nA=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "ac903e80b33ba6a88df83d02232483d99f327573", + "rev": "45fcc10b4c282746d93ec406a740c43b48b4ef80", "type": "github" }, "original": { @@ -341,11 +341,11 @@ ] }, "locked": { - "lastModified": 1745015490, - "narHash": "sha256-apEJ9zoSzmslhJ2vOKFcXTMZLUFYzh1ghfB6Rbw3Low=", + "lastModified": 1749238452, + "narHash": "sha256-8qiKEWcxUrjpUpK+WyFNg/72C8rp70LUuyTD23T+SdQ=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "60754910946b4e2dc1377b967b7156cb989c5873", + "rev": "c7225d73755a6c4c7c72f4d4f3925ea426e325a8", "type": "github" }, "original": { @@ -374,11 +374,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1749049255, - "narHash": "sha256-QXg2B/bF/f9IeSiZwJuhdnz2xcnpu/hDfz4eIHWVhz8=", + "lastModified": 1749540031, + "narHash": "sha256-11k6hq/4Tao2PNBFQpSNTlFFKmKGswL17caKuZIE0sM=", "owner": "hyprwm", "repo": "hyprland", - "rev": "d7a87ce6e2535f1029fc93b062d2828e8549c525", + "rev": "6bdb1f413e4c592f73d91bef33dfb202503ef7ab", "type": "github" }, "original": { @@ -399,11 +399,11 @@ ] }, "locked": { - "lastModified": 1743714874, - "narHash": "sha256-yt8F7NhMFCFHUHy/lNjH/pjZyIDFNk52Q4tivQ31WFo=", + "lastModified": 1749046714, + "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "3a5c2bda1c1a4e55cc1330c782547695a93f05b2", + "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330", "type": "github" }, "original": { @@ -431,11 +431,11 @@ ] }, "locked": { - "lastModified": 1737634706, - "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", + "lastModified": 1749154592, + "narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=", "owner": "hyprwm", "repo": "hyprland-qt-support", - "rev": "8810df502cdee755993cb803eba7b23f189db795", + "rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074", "type": "github" }, "original": { @@ -467,11 +467,11 @@ ] }, "locked": { - "lastModified": 1745951494, - "narHash": "sha256-2dModE32doiyQMmd6EDAQeZnz+5LOs6KXyE0qX76WIg=", + "lastModified": 1749155776, + "narHash": "sha256-t1PM0wxQLQwv2F2AW23uA7pm5giwmcgYEWbNIRct9r4=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "4be1d324faf8d6e82c2be9f8510d299984dfdd2e", + "rev": "396e8aa1c06274835b69da7f9a015fff9a9b7522", "type": "github" }, "original": { @@ -496,11 +496,11 @@ ] }, "locked": { - "lastModified": 1747484975, - "narHash": "sha256-+LAQ81HBwG0lwshHlWe0kfWg4KcChIPpnwtnwqmnoEU=", + "lastModified": 1749145882, + "narHash": "sha256-qr0KXeczF8Sma3Ae7+dR2NHhvG7YeLBJv19W4oMu6ZE=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "163c83b3db48a17c113729c220a60b94596c9291", + "rev": "1bfb84f54d50c7ae6558c794d3cfd5f6a7e6e676", "type": "github" }, "original": { @@ -521,11 +521,11 @@ ] }, "locked": { - "lastModified": 1746635225, - "narHash": "sha256-W9G9bb0zRYDBRseHbVez0J8qVpD5QbizX67H/vsudhM=", + "lastModified": 1749135356, + "narHash": "sha256-Q8mAKMDsFbCEuq7zoSlcTuxgbIBVhfIYpX0RjE32PS0=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "674ea57373f08b7609ce93baff131117a0dfe70d", + "rev": "e36db00dfb3a3d3fdcc4069cb292ff60d2699ccb", "type": "github" }, "original": { @@ -546,11 +546,11 @@ ] }, "locked": { - "lastModified": 1747584298, - "narHash": "sha256-PH9qZqWLHvSBQiUnA0NzAyQA3tu2no2z8kz0ZeHWj4w=", + "lastModified": 1749145760, + "narHash": "sha256-IHaGWpGrv7seFWdw/1A+wHtTsPlOGIKMrk1TUIYJEFI=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "e511882b9c2e1d7a75d45d8fddd2160daeafcbc3", + "rev": "817918315ea016cc2d94004bfb3223b5fd9dfcc6", "type": "github" }, "original": { @@ -586,11 +586,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1748959397, - "narHash": "sha256-hq+njWbMLAfQIFEP+8G/7xLz1ZELWC+780332FdpnW0=", + "lastModified": 1749471908, + "narHash": "sha256-uGfPqd43KTomeIVWUzHu3hGLWFsqYibhWLt2OaRic28=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "20721e48123f1f900b323a76349130080a2f8343", + "rev": "00292388ad3b497763b81568d6ee5e1c4a2bcf85", "type": "github" }, "original": { @@ -662,11 +662,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748929857, - "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=", + "lastModified": 1749285348, + "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4", + "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", "type": "github" }, "original": { @@ -760,11 +760,11 @@ ] }, "locked": { - "lastModified": 1748598934, - "narHash": "sha256-c8o4KJPda4HNj/jWwjrWip7QZmfnuOQxKiAadzu/Ibs=", + "lastModified": 1749533342, + "narHash": "sha256-cQzKzqsPQmDBRDjcX4UFEQKNeAyibLIKkF+BBhE2JnI=", "ref": "refs/heads/master", - "rev": "aa547bad843439615bc0a7f97a55d81058b2e9c8", - "revCount": 565, + "rev": "2b01a75679a03bd6557cf11c20b1588f436d6b94", + "revCount": 571, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, @@ -782,8 +782,8 @@ "nixpkgs": "nixpkgs", "quickshell": "quickshell", "schizofox": "schizofox", - "superfreq": "superfreq", - "systems": "systems_3" + "systems": "systems_3", + "watt": "watt" } }, "rust-overlay": { @@ -794,11 +794,11 @@ ] }, "locked": { - "lastModified": 1748227081, - "narHash": "sha256-RLnN7LBxhEdCJ6+rIL9sbhjBVDaR6jG377M/CLP/fmE=", + "lastModified": 1749436897, + "narHash": "sha256-OkDtaCGQQVwVFz5HWfbmrMJR99sFIMXHCHEYXzUJEJY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1cbe817fd8c64a9f77ba4d7861a4839b0b15983e", + "rev": "e7876c387e35dc834838aff254d8e74cf5bd4f19", "type": "github" }, "original": { @@ -854,26 +854,6 @@ "type": "github" } }, - "superfreq": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1748722431, - "narHash": "sha256-kuvt+oy5nVr3C8PpjTBPSO25evEMA3rXGBg+PfHIevw=", - "owner": "notashelf", - "repo": "watt", - "rev": "da07011b02841c27ce751ea8dd67c4c3d153fb10", - "type": "github" - }, - "original": { - "owner": "notashelf", - "repo": "watt", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -919,6 +899,26 @@ "type": "github" } }, + "watt": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1749377316, + "narHash": "sha256-hw3rL4rlIlYJMTeE7DlQ3lRhQDJURAhE+PC/NT4VAAQ=", + "owner": "notashelf", + "repo": "watt", + "rev": "154724c7b1bd49654ea55df719e1eb3219ec2000", + "type": "github" + }, + "original": { + "owner": "notashelf", + "repo": "watt", + "type": "github" + } + }, "xdph": { "inputs": { "hyprland-protocols": [ @@ -947,11 +947,11 @@ ] }, "locked": { - "lastModified": 1745871725, - "narHash": "sha256-M24SNc2flblWGXFkGQfqSlEOzAGZnMc9QG3GH4K/KbE=", + "lastModified": 1749155346, + "narHash": "sha256-KIkJu3zF8MF3DuGwzAmo3Ww9wsWXolwV30SjJRTAxYE=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "76bbf1a6b1378e4ab5230bad00ad04bc287c969e", + "rev": "44bf29f1df45786098920c655af523535a9191ae", "type": "github" }, "original": { From e5134f2ae06348abbd97f6d2ecb4a346bf7a7b49 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Tue, 10 Jun 2025 20:23:50 +0200 Subject: [PATCH 2/6] power: superfreq => watt --- flake.nix | 2 +- modules/system/hardware/power.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 2f1f9e3..d4c330a 100644 --- a/flake.nix +++ b/flake.nix @@ -55,7 +55,7 @@ schizofox.url = "github:schizofox/schizofox"; - superfreq = { + watt = { url = "github:notashelf/watt"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/modules/system/hardware/power.nix b/modules/system/hardware/power.nix index 22507af..a867c14 100644 --- a/modules/system/hardware/power.nix +++ b/modules/system/hardware/power.nix @@ -8,7 +8,7 @@ inherit (lib.modules) mkDefault; in { imports = [ - inputs.superfreq.nixosModules.default + inputs.watt.nixosModules.default ]; config = { environment.systemPackages = builtins.attrValues { @@ -29,9 +29,9 @@ in { hardware.acpilight.enable = false; - services.superfreq = { + services.watt = { enable = true; - # sample config from https://github.com/NotAShelf/superfreq#sample-configuration + # sample config from https://github.com/NotAShelf/watt#sample-configuration settings = { charger = { # CPU governor to use From cd362bc5cddf8080fd5f326f68995cd0a9b9cce9 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Tue, 10 Jun 2025 20:24:04 +0200 Subject: [PATCH 3/6] users: switch to zsh as my default shell --- modules/other/users.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/other/users.nix b/modules/other/users.nix index 1fa4711..cdc7f02 100644 --- a/modules/other/users.nix +++ b/modules/other/users.nix @@ -33,7 +33,8 @@ in { The main user's git signing key, used to automatically sing git commits with this key ''; default = '' - ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAAWEDj/Yib6Mqs016jx7rtecWpytwfVl28eoHtPYCM9TVLq81VIHJSN37lbkc/JjiXCdIJy2Ta3A3CVV5k3Z37NbgAu23oKA2OcHQNaRTLtqWlcBf9fk9suOkP1A3NzAqzivFpBnZm3ytaXwU8LBJqxOtNqZcFVruO6fZxJtg2uE34mAw== ''; + ecdsa-sha2-nistp521 AAAAE2VjZHNhLXNoYTItbmlzdHA1MjEAAAAIbmlzdHA1MjEAAACFBAAWEDj/Yib6Mqs016jx7rtecWpytwfVl28eoHtPYCM9TVLq81VIHJSN37lbkc/JjiXCdIJy2Ta3A3CVV5k3Z37NbgAu23oKA2OcHQNaRTLtqWlcBf9fk9suOkP1A3NzAqzivFpBnZm3ytaXwU8LBJqxOtNqZcFVruO6fZxJtg2uE34mAw== + ''; }; }; }; @@ -52,7 +53,7 @@ in { "nix" "docker" ]; - shell = self.packages.${pkgs.stdenv.system}.fish; + shell = pkgs.zsh; # hashedPasswordFile = "/etc/passwords/cr"; }; # root.hashedPasswordFile = "/persist/passwords/root"; From 68eb88f562f2644951da3533e876d27d850b753f Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Tue, 10 Jun 2025 20:25:08 +0200 Subject: [PATCH 4/6] hermit: enable zsh --- hosts/hermit/configuration.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hosts/hermit/configuration.nix b/hosts/hermit/configuration.nix index 1282776..aa72fd3 100644 --- a/hosts/hermit/configuration.nix +++ b/hosts/hermit/configuration.nix @@ -16,6 +16,10 @@ thermald.enable = true; }; virtualisation.docker.enable = true; + programs.zsh = { + enable = true; + enableBashCompletion = true; + }; programs.gnupg.agent = { enable = true; From 04d18c1127d4659f4085ea554df142db19cd48f0 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Tue, 10 Jun 2025 20:25:16 +0200 Subject: [PATCH 5/6] hermit: programs: add nushell --- hosts/hermit/programs.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/hermit/programs.nix b/hosts/hermit/programs.nix index 4ac32e3..93994b2 100644 --- a/hosts/hermit/programs.nix +++ b/hosts/hermit/programs.nix @@ -52,6 +52,7 @@ swww microfetch nmap + nushell pamixer pwvucontrol pdfarranger From 8ea0b0cd87eb5e7ee63295002b6ecd6088b02b7c Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Tue, 10 Jun 2025 20:25:42 +0200 Subject: [PATCH 6/6] niri: config: fix compose key --- modules/wms/wayland/niri/config.kdl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/wms/wayland/niri/config.kdl b/modules/wms/wayland/niri/config.kdl index 7b7cf15..eb586d7 100644 --- a/modules/wms/wayland/niri/config.kdl +++ b/modules/wms/wayland/niri/config.kdl @@ -2,8 +2,8 @@ input { keyboard { xkb { layout "us,ru" - variant "phonetic_winkeys," - options "grp:rctrl_rshift_toggle,compose:102" + variant ",phonetic_winkeys" + options "grp:rctrl_rshift_toggle, compose:102" } repeat-rate 60 repeat-delay 200