From 7a5a78424ad6b32e301c5066da32213d67ee7efe Mon Sep 17 00:00:00 2001 From: cnst Date: Tue, 8 Jul 2025 16:02:30 +0200 Subject: [PATCH] some fixings and flake up --- flake.lock | 168 ++++++++----------- modules/nixos/programs/hyprland/keybinds.nix | 2 +- modules/nixos/programs/hyprland/rules.nix | 6 +- modules/nixos/programs/hyprland/startup.nix | 4 +- modules/nixos/programs/pkgs/default.nix | 2 +- 5 files changed, 81 insertions(+), 101 deletions(-) diff --git a/flake.lock b/flake.lock index c95bdc72..add5cc61 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1751619699, - "narHash": "sha256-3Si+Gi0e8PDIzUrV6LYCUN21EvaQyPaOU64kF6KT824=", + "lastModified": 1751930350, + "narHash": "sha256-hBIrzyrwG3XjeNyzVNWKDX+yYVlpwAqf9ovgF7qecug=", "owner": "Aylur", "repo": "ags", - "rev": "e5e2efaf2e05e077190cfddabf5b827edae5ef8b", + "rev": "22f37ccb0db58d9d8a11ad0054ab20ecfad005ad", "type": "github" }, "original": { @@ -81,11 +81,11 @@ ] }, "locked": { - "lastModified": 1751569683, - "narHash": "sha256-PoQcCYTiN52PanxgWBN4Tqet1x4PCk6KtjaHNjELH88=", + "lastModified": 1751740947, + "narHash": "sha256-35040CHH7P3JGmhGVfEb2oJHL/A5mI2IXumhkxrBnao=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "c0c56dde3e471030edb135425a82107cf0057c6f", + "rev": "dfc1db15a08c4cd234288f66e1199c653495301f", "type": "github" }, "original": { @@ -144,11 +144,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1751549328, - "narHash": "sha256-Pzh9+N0palTIX+O2NygrUmMS8omB86SnYthLwE5cu5g=", + "lastModified": 1751887274, + "narHash": "sha256-QJJXdfLFVz+0NiX2KcwHdlAAm0dSFgDgvSHWqXMeh2A=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "53209f5724858da5e3e5db3db404c325b4da5414", + "rev": "d8e4df179a1b18db062d568d7a4979aa147e9644", "type": "github" }, "original": { @@ -203,11 +203,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1751611255, - "narHash": "sha256-OoD7QdCBKk41sjGr7UpTxXtVba2kc2gfdex2qUCO1FQ=", + "lastModified": 1751957021, + "narHash": "sha256-2h9T/5Tyd2ounm3DAn+8LftRXctotQ/XD2aoZ9XBtsI=", "owner": "nix-community", "repo": "fenix", - "rev": "e60617a7e9ad348c2679557d01177f9d244e6e5d", + "rev": "fcb0981c8fe996743fc57087e781017eab6e46f9", "type": "github" }, "original": { @@ -459,11 +459,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1751640477, - "narHash": "sha256-+VyTrM4AecacK1CbaabLWDj91SoSb/QUpDUTFGrRKQM=", + "lastModified": 1751912500, + "narHash": "sha256-7hCbGzNRAXWSBWXZrTMZ7DIB6LDlCQKzPXGRxwOoOKA=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "908eb6d1564f480ee6028eb6b72dcd4b8839ad53", + "rev": "26522ab8c20dd9d2c690d04af94844f5e8719637", "type": "github" }, "original": { @@ -519,11 +519,11 @@ "gnim": { "flake": false, "locked": { - "lastModified": 1751120710, - "narHash": "sha256-sT1ILM8m1QG8CeMmqLHhW/8T/MzUq3JL9jO3V7FMa4w=", + "lastModified": 1751928958, + "narHash": "sha256-vQY2L+Hnp6F1MHFa3UbMft1goGw3iODI5M+96Z7P+9Q=", "owner": "aylur", "repo": "gnim", - "rev": "5d2b734be452e2819f3a7313dbb34fa43c23e5d9", + "rev": "9bffa83f52f711b13e3c139454623a9aea4f5552", "type": "github" }, "original": { @@ -570,11 +570,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1751638642, - "narHash": "sha256-lKlxSvY6Dn9yYkwAedht2O7iXX3QjJ76YFvGOLvnpfk=", + "lastModified": 1751928076, + "narHash": "sha256-Y9SnpJvUvLZsSKOzPRbyKxwxe6b9eBLGLkb+6vwobtc=", "owner": "helix-editor", "repo": "helix", - "rev": "9789b2746192c9501577a6a25ba15fae5b27e88b", + "rev": "02fe4376220664479aadfb943f0314712d82ac33", "type": "github" }, "original": { @@ -590,11 +590,11 @@ ] }, "locked": { - "lastModified": 1751638848, - "narHash": "sha256-7HiC6w4ROEbMmKtj5pilnLOJej9HkkfU9wEd5QSTyNo=", + "lastModified": 1751824240, + "narHash": "sha256-aDDC0CHTlL7QDKWWhdbEgVPK6KwWt+ca0QkmHYZxMzI=", "owner": "nix-community", "repo": "home-manager", - "rev": "7d9e3c35f0d46f82bac791d76260f15f53d83529", + "rev": "fd9e55f5fac45a26f6169310afca64d56b681935", "type": "github" }, "original": { @@ -632,11 +632,11 @@ ] }, "locked": { - "lastModified": 1751513147, - "narHash": "sha256-idSXM3Y0KNf/WDDqGfthiOSQMwZYwis1JZhTkdWrr6A=", + "lastModified": 1751693185, + "narHash": "sha256-+LKghTO5wWBcR/MJAeoSarWR7c7dO6GyA8+jM8DHV08=", "owner": "nix-community", "repo": "home-manager", - "rev": "426b405d979d893832549b95f23c13537c65d244", + "rev": "36c57c6a1d03a5efbf5e23c04dbe21259d25f992", "type": "github" }, "original": { @@ -690,11 +690,11 @@ ] }, "locked": { - "lastModified": 1750621377, - "narHash": "sha256-8u6b5oAdX0rCuoR8wFenajBRmI+mzbpNig6hSCuWUzE=", + "lastModified": 1751808145, + "narHash": "sha256-OXgL0XaKMmfX2rRQkt9SkJw+QNfv0jExlySt1D6O72g=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "b3d628d01693fb9bb0a6690cd4e7b80abda04310", + "rev": "b841473a0bd4a1a74a0b64f1ec2ab199035c349f", "type": "github" }, "original": { @@ -783,11 +783,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1751633026, - "narHash": "sha256-36YOErrM/BB8J/IpqgAg7CNZfAlfU7Mng1S9Y9OFOmc=", + "lastModified": 1751971270, + "narHash": "sha256-24tLzp7xNegOdEpVrO7s9Gjmt7bBfvvCC8KAByxd2Fk=", "owner": "hyprwm", "repo": "hyprland", - "rev": "9b51d73a1e22c86e8d6ec78750e622da9242e32f", + "rev": "8f948827a69499c0b112043debad35f82a312b6b", "type": "github" }, "original": { @@ -804,11 +804,11 @@ ] }, "locked": { - "lastModified": 1750372088, - "narHash": "sha256-LPwgPRBTfnA76rHUr7KYvwq2pNt5IfxymNAZUJFvn/M=", + "lastModified": 1751715349, + "narHash": "sha256-cP76ijtfGTFTpWFfmyFHA2MpDlIyKpWwW82kqQSQ6s0=", "owner": "hyprwm", "repo": "contrib", - "rev": "189f32f56285aae9646bf1292976392beba5a2e2", + "rev": "dafa5d09b413d08a55a81f6f8e85775d717bacda", "type": "github" }, "original": { @@ -1049,11 +1049,11 @@ ] }, "locked": { - "lastModified": 1751061882, - "narHash": "sha256-g9n8Vrbx+2JYM170P9BbvGHN39Wlkr4U+V2WLHQsXL8=", + "lastModified": 1751888065, + "narHash": "sha256-F2SV9WGqgtRsXIdUrl3sRe0wXlQD+kRRZcSfbepjPJY=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "4737241eaf8a1e51671a2a088518071f9a265cf4", + "rev": "a8229739cf36d159001cfc203871917b83fdf917", "type": "github" }, "original": { @@ -1099,11 +1099,11 @@ ] }, "locked": { - "lastModified": 1750371869, - "narHash": "sha256-lGk4gLjgZQ/rndUkzmPYcgbHr8gKU5u71vyrjnwfpB4=", + "lastModified": 1751881472, + "narHash": "sha256-meB0SnXbwIe2trD041MLKEv6R7NZ759QwBcVIhlSBfE=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "aa38edd6e3e277ae6a97ea83a69261a5c3aab9fd", + "rev": "8fb426b3e5452fd9169453fd6c10f8c14ca37120", "type": "github" }, "original": { @@ -1257,27 +1257,6 @@ "type": "github" } }, - "nil": { - "inputs": { - "nixpkgs": [ - "nvf", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1750047244, - "narHash": "sha256-vluLARrk4485npdyHOj8XKr0yk6H22pNf+KVRNL+i/Y=", - "owner": "oxalica", - "repo": "nil", - "rev": "870a4b1b5f12004832206703ac15aa85c42c247b", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "nil", - "type": "github" - } - }, "nix-gaming": { "inputs": { "flake-parts": [ @@ -1288,11 +1267,11 @@ ] }, "locked": { - "lastModified": 1751508010, - "narHash": "sha256-IXBLUCMTKaMzbbs5SOqH7FEI9fRwOi3ZP6LKjttnO5o=", + "lastModified": 1751971490, + "narHash": "sha256-lYfUD5OaQXU7fM6LCV8/uklgpf6Ey7z4zH9NomSDrbc=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "d00203f8630983aadb57cfde60b481cd97d06659", + "rev": "9c03f0df5fe163eb2000f69921c7ed2dc8797803", "type": "github" }, "original": { @@ -1357,11 +1336,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1751271578, - "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", "type": "github" }, "original": { @@ -1389,11 +1368,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1751011381, - "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", "type": "github" }, "original": { @@ -1421,11 +1400,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1751271578, - "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", "type": "github" }, "original": { @@ -1466,11 +1445,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1751011381, - "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", + "lastModified": 1751792365, + "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", + "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", "type": "github" }, "original": { @@ -1516,16 +1495,15 @@ "flake-parts": "flake-parts_4", "flake-utils": "flake-utils_2", "mnw": "mnw", - "nil": "nil", "nixpkgs": "nixpkgs_11", "systems": "systems_6" }, "locked": { - "lastModified": 1751520935, - "narHash": "sha256-jp5Mzbw0I/DEX4PVFi4C6MzwCZ/st+GUKMl/+IodX0o=", + "lastModified": 1751887073, + "narHash": "sha256-M92RDGGx330MPqK2v7IRn98938Y2b1tkfe0ujD5GK70=", "owner": "notashelf", "repo": "nvf", - "rev": "b4850409336b770d0db4cfd8acd71793747ddfe5", + "rev": "d70c3a834061b9f24cfcc350ce2325c3bbede774", "type": "github" }, "original": { @@ -1615,11 +1593,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1751584117, - "narHash": "sha256-X+eVYBgJtR5WtFGifchtuidsl0epV3+oKXVxdd9ntuY=", + "lastModified": 1751913732, + "narHash": "sha256-h6rTTB4MBJSIr4xsXxCi8fk8LdiFbwOw/g3QqBHLpW4=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "040049b79973a742bbd0eef25369b983f764dc38", + "rev": "778e08df16294e4a2c11a40136f69f908e9be879", "type": "github" }, "original": { @@ -1637,11 +1615,11 @@ ] }, "locked": { - "lastModified": 1751510438, - "narHash": "sha256-m8PjOoyyCR4nhqtHEBP1tB/jF+gJYYguSZmUmVTEAQE=", + "lastModified": 1751683029, + "narHash": "sha256-dYO5X5jK8bpQOeRAo8R5aUt6M/+Ji1cZgstZI7SQ2IA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7f415261f298656f8164bd636c0dc05af4e95b6b", + "rev": "9e5e62a33a929a67a5427fb7324a6f583dced0b2", "type": "github" }, "original": { @@ -1927,11 +1905,11 @@ ] }, "locked": { - "lastModified": 1750372504, - "narHash": "sha256-VBeZb1oqZM1cqCAZnFz/WyYhO8aF/ImagI7WWg/Z3Og=", + "lastModified": 1751300244, + "narHash": "sha256-PFuv1TZVYvQhha0ac53E3YgdtmLShrN0t4T6xqHl0jE=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "400308fc4f9d12e0a93e483c2e7a649e12af1a92", + "rev": "6115f3fdcb2c1a57b4a80a69f3c797e47607b90a", "type": "github" }, "original": { @@ -1947,11 +1925,11 @@ ] }, "locked": { - "lastModified": 1751447312, - "narHash": "sha256-3O3Tvfyb6Wx3jCLTXx8DYwC+aPsMkba+bnmt6fI5EvY=", + "lastModified": 1751859193, + "narHash": "sha256-VbSNIVa3U6umZqJUfXNeIvZKvqitQki3lZmjxOCD/yI=", "ref": "refs/heads/main", - "rev": "65d7cdedfa21891bb876adb8204fa70f52d7f85f", - "revCount": 109, + "rev": "04300e9f136bab8a82744b9be392b01c84de35eb", + "revCount": 111, "type": "git", "url": "https://git.sr.ht/~canasta/zen-browser-flake" }, diff --git a/modules/nixos/programs/hyprland/keybinds.nix b/modules/nixos/programs/hyprland/keybinds.nix index e64d5e8e..7380f797 100644 --- a/modules/nixos/programs/hyprland/keybinds.nix +++ b/modules/nixos/programs/hyprland/keybinds.nix @@ -68,7 +68,7 @@ in { "$mod SHIFT, 8, movetoworkspace, 8" "$mod SHIFT, 9, movetoworkspace, 9" "$mod SHIFT, 0, movetoworkspace, 10" - "CTRL SHIFT, Escape, exec, ${runOnce "missioncenter"}" + "CTRL SHIFT, Escape, exec, ${runOnce "resources"}" ",XF86AudioLowerVolume, exec, volume-control.sh --dec" ",XF86AudioRaiseVolume, exec, volume-control.sh --inc" diff --git a/modules/nixos/programs/hyprland/rules.nix b/modules/nixos/programs/hyprland/rules.nix index 676b5b7b..a8f95a70 100644 --- a/modules/nixos/programs/hyprland/rules.nix +++ b/modules/nixos/programs/hyprland/rules.nix @@ -28,9 +28,9 @@ in { "move 100%-w-20 40, class:^(org.keepassxc.KeePassXC)$" "float, class:^(org.keepassxc.KeePassXC)$" - "size 50% 70%, class:^(io.missioncenter.MissionCenter)$" - "center, class:^(io.missioncenter.MissionCenter)$" - "float, class:^(io.missioncenter.MissionCenter)$" + "size 50% 70%, class:^(net.nokyan.Resources)$" + "center, class:^(net.nokyan.Resources)$" + "float, class:^(net.nokyan.Resources)$" "suppressevent maximize, class:.*" diff --git a/modules/nixos/programs/hyprland/startup.nix b/modules/nixos/programs/hyprland/startup.nix index c46e9a7a..bf8235c9 100644 --- a/modules/nixos/programs/hyprland/startup.nix +++ b/modules/nixos/programs/hyprland/startup.nix @@ -38,7 +38,9 @@ in { }) (mkIf (host == "cnixpad") { - programs.hyprland.settings.exec-once = commonExecOnce; + programs.hyprland.settings.exec-once = + [] + ++ commonExecOnce; }) (mkIf (host == "toothpc") { diff --git a/modules/nixos/programs/pkgs/default.nix b/modules/nixos/programs/pkgs/default.nix index c4be1ae6..6f408bf3 100644 --- a/modules/nixos/programs/pkgs/default.nix +++ b/modules/nixos/programs/pkgs/default.nix @@ -51,7 +51,7 @@ in { jq fd libqalculate - mission-center + resources git stow tree