From 9082adb7afcc304dffa66ac662a94675e8593b08 Mon Sep 17 00:00:00 2001 From: lightly-toasted Date: Sat, 14 Feb 2026 15:49:37 +0900 Subject: [PATCH] chore: update inputs - Update flake inputs - Update package names - Update hyprland window rules - Set programs.zsh.dotDir --- flake.lock | 175 ++++++------------------ home/modules/cli/zsh.nix | 3 +- home/modules/graphical/fonts.nix | 8 +- home/modules/graphical/hyprland.nix | 4 +- home/modules/graphical/udiskie.nix | 2 +- hosts/nixos/modules/programs/thunar.nix | 2 +- 6 files changed, 55 insertions(+), 139 deletions(-) diff --git a/flake.lock b/flake.lock index 7c30183..afd53f9 100644 --- a/flake.lock +++ b/flake.lock @@ -35,11 +35,11 @@ }, "crane": { "locked": { - "lastModified": 1763938834, - "narHash": "sha256-j8iB0Yr4zAvQLueCZ5abxfk6fnG/SJ5JnGUziETjwfg=", + "lastModified": 1770419512, + "narHash": "sha256-o8Vcdz6B6bkiGUYkZqFwH3Pv1JwZyXht3dMtS7RchIo=", "owner": "ipetkov", "repo": "crane", - "rev": "d9e753122e51cee64eb8d2dddfe11148f339f5a2", + "rev": "2510f2cbc3ccd237f700bb213756a8f35c32d8d7", "type": "github" }, "original": { @@ -67,15 +67,15 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } @@ -97,11 +97,11 @@ "flake-compat_4": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", "owner": "edolstra", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { @@ -136,11 +136,11 @@ ] }, "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -149,24 +149,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems_2" - }, - "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" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -218,11 +200,11 @@ ] }, "locked": { - "lastModified": 1764361670, - "narHash": "sha256-jgWzgpIaHbL3USIq0gihZeuy1lLf2YSfwvWEwnfAJUw=", + "lastModified": 1771037579, + "narHash": "sha256-NX5XuhGcsmk0oEII2PEtMRgvh2KaAv3/WWQsOpxAgR4=", "owner": "nix-community", "repo": "home-manager", - "rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6", + "rev": "05e6dc0f6ed936f918cb6f0f21f1dad1e4c53150", "type": "github" }, "original": { @@ -550,34 +532,6 @@ "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" - } - }, "lanzaboote": { "inputs": { "crane": "crane", @@ -590,11 +544,11 @@ ] }, "locked": { - "lastModified": 1763975256, - "narHash": "sha256-IhdDL+0YwlLz5Ty0EnAxWN/btemN9FxcQbYs/V/8jvs=", + "lastModified": 1770734117, + "narHash": "sha256-PNXSnK507MRj+hYMgnUR7InNJzVCmOfsjHV4YXZgpwQ=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "6803b15c4ab9df2dcc478254b4adb55524746ac7", + "rev": "2038a9a19adb886eccba775321b055fdbdc5029d", "type": "github" }, "original": { @@ -605,11 +559,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1754777568, - "narHash": "sha256-0bBqT+3XncgF8F03RFAamw9vdf0VmaDoIJLTGkjfQZs=", + "lastModified": 1768656715, + "narHash": "sha256-Sbh037scxKFm7xL0ahgSCw+X2/5ZKeOwI2clqrYr9j4=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "62f636b87ef6050760a8cb325cadb90674d1e23e", + "rev": "123fe29340a5b8671367055b75a6e7c320d6f89a", "type": "github" }, "original": { @@ -627,11 +581,11 @@ ] }, "locked": { - "lastModified": 1770761134, - "narHash": "sha256-65Xg7Rfx9Cj/D+OUF7KZUcYSQPbToBDZpqUfFUAKuwc=", + "lastModified": 1770971055, + "narHash": "sha256-XYFbDiNsfUKduV0DgV8UYSRey9t9vz/A4ppmzwBW+vQ=", "owner": "FlameFlag", "repo": "nixcord", - "rev": "f77d6e05efd34581cbc30e7f426496285711bcde", + "rev": "77e0320dd37093da79e4f146659c66bb7ae692cc", "type": "github" }, "original": { @@ -648,11 +602,11 @@ ] }, "locked": { - "lastModified": 1764072830, - "narHash": "sha256-ezkjlUCohD9o9c47Ey0/I4CamSS0QEORTqGvyGqMud0=", + "lastModified": 1770657009, + "narHash": "sha256-v/LA5ZSJ+JQYzMSKB4sySM0wKfsAqddNzzxLLnbsV/E=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "c7832dd786175e20f2697179e0e03efadffe4201", + "rev": "5b50ea1aaa14945d4794c80fcc99c4aa1db84d2d", "type": "github" }, "original": { @@ -695,11 +649,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1764242076, - "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", + "lastModified": 1770841267, + "narHash": "sha256-9xejG0KoqsoKEGp2kVbXRlEYtFFcDTHjidiuX8hGO44=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", + "rev": "ec7c70d12ce2fc37cb92aff673dcdca89d187bae", "type": "github" }, "original": { @@ -715,15 +669,14 @@ "nixpkgs": [ "nixpkgs" ], - "nuschtosSearch": "nuschtosSearch", - "systems": "systems_3" + "systems": "systems_2" }, "locked": { - "lastModified": 1764385708, - "narHash": "sha256-OW19qwRisjzD1vQknzGXbZ5yqtULI1FU1f6HZdKn5TA=", + "lastModified": 1771023756, + "narHash": "sha256-sTj1hrPT7D4oGHaQQzwDeqyZBwnxYc+T7yceyQc4sy4=", "owner": "nix-community", "repo": "nixvim", - "rev": "96d3538c32816992f30d858095aa93c9ee32fd45", + "rev": "4c63aa76be59b49ae89892ae803005afd4a400cd", "type": "github" }, "original": { @@ -732,29 +685,6 @@ "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" - } - }, "pre-commit": { "inputs": { "flake-compat": "flake-compat_2", @@ -765,11 +695,11 @@ ] }, "locked": { - "lastModified": 1763741496, - "narHash": "sha256-uIRqs/H18YEtMOn1OkbnPH+aNTwXKx+iU3qnxEkVUd0=", + "lastModified": 1769939035, + "narHash": "sha256-Fok2AmefgVA0+eprw2NDwqKkPGEI5wvR+twiZagBvrg=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "20e71a403c5de9ce5bd799031440da9728c1cda1", + "rev": "a8ca480175326551d6c4121498316261cbb5b260", "type": "github" }, "original": { @@ -822,11 +752,11 @@ ] }, "locked": { - "lastModified": 1764383863, - "narHash": "sha256-KA5F0137hLvk576mfucWvFu8Z8g8MTm+6c3gw2mZcKI=", + "lastModified": 1771038269, + "narHash": "sha256-TygYZ7JhnJbRoWOk7d5HaA/GhEVCvtRruN7TqaN9s/c=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4f5a90bf043a57add9b3288bbd25ed534bfaffb5", + "rev": "d7a86c8a4df49002446737603a3e0d7ef91a9637", "type": "github" }, "original": { @@ -842,11 +772,11 @@ ] }, "locked": { - "lastModified": 1764021963, - "narHash": "sha256-1m84V2ROwNEbqeS9t37/mkry23GBhfMt8qb6aHHmjuc=", + "lastModified": 1770683991, + "narHash": "sha256-xVfPvXDf9QN3Eh9dV+Lw6IkWG42KSuQ1u2260HKvpnc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c482a1c1bbe030be6688ed7dc84f7213f304f1ec", + "rev": "8b89f44c2cc4581e402111d928869fe7ba9f7033", "type": "github" }, "original": { @@ -885,21 +815,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" - } - }, "xdph": { "inputs": { "hyprland-protocols": [ diff --git a/home/modules/cli/zsh.nix b/home/modules/cli/zsh.nix index d788361..556bff4 100644 --- a/home/modules/cli/zsh.nix +++ b/home/modules/cli/zsh.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: { +{ config, ... }: { programs.zsh = { enable = true; @@ -11,5 +11,6 @@ gl = "git log --oneline --graph --decorate --all"; ga = "git add --all"; }; + dotDir = "${config.xdg.configHome}/zsh"; }; } diff --git a/home/modules/graphical/fonts.nix b/home/modules/graphical/fonts.nix index 24df37b..53195d6 100644 --- a/home/modules/graphical/fonts.nix +++ b/home/modules/graphical/fonts.nix @@ -11,11 +11,11 @@ fira-code font-awesome liberation_ttf - xorg.fontutil - xorg.fontbh100dpi - xorg.fontbh75dpi + font-util + font-bh-75dpi + font-bh-100dpi - xorg.mkfontscale + mkfontscale nerd-fonts.jetbrains-mono ]; } diff --git a/home/modules/graphical/hyprland.nix b/home/modules/graphical/hyprland.nix index 8d41aa3..2dfede1 100644 --- a/home/modules/graphical/hyprland.nix +++ b/home/modules/graphical/hyprland.nix @@ -170,8 +170,8 @@ }; windowrule = [ - "suppressevent maximize, class:.*" - "nofocus,class:^%,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0" + "match:class .*, suppress_event maximize" + "match:class ^$, match:title ^$, match:xwayland 1, no_focus on" ]; }; }; diff --git a/home/modules/graphical/udiskie.nix b/home/modules/graphical/udiskie.nix index 98185fa..a0a36ca 100644 --- a/home/modules/graphical/udiskie.nix +++ b/home/modules/graphical/udiskie.nix @@ -5,7 +5,7 @@ enable = true; settings = { programs_options = { - file_manager = "${pkgs.xfce.thunar}/bin/thunar"; + file_manager = "${pkgs.thunar}/bin/thunar"; }; }; }; diff --git a/hosts/nixos/modules/programs/thunar.nix b/hosts/nixos/modules/programs/thunar.nix index 0cdb885..fcffc4a 100644 --- a/hosts/nixos/modules/programs/thunar.nix +++ b/hosts/nixos/modules/programs/thunar.nix @@ -3,7 +3,7 @@ { programs.thunar = { enable = true; - plugins = with pkgs.xfce; [ + plugins = with pkgs; [ thunar-volman ]; };