diff options
| -rw-r--r-- | flake.lock | 452 | ||||
| -rw-r--r-- | flake.nix | 11 | ||||
| -rw-r--r-- | hosts/local/gui.nix | 12 | ||||
| -rw-r--r-- | hosts/local/niri.nix | 12 | ||||
| -rw-r--r-- | hosts/local/sway.nix | 2 | ||||
| -rw-r--r-- | hosts/pkgs.nix | 8 | ||||
| -rw-r--r-- | hosts/users.nix | 1 |
7 files changed, 212 insertions, 286 deletions
@@ -22,7 +22,8 @@ "devenv" ], "flake-compat": [ - "devenv" + "devenv", + "flake-compat" ], "git-hooks": [ "devenv", @@ -34,11 +35,11 @@ ] }, "locked": { - "lastModified": 1752264895, - "narHash": "sha256-1zBPE/PNAkPNUsOWFET4J0cjlvziH8DOekesDmjND+w=", + "lastModified": 1760971495, + "narHash": "sha256-IwnNtbNVrlZIHh7h4Wz6VP0Furxg9Hh0ycighvL5cZc=", "owner": "cachix", "repo": "cachix", - "rev": "47053aef762f452e816e44eb9a23fbc3827b241a", + "rev": "c5bfd933d1033672f51a863c47303fc0e093c2d2", "type": "github" }, "original": { @@ -68,19 +69,16 @@ "dgop": [ "dgop" ], - "dms-cli": [ - "dms-cli" - ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1761410608, - "narHash": "sha256-I5qm5PBxQTRJHUvuX7N9KPA2qsbZhtvOKJcCj6jl0bo=", + "lastModified": 1763316584, + "narHash": "sha256-KjoOir4PyBINRdSyuzVLc7AA1Bh7yeaoSrZjhKOUlGc=", "owner": "AvengeMedia", "repo": "DankMaterialShell", - "rev": "7a45f370b54b9a01eea5a80e2ef8e96b9380cc83", + "rev": "f6db20cd06e4abbb49a0586dc7886c5138402d19", "type": "github" }, "original": { @@ -99,11 +97,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1761343822, - "narHash": "sha256-ZOykrkxsY2lM4a3+MLZN8eUc0dRXypo3aKvj8v5xN/0=", + "lastModified": 1763136231, + "narHash": "sha256-QVtIjPSQ/xVhuXSSENYOYZPfrjjc/W/djuxcJyKxGTw=", "owner": "cachix", "repo": "devenv", - "rev": "679d2951cee2d09da3c732d00b320ce752d21ee0", + "rev": "4b8c2bbdb4e01ef8c4093ee1224fe21ed5ea1a5e", "type": "github" }, "original": { @@ -119,11 +117,11 @@ ] }, "locked": { - "lastModified": 1760238269, - "narHash": "sha256-7CeGZM/Z/5Qt3AYByCRohGYGR1MRuXYzTTbkV/JxyAs=", + "lastModified": 1762835999, + "narHash": "sha256-UykYGrGFOFTmDpKTLNxj1wvd1gbDG4TkqLNSbV0TYwk=", "owner": "AvengeMedia", "repo": "dgop", - "rev": "95acdfce2d323e28fa8f5a4f345160962034f2b5", + "rev": "799301991cd5dcea9b64245f9d500dcc76615653", "type": "github" }, "original": { @@ -139,11 +137,11 @@ ] }, "locked": { - "lastModified": 1760701190, - "narHash": "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw=", + "lastModified": 1762276996, + "narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=", "owner": "nix-community", "repo": "disko", - "rev": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5", + "rev": "af087d076d3860760b3323f6b583f4d828c1ac17", "type": "github" }, "original": { @@ -154,17 +152,16 @@ }, "dms-cli": { "inputs": { - "gomod2nix": "gomod2nix", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1761413329, - "narHash": "sha256-HGLw+5QkV0nCHUIJlwMMBr5zTUiQM47roqIjXgvGkH0=", + "lastModified": 1763078370, + "narHash": "sha256-wsYqJlLdRSlJpRE0tIuuPMU6aOyhMdV237rEG/enUxY=", "owner": "AvengeMedia", "repo": "danklinux", - "rev": "3c468ff5332748aa84852a05bdabcf703d956f7c", + "rev": "7a083a0d6d087d41d0bc5077d03e662e1417ce3c", "type": "github" }, "original": { @@ -176,11 +173,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -224,11 +221,11 @@ "flake-compat_4": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -240,11 +237,11 @@ "flake-compat_5": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -255,11 +252,11 @@ }, "flake-compat_6": { "locked": { - "lastModified": 1746162366, - "narHash": "sha256-5SSSZ/oQkwfcAz/o/6TlejlVGqeK08wyREBQ5qFFPhM=", + "lastModified": 1761640442, + "narHash": "sha256-AtrEP6Jmdvrqiv4x2xa5mrtaIp3OEe8uBYCDZDS+hu8=", "owner": "nix-community", "repo": "flake-compat", - "rev": "0f158086a2ecdbb138cd0429410e44994f1b7e4b", + "rev": "4a56054d8ffc173222d09dad23adf4ba946c8884", "type": "github" }, "original": { @@ -292,11 +289,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1760948891, + "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", "type": "github" }, "original": { @@ -310,11 +307,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1760948891, - "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", + "lastModified": 1762980239, + "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", + "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", "type": "github" }, "original": { @@ -349,11 +346,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1760813311, - "narHash": "sha256-lbHQ7FXGzt6/IygWvJ1lCq+Txcut3xYYd6VIpF1ojkg=", + "lastModified": 1762980239, + "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4e627ac2e1b8f1de7f5090064242de9a259dbbc8", + "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", "type": "github" }, "original": { @@ -420,24 +417,6 @@ } }, "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, - "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" - } - }, - "flake-utils_4": { "locked": { "lastModified": 1638122382, "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", @@ -452,9 +431,9 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_4": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1701680307, @@ -470,9 +449,9 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_5": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1731533236, @@ -518,11 +497,11 @@ ] }, "locked": { - "lastModified": 1758108966, - "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", + "lastModified": 1760663237, + "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", + "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37", "type": "github" }, "original": { @@ -538,11 +517,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1760663237, - "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=", + "lastModified": 1763032142, + "narHash": "sha256-M+2QBQoC0lzkCdUQRXylR2RkcT6BCRfW3KDs+c/IGLw=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37", + "rev": "84255025dee4c8701a99fbff65ac3c9095952f99", "type": "github" }, "original": { @@ -564,11 +543,11 @@ ] }, "locked": { - "lastModified": 1758108966, - "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", + "lastModified": 1762441963, + "narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", + "rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885", "type": "github" }, "original": { @@ -686,40 +665,17 @@ "type": "github" } }, - "gomod2nix": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "dms-cli", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1756047880, - "narHash": "sha256-JeuGh9kA1SPL70fnvpLxkIkCWpTjtoPaus3jzvdna0k=", - "owner": "nix-community", - "repo": "gomod2nix", - "rev": "47d628dc3b506bd28632e47280c6b89d3496909d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "v1.7.0", - "repo": "gomod2nix", - "type": "github" - } - }, "helix": { "inputs": { "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1761141169, - "narHash": "sha256-5IZjbTvP5dNTD8CbEYlNbicdGcbCN9SC9ksMm2ZEXH0=", + "lastModified": 1763309322, + "narHash": "sha256-2M6D/i0Poh529SovRSsM+m9sYqfl9GNMmDW4efKvh/4=", "owner": "helix-editor", "repo": "helix", - "rev": "d79cce4e4bfc24dd204f1b294c899ed73f7e9453", + "rev": "d966e12930d4ea0093708457bde0951aa77660ec", "type": "github" }, "original": { @@ -735,11 +691,11 @@ ] }, "locked": { - "lastModified": 1761395627, - "narHash": "sha256-9wQpgBRW2PzYw1wx+MgCt1IbPAYz93csApLMgSZOJCk=", + "lastModified": 1763313531, + "narHash": "sha256-yvdCYUL85zEDp2NzPUBmaNBXP6KnWEOhAk3j7PTfsKw=", "owner": "nix-community", "repo": "home-manager", - "rev": "7296022150cd775917e4c831c393026eae7c2427", + "rev": "3670a78eee49deebe4825fc8ecc46b172d1a8391", "type": "github" }, "original": { @@ -789,11 +745,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1761259732, - "narHash": "sha256-YI7xGgh+nCoh1k6NJQkXwjDr5B2VQnfZB8/nVCRO7dY=", + "lastModified": 1762117835, + "narHash": "sha256-1xcZ4TJWNnDo8yxrHVUZKv3V1fBWC383+HjPPeBAUf8=", "owner": "kmonad", "repo": "kmonad", - "rev": "7f8a0b38d4777fbacf3629b6ff8805e8eeec2f19", + "rev": "52050528a1e45b3732ff476d1de1bef72e637a23", "type": "github" }, "original": { @@ -813,11 +769,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1756744479, - "narHash": "sha256-EyZXusK/wRD3V9vDh00W2Re3Eg8UQ+LjVBQrrH9dq1U=", + "lastModified": 1763154177, + "narHash": "sha256-LIIrMS2f2pPT2/BHs8dfGeupI23v5DNcoRz3W+iMsUA=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "747b7912f49e2885090c83364d88cf853a020ac1", + "rev": "70be03ab23d0988224e152f5b52e2fbf44a6d8ee", "type": "github" }, "original": { @@ -828,7 +784,7 @@ }, "lib-aggregate": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { @@ -847,16 +803,16 @@ }, "microvm": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs_6", "spectrum": "spectrum" }, "locked": { - "lastModified": 1760574296, - "narHash": "sha256-S3gIp6Wd9vQ2RYDxcbHM2CIYgDtogbwzSdu38WABKaQ=", + "lastModified": 1762200934, + "narHash": "sha256-Bv4ZKRPsIc6W7qF1I2fevxFETqRNuG3XOsiRIfJ7YlQ=", "owner": "astro", "repo": "microvm.nix", - "rev": "42628f7c61b02d385ce2cb1f66f9be333ac20140", + "rev": "1d05a3c26dbb9d4b1cd644e10713a70d8740cb6a", "type": "github" }, "original": { @@ -877,11 +833,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1761413535, - "narHash": "sha256-bLkDHmHCYn9hWZJXXRAYCnB1OI7Garoe19571V7bPsU=", + "lastModified": 1763289873, + "narHash": "sha256-vzVbMit/Y8IdSYiN2jal77Bp0uRw3MNqSoqy0l4dYoo=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "0ec38cd3276971c99289d80b1215aaf7ada65573", + "rev": "13d47ed15fc3d8cc98ad42525e85851faf15a47c", "type": "github" }, "original": { @@ -910,11 +866,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1761337523, - "narHash": "sha256-j6hQ1B7TJt9irtvt2Kxbrb8pq16C8yv4w+M/Dbghabw=", + "lastModified": 1763286485, + "narHash": "sha256-noCCGXkqQxHT+Pk723/poMqkbLHPtgENwg/kntlh2mA=", "owner": "YaLTeR", "repo": "niri", - "rev": "4310c20c320d040f3df7a93de4064e452a1876ae", + "rev": "9dad215b9f384310dea53fbd1aa8010e42f779f4", "type": "github" }, "original": { @@ -949,16 +905,16 @@ ] }, "locked": { - "lastModified": 1758763079, - "narHash": "sha256-Bx1A+lShhOWwMuy3uDzZQvYiBKBFcKwy6G6NEohhv6A=", + "lastModified": 1761648602, + "narHash": "sha256-H97KSB/luq/aGobKRuHahOvT1r7C03BgB6D5HBZsbN8=", "owner": "cachix", "repo": "nix", - "rev": "6f0140527c2b0346df4afad7497baa08decb929f", + "rev": "3e5644da6830ef65f0a2f7ec22830c46285bfff6", "type": "github" }, "original": { "owner": "cachix", - "ref": "devenv-2.30.5", + "ref": "devenv-2.30.6", "repo": "nix", "type": "github" } @@ -970,11 +926,11 @@ ] }, "locked": { - "lastModified": 1761339987, - "narHash": "sha256-IUaawVwItZKi64IA6kF6wQCLCzpXbk2R46dHn8sHkig=", + "lastModified": 1763136804, + "narHash": "sha256-6p2ljK42s0S8zS0UU59EsEqupz0GVCaBYRylpUadeBM=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "7cd9aac79ee2924a85c211d21fafd394b06a38de", + "rev": "973db96394513fd90270ea5a1211a82a4a0ba47f", "type": "github" }, "original": { @@ -989,11 +945,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1761356901, - "narHash": "sha256-YDySchURSJrS1P8zuzmFqypUS7shY6//0e0JiMZeLSI=", + "lastModified": 1763313066, + "narHash": "sha256-i2s3jPiMRPLd1mcL0oNMSbrbmq9ba/Qo4YPVPehPmEs=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "a8635e459ff96acbd156a8de613b99d9d6b3676a", + "rev": "dfa5f946fe41f085e34159a818790f69a19a0022", "type": "github" }, "original": { @@ -1034,7 +990,7 @@ }, "nixos-cn": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ] @@ -1098,11 +1054,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1760958188, - "narHash": "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU=", + "lastModified": 1762847253, + "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "d6645c340ef7d821602fd2cd199e8d1eed10afbc", + "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", "type": "github" }, "original": { @@ -1119,15 +1075,14 @@ "git-hooks": "git-hooks_3", "nixpkgs": [ "nixpkgs" - ], - "nixpkgs-25_05": "nixpkgs-25_05" + ] }, "locked": { - "lastModified": 1759489698, - "narHash": "sha256-2lT2i5ha23I2vrolEaBaAS/63ChgZPh181Awt6q1bDY=", + "lastModified": 1763314907, + "narHash": "sha256-HRcOR71t0nHJxqqGvGvcgO1tV/SeECvz85N9+4LDIkM=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "6005d88bed7a5418f9772b4058a73cd0fd1e69a1", + "rev": "b946f74261e58ab941de38658c124f9fcb999096", "type": "gitlab" }, "original": { @@ -1138,7 +1093,7 @@ }, "nixos-rk3588": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixos-generators": "nixos-generators_2", "nixpkgs": "nixpkgs_8", "pre-commit-hooks": "pre-commit-hooks" @@ -1163,11 +1118,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1760536587, - "narHash": "sha256-wfWqt+igns/VazjPLkyb4Z/wpn4v+XIjUeI3xY/1ENg=", + "lastModified": 1762908663, + "narHash": "sha256-HqdYfzBaidYX+EYAcXDFCggXJPZBv2fusMwhc7/4+cI=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "f98ee1de1fa36eca63c67b600f5d617e184e82ea", + "rev": "debc562c48c445f9f08778ecb9fc6b35197623ad", "type": "github" }, "original": { @@ -1179,11 +1134,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1758532697, - "narHash": "sha256-bhop0bR3u7DCw9/PtLCwr7GwEWDlBSxHp+eVQhCW9t4=", + "lastModified": 1761313199, + "narHash": "sha256-wCIACXbNtXAlwvQUo1Ed++loFALPjYUA3dpcUJiXO44=", "owner": "cachix", "repo": "devenv-nixpkgs", - "rev": "207a4cb0e1253c7658c6736becc6eb9cace1f25f", + "rev": "d1c30452ebecfc55185ae6d1c983c09da0c274ff", "type": "github" }, "original": { @@ -1193,29 +1148,13 @@ "type": "github" } }, - "nixpkgs-25_05": { - "locked": { - "lastModified": 1759143472, - "narHash": "sha256-TvODmeR2W7yX/JmOCmP+lAFNkTT7hAxYcF3Kz8SZV3w=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5ed4e25ab58fd4c028b59d5611e14ea64de51d23", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-darwin": { "locked": { - "lastModified": 1761214245, - "narHash": "sha256-PP9OPFAgQuoeYLnekbROBtaysdnnXAOwdMRn0NJslxY=", + "lastModified": 1763097414, + "narHash": "sha256-JhmHOuV0+lQug8ahv09ISlw9dqH4iOzOxAAml2d2KYo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "95ec937f47c15392185aafd64480dc128f8a80bd", + "rev": "133519eaef82388d4ed61dd65b1ae3abc895bd1b", "type": "github" }, "original": { @@ -1227,11 +1166,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1754788789, - "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", + "lastModified": 1761765539, + "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", + "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc", "type": "github" }, "original": { @@ -1242,11 +1181,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1754788789, - "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", + "lastModified": 1761765539, + "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", + "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc", "type": "github" }, "original": { @@ -1288,11 +1227,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1761173472, - "narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=", + "lastModified": 1763049705, + "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb", + "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c", "type": "github" }, "original": { @@ -1304,11 +1243,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1761173472, - "narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=", + "lastModified": 1763049705, + "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb", + "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c", "type": "github" }, "original": { @@ -1323,11 +1262,11 @@ "nixpkgs": "nixpkgs_11" }, "locked": { - "lastModified": 1761229432, - "narHash": "sha256-6TOd2i7Exq47NxjRcx9bizwMDYdxyhU15PjeTzerczA=", + "lastModified": 1763130223, + "narHash": "sha256-6XEGQMrFFj0/wNxDDawQDtZKmql0+yTH0kKoGNN8aZ8=", "owner": "numtide", "repo": "nixpkgs-unfree", - "rev": "80a92b4e4cc50ca26645269daa5f78b3fad995c4", + "rev": "6b8d53119a6c8a172481d7e28b262469313e536c", "type": "github" }, "original": { @@ -1346,11 +1285,11 @@ ] }, "locked": { - "lastModified": 1761397316, - "narHash": "sha256-HGIm1W/Z5foN0g8c2PderNKMb4t5OCCsQteMS2WHf/I=", + "lastModified": 1763102822, + "narHash": "sha256-cJBaikZ3N4OhyBNtSWdHP/Pe4Igk/wBA1B95WnRjbII=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "8d12d9b353a98e7d5bcddf09db42a350fb2bfb8c", + "rev": "ab1ae4d706471e9310b56c87a1ed9f43dcd4552d", "type": "github" }, "original": { @@ -1361,11 +1300,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1761114652, - "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", + "lastModified": 1762977756, + "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", + "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", "type": "github" }, "original": { @@ -1377,11 +1316,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1761114652, - "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", + "lastModified": 1762977756, + "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", + "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", "type": "github" }, "original": { @@ -1391,11 +1330,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1761114652, - "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", + "lastModified": 1762977756, + "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", + "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", "type": "github" }, "original": { @@ -1407,11 +1346,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1759070547, - "narHash": "sha256-JVZl8NaVRYb0+381nl7LvPE+A774/dRpif01FKLrYFQ=", + "lastModified": 1759417375, + "narHash": "sha256-O7eHcgkQXJNygY6AypkF9tFhsoDQjpNEojw3eFs73Ow=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "647e5c14cbd5067f44ac86b74f014962df460840", + "rev": "dc704e6102e76aad573f63b74c742cd96f8f1e6c", "type": "github" }, "original": { @@ -1487,11 +1426,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1760596604, - "narHash": "sha256-J/i5K6AAz/y5dBePHQOuzC7MbhyTOKsd/GLezSbEFiM=", + "lastModified": 1763191728, + "narHash": "sha256-esRhOS0APE6k40Hs/jjReXg+rx+J5LkWw7cuWFKlwYA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3cbe716e2346710d6e1f7c559363d14e11c32a43", + "rev": "1d4c88323ac36805d09657d13a5273aea1b34f0c", "type": "github" }, "original": { @@ -1519,11 +1458,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1759733170, - "narHash": "sha256-TXnlsVb5Z8HXZ6mZoeOAIwxmvGHp1g4Dw89eLvIwKVI=", + "lastModified": 1762596750, + "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8913c168d1c56dc49a7718685968f38752171c3b", + "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e", "type": "github" }, "original": { @@ -1533,33 +1472,17 @@ "type": "github" } }, - "nixstaging": { - "locked": { - "lastModified": 1761402570, - "narHash": "sha256-1VB+TyMQwtW4I3v6Dc1tt9xFpSJ81A1rAXsbQvSSnmQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "7cd973a281b4b2cfe96f746f7316fba57c62d555", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "staging", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "inputs": { "flake-parts": "flake-parts_5", "nixpkgs": "nixpkgs_12" }, "locked": { - "lastModified": 1761411824, - "narHash": "sha256-pcIB+NirMkYHe6zqC0zYMqZO3wyGdPoej4IMiERHSYU=", + "lastModified": 1763315109, + "narHash": "sha256-zbM2+TOsyreORr/10mOluHDPwNQdjtTHDCuMtjQoSPE=", "owner": "nix-community", "repo": "NUR", - "rev": "8dec4c083a4653a82a1c05ba981301fe1aa426b0", + "rev": "9a98977038a0331f95c22407a19b4330133a0450", "type": "github" }, "original": { @@ -1575,11 +1498,11 @@ ] }, "locked": { - "lastModified": 1761372460, - "narHash": "sha256-oj7hNwh3t3qFxB60+cbRx8N4kIIoZhVbWp2UFPIKC3U=", + "lastModified": 1763227546, + "narHash": "sha256-khCwSq1QyDHGJer/oeM6xnQbUUFxkMXf2yybGF4ro3U=", "owner": "openai", "repo": "codex", - "rev": "88abbf58cec9843a7cebe250d71146314ebbcf1a", + "rev": "326c1e0a7eaefaf675e41c66e0b1c8033cbfdb7c", "type": "github" }, "original": { @@ -1671,7 +1594,7 @@ "disko": "disko", "dms-cli": "dms-cli", "flake-parts": "flake-parts_2", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "gemini-cli": "gemini-cli", "git-hooks": "git-hooks_2", "helix": "helix", @@ -1696,15 +1619,15 @@ "nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-unfree": "nixpkgs-unfree", "nixpkgs-wayland": "nixpkgs-wayland", - "nixstaging": "nixstaging", "nur": "nur", "openai-codex": "openai-codex", "polybar-themes": "polybar-themes", + "staging": "staging", + "staging-next": "staging-next", "waybar": "waybar", "windsurf": "windsurf", "wrapper-manager": "wrapper-manager", - "yek": "yek", - "zen-browser": "zen-browser" + "yek": "yek" } }, "rust-overlay": { @@ -1736,11 +1659,11 @@ ] }, "locked": { - "lastModified": 1754189623, - "narHash": "sha256-fstu5eb30UYwsxow0aQqkzxNxGn80UZjyehQVNVHuBk=", + "lastModified": 1761791894, + "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c582ff7f0d8a7ea689ae836dfb1773f1814f472a", + "rev": "59c45eb69d9222a4362673141e00ff77842cd219", "type": "github" }, "original": { @@ -1765,22 +1688,39 @@ "url": "https://spectrum-os.org/git/spectrum" } }, - "systems": { + "staging": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "lastModified": 1763306632, + "narHash": "sha256-kE3Zqwdh91xIjeCSND5yjWfhcePblFubcT9ilGMMIk8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ad87c47716b19d09057d47d693e00497ed3de05e", "type": "github" }, "original": { - "owner": "nix-systems", - "repo": "default", + "owner": "nixos", + "ref": "staging", + "repo": "nixpkgs", "type": "github" } }, - "systems_2": { + "staging-next": { + "locked": { + "lastModified": 1763317096, + "narHash": "sha256-3v4Ny3b43+wtuLPO5q93rDVMuzTdAoUs0HC0d0oNlYc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b29e9e540cd3e5cc9af6a42320fb7e70bc829711", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "staging-next", + "repo": "nixpkgs", + "type": "github" + } + }, + "systems": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1795,7 +1735,7 @@ "type": "github" } }, - "systems_3": { + "systems_2": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1810,7 +1750,7 @@ "type": "github" } }, - "systems_4": { + "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1825,7 +1765,7 @@ "type": "github" } }, - "systems_5": { + "systems_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1913,11 +1853,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1761407446, - "narHash": "sha256-Z2IB6ni6iPtv2Bon/bkru9R96UzBR3s8HY+tcDuCH74=", + "lastModified": 1762747449, + "narHash": "sha256-Z1TKiux8K09a93w4PFDFsj8HFugXNy3iCC3Z8MpR5Rk=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "52cc06e6c63674fc997fd61d27aaccfce2da5b5d", + "rev": "6338574bc5c036487486acde264f38f39ea15fad", "type": "github" }, "original": { @@ -1942,26 +1882,6 @@ "path": "/home/y/nixconf/derivations/yek", "type": "path" } - }, - "zen-browser": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1761278750, - "narHash": "sha256-H00vsbCQRRutJ6sg7Pijy+pPY0+mafnTWw1MZXdVbh8=", - "owner": "youwen5", - "repo": "zen-browser-flake", - "rev": "1689281237cb389759a005c41545302a54ec8100", - "type": "github" - }, - "original": { - "owner": "youwen5", - "repo": "zen-browser-flake", - "type": "github" - } } }, "root": "root", @@ -3,7 +3,8 @@ description = "Master flake"; inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixstaging.url = "github:nixos/nixpkgs/staging"; + staging.url = "github:nixos/nixpkgs/staging"; + staging-next.url = "github:nixos/nixpkgs/staging-next"; nixpkgs-old.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-25.05-darwin"; @@ -133,10 +134,10 @@ url = "github:cachix/devenv"; }; - zen-browser = { - url = "github:youwen5/zen-browser-flake"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # zen-browser = { + # url = "github:youwen5/zen-browser-flake"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; openai-codex = { url = "github:openai/codex"; diff --git a/hosts/local/gui.nix b/hosts/local/gui.nix index cf6beff..4de3358 100644 --- a/hosts/local/gui.nix +++ b/hosts/local/gui.nix @@ -3,9 +3,10 @@ pkgs, ... }: let - spkgs = import inputs.nixstaging { - system = pkgs.system; - }; + # spkgs = import inputs.nixstaging { + # system = pkgs.system; + # }; + _lol = "lmao"; in { environment.systemPackages = with pkgs; [ pavucontrol @@ -47,7 +48,7 @@ in { wineWowPackages.staging dosbox siyuan - inputs.zen-browser.packages.${pkgs.system}.default + # inputs.zen-browser.packages.${pkgs.system}.default qimgv # inputs.quickshell.packages.${pkgs.system}.default # chat @@ -60,6 +61,7 @@ in { # xorg.xhost gparted + zed-editor ]; i18n.inputMethod = { @@ -71,7 +73,7 @@ in { fcitx5-gtk libsForQt5.fcitx5-qt fcitx5-lua - fcitx5-configtool + qt6Packages.fcitx5-configtool fcitx5-rime ]; }; diff --git a/hosts/local/niri.nix b/hosts/local/niri.nix index ee5fae2..042fff9 100644 --- a/hosts/local/niri.nix +++ b/hosts/local/niri.nix @@ -15,7 +15,7 @@ enable32Bit = true; extraPackages = [ pkgs.mesa - pkgs.vaapiVdpau + pkgs.libva-vdpau-driver pkgs.libvdpau-va-gl ]; }; @@ -169,15 +169,11 @@ inconsolata # monospaced noto-fonts noto-fonts-cjk-sans - noto-fonts-emoji - noto-fonts-extra + noto-fonts-color-emoji powerline-fonts - source-han-sans-japanese - source-han-sans-korean - source-han-sans-simplified-chinese - source-han-sans-traditional-chinese + source-han-sans source-sans-pro - ubuntu_font_family + ubuntu-classic wqy_microhei wqy_zenhei ] diff --git a/hosts/local/sway.nix b/hosts/local/sway.nix index 30834c3..af00969 100644 --- a/hosts/local/sway.nix +++ b/hosts/local/sway.nix @@ -12,7 +12,7 @@ enable32Bit = true; extraPackages = [ pkgs.mesa - pkgs.vaapiVdpau + pkgs.libva-vdpau-driver pkgs.libvdpau-va-gl ]; }; diff --git a/hosts/pkgs.nix b/hosts/pkgs.nix index 22ca094..f496128 100644 --- a/hosts/pkgs.nix +++ b/hosts/pkgs.nix @@ -23,8 +23,9 @@ nvitop rlwrap bat - gitAndTools.gitFull + gitFull lazygit + tig git-lfs lsd lsof @@ -40,6 +41,11 @@ pigz rclone socat + fd + jujutsu + zoxide + delta + httpie # files/disk nnn ranger diff --git a/hosts/users.nix b/hosts/users.nix index a016642..7bfe0bf 100644 --- a/hosts/users.nix +++ b/hosts/users.nix @@ -16,6 +16,7 @@ sourceit = ". (sed 's/^/export /' .env | psub)"; sqlite = "rlwrap sqlite3"; # rsyn = "rsync -zuvaP --filter=':- .gitignore'" + rsyn = "rsync -vhraP --include='**.gitignore' --filter=':- .gitignore' --delete-after"; }; in { programs.fish = { |