diff --git a/flake.lock b/flake.lock index d142b17..31a6e49 100644 --- a/flake.lock +++ b/flake.lock @@ -11,11 +11,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1723293904, - "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", + "lastModified": 1761656077, + "narHash": "sha256-lsNWuj4Z+pE7s0bd2OKicOFq9bK86JE0ZGeKJbNqb94=", "owner": "ryantm", "repo": "agenix", - "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", + "rev": "9ba0d85de3eaa7afeab493fed622008b6e4924f5", "type": "github" }, "original": { @@ -75,11 +75,11 @@ ] }, "locked": { - "lastModified": 1757362872, - "narHash": "sha256-juUSWjxX8y2gueU34BpkQipUlhZRFJNLFccdprle0iM=", + "lastModified": 1764708670, + "narHash": "sha256-Gdo9lD6JwXGMVFJ8ZHCENcxXg30SG72kwsHnxPDCscI=", "owner": "9001", "repo": "copyparty", - "rev": "e09f3c9e2c3dccf8f3912539e04dd840b10b51ee", + "rev": "29925dc22b1f6810768d0af25d9c35ee35d88aa7", "type": "github" }, "original": { @@ -90,11 +90,11 @@ }, "crane": { "locked": { - "lastModified": 1725409566, - "narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=", + "lastModified": 1760924934, + "narHash": "sha256-tuuqY5aU7cUkR71sO2TraVKK2boYrdW3gCSXUkF4i44=", "owner": "ipetkov", "repo": "crane", - "rev": "7e4586bad4e3f8f97a9271def747cf58c4b68f3c", + "rev": "c6b4d5308293d0d04fcfeee92705017537cad02f", "type": "github" }, "original": { @@ -112,11 +112,11 @@ ] }, "locked": { - "lastModified": 1700795494, - "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", + "lastModified": 1744478979, + "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "rev": "43975d782b418ebf4969e9ccba82466728c2851b", "type": "github" }, "original": { @@ -135,11 +135,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1756719547, - "narHash": "sha256-N9gBKUmjwRKPxAafXEk1EGadfk2qDZPBQp4vXWPHINQ=", + "lastModified": 1762286984, + "narHash": "sha256-9I2H9x5We6Pl+DBYHjR1s3UT8wgwcpAH03kn9CqtdQc=", "owner": "serokell", "repo": "deploy-rs", - "rev": "125ae9e3ecf62fb2c0fd4f2d894eb971f1ecaed2", + "rev": "9c870f63e28ec1e83305f7f6cb73c941e699f74f", "type": "github" }, "original": { @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1741473158, - "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=", + "lastModified": 1764011051, + "narHash": "sha256-M7SZyPZiqZUR/EiiBJnmyUbOi5oE/03tCeFrTiUZchI=", "owner": "numtide", "repo": "devshell", - "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0", + "rev": "17ed8d9744ebe70424659b0ef74ad6d41fc87071", "type": "github" }, "original": { @@ -396,11 +396,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -436,11 +436,11 @@ ] }, "locked": { - "lastModified": 1703113217, - "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "lastModified": 1745494811, + "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", "owner": "nix-community", "repo": "home-manager", - "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", + "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", "type": "github" }, "original": { @@ -456,16 +456,16 @@ ] }, "locked": { - "lastModified": 1756679287, - "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=", + "lastModified": 1764866045, + "narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=", "owner": "nix-community", "repo": "home-manager", - "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8", + "rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab", "type": "github" }, "original": { "id": "home-manager", - "ref": "release-25.05", + "ref": "release-25.11", "type": "indirect" } }, @@ -476,11 +476,11 @@ ] }, "locked": { - "lastModified": 1757075491, - "narHash": "sha256-a+NMGl5tcvm+hyfSG2DlVPa8nZLpsumuRj1FfcKb2mQ=", + "lastModified": 1764872372, + "narHash": "sha256-uZuXRz9CzeCHsRbc2MQvKomwoX6GcFC5BUMEk3ouSFU=", "owner": "nix-community", "repo": "home-manager", - "rev": "f56bf065f9abedc7bc15e1f2454aa5c8edabaacf", + "rev": "05a56dbf24f195c62286e3273a2671d3b4904b00", "type": "github" }, "original": { @@ -527,11 +527,11 @@ ] }, "locked": { - "lastModified": 1752054764, - "narHash": "sha256-Ob/HuUhANoDs+nvYqyTKrkcPXf4ZgXoqMTQoCK0RFgQ=", + "lastModified": 1762090880, + "narHash": "sha256-fbRQzIGPkjZa83MowjbD2ALaJf9y6KMDdJBQMKFeY/8=", "owner": "nix-community", "repo": "nixGL", - "rev": "a8e1ce7d49a149ed70df676785b07f63288f53c5", + "rev": "b6105297e6f0cd041670c3e8628394d4ee247ed5", "type": "github" }, "original": { @@ -558,11 +558,11 @@ }, "nixpkgs-mine": { "locked": { - "lastModified": 1757173087, - "narHash": "sha256-NYXuC8xUUbvtwbaC1aLdpQKHzQtQ2XB3VkK0hfYTPd8=", + "lastModified": 1765034197, + "narHash": "sha256-SioIdjObnBC/N78okBChJpcfNns3qLsyXrMaBLx6uio=", "owner": "devplayer0", "repo": "nixpkgs", - "rev": "06e4c8cd503ed73806744b39368393df38b36bb7", + "rev": "96f12e0722c76b4113f8bd4c4fd18532b35d5a7f", "type": "github" }, "original": { @@ -574,11 +574,11 @@ }, "nixpkgs-mine-stable": { "locked": { - "lastModified": 1757173155, - "narHash": "sha256-aDNAiQQsrgS/coVOqLbtILpOUouE6jp/wqAsO8Dta/o=", + "lastModified": 1765034227, + "narHash": "sha256-5yQGE8/IvyHV1xQsESjhQumSzPcAmeLXFCY6ZdGDpek=", "owner": "devplayer0", "repo": "nixpkgs", - "rev": "8a1a03f2d17918a6d51746371031a8fe4014c549", + "rev": "c07d5abb1e18828369dabbda975b7374d39347c0", "type": "github" }, "original": { @@ -590,26 +590,26 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1757020766, - "narHash": "sha256-PLoSjHRa2bUbi1x9HoXgTx2AiuzNXs54c8omhadyvp0=", + "lastModified": 1764677808, + "narHash": "sha256-H3lC7knbXOBrHI9hITQ7modLuX20mYJVhZORL5ioms0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fe83bbdde2ccdc2cb9573aa846abe8363f79a97a", + "rev": "1aab89277eb2d87823d5b69bae631a2496cff57a", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "type": "indirect" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1756787288, - "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", + "lastModified": 1764667669, + "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", + "rev": "418468ac9527e799809c900eda37cbff999199b6", "type": "github" }, "original": { @@ -712,11 +712,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1731774781, - "narHash": "sha256-vwsUUYOIs8J6weeSK1n1mbZf8fgvygGUMsadx0JmG70=", + "lastModified": 1764843533, + "narHash": "sha256-ovPNJh3Yws59Z8QHXAK+JkoftpdsUh1Ifxu2k+A/xxM=", "owner": "devplayer0", "repo": "ragenix", - "rev": "ec4115da7b67c783b1091811e17dbcba50edd1c6", + "rev": "e1a7bce819be6966ff369b7c0100c2713f8a9b32", "type": "github" }, "original": { @@ -755,11 +755,11 @@ ] }, "locked": { - "lastModified": 1725675754, - "narHash": "sha256-hXW3csqePOcF2e/PYnpXj72KEYyNj2HzTrVNmS/F7Ug=", + "lastModified": 1761791894, + "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8cc45e678e914a16c8e224c3237fb07cf21e5e54", + "rev": "59c45eb69d9222a4362673141e00ff77842cd219", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9be9284..cdbef6d 100644 --- a/flake.nix +++ b/flake.nix @@ -12,13 +12,13 @@ devshell.inputs.nixpkgs.follows = "nixpkgs-unstable"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "nixpkgs/nixos-25.05"; + nixpkgs-stable.url = "nixpkgs/nixos-25.11"; nixpkgs-mine.url = "github:devplayer0/nixpkgs/devplayer0"; nixpkgs-mine-stable.url = "github:devplayer0/nixpkgs/devplayer0-stable"; home-manager-unstable.url = "home-manager"; home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs-unstable"; - home-manager-stable.url = "home-manager/release-25.05"; + home-manager-stable.url = "home-manager/release-25.11"; home-manager-stable.inputs.nixpkgs.follows = "nixpkgs-stable"; # Stuff used by the flake for build / deployment diff --git a/home-manager/modules/common.nix b/home-manager/modules/common.nix index cb0a89b..24185f7 100644 --- a/home-manager/modules/common.nix +++ b/home-manager/modules/common.nix @@ -132,8 +132,7 @@ in ssh = { enable = mkDefault true; - # TODO: Set after 25.11 releases - # enableDefaultConfig = false; + enableDefaultConfig = false; matchBlocks = { nix-dev-vm = { user = "dev"; @@ -159,13 +158,14 @@ in host = "cube spoon napalm gandalf saruman"; user = "root"; }; + + "*" = { + identityFile = [ + "~/.ssh/id_rsa" + "~/.ssh/borg" + ]; + }; }; - extraConfig = - '' - IdentityFile ~/.ssh/id_rsa - IdentityFile ~/.ssh/netsoc - IdentityFile ~/.ssh/borg - ''; }; direnv = { diff --git a/home-manager/modules/gui/default.nix b/home-manager/modules/gui/default.nix index 676ec21..242f4a7 100644 --- a/home-manager/modules/gui/default.nix +++ b/home-manager/modules/gui/default.nix @@ -63,7 +63,7 @@ in font.package nerd-fonts.sauce-code-pro nerd-fonts.droid-sans-mono - noto-fonts-emoji + noto-fonts-color-emoji grim slurp @@ -420,24 +420,24 @@ in programs = { git = { enable = true; - diff-so-fancy.enable = true; - userEmail = "jackos1998@gmail.com"; - userName = "Jack O'Sullivan"; - lfs.enable = true; - extraConfig = { + settings = { + user = { + email = "jackos1998@gmail.com"; + name = "Jack O'Sullivan"; + }; pull.rebase = true; }; + lfs.enable = true; }; + diff-so-fancy.enable = true; waybar = import ./waybar.nix { inherit lib pkgs config font; }; rofi = { - package = pkgs.rofi-wayland; enable = true; font = "${font.name} ${toString font.size}"; - plugins = with pkgs; (map (p: p.override { rofi-unwrapped = rofi-wayland-unwrapped; }) [ + plugins = with pkgs; [ rofi-calc - ]) ++ [ - rofi-emoji-wayland + rofi-emoji ]; extraConfig = { modes = "window,run,ssh,filebrowser,calc,emoji"; diff --git a/lib/constants.nix b/lib/constants.nix index bcaa034..7bdf635 100644 --- a/lib/constants.nix +++ b/lib/constants.nix @@ -30,7 +30,7 @@ rec { kernel = { lts = pkgs: pkgs.linuxKernel.packages.linux_6_12; - latest = pkgs: pkgs.linuxKernel.packages.linux_6_16; + latest = pkgs: pkgs.linuxKernel.packages.linux_6_17; }; nginx = rec { diff --git a/lib/default.nix b/lib/default.nix index 7cb61ee..9e80c45 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -248,8 +248,8 @@ rec { in { trivial = prev.trivial // { - release = "25.09:u-${prev.trivial.release}"; - codeName = "Giving"; + release = "25.11:u-${prev.trivial.release}"; + codeName = "Hooray"; revisionWithDefault = default: self.rev or default; versionSuffix = ".${date}.${revCode self}:u-${revCode pkgsFlake}"; }; diff --git a/nixos/boxes/colony/vms/shill/containers/jackflix/default.nix b/nixos/boxes/colony/vms/shill/containers/jackflix/default.nix index 61913d0..397dc0d 100644 --- a/nixos/boxes/colony/vms/shill/containers/jackflix/default.nix +++ b/nixos/boxes/colony/vms/shill/containers/jackflix/default.nix @@ -114,6 +114,7 @@ in transmission = { enable = true; + package = pkgs.transmission_4; downloadDirPermissions = null; performanceNetParameters = true; settings = { @@ -185,8 +186,8 @@ in hist = "/var/cache/copyparty"; shr = "/share"; # enable share creation ed = true; # enable dotfiles - chmod-f = 664; - chmod-d = 775; + chmod-f = "664"; + chmod-d = "775"; e2dsa = true; # file indexing e2t = true; # metadata indexing og-ua = "(Discord|Twitter|Slack)bot"; # embeds diff --git a/nixos/boxes/colony/vms/whale2/default.nix b/nixos/boxes/colony/vms/whale2/default.nix index 8d6f898..7715328 100644 --- a/nixos/boxes/colony/vms/whale2/default.nix +++ b/nixos/boxes/colony/vms/whale2/default.nix @@ -114,7 +114,7 @@ in }; containers.containersConf.settings.network = { network_backend = "netavark"; - firewall_driver = "none"; + firewall_driver = mkForce "none"; }; }; diff --git a/nixos/boxes/kelder/containers/acquisition/default.nix b/nixos/boxes/kelder/containers/acquisition/default.nix index fcc3570..7efe2ab 100644 --- a/nixos/boxes/kelder/containers/acquisition/default.nix +++ b/nixos/boxes/kelder/containers/acquisition/default.nix @@ -29,7 +29,7 @@ in hardware.graphics = { enable = true; extraPackages = with pkgs; [ - vaapiIntel + intel-vaapi-driver intel-ocl ]; }; @@ -89,6 +89,7 @@ in services = { transmission = { enable = true; + package = pkgs.transmission_4; downloadDirPermissions = null; performanceNetParameters = true; settings = { diff --git a/nixos/boxes/kelder/containers/spoder/default.nix b/nixos/boxes/kelder/containers/spoder/default.nix index c661f7c..22f14a5 100644 --- a/nixos/boxes/kelder/containers/spoder/default.nix +++ b/nixos/boxes/kelder/containers/spoder/default.nix @@ -92,8 +92,8 @@ in nextcloud = { enable = true; - # TODO: Might need to do some bullshit to go from Nextcloud 28 (?) to 30 - package = pkgs.nextcloud30; + # TODO: Might need to do some bullshit to go from Nextcloud 28 (?) to 32 + package = pkgs.nextcloud32; datadir = "/mnt/storage/nextcloud"; hostName = "cloud.${domain}"; https = true; diff --git a/nixos/modules/gui/default.nix b/nixos/modules/gui/default.nix index f7c7426..674e291 100644 --- a/nixos/modules/gui/default.nix +++ b/nixos/modules/gui/default.nix @@ -83,7 +83,7 @@ in gyre-fonts # TrueType substitutes for standard PostScript fonts liberation_ttf unifont - noto-fonts-emoji + noto-fonts-color-emoji ]; xdg = { diff --git a/nixos/modules/nvme/default.nix b/nixos/modules/nvme/default.nix index 36b03da..f6f7e2e 100644 --- a/nixos/modules/nvme/default.nix +++ b/nixos/modules/nvme/default.nix @@ -45,6 +45,11 @@ in wait-online.enable = true; }; + settings.Manager = { + DefaultTimeoutStartSec = 20; + DefaultDeviceTimeoutSec = 20; + }; + services.connect-nvme = { description = "Connect NVMe-oF"; before = [ "initrd-root-device.target" ]; @@ -60,18 +65,7 @@ in wantedBy = [ "initrd-root-device.target" ]; }; - # TODO: Remove when 25.11 releases - } // (if (lib.versionAtLeast lib.my.upstreamRelease "25.11") then { - settings.Manager = { - DefaultTimeoutStartSec = 20; - DefaultDeviceTimeoutSec = 20; - }; - } else { - extraConfig = '' - DefaultTimeoutStartSec=20 - DefaultDeviceTimeoutSec=20 - ''; - }); + }; }; }; };