diff --git a/flake.lock b/flake.lock index 52f2f90..e177a3c 100644 --- a/flake.lock +++ b/flake.lock @@ -47,16 +47,17 @@ }, "flake-compat": { "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" } }, "flake-compat_2": { @@ -79,42 +80,6 @@ "inputs": { "systems": "systems_2" }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils-plus": { - "inputs": { - "flake-utils": "flake-utils_2" - }, - "locked": { - "lastModified": 1696331477, - "narHash": "sha256-YkbRa/1wQWdWkVJ01JvV+75KIdM37UErqKgTf0L54Fk=", - "owner": "gytis-ivaskevicius", - "repo": "flake-utils-plus", - "rev": "bfc53579db89de750b25b0c5e7af299e0c06d7d3", - "type": "github" - }, - "original": { - "owner": "gytis-ivaskevicius", - "repo": "flake-utils-plus", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_3" - }, "locked": { "lastModified": 1694529238, "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", @@ -129,6 +94,25 @@ "type": "github" } }, + "flake-utils-plus": { + "inputs": { + "flake-utils": "flake-utils" + }, + "locked": { + "lastModified": 1715533576, + "narHash": "sha256-fT4ppWeCJ0uR300EH3i7kmgRZnAVxrH+XtK09jQWihk=", + "owner": "gytis-ivaskevicius", + "repo": "flake-utils-plus", + "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f", + "type": "github" + }, + "original": { + "owner": "gytis-ivaskevicius", + "repo": "flake-utils-plus", + "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f", + "type": "github" + } + }, "flakeCompat": { "flake": false, "locked": { @@ -152,11 +136,11 @@ ] }, "locked": { - "lastModified": 1743136572, - "narHash": "sha256-uwaVrKgi6g1TUq56247j6QvvFtYHloCkjCrEpGBvV54=", + "lastModified": 1773367248, + "narHash": "sha256-FFMc1uAwy2GYasd0rdNDVxKyAgzuoJH2M+GglBQbqf0=", "owner": "nix-community", "repo": "home-manager", - "rev": "1efd2503172016a6742c87b47b43ca2c8145607d", + "rev": "be0c641a6a5564caa33982faa1fe2c60d92131c7", "type": "github" }, "original": { @@ -172,11 +156,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1730517716, - "narHash": "sha256-hq3jlW5lyT2RkWhJ2/Oo+dt9FXtJ47zDDBBk8A8abMo=", + "lastModified": 1771143544, + "narHash": "sha256-hnApcv/55630/y7MPU7zgWYSStxj9IpnEfgxl/qpLj0=", "owner": "snowfallorg", "repo": "nix-software-center", - "rev": "216eb549f1ec222c2877d2194f2987527954f2c4", + "rev": "181c1c61eab79130879257550dba0b36bd6bb8c9", "type": "github" }, "original": { @@ -187,17 +171,16 @@ }, "nix-vscode-extensions": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1743213162, - "narHash": "sha256-9UU0x2fZORsX6PEpzkIAD/7+bwm+javJtZA/411ZmLg=", + "lastModified": 1773369788, + "narHash": "sha256-32y9nyVU2rmXp/zMTNsVbIWNKMPUuBSj4bIAnaPiCVU=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "1b2a53e3478225bc35d14ae75ea9e7b749c16d5b", + "rev": "70e188702ad3b4dcf5de12ff64f0d31c906d6d7a", "type": "github" }, "original": { @@ -239,11 +222,11 @@ "snowfall-lib": "snowfall-lib" }, "locked": { - "lastModified": 1707338010, - "narHash": "sha256-UtLeZzDdk96sLTRcWsGrkWCslNUDytrGe0VmOTB/iig=", + "lastModified": 1771149335, + "narHash": "sha256-YPUIwyumbQOE2DUY8NIsHIUTGUQnDVhnTVUZMZDRwi4=", "owner": "snowfallorg", "repo": "nixos-conf-editor", - "rev": "27b5e92f580f794c690093503869aab242f075ab", + "rev": "9f8b4519a2e0e8919b69b7572bc26dab54274a6f", "type": "github" }, "original": { @@ -254,11 +237,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1692638711, - "narHash": "sha256-J0LgSFgJVGCC1+j5R2QndadWI1oumusg6hCtYAzLID4=", + "lastModified": 1771008912, + "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "91a22f76cd1716f9d0149e8a5c68424bb691de15", + "rev": "a82ccc39b39b621151d6732718e3e250109076fa", "type": "github" }, "original": { @@ -270,27 +253,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1742937945, - "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", + "lastModified": 1773222311, + "narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", + "rev": "0590cd39f728e129122770c029970378a79d076a", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1698318101, - "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", + "lastModified": 1771008912, + "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", + "rev": "a82ccc39b39b621151d6732718e3e250109076fa", "type": "github" }, "original": { @@ -302,11 +285,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1743095683, - "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", + "lastModified": 1773282481, + "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", + "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127", "type": "github" }, "original": { @@ -325,7 +308,7 @@ "nixos-conf-editor": "nixos-conf-editor", "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable", - "systems": "systems_4" + "systems": "systems_3" } }, "rust-analyzer-src": { @@ -355,11 +338,11 @@ ] }, "locked": { - "lastModified": 1696432959, - "narHash": "sha256-oJQZv2MYyJaVyVJY5IeevzqpGvMGKu5pZcCCJvb+xjc=", + "lastModified": 1765361626, + "narHash": "sha256-kX0Dp/kYSRbQ+yd9e3lmmUWdNbipufvKfL2IzbrSpnY=", "owner": "snowfallorg", "repo": "lib", - "rev": "92803a029b5314d4436a8d9311d8707b71d9f0b6", + "rev": "c566ad8b7352c30ec3763435de7c8f1c46ebb357", "type": "github" }, "original": { @@ -399,21 +382,6 @@ } }, "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -432,11 +400,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e54c100..213c3d1 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11"; alejandra.url = "github:kamadorueda/alejandra/3.1.0"; alejandra.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/common/global/default.nix b/hosts/common/global/default.nix index a443dc9..23d356e 100644 --- a/hosts/common/global/default.nix +++ b/hosts/common/global/default.nix @@ -16,5 +16,5 @@ inherit inputs outputs; }; - system.stateVersion = "24.11"; + system.stateVersion = "25.11"; } diff --git a/hosts/hummingbird/configuration.nix b/hosts/hummingbird/configuration.nix index 2f8a750..1b61f1f 100644 --- a/hosts/hummingbird/configuration.nix +++ b/hosts/hummingbird/configuration.nix @@ -18,9 +18,9 @@ ../common/optional/flatpak.nix ../common/optional/ckb-next.nix ../common/optional/docker.nix - ../common/optional/distrobox.nix - ../common/optional/virt-manager.nix - ../common/optional/spotify.nix + #../common/optional/distrobox.nix + #../common/optional/virt-manager.nix + #../common/optional/spotify.nix # Include the results of the hardware scan. ./hardware-configuration.nix @@ -65,7 +65,7 @@ ]; # ssh agent - programs.ssh.startAgent = true; + #programs.ssh.startAgent = true; programs.steam = { enable = true; diff --git a/hosts/hummingbird/hardware-configuration.nix b/hosts/hummingbird/hardware-configuration.nix index c6f4585..a97dcca 100644 --- a/hosts/hummingbird/hardware-configuration.nix +++ b/hosts/hummingbird/hardware-configuration.nix @@ -10,36 +10,35 @@ imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "ums_realtek" "usbhid" "sd_mod" "sr_mod"]; boot.initrd.kernelModules = ["sg"]; boot.kernelModules = ["kvm-amd"]; boot.extraModulePackages = []; fileSystems."/" = { - device = "/dev/disk/by-uuid/d3942c4d-eca8-41e2-afa7-57ba5704e86f"; + device = "/dev/disk/by-uuid/a7f5df73-8af4-4f3c-9281-dae870b228ee"; fsType = "ext4"; }; fileSystems."/mnt/sda1" = { - device = "/dev/disk/by-uuid/22847bcf-830f-484b-9ff8-dec259e4a990"; - fsType = "ext4"; - }; - - fileSystems."/mnt/sdb1" = { device = "/dev/disk/by-uuid/21301a6f-2937-421d-81ec-e2e9be139b0a"; fsType = "ext4"; }; + fileSystems."/mnt/sdb1" = { + device = "/dev/disk/by-uuid/d411a82c-1d7a-4484-89e7-ca2ac38c6381"; + fsType = "ext4"; + }; + fileSystems."/boot" = { - device = "/dev/disk/by-uuid/B44E-D001"; + device = "/dev/disk/by-uuid/8374-D896"; fsType = "vfat"; options = ["fmask=0077" "dmask=0077"]; }; - swapDevices = [ - {device = "/dev/disk/by-uuid/f054feb9-61b1-41f3-b0b2-6e48bfcc6655";} - ]; + #swapDevices = [ + # {device = "/dev/disk/by-uuid/f054feb9-61b1-41f3-b0b2-6e48bfcc6655";} + #]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's