From dfa8f48126ff7c57261b4f5d7f4d27fdf973f3de Mon Sep 17 00:00:00 2001 From: Frank LoTurco Date: Sun, 18 Oct 2026 19:19:27 -0400 Subject: [PATCH] flake: rebase nixos packages to nixos-unstable until latest release --- features/kde.nix | 1 + flake.lock | 99 +++++++++++++++++++-------------------- flake.nix | 5 +- hosts/shared/nixos-pc.nix | 18 ++----- 4 files changed, 58 insertions(+), 65 deletions(-) diff --git a/features/kde.nix b/features/kde.nix index 7f2dc15..4b86e1d 100644 --- a/features/kde.nix +++ b/features/kde.nix @@ -39,6 +39,7 @@ in systemPackages = with pkgs.kdePackages; [ union ksshaskpass + kwin ]; plasma6.excludePackages = with pkgs.kdePackages; [ diff --git a/flake.lock b/flake.lock index 6cf1b6e..9a7fd9f 100644 --- a/flake.lock +++ b/flake.lock @@ -51,11 +51,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1791921865, - "narHash": "sha256-diOO23bmq1VVyMzByL6qWx685SZSk8LUn9DZa2Uom8Q=", + "lastModified": 1792349696, + "narHash": "sha256-guXAv/DBTf9qtxRDn/ugCBCSMYJH1tAVUVL+XCw6jlg=", "owner": "kem-a", "repo": "AppManager", - "rev": "e2000532fdbcfab40d96c60784352ef3ab8ab186", + "rev": "372a81c911cbdd926e073576e9a303058bf322f7", "type": "github" }, "original": { @@ -355,11 +355,11 @@ ] }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1791914995, + "narHash": "sha256-Zf/xfQEAasnwnmEfHqW/4hjDE/s44yn2hD4RuVIZRjA=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "b7a79d3fea1e214f6d668d521cecec0c01e26544", "type": "github" }, "original": { @@ -418,11 +418,11 @@ ] }, "locked": { - "lastModified": 1790500375, - "narHash": "sha256-XN3sDtn8TU9hAc9xqZ+SqRB/HHm2wjxM6aSWYLJU+oo=", + "lastModified": 1791909798, + "narHash": "sha256-VAhpCOmrun/KXimYfR8NM88bciKCui7CqHHhThSzgag=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "a0e4241b51206fbcbf52fd322eb5f0cd80f153c4", + "rev": "1ba1dbfe28738c9a71c266be6efa5b89e75491a9", "type": "github" }, "original": { @@ -475,16 +475,15 @@ ] }, "locked": { - "lastModified": 1791938526, - "narHash": "sha256-yNYK2pdk3bCtJrpblrNYA6hZKdybWUeyTtx74+OEJFo=", + "lastModified": 1792098797, + "narHash": "sha256-u4DIIZgznEGzByxXrxWCXK19VcMtTBmi/M9gZ7Jk9bM=", "owner": "nix-community", "repo": "home-manager", - "rev": "32904dfe1cf86039f3c8c9f41f94e1cfd76dbb34", + "rev": "640725978b99076e18e069f6e7d2959124584f8f", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-26.05", "repo": "home-manager", "type": "github" } @@ -517,11 +516,11 @@ }, "locked": { "dir": "packages/nix", - "lastModified": 1791991619, - "narHash": "sha256-JquPo1pb8gQTazVr5UBEOsWhoV9YR4/yOVtMyR4lQXM=", + "lastModified": 1792022604, + "narHash": "sha256-xyl3KTB+j4W3dAxQVSolNJCQZOasDnCLB3Dr14adBmU=", "owner": "SteamClientHomebrew", "repo": "Millennium", - "rev": "4ecc644bf728090215294ceeb2c7cc5e22abac66", + "rev": "22af2f453777a925fb398a3dab60a407e66aa83f", "type": "github" }, "original": { @@ -555,11 +554,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1791928760, - "narHash": "sha256-6KooAP/cLL7Loo0BU+wF7mARLGVv9lLjx2bhd78V89E=", + "lastModified": 1792266198, + "narHash": "sha256-HiycXeT3y+3tzUwvYDs7F7r5h2H+FZkuzwrcuzYGc7I=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "85af0d8e588946173af589868107b2e4584a3220", + "rev": "e61f03b63691ee505bc27274ff1d311a32f64f6c", "type": "github" }, "original": { @@ -613,11 +612,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1791951554, - "narHash": "sha256-7ZMKTSse+BxmGiQ+isxga/biFfaEpEgYSRvv2efdCWY=", + "lastModified": 1792295076, + "narHash": "sha256-cI7nldj6D1f4QLN9y82sqCA7kERAcrwD7/F9i89PhmY=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "b3d035dbc65250f6990ac526b0c9e188fe853856", + "rev": "8bfba80f57356cc26eba4e5d7b8a595e70e87a00", "type": "github" }, "original": { @@ -737,11 +736,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1791734076, - "narHash": "sha256-i5qk1kLiit98rRbh1AXmWBNT9QXC/y4l5Wk/u5EdpDQ=", + "lastModified": 1792094642, + "narHash": "sha256-zp8ToDMnqZcu4o4IH9pdwXFXGp7yLm/M0dEnNWnyd7I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7fd4004d0511991fff3a0524856a9be09e28c5f0", + "rev": "fe13242281a67641c0102cdb1087f0ebe586c7df", "type": "github" }, "original": { @@ -777,11 +776,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1791870120, - "narHash": "sha256-eWGb+BosVcUx9P8c/yWy18cZp5ibRUmhsHnA9kbvdAE=", + "lastModified": 1792311987, + "narHash": "sha256-qrt97Ymg2VgbESOXPnOOq+5+K39ywjNJGNNhJRFaV0w=", "owner": "nix-community", "repo": "nixpkgs-xr", - "rev": "2e2fda8f6f26d34fb2b6dd2f0b7e5de8e9f7c704", + "rev": "de7fd08e9336c17a56d4363df1bfc8eb2003ca71", "type": "github" }, "original": { @@ -792,11 +791,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1791487292, - "narHash": "sha256-tqM7xDEsaeK1p6VvRygeZ9LkQRpUUkbRT02BHv6hnTM=", + "lastModified": 1792116957, + "narHash": "sha256-EjZqHKObBfIOeHZnMRVV87HB3pPq/WBkmRJWyFxmZu8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8edc0c72e3a38faf5434e40d1f19431125fe4b30", + "rev": "f20cd90e28fe0403873f473b29e42662cd86e8c4", "type": "github" }, "original": { @@ -808,27 +807,27 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1791883866, - "narHash": "sha256-yvkDdToRZ4IgPc9tSBzzCYJvTLf8n5eE3rgUkpCuD5A=", + "lastModified": 1792094642, + "narHash": "sha256-zp8ToDMnqZcu4o4IH9pdwXFXGp7yLm/M0dEnNWnyd7I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a033e66ab94a6bedf2c3d58d93a36319d3cbbbaf", + "rev": "fe13242281a67641c0102cdb1087f0ebe586c7df", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-26.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_12": { "locked": { - "lastModified": 1791734076, - "narHash": "sha256-i5qk1kLiit98rRbh1AXmWBNT9QXC/y4l5Wk/u5EdpDQ=", + "lastModified": 1792094642, + "narHash": "sha256-zp8ToDMnqZcu4o4IH9pdwXFXGp7yLm/M0dEnNWnyd7I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7fd4004d0511991fff3a0524856a9be09e28c5f0", + "rev": "fe13242281a67641c0102cdb1087f0ebe586c7df", "type": "github" }, "original": { @@ -856,11 +855,11 @@ }, "nixpkgs_14": { "locked": { - "lastModified": 1791734076, - "narHash": "sha256-i5qk1kLiit98rRbh1AXmWBNT9QXC/y4l5Wk/u5EdpDQ=", + "lastModified": 1792094642, + "narHash": "sha256-zp8ToDMnqZcu4o4IH9pdwXFXGp7yLm/M0dEnNWnyd7I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7fd4004d0511991fff3a0524856a9be09e28c5f0", + "rev": "fe13242281a67641c0102cdb1087f0ebe586c7df", "type": "github" }, "original": { @@ -997,11 +996,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1791832894, - "narHash": "sha256-OWH1UMHyyujUBebnpMKqD2S8ESIJBqXl/s0mIUvX2tk=", + "lastModified": 1792234340, + "narHash": "sha256-QI3lSHgcDJ9iSXAHCrX2ES/3QZ+J/Of74pFI/Z+4abg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6aa7ad7f840d5a5bf17020b231d1c8d87a71995b", + "rev": "0541f3358c07bae491588b698fcca2e1abc361aa", "type": "github" }, "original": { @@ -1063,11 +1062,11 @@ "nixpkgs-darwin-x64": "nixpkgs-darwin-x64" }, "locked": { - "lastModified": 1791408813, - "narHash": "sha256-lwjspkMGrW+8Fl/yBEDEFsHZJA57OKOhmVQmi6zfej4=", + "lastModified": 1792090647, + "narHash": "sha256-AsutbwnjiwwLkB5tqLW+1GdGZyLmXsU0W+SNdNhJu7U=", "owner": "earendil-works", "repo": "pi", - "rev": "abe508e1b89912adde45528136c3221eb69acdd7", + "rev": "71023aec1546d6d677a65669c5665c0927ce0dd0", "type": "github" }, "original": { @@ -1277,11 +1276,11 @@ ] }, "locked": { - "lastModified": 1791490544, - "narHash": "sha256-qScE7Wz6Zg7eg8ItUpnkmKgst8weWschGe0E8jM4rj4=", + "lastModified": 1791885023, + "narHash": "sha256-C3alQ2MEt0zVrUSho5NUDo3jmhbff72++bfwoqT9Omo=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4cfe8d7065cc8ca91c0a50361b6dd74920eeb1f5", + "rev": "0d6d739a833ba9a9c93034862e4a7b061a062a1c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0514ae5..ba83116 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,7 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05"; + #nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-firmware.url = "github:NixOS/nixpkgs?rev=220e781eee89fa86f26d05c40a57eea1c691adec"; xivlauncher-rb.url = "github:dawei-nh/xivlauncher-rb-nix"; @@ -18,7 +19,7 @@ gloomberb.url = "./packages/gloomberb"; home-manager = { - url = "github:nix-community/home-manager/release-26.05"; + url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/hosts/shared/nixos-pc.nix b/hosts/shared/nixos-pc.nix index bc7d1b2..55c8921 100644 --- a/hosts/shared/nixos-pc.nix +++ b/hosts/shared/nixos-pc.nix @@ -132,19 +132,11 @@ in # Enable KMSCON DRM TTY. kmscon = { enable = true; - hwRender = true; - term = "xterm-256color"; - - fonts = [ - { - name = "Hack"; - package = pkgs.hack-font; - } - { - name = "Hack Nerd Font Mono"; - package = pkgs.nerd-fonts.hack; - } - ]; + config = { + hwAccel = true; + term = "xterm-256color"; + font-name = "Hack Nerd Font Mono"; + }; }; # Configure pipewire. Disables 32Bit ALSA since it causes build errors