comparing odin and shizuri on ngp.computer/nixos

+20 -12

configuration.nix

··· 3 3 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`). 4 4 5 5 { ... }: 6 + let 7 + agenix = builtins.fetchTarball "https://github.com/ryantm/agenix/archive/main.tar.gz"; 8 + in 6 9 { 7 - imports = [ 8 - # Include the results of the hardware scan. 9 - ./hardware-configuration.nix 10 - ./boot.nix 11 - ./networking.nix 12 - #./gui.nix 13 - ./users.nix 14 - ./packages.nix 15 - ./services.nix 16 - ]; 17 - 18 - nixpkgs.config.allowUnfree = true; 10 + imports = 11 + [ 12 + # Include the results of the hardware scan. 13 + ./hardware-configuration.nix 14 + ./boot.nix 15 + ./networking.nix 16 + ./gui.nix 17 + (import "${agenix}/modules/age.nix") 18 + ./users.nix 19 + ./packages.nix 20 + ./services.nix 21 + ]; 19 22 20 23 # Set your time zone. 21 24 time.timeZone = "America/Chicago"; ··· 27 30 # keyMap = "us"; 28 31 # useXkbConfig = true; # use xkb.options in tty. 29 32 # }; 33 + 34 + # Copy the NixOS configuration file and link it from the resulting system 35 + # (/run/current-system/configuration.nix). This is useful in case you 36 + # accidentally delete configuration.nix. 37 + system.copySystemConfiguration = true; 30 38 31 39 # Automatic doc cache generation 32 40 documentation.man.generateCaches = true;

-3

fish/functions/fish_user_key_bindings.fish

··· 1 1 function fish_user_key_bindings 2 - if command -s fzf-share >/dev/null 3 - source (fzf-share)/key-bindings.fish 4 - end 5 2 fzf_key_bindings 6 3 bind \co 'lfcd; commandline -f repaint' 7 4 end

+26 -312

flake.lock

··· 1 1 { 2 2 "nodes": { 3 - "agenix": { 4 - "inputs": { 5 - "darwin": "darwin", 6 - "home-manager": "home-manager", 7 - "nixpkgs": "nixpkgs", 8 - "systems": "systems" 9 - }, 10 - "locked": { 11 - "lastModified": 1762618334, 12 - "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", 13 - "owner": "ryantm", 14 - "repo": "agenix", 15 - "rev": "fcdea223397448d35d9b31f798479227e80183f6", 16 - "type": "github" 17 - }, 18 - "original": { 19 - "owner": "ryantm", 20 - "repo": "agenix", 21 - "type": "github" 22 - } 23 - }, 24 - "darwin": { 25 - "inputs": { 26 - "nixpkgs": [ 27 - "agenix", 28 - "nixpkgs" 29 - ] 30 - }, 31 - "locked": { 32 - "lastModified": 1744478979, 33 - "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", 34 - "owner": "lnl7", 35 - "repo": "nix-darwin", 36 - "rev": "43975d782b418ebf4969e9ccba82466728c2851b", 37 - "type": "github" 38 - }, 39 - "original": { 40 - "owner": "lnl7", 41 - "ref": "master", 42 - "repo": "nix-darwin", 43 - "type": "github" 44 - } 45 - }, 46 - "determinate-nixd-aarch64-darwin": { 47 - "flake": false, 48 - "locked": { 49 - "narHash": "sha256-vDaEQ5T4eA7kEPREmm68IVWGR6zT0aDL5slZxA6dkSc=", 50 - "type": "file", 51 - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.0/macOS" 52 - }, 53 - "original": { 54 - "type": "file", 55 - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.0/macOS" 56 - } 57 - }, 58 - "determinate-nixd-aarch64-linux": { 59 - "flake": false, 60 - "locked": { 61 - "narHash": "sha256-Hf4JsIv5G3IR0Q0RHGLSNdmDzFv97sVQQKwzY6A0vV4=", 62 - "type": "file", 63 - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.0/aarch64-linux" 64 - }, 65 - "original": { 66 - "type": "file", 67 - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.0/aarch64-linux" 68 - } 69 - }, 70 - "determinate-nixd-x86_64-linux": { 71 - "flake": false, 72 - "locked": { 73 - "narHash": "sha256-J+J4E02XpEl0ZkpzMbUmGCf6S4yk0gYCYmiGzZ058ik=", 74 - "type": "file", 75 - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.0/x86_64-linux" 76 - }, 77 - "original": { 78 - "type": "file", 79 - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.0/x86_64-linux" 80 - } 81 - }, 82 - "determinite": { 83 - "inputs": { 84 - "determinate-nixd-aarch64-darwin": "determinate-nixd-aarch64-darwin", 85 - "determinate-nixd-aarch64-linux": "determinate-nixd-aarch64-linux", 86 - "determinate-nixd-x86_64-linux": "determinate-nixd-x86_64-linux", 87 - "nix": "nix", 88 - "nixpkgs": [ 89 - "nixpkgs" 90 - ] 91 - }, 92 - "locked": { 93 - "lastModified": 1766177528, 94 - "narHash": "sha256-Bl+p766mM7qNCZtMqmTz13RuUbOMKsFa+/vnGYoxgPk=", 95 - "rev": "b159c082f0f9bdefa6c386189a13c5fa0734d8d8", 96 - "revCount": 317, 97 - "type": "tarball", 98 - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.15.0/019b3865-57a1-7d80-98c5-962fac29c404/source.tar.gz" 99 - }, 100 - "original": { 101 - "type": "tarball", 102 - "url": "https://flakehub.com/f/DeterminateSystems/determinate/3" 103 - } 104 - }, 105 3 "flake-compat": { 106 4 "flake": false, 107 5 "locked": { 108 - "lastModified": 1696426674, 109 - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", 110 - "owner": "edolstra", 111 - "repo": "flake-compat", 112 - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", 113 - "type": "github" 114 - }, 115 - "original": { 6 + "lastModified": 1747046372, 7 + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", 116 8 "owner": "edolstra", 117 9 "repo": "flake-compat", 118 - "type": "github" 119 - } 120 - }, 121 - "flake-compat_2": { 122 - "flake": false, 123 - "locked": { 124 - "lastModified": 1761588595, 125 - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", 126 - "owner": "edolstra", 127 - "repo": "flake-compat", 128 - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", 10 + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", 129 11 "type": "github" 130 12 }, 131 13 "original": { ··· 134 16 "type": "github" 135 17 } 136 18 }, 137 - "flake-parts": { 138 - "inputs": { 139 - "nixpkgs-lib": [ 140 - "determinite", 141 - "nix", 142 - "nixpkgs" 143 - ] 144 - }, 145 - "locked": { 146 - "lastModified": 1748821116, 147 - "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=", 148 - "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1", 149 - "revCount": 377, 150 - "type": "tarball", 151 - "url": "https://api.flakehub.com/f/pinned/hercules-ci/flake-parts/0.1.377%2Brev-49f0870db23e8c1ca0b5259734a02cd9e1e371a1/01972f28-554a-73f8-91f4-d488cc502f08/source.tar.gz" 152 - }, 153 - "original": { 154 - "type": "tarball", 155 - "url": "https://flakehub.com/f/hercules-ci/flake-parts/0.1" 156 - } 157 - }, 158 - "git-hooks-nix": { 159 - "inputs": { 160 - "flake-compat": "flake-compat", 161 - "gitignore": [ 162 - "determinite", 163 - "nix" 164 - ], 165 - "nixpkgs": [ 166 - "determinite", 167 - "nix", 168 - "nixpkgs" 169 - ] 170 - }, 171 - "locked": { 172 - "lastModified": 1747372754, 173 - "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", 174 - "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", 175 - "revCount": 1026, 176 - "type": "tarball", 177 - "url": "https://api.flakehub.com/f/pinned/cachix/git-hooks.nix/0.1.1026%2Brev-80479b6ec16fefd9c1db3ea13aeb038c60530f46/0196d79a-1b35-7b8e-a021-c894fb62163d/source.tar.gz" 178 - }, 179 - "original": { 180 - "type": "tarball", 181 - "url": "https://flakehub.com/f/cachix/git-hooks.nix/0.1.941" 182 - } 183 - }, 184 19 "gitignore": { 185 20 "inputs": { 186 21 "nixpkgs": [ ··· 205 40 "home-manager": { 206 41 "inputs": { 207 42 "nixpkgs": [ 208 - "agenix", 209 43 "nixpkgs" 210 44 ] 211 45 }, 212 46 "locked": { 213 - "lastModified": 1745494811, 214 - "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", 47 + "lastModified": 1747688870, 48 + "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", 215 49 "owner": "nix-community", 216 50 "repo": "home-manager", 217 - "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", 51 + "rev": "d5f1f641b289553927b3801580598d200a501863", 218 52 "type": "github" 219 53 }, 220 54 "original": { 221 55 "owner": "nix-community", 56 + "ref": "release-24.11", 222 57 "repo": "home-manager", 223 58 "type": "github" 224 59 } 225 60 }, 226 - "home-manager_2": { 227 - "inputs": { 228 - "nixpkgs": [ 229 - "nixpkgs" 230 - ] 231 - }, 232 - "locked": { 233 - "lastModified": 1766292113, 234 - "narHash": "sha256-sWTtmkQujRpjWYCnZc8LWdDiCzrRlSBPrGovkZpLkBI=", 235 - "owner": "nix-community", 236 - "repo": "home-manager", 237 - "rev": "fdec8815a86db36f42fc9c8cb2931cd8485f5aed", 238 - "type": "github" 239 - }, 240 - "original": { 241 - "owner": "nix-community", 242 - "ref": "release-25.11", 243 - "repo": "home-manager", 244 - "type": "github" 245 - } 246 - }, 247 - "nix": { 248 - "inputs": { 249 - "flake-parts": "flake-parts", 250 - "git-hooks-nix": "git-hooks-nix", 251 - "nixpkgs": "nixpkgs_2", 252 - "nixpkgs-23-11": "nixpkgs-23-11", 253 - "nixpkgs-regression": "nixpkgs-regression" 254 - }, 255 - "locked": { 256 - "lastModified": 1766174426, 257 - "narHash": "sha256-0ZofAQZNgg5nfIKsVb7g4It6ufmIyLtfFRPOf+6WRkk=", 258 - "rev": "15d6091194b5b90d292e8d6283db77f09c303b1e", 259 - "revCount": 24285, 260 - "type": "tarball", 261 - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.15.0/019b3854-cca6-7298-a91c-0fd8551a7270/source.tar.gz" 262 - }, 263 - "original": { 264 - "type": "tarball", 265 - "url": "https://flakehub.com/f/DeterminateSystems/nix-src/%2A" 266 - } 267 - }, 268 61 "nixpkgs": { 269 62 "locked": { 270 - "lastModified": 1754028485, 271 - "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", 272 - "owner": "NixOS", 273 - "repo": "nixpkgs", 274 - "rev": "59e69648d345d6e8fef86158c555730fa12af9de", 275 - "type": "github" 276 - }, 277 - "original": { 278 - "owner": "NixOS", 279 - "ref": "nixos-25.05", 280 - "repo": "nixpkgs", 281 - "type": "github" 282 - } 283 - }, 284 - "nixpkgs-23-11": { 285 - "locked": { 286 - "lastModified": 1717159533, 287 - "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", 288 - "owner": "NixOS", 63 + "lastModified": 1751274312, 64 + "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", 65 + "owner": "nixos", 289 66 "repo": "nixpkgs", 290 - "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", 67 + "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", 291 68 "type": "github" 292 69 }, 293 70 "original": { 294 - "owner": "NixOS", 71 + "owner": "nixos", 72 + "ref": "nixos-24.11", 295 73 "repo": "nixpkgs", 296 - "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", 297 - "type": "github" 298 - } 299 - }, 300 - "nixpkgs-regression": { 301 - "locked": { 302 - "lastModified": 1643052045, 303 - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", 304 - "owner": "NixOS", 305 - "repo": "nixpkgs", 306 - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", 307 - "type": "github" 308 - }, 309 - "original": { 310 - "owner": "NixOS", 311 - "repo": "nixpkgs", 312 - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", 313 74 "type": "github" 314 75 } 315 76 }, 316 77 "nixpkgs-unstable": { 317 78 "locked": { 318 - "lastModified": 1766309749, 319 - "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=", 79 + "lastModified": 1756386758, 80 + "narHash": "sha256-1wxxznpW2CKvI9VdniaUnTT2Os6rdRJcRUf65ZK9OtE=", 320 81 "owner": "nixos", 321 82 "repo": "nixpkgs", 322 - "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816", 83 + "rev": "dfb2f12e899db4876308eba6d93455ab7da304cd", 323 84 "type": "github" 324 85 }, 325 86 "original": { ··· 331 92 }, 332 93 "nixpkgs_2": { 333 94 "locked": { 334 - "lastModified": 1761597516, 335 - "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", 336 - "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55", 337 - "revCount": 811874, 338 - "type": "tarball", 339 - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2505.811874%2Brev-daf6dc47aa4b44791372d6139ab7b25269184d55/019a3494-3498-707e-9086-1fb81badc7fe/source.tar.gz" 340 - }, 341 - "original": { 342 - "type": "tarball", 343 - "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2505" 344 - } 345 - }, 346 - "nixpkgs_3": { 347 - "locked": { 348 - "lastModified": 1766201043, 349 - "narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=", 350 - "owner": "nixos", 351 - "repo": "nixpkgs", 352 - "rev": "b3aad468604d3e488d627c0b43984eb60e75e782", 353 - "type": "github" 354 - }, 355 - "original": { 356 - "owner": "nixos", 357 - "ref": "nixos-25.11", 358 - "repo": "nixpkgs", 359 - "type": "github" 360 - } 361 - }, 362 - "nixpkgs_4": { 363 - "locked": { 364 - "lastModified": 1764947035, 365 - "narHash": "sha256-EYHSjVM4Ox4lvCXUMiKKs2vETUSL5mx+J2FfutM7T9w=", 95 + "lastModified": 1754340878, 96 + "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=", 366 97 "owner": "NixOS", 367 98 "repo": "nixpkgs", 368 - "rev": "a672be65651c80d3f592a89b3945466584a22069", 99 + "rev": "cab778239e705082fe97bb4990e0d24c50924c04", 369 100 "type": "github" 370 101 }, 371 102 "original": { ··· 377 108 }, 378 109 "pre-commit-hooks": { 379 110 "inputs": { 380 - "flake-compat": "flake-compat_2", 111 + "flake-compat": "flake-compat", 381 112 "gitignore": "gitignore", 382 - "nixpkgs": "nixpkgs_4" 113 + "nixpkgs": "nixpkgs_2" 383 114 }, 384 115 "locked": { 385 - "lastModified": 1765911976, 386 - "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=", 116 + "lastModified": 1755960406, 117 + "narHash": "sha256-RF7j6C1TmSTK9tYWO6CdEMtg6XZaUKcvZwOCD2SICZs=", 387 118 "owner": "cachix", 388 119 "repo": "git-hooks.nix", 389 - "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27", 120 + "rev": "e891a93b193fcaf2fc8012d890dc7f0befe86ec2", 390 121 "type": "github" 391 122 }, 392 123 "original": { ··· 397 128 }, 398 129 "root": { 399 130 "inputs": { 400 - "agenix": "agenix", 401 - "determinite": "determinite", 402 - "home-manager": "home-manager_2", 403 - "nixpkgs": "nixpkgs_3", 131 + "home-manager": "home-manager", 132 + "nixpkgs": "nixpkgs", 404 133 "nixpkgs-unstable": "nixpkgs-unstable", 405 134 "pre-commit-hooks": "pre-commit-hooks" 406 - } 407 - }, 408 - "systems": { 409 - "locked": { 410 - "lastModified": 1681028828, 411 - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", 412 - "owner": "nix-systems", 413 - "repo": "default", 414 - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", 415 - "type": "github" 416 - }, 417 - "original": { 418 - "owner": "nix-systems", 419 - "repo": "default", 420 - "type": "github" 421 135 } 422 136 } 423 137 },

+21 -66

flake.nix

··· 1 1 { 2 - description = "Home Manager configuration for noah"; 2 + description = "Home Manager configuration of noah"; 3 3 4 4 inputs = { 5 5 # Specify the source of Home Manager and Nixpkgs. 6 - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; 6 + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; 7 7 nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; 8 - determinite = { 9 - url = "https://flakehub.com/f/DeterminateSystems/determinate/3"; 10 - inputs.nixpkgs.follows = "nixpkgs"; 11 - }; 12 8 home-manager = { 13 - url = "github:nix-community/home-manager/release-25.11"; 9 + url = "github:nix-community/home-manager/release-24.11"; 14 10 inputs.nixpkgs.follows = "nixpkgs"; 15 11 }; 16 12 pre-commit-hooks.url = "github:cachix/git-hooks.nix"; 17 - agenix.url = "github:ryantm/agenix"; 18 13 }; 19 14 20 - outputs = 21 - { 22 - self, 23 - nixpkgs, 24 - nixpkgs-unstable, 25 - determinite, 26 - home-manager, 27 - pre-commit-hooks, 28 - agenix, 29 - ... 30 - }@inputs: 15 + outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, pre-commit-hooks, ... }@inputs: 31 16 let 32 - supportedSystems = [ 33 - "x86_64-linux" 34 - "aarch64-linux" 35 - "x86_64-darwin" 36 - "aarch64-darwin" 37 - ]; 17 + system = "aarch64-darwin"; 18 + pkgs = nixpkgs.legacyPackages.${system}; 19 + unstable-pkgs = nixpkgs-unstable.legacyPackages.${system}; 20 + supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; 38 21 forAllSystems = nixpkgs.lib.genAttrs supportedSystems; 39 22 in 40 23 { 41 - nixosConfigurations.odin = inputs.nixpkgs.lib.nixosSystem rec { 42 - system = "x86_64-linux"; 43 - specialArgs = { 44 - inherit inputs; 45 - unstable = nixpkgs-unstable.legacyPackages.${system}; 24 + homeConfigurations."noah" = home-manager.lib.homeManagerConfiguration { 25 + inherit pkgs; 26 + 27 + # Specify your home configuration modules here, for example, 28 + # the path to your home.nix. 29 + modules = [ ./noah-home.nix ]; 30 + 31 + # Optionally use extraSpecialArgs 32 + # to pass through arguments to home.nix 33 + extraSpecialArgs = { 34 + unstable = unstable-pkgs; 46 35 }; 47 - modules = [ 48 - determinite.nixosModules.default 49 - ./configuration.nix 50 - agenix.nixosModules.default 51 - home-manager.nixosModules.home-manager 52 - { 53 - home-manager.useGlobalPkgs = true; 54 - home-manager.useUserPackages = true; 55 - home-manager.users.noah = ./home.nix; 56 - home-manager.extraSpecialArgs = { 57 - inherit inputs; 58 - unstable = nixpkgs-unstable.legacyPackages.x86_64-linux; 59 - }; 60 - 61 - # Optionally, use home-manager.extraSpecialArgs to pass 62 - # arguments to home.nix 63 - } 64 - ]; 65 36 }; 66 - #homeConfigurations."noah" = home-manager.lib.homeManagerConfiguration { 67 - # # Specify your home configuration modules here, for example, 68 - # # the path to your home.nix. 69 - # modules = [ ./home.nix ]; 70 - # # Optionally use extraSpecialArgs 71 - # # to pass through arguments to home.nix 72 - # extraSpecialArgs = { 73 - # inherit inputs; 74 - # # TODO(ngp): figure out how to avoid double speccifying the platform here 75 - # unstable = nixpkgs-unstable.legacyPackages.x86_64-linux; 76 - # }; 77 - #}; 78 37 checks = forAllSystems (system: { 79 38 pre-commit-check = inputs.pre-commit-hooks.lib.${system}.run { 80 39 src = ./.; 81 40 # If your hooks are intrusive, avoid running on each commit with a default_states like this: 82 41 # default_stages = ["manual" "push"]; 83 42 hooks = { 84 - nixfmt.enable = true; 43 + nixpkgs-fmt.enable = true; 85 44 nil.enable = true; 86 45 luacheck.enable = true; 87 46 }; ··· 90 49 devShells = forAllSystems (system: { 91 50 default = nixpkgs.legacyPackages.${system}.mkShell { 92 51 inherit (self.checks.${system}.pre-commit-check) shellHook; 93 - buildInputs = [ 94 - nixpkgs.legacyPackages.${system}.nixfmt-rfc-style 95 - ] 96 - ++ self.checks.${system}.pre-commit-check.enabledPackages; 52 + buildInputs = self.checks.${system}.pre-commit-check.enabledPackages; 97 53 }; 98 54 }); 99 - formatter = forAllSystems (system: inputs.nixpkgs.legacyPackages.${system}.nixfmt-rfc-style); 100 55 }; 101 56 }

+2 -2

ghostty/config

··· 1 1 font-size = 13 2 - font-family = Berkeley Mono 2 + font-family = TX-02 3 3 theme = catppuccin-macchiato 4 4 shell-integration = fish 5 5 6 - window-decoration = false 6 + window-decoration = server 7 7 8 8 font-feature = calt 9 9 font-feature = ccmp

+27

gs.sh

··· 1 + #!/usr/bin/env bash 2 + set -xeuo pipefail 3 + 4 + gamescopeArgs=( 5 + --adaptive-sync # VRR support 6 + --hdr-enabled 7 + --mangoapp # performance overlay 8 + --rt 9 + --steam 10 + ) 11 + steamArgs=( 12 + -pipewire-dmabuf 13 + -tenfoot 14 + ) 15 + mangoConfig=( 16 + cpu_temp 17 + gpu_temp 18 + ram 19 + vram 20 + ) 21 + mangoVars=( 22 + MANGOHUD=1 23 + MANGOHUD_CONFIG="$(IFS=,; echo "${mangoConfig[*]}")" 24 + ) 25 + 26 + export "${mangoVars[@]}" 27 + exec gamescope "${gamescopeArgs[@]}" -- steam "${steamArgs[@]}"

+31 -10

gui.nix

··· 12 12 ]; 13 13 14 14 # Configure keymap in X11 15 - # services.xserver.xkb.layout = "us"; 15 + services.xserver.xkb = { 16 + layout = "us"; 17 + variant = ""; 18 + }; 16 19 # services.xserver.xkb.options = "eurosign:e,caps:escape"; 17 20 18 21 # Enable CUPS to print documents. ··· 32 35 hardware.graphics = { 33 36 enable = true; 34 37 extraPackages = with pkgs; [ 38 + amdvlk 35 39 libva 36 40 mesa 37 41 rocmPackages.clr.icd 38 42 ]; 39 43 }; 40 44 45 + 41 46 # Enable touchpad support (enabled default in most desktopManager). 42 47 # services.xserver.libinput.enable = true; 43 48 ··· 47 52 fira-code-symbols 48 53 noto-fonts 49 54 noto-fonts-cjk-sans 50 - noto-fonts-color-emoji 55 + noto-fonts-emoji 56 + noto-fonts-extra 51 57 nerd-fonts.fira-code 52 58 ]; 53 59 ··· 56 62 57 63 # Enable the sway window manager 58 64 programs.sway = { 59 - enable = true; 65 + enable = false; 60 66 #package = unstable.sway; 61 67 wrapperFeatures.gtk = true; 62 68 }; 63 69 # Use greetd as the displaymanager 64 70 #services.xserver.displayManager.greetd.enable = true; 65 - #services.xserver.displayManager.lightdm.enable = false; 66 - services.displayManager.sddm.enable = true; 67 - services.displayManager.defaultSession = "sway"; 68 - services.displayManager.autoLogin = { 71 + 72 + 73 + services.xserver.displayManager.lightdm.enable = false; 74 + 75 + #services.displayManager.sddm.enable = true; 76 + #services.displayManager.defaultSession = "sway"; 77 + #services.displayManager.autoLogin = { 78 + # enable = true; 79 + # user = "noah"; 80 + #}; 81 + services.xserver.desktopManager.xfce.enable = false; 82 + services.xserver.desktopManager.lxqt = { 69 83 enable = true; 70 - user = "noah"; 71 84 }; 85 + services.xscreensaver.enable = true; 86 + security.pam.services.xscreensaver.enable = true; 72 87 73 88 # i3, for when I need XOrg 74 89 services.xserver.windowManager.i3 = { 75 - enable = true; 90 + enable = false; 76 91 extraPackages = with pkgs; [ 77 92 dmenu 78 93 i3status ··· 84 99 xdg.portal = { 85 100 enable = true; 86 101 wlr.enable = true; 87 - extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; 102 + extraPortals = [ 103 + pkgs.xdg-desktop-portal 104 + pkgs.xdg-desktop-portal-wlr 105 + pkgs.xdg-desktop-portal-gtk 106 + pkgs.xdg-desktop-portal-termfilechooser 107 + pkgs.lxqt.xdg-desktop-portal-lxqt 108 + ]; 88 109 }; 89 110 xdg.mime = { 90 111 enable = true;

+49 -70

hardware-configuration.nix

··· 1 1 # Do not modify this file! It was generated by ‘nixos-generate-config’ 2 2 # and may be overwritten by future invocations. Please make changes 3 3 # to /etc/nixos/configuration.nix instead. 4 - { 5 - config, 6 - lib, 7 - modulesPath, 8 - pkgs, 9 - ... 10 - }: 4 + { config, lib, pkgs, modulesPath, ... }: 11 5 12 6 { 13 - imports = [ 14 - (modulesPath + "/installer/scan/not-detected.nix") 15 - ]; 7 + imports = 8 + [ 9 + (modulesPath + "/installer/scan/not-detected.nix") 10 + ]; 16 11 17 12 boot.kernelPackages = pkgs.linuxPackages_latest; 18 - boot.initrd.availableKernelModules = [ 19 - "nvme" 20 - "xhci_pci" 21 - "thunderbolt" 22 - "usb_storage" 23 - "usbhid" 24 - "sd_mod" 25 - "sdhci_pci" 26 - ]; 27 - boot.initrd.kernelModules = [ 28 - "kvm-amd" 29 - "amdgpu" 30 - "nvme" 31 - "xhci_pci" 32 - "thunderbolt" 33 - "usb_storage" 34 - "usbhid" 35 - "sd_mod" 36 - "sdhci_pci" 37 - ]; 38 - boot.kernelModules = [ 39 - "kvm-amd" 40 - "amdgpu" 41 - "nvme" 42 - "xhci_pci" 43 - "thunderbolt" 44 - "usb_storage" 45 - "usbhid" 46 - "sd_mod" 47 - "sdhci_pci" 48 - ]; 49 - virtualisation.libvirtd = { 13 + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "usbhid" "uas" "sd_mod" ]; 14 + boot.initrd.kernelModules = [ ]; 15 + boot.kernelModules = [ "kvm-amd" ]; 16 + boot.extraModulePackages = [ ]; 17 + 18 + # Bluetooth / wireless configuration 19 + hardware.bluetooth = { 50 20 enable = true; 51 - qemu = { 52 - runAsRoot = false; 21 + powerOnBoot = true; 22 + settings = { 23 + General = { 24 + # Shows battery charge of connected devices on supported 25 + # Bluetooth adapters. Defaults to 'false'. 26 + Experimental = true; 27 + # When enabled other devices can connect faster to us, however 28 + # the tradeoff is increased power consumption. Defaults to 29 + # 'false'. 30 + FastConnectable = true; 31 + }; 32 + Policy = { 33 + # Enable all controllers when they are found. This includes 34 + # adapters present on start as well as adapters that are plugged 35 + # in later on. Defaults to 'true'. 36 + AutoEnable = true; 37 + }; 53 38 }; 54 39 }; 55 - #boot.extraModulePackages = with config.boot.kernelPackages; [ ]; 56 - boot.kernelParams = [ ]; 57 40 58 - hardware.enableRedistributableFirmware = true; 41 + 42 + fileSystems."/" = 43 + { 44 + device = "/dev/disk/by-uuid/9a7cbffe-6c10-4220-bb99-4dcea8181dcc"; 45 + fsType = "ext4"; 46 + }; 47 + 48 + fileSystems."/boot" = 49 + { 50 + device = "/dev/disk/by-uuid/9AC5-62C3"; 51 + fsType = "vfat"; 52 + options = [ "fmask=0077" "dmask=0077" ]; 53 + }; 59 54 60 - fileSystems."/" = { 61 - device = "/dev/disk/by-uuid/07019c69-2597-410d-a8a0-a8ffb0f58883"; 55 + swapDevices = 56 + [{ device = "/dev/disk/by-uuid/a19d8fad-d8d2-4bbe-a233-e645020419ff"; }]; 57 + fileSystems."/srv/mugino" = { 58 + device = "/dev/disk/by-uuid/d832dd9f-1fbb-4ca7-9097-0ba329b838af"; 62 59 fsType = "ext4"; 63 60 }; 64 61 65 - fileSystems."/boot" = { 66 - device = "/dev/disk/by-uuid/4B85-C90A"; 67 - fsType = "vfat"; 68 - }; 69 - 70 - swapDevices = [ 71 - { 72 - device = "/swapfile"; 73 - size = 32 * 1024; 74 - } 75 - ]; 76 - 77 62 # Enables DHCP on each ethernet and wireless interface. In case of scripted networking 78 63 # (the default) this is the recommended approach. When using systemd-networkd it's 79 64 # still possible to use this option, but it's recommended to use it in conjunction 80 65 # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`. 81 66 networking.useDHCP = lib.mkDefault true; 82 - # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true; 83 - # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; 67 + # networking.interfaces.enp191s0.useDHCP = lib.mkDefault true; 68 + # networking.interfaces.wlp192s0.useDHCP = lib.mkDefault true; 84 69 85 - nixpkgs.hostPlatform = { 86 - #gcc.arch = "znver2"; 87 - #gcc.tune = "znver2"; 88 - system = "x86_64-linux"; 89 - #gcc.arch = "x86-64-v3"; 90 - }; 91 - #nix.settings.system-features = ["gccarch-znver2" "big-parallel" "nixos-test" "benchmark" "kvm"]; 70 + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; 92 71 hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; 93 72 }

-298

home.nix

··· 1 - { 2 - pkgs, 3 - unstable, 4 - ... 5 - }: 6 - { 7 - home.sessionVariables = { 8 - NIXOS_OZONE_WL = "1"; 9 - }; 10 - 11 - home.packages = with pkgs; [ 12 - # main tool 13 - # TODO: re-enable this ASAP. Why is it broken??? 14 - #firefox-devedition 15 - direnv 16 - fish 17 - tree 18 - btop 19 - htop 20 - mtr 21 - pavucontrol 22 - moreutils 23 - picocom 24 - # Disabled because even unstable is too out-of-date 25 - # unstable.logseq 26 - #element-desktop 27 - rsync 28 - unzip 29 - fd 30 - jq 31 - ripgrep 32 - bat 33 - netcat 34 - stunnel 35 - fzf 36 - iperf3 37 - entr 38 - bitwarden-cli 39 - # Previewer for LF 40 - unstable.pistol 41 - sqlite 42 - age 43 - just 44 - unstable.catgirl 45 - #devenv 46 - plan9port 47 - killall 48 - 49 - # Dev tools 50 - git 51 - gcc 52 - go 53 - gopls 54 - gnumake 55 - babashka 56 - ccls 57 - unstable.clojure 58 - unstable.cljfmt 59 - unstable.clojure-lsp 60 - unstable.janet 61 - unstable.jpm 62 - unstable.fennel-ls 63 - graalvmPackages.graalvm-ce 64 - cmake 65 - ctags 66 - kotlin 67 - nodejs 68 - node2nix 69 - opam 70 - unstable.rustup # includes rust-analyzer 71 - # Scala stuff 72 - #scala_3 73 - #scalafmt 74 - #metals 75 - # Scala / Java build tool 76 - #sbt 77 - # Haskell 78 - #cabal-install 79 - luarocks 80 - luajit 81 - lua-language-server 82 - luaformatter 83 - #leiningen 84 - libressl 85 - erlang 86 - elixir 87 - #ghc 88 - nil # nix language server 89 - typescript 90 - # This is currently broken 91 - #vscode-langservers-extracted 92 - scdoc 93 - dockerfile-language-server-nodejs 94 - yaml-language-server 95 - mkcert 96 - natscli 97 - sqlite 98 - unstable.gleam 99 - unstable.rebar3 100 - #unstable.flyctl 101 - unstable.bun 102 - unstable.gh 103 - unstable.kraft 104 - unstable.doctl 105 - 106 - # GUI tools 107 - i3status 108 - i3lock 109 - maim 110 - slurp 111 - grim 112 - wl-clipboard 113 - playerctl 114 - xclip 115 - zathura 116 - fuzzel 117 - thunderbird 118 - ghostty 119 - slack 120 - 121 - # Python dev tools 122 - #pyright 123 - python314 124 - #python314Packages.pip 125 - # These are broken right now for some reason 126 - #python314Packages.python-lsp-server 127 - #python314Packages.python-lsp-ruff 128 - 129 - # Certificate Management 130 - minica 131 - mkcert 132 - step-cli 133 - #unstable.ollama 134 - 135 - # Unfree 136 - #discord 137 - #spotify 138 - #telegram-desktop 139 - #unstable.google-chrome 140 - #unstable.jetbrains-toolbox 141 - (pkgs.callPackage ./packages/foks.nix { }) 142 - (pkgs.callPackage ./packages/foks-server.nix { }) 143 - ]; 144 - 145 - nix = { 146 - settings.experimental-features = [ 147 - "nix-command" 148 - "flakes" 149 - ]; 150 - }; 151 - 152 - programs.fish = { 153 - enable = true; 154 - #package = unstable.fish; 155 - }; 156 - programs.neovim = { 157 - #package = unstable.neovim-unwrapped; 158 - enable = true; 159 - defaultEditor = true; 160 - withNodeJs = true; 161 - withPython3 = true; 162 - extraPackages = with pkgs; [ 163 - fzf 164 - ripgrep 165 - luarocks 166 - unstable.tree-sitter 167 - ]; 168 - }; 169 - programs.git = { 170 - enable = true; 171 - lfs.enable = true; 172 - userName = "Noah Pederson"; 173 - userEmail = "noah@packetlost.dev"; 174 - extraConfig = { 175 - sendemail = { 176 - smtpserver = "smtp.migadu.com"; 177 - smtpuser = "noah@packetlost.dev"; 178 - smtpencryption = "ssl"; 179 - smtpserverport = 465; 180 - }; 181 - init = { 182 - defaultBranch = "master"; 183 - }; 184 - pull = { 185 - rebase = true; 186 - }; 187 - credential = { 188 - helper = "cache"; 189 - }; 190 - }; 191 - ignores = [ 192 - ".direnv/" 193 - ".envrc" 194 - "flake.nix" 195 - "shell.nix" 196 - ".env/" 197 - ".clj-kondo/" 198 - ]; 199 - }; 200 - 201 - programs.aerc = { 202 - enable = true; 203 - package = unstable.aerc; 204 - }; 205 - 206 - programs.ssh = { 207 - enable = true; 208 - extraConfig = builtins.readFile ./ssh/extra; 209 - addKeysToAgent = "yes"; 210 - }; 211 - 212 - programs.yazi = { 213 - enable = true; 214 - package = unstable.yazi; 215 - enableFishIntegration = true; 216 - settings = { 217 - preview = { 218 - image_quality = 90; 219 - }; 220 - tasks = { 221 - image_bound = [ 222 - 0 223 - 0 224 - ]; 225 - }; 226 - }; 227 - plugins = { 228 - rsync = unstable.yaziPlugins.rsync; 229 - piper = unstable.yaziPlugins.piper; 230 - nord = unstable.yaziPlugins.nord; 231 - mediainfo = unstable.yaziPlugins.mediainfo; 232 - glow = unstable.yaziPlugins.glow; 233 - git = unstable.yaziPlugins.git; 234 - diff = unstable.yaziPlugins.diff; 235 - duckdb = unstable.yaziPlugins.duckdb; 236 - }; 237 - }; 238 - 239 - services.ssh-agent.enable = true; 240 - 241 - programs.direnv = { 242 - enable = true; 243 - nix-direnv.enable = true; 244 - }; 245 - 246 - # Independent config files. 247 - xdg.configFile.nvim = { 248 - source = ./nvim; 249 - recursive = true; 250 - }; 251 - 252 - xdg.configFile.vis = { 253 - source = ./vis; 254 - recursive = true; 255 - }; 256 - 257 - xdg.configFile.fish = { 258 - source = ./fish; 259 - recursive = true; 260 - }; 261 - 262 - xdg.configFile.kitty = { 263 - source = ./kitty; 264 - recursive = true; 265 - }; 266 - 267 - xdg.configFile.aerc = { 268 - source = ./aerc; 269 - recursive = true; 270 - }; 271 - 272 - xdg.configFile.sway = { 273 - source = ./sway; 274 - recursive = true; 275 - }; 276 - 277 - xdg.configFile.i3 = { 278 - source = ./i3; 279 - recursive = true; 280 - }; 281 - xdg.configFile.i3status = { 282 - source = ./i3status; 283 - recursive = true; 284 - }; 285 - 286 - xdg.configFile.ghostty = { 287 - source = ./ghostty; 288 - recursive = true; 289 - }; 290 - 291 - home.file.".local/bin" = { 292 - source = ./scripts; 293 - recursive = true; 294 - }; 295 - 296 - home.stateVersion = "23.11"; 297 - 298 - }

+2

i3/config

··· 192 192 bar { 193 193 status_command i3status 194 194 } 195 + 196 + exec barrier

+7 -17

networking.nix

··· 4 4 # Pick only one of the below networking options. 5 5 # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. 6 6 # networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. 7 - networking.hostName = "odin"; 7 + networking.hostName = "shizuri"; 8 8 # I like systemd-networkd 9 9 systemd.network.enable = true; 10 10 systemd.network.networks."50-wlp2s0" = { ··· 16 16 networking.tempAddresses = "disabled"; 17 17 18 18 networking.useNetworkd = true; 19 - # TODO: static IP @ 192.168.1.6 19 + # TODO: static IP @ 192.168.1.2 20 20 21 21 # Configure network proxy if necessary 22 22 # networking.proxy.default = "http://user:password@proxy:port/"; ··· 25 25 # networking.firewall.allowedTCPPorts = [ ... ]; 26 26 # networking.firewall.allowedUDPPorts = [ ... ]; 27 27 # Or disable the firewall altogether. 28 + # TODO: allow some ports 28 29 networking.firewall = { 29 - enable = true; 30 + enable = false; 30 31 allowPing = true; 31 32 allowedUDPPorts = [ ]; 32 - allowedUDPPortRanges = [ ]; 33 33 allowedTCPPorts = [ 34 + 1234 34 35 2375 35 - 3000 36 36 ]; 37 37 }; 38 38 ··· 57 57 "/srv/shokuhou" = { 58 58 device = "192.168.1.3:/srv/shokuhou"; 59 59 fsType = "nfs"; 60 - options = [ 61 - "nfsvers=4" 62 - "user" 63 - "x-system.automount" 64 - "x-system.idle-timeout=600" 65 - ]; 60 + options = [ "nfsvers=4" "user" "x-system.automount" "x-system.idle-timeout=600" ]; 66 61 }; 67 62 "/srv/mentalout" = { 68 63 device = "192.168.1.3:/srv/mentalout"; 69 64 fsType = "nfs"; 70 - options = [ 71 - "nfsvers=4" 72 - "user" 73 - "x-system.automount" 74 - "x-system.idle-timeout=600" 75 - ]; 65 + options = [ "nfsvers=4" "user" "x-system.automount" "x-system.idle-timeout=600" ]; 76 66 }; 77 67 }; 78 68 }

+385

noah-home.nix

··· 1 + { pkgs, lib, ... }: 2 + let 3 + unstable = import <nixos-unstable> { 4 + config.allowUnfreePredicate = 5 + pkg: 6 + builtins.elem (lib.getName pkg) [ 7 + "jetbrains-toolbox" 8 + "jetbrains.rust-rover" 9 + "rust-rover" 10 + "discord" 11 + "google-chrome" 12 + "slack" 13 + "lmstudio" 14 + ]; 15 + overlays = [ 16 + (final: prev: { 17 + lmstudio = prev.lmstudio.overrideAttrs rec { 18 + version = "0.3.24-6"; 19 + hash = "sha256-TjfrNPr8xRUOmRRx2rLJEh3D/kV3OOfqgRTVstOd6AE="; 20 + src = final.fetchurl { 21 + hash = hash; 22 + url = "https://installers.lmstudio.ai/linux/x64/${version}/LM-Studio-${version}-x64.AppImage"; 23 + }; 24 + }; 25 + }) 26 + ]; 27 + }; 28 + chicago95 = pkgs.callPackage ./xfce/chicago95.nix { }; 29 + xfceConfigPath = ./xfce/themeConfig; 30 + xfceConfig = "${xfceConfigPath}"; 31 + in 32 + { 33 + home.sessionVariables = { 34 + NIXOS_OZONE_WL = "1"; 35 + }; 36 + 37 + home.packages = with pkgs; [ 38 + # main tool 39 + unstable.firefox-devedition 40 + direnv 41 + fish 42 + tree 43 + btop 44 + htop 45 + amdgpu_top 46 + mtr 47 + pavucontrol 48 + moreutils 49 + picocom 50 + # Disabled because even unstable is too out-of-date 51 + # unstable.logseq 52 + element-desktop 53 + rsync 54 + unzip 55 + fd 56 + jq 57 + xz 58 + bzip3 59 + ripgrep 60 + bat 61 + netcat 62 + stunnel 63 + fzf 64 + iperf3 65 + entr 66 + bitwarden-cli 67 + # Previewer for LF 68 + unstable.pistol 69 + sqlite 70 + age 71 + just 72 + unstable.catgirl 73 + #devenv 74 + plan9port 75 + killall 76 + 77 + # Dev tools 78 + git 79 + gcc 80 + go 81 + gopls 82 + gnumake 83 + babashka 84 + ccls 85 + unstable.clojure 86 + unstable.cljfmt 87 + unstable.clojure-lsp 88 + unstable.janet 89 + unstable.jpm 90 + unstable.fennel-ls 91 + graalvm-ce 92 + cmake 93 + ctags 94 + kotlin 95 + nodejs 96 + node2nix 97 + opam 98 + unstable.rustup # includes rust-analyzer 99 + # Scala stuff 100 + #scala_3 101 + #scalafmt 102 + #metals 103 + # Scala / Java build tool 104 + #sbt 105 + # Haskell 106 + #cabal-install 107 + luarocks 108 + luajit 109 + lua-language-server 110 + luaformatter 111 + #leiningen 112 + libressl 113 + erlang 114 + elixir 115 + #ghc 116 + nil # nix language server 117 + typescript 118 + # This is currently broken 119 + #vscode-langservers-extracted 120 + scdoc 121 + dockerfile-language-server-nodejs 122 + yaml-language-server 123 + mkcert 124 + natscli 125 + python3 126 + python311Packages.pip 127 + sqlite 128 + unstable.harec 129 + unstable.hare 130 + unstable.haredoc 131 + unstable.haredo 132 + unstable.gleam 133 + unstable.rebar3 134 + #unstable.flyctl 135 + unstable.bun 136 + unstable.gh 137 + unstable.kraft 138 + unstable.doctl 139 + 140 + # JetBrains 141 + unstable.jetbrains-toolbox 142 + 143 + # GUI tools 144 + i3status 145 + i3lock 146 + maim 147 + slurp 148 + grim 149 + wl-clipboard 150 + playerctl 151 + barrier 152 + xclip 153 + zathura 154 + fuzzel 155 + thunderbird 156 + ghostty 157 + slack 158 + dconf 159 + 160 + # Python dev tools 161 + pyright 162 + python311Packages.python-lsp-server 163 + python311Packages.python-lsp-ruff 164 + 165 + # Certificate Management 166 + minica 167 + mkcert 168 + step-cli 169 + unstable.ollama 170 + 171 + # XFCE theme stuff 172 + xfce.xfce4-panel 173 + xfce.xfconf 174 + xfce.xfdesktop 175 + xfce.xfce4-whiskermenu-plugin 176 + xfce.xfce4-docklike-plugin 177 + xorg.xrandr 178 + 179 + # Unfree 180 + discord 181 + spotify 182 + telegram-desktop 183 + google-chrome 184 + unstable.lmstudio 185 + libreoffice-qt6-fresh 186 + ]; 187 + 188 + nix = { 189 + settings.experimental-features = [ 190 + "nix-command" 191 + "flakes" 192 + ]; 193 + }; 194 + 195 + programs.fish = { 196 + enable = true; 197 + #package = unstable.fish; 198 + }; 199 + programs.neovim = { 200 + #package = unstable.neovim-unwrapped; 201 + enable = true; 202 + defaultEditor = true; 203 + withNodeJs = true; 204 + withPython3 = true; 205 + plugins = [ 206 + unstable.vimPlugins.nvim-treesitter.withAllGrammars 207 + ]; 208 + extraPackages = with pkgs; [ 209 + fzf 210 + ripgrep 211 + luarocks 212 + unstable.tree-sitter 213 + ]; 214 + }; 215 + programs.git = { 216 + enable = true; 217 + lfs.enable = true; 218 + userName = "Noah Pederson"; 219 + userEmail = "noah@packetlost.dev"; 220 + extraConfig = { 221 + sendemail = { 222 + smtpserver = "smtp.migadu.com"; 223 + smtpuser = "noah@packetlost.dev"; 224 + smtpencryption = "ssl"; 225 + smtpserverport = 465; 226 + }; 227 + init = { 228 + defaultBranch = "master"; 229 + }; 230 + pull = { 231 + rebase = true; 232 + }; 233 + credential = { 234 + helper = "cache"; 235 + }; 236 + }; 237 + ignores = [ 238 + ".direnv/" 239 + ".envrc" 240 + "flake.nix" 241 + "shell.nix" 242 + ".env/" 243 + ".clj-kondo/" 244 + ]; 245 + }; 246 + 247 + programs.aerc = { 248 + enable = true; 249 + package = unstable.aerc; 250 + }; 251 + 252 + programs.ssh = { 253 + enable = true; 254 + extraConfig = builtins.readFile ./ssh/extra; 255 + addKeysToAgent = "yes"; 256 + }; 257 + 258 + programs.yazi = { 259 + enable = true; 260 + package = unstable.yazi; 261 + enableFishIntegration = true; 262 + settings = { 263 + preview = { 264 + image_quality = 90; 265 + }; 266 + tasks = { 267 + image_bound = [ 268 + 0 269 + 0 270 + ]; 271 + }; 272 + }; 273 + plugins = { 274 + rsync = unstable.yaziPlugins.rsync; 275 + piper = unstable.yaziPlugins.piper; 276 + nord = unstable.yaziPlugins.nord; 277 + mediainfo = unstable.yaziPlugins.mediainfo; 278 + glow = unstable.yaziPlugins.glow; 279 + git = unstable.yaziPlugins.git; 280 + diff = unstable.yaziPlugins.diff; 281 + duckdb = unstable.yaziPlugins.duckdb; 282 + }; 283 + }; 284 + 285 + services.ssh-agent.enable = true; 286 + 287 + programs.direnv = { 288 + enable = true; 289 + nix-direnv.enable = true; 290 + }; 291 + 292 + # Independent config files. 293 + xdg.configFile.nvim = { 294 + source = ./nvim; 295 + recursive = true; 296 + }; 297 + 298 + xdg.configFile.vis = { 299 + source = ./vis; 300 + recursive = true; 301 + }; 302 + 303 + xdg.configFile.fish = { 304 + source = ./fish; 305 + recursive = true; 306 + }; 307 + 308 + xdg.configFile.kitty = { 309 + source = ./kitty; 310 + recursive = true; 311 + }; 312 + 313 + xdg.configFile.aerc = { 314 + source = ./aerc; 315 + recursive = true; 316 + }; 317 + 318 + xdg.configFile.sway = { 319 + source = ./sway; 320 + recursive = true; 321 + }; 322 + 323 + xdg.configFile.i3 = { 324 + source = ./i3; 325 + recursive = true; 326 + }; 327 + xdg.configFile.i3status = { 328 + source = ./i3status; 329 + recursive = true; 330 + }; 331 + 332 + xdg.configFile.ghostty = { 333 + source = ./ghostty; 334 + recursive = true; 335 + }; 336 + 337 + home.file.".local/bin" = { 338 + source = ./scripts; 339 + recursive = true; 340 + }; 341 + 342 + home.file.".luacheckrc" = { 343 + text = '' 344 + globals = { 345 + "vim", 346 + "vis", 347 + } 348 + ''; 349 + 350 + }; 351 + 352 + gtk = { 353 + enable = true; 354 + theme = { 355 + name = "Chicago95"; 356 + package = chicago95; 357 + }; 358 + iconTheme = { 359 + name = "Chicago95"; 360 + package = chicago95; 361 + }; 362 + #iconTheme = { 363 + # name = "Win95_plus"; 364 + # package = pkgs.callPackage ./xfce/win95_plus.nix {}; 365 + #}; 366 + cursorTheme = { 367 + name = "Chicago95"; 368 + package = chicago95; 369 + }; 370 + font = { 371 + name = "Sans"; 372 + size = 12; 373 + }; 374 + }; 375 + home.pointerCursor = { 376 + name = "Chicago95"; 377 + package = chicago95; 378 + size = 24; 379 + gtk.enable = true; 380 + x11.enable = true; 381 + }; 382 + 383 + home.stateVersion = "23.11"; 384 + 385 + }

+2 -2

nvim/init.lua

··· 7 7 -- Config for Nord, which I usually use 8 8 -- vim.g.nord_italic = false 9 9 -- vim.g.nord_bold = false 10 - --vim.opt.background = "light" 11 - vim.opt.background = "dark" 10 + vim.opt.background = "light" 11 + --vim.opt.background = "dark" 12 12 13 13 -- Formatting and vim config 14 14 vim.opt.expandtab = true

+1 -1

nvim/lua/lsp/janet_lsp.lua

··· 2 2 cmd = { 3 3 "janet", 4 4 "-i", 5 - "/Users/noah/repos/janet-lsp/build/janet-lsp.jimage", 5 + "/home/noah/repos/janet-lsp/jpm_tree/lib/janet-lsp.jimage", 6 6 "--stdio", 7 7 } 8 8 }

+3 -3

nvim/lua/lsp.lua

··· 44 44 end, opts) 45 45 vim.keymap.set("n", "<space>D", vim.lsp.buf.type_definition, opts) 46 46 vim.keymap.set("n", "<space>rn", vim.lsp.buf.rename, opts) 47 - vim.keymap.set("n", "<leader>ca", vim.lsp.buf.code_action, opts) 47 + vim.keymap.set("n", "<space>ca", vim.lsp.buf.code_action, opts) 48 48 vim.keymap.set("n", "gr", vim.lsp.buf.references, opts) 49 49 vim.keymap.set("n", "<space>e", vim.diagnostic.open_float, opts) 50 - vim.keymap.set("n", "[d", function () vim.diagnostic.jump {count = -1, float = true} end, opts) 51 - vim.keymap.set("n", "]d", function () vim.diagnostic.jump {count = 1, float = true} end, opts) 50 + vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, opts) 51 + vim.keymap.set("n", "]d", vim.diagnostic.goto_next, opts) 52 52 vim.keymap.set("n", "<space>q", vim.diagnostic.setloclist, opts) 53 53 vim.keymap.set("n", "<space>f", 54 54 function() vim.lsp.buf.format { async = true } end, opts)

+21 -3

nvim/lua/plugins.lua

··· 277 277 { "rktjmp/hotpot.nvim", lazy = true, ft = "fennel", config = true }, 278 278 { "Olical/nfnl", lazy = true, ft = "fennel", config = true }, -- Rust stuff 279 279 { 280 - "mrcjkb/rustaceanvim", 281 - lazy = false, 282 - version = "^6" 280 + "simrat39/rust-tools.nvim", 281 + lazy = true, 282 + ft = { "rust" }, 283 + config = function() 284 + local rt = require("rust-tools") 285 + rt.setup({ 286 + server = { 287 + on_attach = function(_, bufnr) 288 + -- Hover actions 289 + vim.keymap.set("n", "<C-space>", 290 + rt.hover_actions.hover_actions, 291 + { buffer = bufnr }) 292 + -- Code action groups 293 + vim.keymap.set("n", "<Leader>a", 294 + rt.code_action_group.code_action_group, 295 + { buffer = bufnr }) 296 + end 297 + } 298 + }) 299 + end, 300 + dependencies = { "nvim-lua/plenary.nvim" } 283 301 }, 284 302 { "mfussenegger/nvim-dap", lazy = true, ft = { "c", "rust" } }, 285 303 {

-107

packages/foks-server.nix

··· 1 - { 2 - lib, 3 - buildGoModule, 4 - fetchFromGitHub, 5 - buildNpmPackage, 6 - pcsclite, 7 - pkg-config, 8 - nix-update-script, 9 - stdenv, 10 - tailwindcss_4, 11 - templ, 12 - uglify-js, 13 - versionCheckHook, 14 - }: 15 - 16 - let 17 - src = fetchFromGitHub { 18 - owner = "foks-proj"; 19 - repo = "go-foks"; 20 - tag = "v${version}"; 21 - hash = "sha256-/+Z/afzj5y4CVU3qRymSIUzCabT2jAEBlKKoYgKlPRE="; 22 - }; 23 - version = "0.1.5"; 24 - templFoks = templ.overrideAttrs (old: { 25 - pname = "templ-foks"; 26 - version = "0.3.833"; 27 - src = old.src.override { 28 - hash = "sha256-4K1MpsM3OuamXRYOllDsxxgpMRseFGviC4RJzNA7Cu8="; 29 - }; 30 - vendorHash = "sha256-OPADot7Lkn9IBjFCfbrqs3es3F6QnWNjSOHxONjG4MM="; 31 - }); 32 - foksNodeModules = buildNpmPackage { 33 - pname = "foks-node-modules"; 34 - inherit version src; 35 - npmDepsHash = "sha256-mASu3taprCYP+muRh4b+qUTce7YTdISf/QnmSvUy6Mo="; 36 - dontNpmBuild = true; 37 - sourceRoot = "${src.name}/server/web/frontend"; 38 - installPhase = '' 39 - mkdir -p $out 40 - cp -r node_modules $out/node_modules 41 - ''; 42 - }; 43 - in 44 - buildGoModule (finalAttrs: { 45 - pname = "foks-server"; 46 - inherit version src; 47 - 48 - vendorHash = "sha256-nTHsYMQjVaQM+g2MM++/BDVYfzIM4CaMM6eK5GQE6Cc="; 49 - 50 - postPatch = 51 - # Generate templates 52 - '' 53 - pushd ./server/web/templates 54 - ${templFoks}/bin/templ generate 55 - popd 56 - '' 57 - # Generate tailwind 58 - + '' 59 - pushd ./server/web/frontend 60 - mkdir -p ../static/css 61 - ${lib.getExe tailwindcss_4} -i ./css/input.css -o ../static/css/style.min.css --minify 62 - ${lib.getExe tailwindcss_4} -i ./css/input.css -o ../static/css/style.css 63 - ${lib.getExe uglify-js} -c < ../static/js/foks.js > ../static/js/foks.min.js 64 - popd 65 - '' 66 - # Copy htmx dependency from node modules 67 - + '' 68 - pushd ./server/web/static 69 - mkdir -p ./js 70 - cp ${foksNodeModules}/node_modules/htmx.org/dist/htmx.js ./js/htmx.js 71 - cp ${foksNodeModules}/node_modules/htmx.org/dist/htmx.min.js ./js/htmx.min.js 72 - popd 73 - ''; 74 - subPackages = [ 75 - "server/foks-server" 76 - "server/foks-tool" 77 - ]; 78 - excludedPackages = [ "client" ]; 79 - 80 - buildInputs = lib.optionals (stdenv.hostPlatform.isLinux) [ pcsclite ]; 81 - nativeBuildInputs = [ 82 - pkg-config 83 - ]; 84 - ldflags = [ 85 - "-X main.LinkerVersion=v${finalAttrs.version}" 86 - ]; 87 - 88 - nativeInstallCheckInputs = [ 89 - versionCheckHook 90 - ]; 91 - versionCheckProgramArg = "version"; 92 - doInstallCheck = true; 93 - 94 - passthru = { 95 - updateScript = nix-update-script { }; 96 - }; 97 - 98 - meta = { 99 - description = "Federated key management and distribution system"; 100 - homepage = "https://foks.pub"; 101 - downloadPage = "https://github.com/foks-proj/go-foks"; 102 - changelog = "https://github.com/foks-proj/go-foks/releases/tag/${finalAttrs.src.tag}"; 103 - license = lib.licenses.mit; 104 - maintainers = with lib.maintainers; [ poptart ]; 105 - mainProgram = "foks-server"; 106 - }; 107 - })

-55

packages/foks.nix

··· 1 - { 2 - lib, 3 - buildGoModule, 4 - fetchFromGitHub, 5 - pcsclite, 6 - pkg-config, 7 - stdenv, 8 - buildPackages, 9 - }: 10 - let 11 - templFoks = buildPackages.templ.overrideAttrs (old: { 12 - pname = "templ-foks"; 13 - version = "0.3.833"; 14 - src = old.src.override { 15 - hash = "sha256-4K1MpsM3OuamXRYOllDsxxgpMRseFGviC4RJzNA7Cu8="; 16 - }; 17 - vendorHash = "sha256-OPADot7Lkn9IBjFCfbrqs3es3F6QnWNjSOHxONjG4MM="; 18 - }); 19 - in 20 - buildGoModule (finalAttrs: { 21 - pname = "foks"; 22 - version = "0.1.5"; 23 - 24 - src = fetchFromGitHub { 25 - owner = "foks-proj"; 26 - repo = "go-foks"; 27 - tag = "v${finalAttrs.version}"; 28 - hash = "sha256-/+Z/afzj5y4CVU3qRymSIUzCabT2jAEBlKKoYgKlPRE="; 29 - }; 30 - 31 - vendorHash = "sha256-nTHsYMQjVaQM+g2MM++/BDVYfzIM4CaMM6eK5GQE6Cc="; 32 - 33 - postPatch = '' 34 - cd ./server/web/templates 35 - ${templFoks}/bin/templ generate 36 - cd - 37 - ''; 38 - subPackages = [ "client/foks" ]; 39 - excludedPackages = [ "server" ]; 40 - 41 - buildInputs = lib.optionals (stdenv.hostPlatform.isLinux) [ pcsclite ]; 42 - nativeBuildInputs = [ 43 - pkg-config 44 - ]; 45 - 46 - meta = { 47 - description = "Federated key management and distribution system"; 48 - homepage = "https://foks.pub"; 49 - downloadPage = "https://github.com/foks-proj/go-foks"; 50 - changelog = "https://github.com/foks-proj/go-foks/releases/tag/${finalAttrs.src.tag}"; 51 - license = lib.licenses.mit; 52 - maintainers = with lib.maintainers; [ poptart ]; 53 - mainProgram = "foks"; 54 - }; 55 - })

+33 -1

packages.nix

··· 44 44 # List packages installed in system profile. To search, run: 45 45 # $ nix search wget 46 46 environment.systemPackages = with pkgs; [ 47 + mangohud 47 48 neovim 48 49 appimage-run 49 50 tzdata ··· 63 64 plan9port 64 65 vis 65 66 rc 66 - ncdu 67 67 68 68 smartmontools 69 69 ··· 80 80 dracula-theme 81 81 glib 82 82 xdg-utils 83 + xdg-desktop-portal 83 84 wayland 84 85 configure-gtk 86 + lxqt.lxqt-menu-data # for lxqt 85 87 dbus-sway-environment 86 88 dbus 87 89 pkg-config ··· 91 93 man-pages-posix 92 94 linuxPackages_latest.perf 93 95 ]; 96 + 97 + environment.loginShellInit = '' 98 + [[ "$(tty)" = "/dev/tty1" ]] && /home/noah/repos/nixos/gs.sh 99 + ''; 100 + 94 101 documentation.dev.enable = true; 95 102 96 103 # Fix dynamically linked libraries for unpackaged binaries ··· 115 122 enableZshIntegration = false; 116 123 }; 117 124 125 + programs.steam = { 126 + enable = true; 127 + remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play 128 + dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server 129 + localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers 130 + gamescopeSession.enable = true; 131 + }; 132 + programs.gamescope = { 133 + enable = true; 134 + capSysNice = true; 135 + }; 136 + # Boot to bigpicture 137 + services.getty.autologinUser = "noah"; 138 + 139 + programs.appimage = { 140 + enable = true; 141 + binfmt = true; 142 + }; 143 + 118 144 # Run other bins in QEMU 119 145 boot.binfmt.emulatedSystems = [ 120 146 "aarch64-linux" ··· 126 152 # Logseq uses an ancient version of Electron, so we enable that 127 153 nixpkgs.config.permittedInsecurePackages = [ "electron-25.9.0" ]; 128 154 155 + # I don't care too much about unfree 156 + nixpkgs.config.allowUnfree = true; 129 157 # Whitelist some unfree packages 130 158 nixpkgs.config.allowUnfreePredicate = 131 159 pkg: ··· 137 165 "tailscale" 138 166 "google-chrome" 139 167 "slack" 168 + "steam" 169 + "steam-original" 170 + "steam-unwrapped" 171 + "steam-run" 140 172 ]; 141 173 }

+11 -4

services.nix

··· 1 - { ... }: 1 + { pkgs, ... }: 2 2 { 3 3 # Some programs need SUID wrappers, can be configured further or are 4 4 # started in user sessions. ··· 14 14 # List services that you want to enable: 15 15 16 16 # Enable the OpenSSH daemon. 17 - services.openssh.enable = true; 17 + services.openssh = { 18 + enable = true; 19 + settings.X11Forwarding = true; 20 + }; 18 21 19 22 # Smart Card daemon 20 23 services.pcscd.enable = true; ··· 24 27 25 28 # Tailscale 26 29 services.tailscale = { 27 - enable = true; 30 + enable = false; 28 31 useRoutingFeatures = "client"; 29 32 }; 30 33 31 - services.redis.servers."" = { 34 + services.fwupd.enable = true; 35 + 36 + services.xrdp = { 32 37 enable = true; 38 + openFirewall = true; 39 + defaultWindowManager = "${pkgs.lxqt.lxqt-session}/bin/lxqt-session"; 33 40 }; 34 41 35 42 # Containers and VMs

+30 -24

users.nix

··· 1 + { pkgs, lib, ... }: 2 + let 3 + home-manager = builtins.fetchTarball 4 + "https://github.com/nix-community/home-manager/archive/release-25.05.tar.gz"; 5 + in 1 6 { 2 - pkgs, 3 - lib, 4 - ... 5 - }: 6 - { 7 + 8 + imports = [ 9 + # Import home-manager first, it's required for other modules 10 + (import "${home-manager}/nixos") 11 + ]; 7 12 8 13 # Declarative only optoins. 9 14 # I don't want to allow ad-hoc modifying users on the system. 10 15 # Users must be declared either as part of a package or in this file. 11 16 users.mutableUsers = false; 12 17 18 + 13 19 # Define a user account. Don't forget to set a password with ‘passwd’. 14 20 users.users.noah = { 15 21 isNormalUser = true; 16 22 shell = pkgs.fish; 17 - extraGroups = [ 18 - "wheel" 19 - "video" 20 - "nas" 21 - "libvirtd" 22 - "qemu-libvirtd" 23 - "docker" 24 - ]; # Enable ‘sudo’ for the user. 23 + extraGroups = [ "wheel" "video" "nas" "libvirtd" "qemu-libvirtd" "docker" ]; # Enable ‘sudo’ for the user. 25 24 hashedPasswordFile = "/etc/nixos/noah-password"; 26 - openssh.authorizedKeys.keys = lib.strings.splitString "\n" ( 27 - builtins.readFile ( 28 - builtins.fetchurl { 29 - url = "https://meta.sr.ht/~chiefnoah.keys"; 30 - name = "chiefnoah.keys"; 31 - # Update this with: 32 - # `curl https://meta.sr.ht/~chiefnoah.keys | sha256sum` 33 - sha256 = "0wdnx25blqihbgaa0hzd39mjqwki92ambar097hjfmlrxg1s4lk7"; 34 - } 35 - ) 36 - ); 25 + openssh.authorizedKeys.keys = 26 + lib.strings.splitString "\n" (builtins.readFile (builtins.fetchurl { 27 + url = "https://meta.sr.ht/~chiefnoah.keys"; 28 + name = "chiefnoah.keys"; 29 + # Update this with: 30 + # `curl https://meta.sr.ht/~chiefnoah.keys | sha256sum` 31 + sha256 = "0wdnx25blqihbgaa0hzd39mjqwki92ambar097hjfmlrxg1s4lk7"; 32 + })); 37 33 }; 34 + 38 35 users.groups.nas.gid = 1001; 36 + 37 + # I manage my home with home-manager 38 + # Don't store packages in ~/.nix-profile, use /etc/profiles so we can build-vm 39 + home-manager.useUserPackages = true; 40 + # No more NIX_PATH, use system pkgs 41 + home-manager.useGlobalPkgs = true; 42 + home-manager.backupFileExtension = "bak"; 43 + 44 + home-manager.users.noah = import ./noah-home.nix; 39 45 }

xfce/Win95_plus/1024x1024/apps/3d_graphics_file.png