From a8ca17564984a21a630cee1189d25028448883f2 Mon Sep 17 00:00:00 2001 From: Frank LoTurco Date: Mon, 19 Oct 2026 12:47:06 -0400 Subject: [PATCH] refactor: fully rebase to nixpkgs-unstable rather than fixed release with backports --- features/kde.nix | 13 - flake.lock | 370 +++--------------- flake.nix | 93 +++-- home/frank.nix | 7 +- hosts/franks-macbook-pro/configuration.nix | 8 +- hosts/nero/configuration.nix | 18 +- hosts/pdw-frankiel/configuration.nix | 7 +- hosts/shared/darwin.nix | 1 + hosts/shared/nixos-pc.nix | 21 +- hosts/shared/nixos-server.nix | 9 +- hosts/vergil/configuration.nix | 4 - packages/aseprite-thumbnailer-kde/package.nix | 4 +- 12 files changed, 130 insertions(+), 425 deletions(-) diff --git a/features/kde.nix b/features/kde.nix index 9de07a5..161caad 100644 --- a/features/kde.nix +++ b/features/kde.nix @@ -1,21 +1,8 @@ { pkgs, - inputs, ... }: -let - unstable = inputs.nixpkgs-unstable.legacyPackages.${pkgs.stdenv.hostPlatform.system}; - - kde-overlay = _final: _prev: { - inherit (unstable) kdePackages; - }; - -in { - nixpkgs.overlays = [ - kde-overlay - ]; - services = { displayManager.plasma-login-manager.enable = true; desktopManager.plasma6.enable = true; diff --git a/flake.lock b/flake.lock index 9a7fd9f..4a63d03 100644 --- a/flake.lock +++ b/flake.lock @@ -9,7 +9,9 @@ "flake-compat": "flake-compat", "flake-parts": "flake-parts", "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "nixpkgs" + ], "nixpkgs-wine": "nixpkgs-wine", "on-linux": "on-linux", "plugin-loader-src": "plugin-loader-src", @@ -48,7 +50,9 @@ }, "appimage-manager": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1792349696, @@ -90,7 +94,9 @@ }, "cheatengine": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1791535459, @@ -224,22 +230,6 @@ } }, "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1767039857, - "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "NixOS", - "repo": "flake-compat", - "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_5": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -311,24 +301,6 @@ "type": "github" } }, - "flake-parts_4": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_3" - }, - "locked": { - "lastModified": 1790898470, - "narHash": "sha256-zTwuwezD0w3hpga6a6P8emidzAZFyWqlNeRBlpWOOl8=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "024633cd702b10285db5cb19b40ad48d2399ba60", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -456,7 +428,9 @@ "gloomberb": { "inputs": { "bun2nix": "bun2nix", - "nixpkgs": "nixpkgs_6" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "path": "./packages/gloomberb", @@ -491,7 +465,9 @@ "lazyvim": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_7" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1780594829, @@ -511,7 +487,9 @@ "millennium": { "inputs": { "millennium-src": "millennium-src", - "nixpkgs": "nixpkgs_8", + "nixpkgs": [ + "nixpkgs" + ], "nixpkgs-bun": "nixpkgs-bun" }, "locked": { @@ -547,26 +525,6 @@ "type": "github" } }, - "nix-cachyos-kernel": { - "inputs": { - "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_9" - }, - "locked": { - "lastModified": 1792266198, - "narHash": "sha256-HiycXeT3y+3tzUwvYDs7F7r5h2H+FZkuzwrcuzYGc7I=", - "owner": "xddxdd", - "repo": "nix-cachyos-kernel", - "rev": "e61f03b63691ee505bc27274ff1d311a32f64f6c", - "type": "github" - }, - "original": { - "owner": "xddxdd", - "repo": "nix-cachyos-kernel", - "type": "github" - } - }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -574,42 +532,43 @@ ] }, "locked": { - "lastModified": 1783744694, - "narHash": "sha256-2cp6N3rrwnGYLTx9l6N+NI+kwrCWxvJUbj5WJhvB29A=", + "lastModified": 1792366139, + "narHash": "sha256-jto4pdsl0bgErQ5vaMc3gOyj//PILLRJuqX3I7fUk6s=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "c3e90c89649b07d1a96e4b9dd6cd0d6e44b91a74", + "rev": "f0ec2b3fae4df92ea7788359aef9e07bb88d720f", "type": "github" }, "original": { "owner": "nix-darwin", - "ref": "nix-darwin-26.05", "repo": "nix-darwin", "type": "github" } }, "nix-flatpak": { "locked": { - "lastModified": 1767983141, - "narHash": "sha256-7ZCulYUD9RmJIDULTRkGLSW1faMpDlPKcbWJLYHoXcs=", + "lastModified": 1790428548, + "narHash": "sha256-OsZ/I7v3ArCrk0XOUvkiU1dFtGtE1qZTHRGjvBXIKUU=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "440818969ac2cbd77bfe025e884d0aa528991374", + "rev": "f1f045fc8b35ff59f88982c1752d3f3a42ca6a61", "type": "github" }, "original": { "owner": "gmodena", - "ref": "v0.7.0", + "ref": "latest", "repo": "nix-flatpak", "type": "github" } }, "nix-gaming": { "inputs": { - "flake-compat": "flake-compat_4", - "flake-parts": "flake-parts_4", + "flake-compat": "flake-compat_3", + "flake-parts": "flake-parts_3", "git-hooks": "git-hooks_2", - "nixpkgs": "nixpkgs_10" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1792295076, @@ -673,22 +632,6 @@ "type": "github" } }, - "nixpkgs-firmware": { - "locked": { - "lastModified": 1782201461, - "narHash": "sha256-41VI8i5RESlcU7+LdPQ9ibz+4HQWixlE6wat2IYPrE0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "220e781eee89fa86f26d05c40a57eea1c691adec", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "220e781eee89fa86f26d05c40a57eea1c691adec", - "type": "github" - } - }, "nixpkgs-lib": { "locked": { "lastModified": 1777168982, @@ -719,37 +662,6 @@ "type": "github" } }, - "nixpkgs-lib_3": { - "locked": { - "lastModified": 1790477367, - "narHash": "sha256-oujbxmVKDhci2E4EM3KyAbRUgp5/IsCoiA/LfEF7OOk=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "f7cd230690d9fc982d06129f9189b101fddcfa3b", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1792094642, - "narHash": "sha256-zp8ToDMnqZcu4o4IH9pdwXFXGp7yLm/M0dEnNWnyd7I=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fe13242281a67641c0102cdb1087f0ebe586c7df", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-wine": { "locked": { "lastModified": 1735834308, @@ -768,9 +680,11 @@ }, "nixpkgs-xr": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_4", "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_12", + "nixpkgs": [ + "nixpkgs" + ], "nvfetcher": "nvfetcher", "systems": "systems_3", "treefmt-nix": "treefmt-nix_3" @@ -789,119 +703,7 @@ "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1792116957, - "narHash": "sha256-EjZqHKObBfIOeHZnMRVV87HB3pPq/WBkmRJWyFxmZu8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f20cd90e28fe0403873f473b29e42662cd86e8c4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { - "locked": { - "lastModified": 1792094642, - "narHash": "sha256-zp8ToDMnqZcu4o4IH9pdwXFXGp7yLm/M0dEnNWnyd7I=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fe13242281a67641c0102cdb1087f0ebe586c7df", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_12": { - "locked": { - "lastModified": 1792094642, - "narHash": "sha256-zp8ToDMnqZcu4o4IH9pdwXFXGp7yLm/M0dEnNWnyd7I=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fe13242281a67641c0102cdb1087f0ebe586c7df", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_13": { - "locked": { - "lastModified": 1788316716, - "narHash": "sha256-bc7rSpXIdn9QWGNqfWcPZWOhEVF8NoeAZkWq0XWnf/k=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3ed67ec0a4d3c7ab4ae1f04f8ee8df07bfa506a2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_14": { - "locked": { - "lastModified": 1792094642, - "narHash": "sha256-zp8ToDMnqZcu4o4IH9pdwXFXGp7yLm/M0dEnNWnyd7I=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fe13242281a67641c0102cdb1087f0ebe586c7df", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_15": { - "locked": { - "lastModified": 1780365719, - "narHash": "sha256-QfWfccTN+70ZQ4m2qlU9PiKfz2Yppq94058iJyARNwc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ffa10e26ae11d676b2db836259889f1f571cb14f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { - "locked": { - "lastModified": 1777954456, - "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1770107345, "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", @@ -917,13 +719,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { - "lastModified": 1776548001, - "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=", + "lastModified": 1792094642, + "narHash": "sha256-zp8ToDMnqZcu4o4IH9pdwXFXGp7yLm/M0dEnNWnyd7I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc", + "rev": "fe13242281a67641c0102cdb1087f0ebe586c7df", "type": "github" }, "original": { @@ -933,83 +735,6 @@ "type": "github" } }, - "nixpkgs_5": { - "locked": { - "lastModified": 1791048980, - "narHash": "sha256-KgItSKML8Xvte0B7/uGnBDsYzSnnKHcOaiUbgWBXLXw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a7868a727837f3c09cee2ce0ca671c76b1589fed", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1789006805, - "narHash": "sha256-xB8mKMOx1IA9vTDNLmJZ6n4wCMq/cuWBBOzGCRnqxrU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8ce4ef6cb6f871616146b9fe26d2a5ae594e94fe", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1752480373, - "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { - "locked": { - "lastModified": 1790769526, - "narHash": "sha256-6j4yqqBUvIbBn29k0y/2jqlv/YJd8CRkTBYhfm5Z/8c=", - "rev": "c9fe7d12cd78d1adcd12dd15e24432dde5b155a0", - "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1082837.c9fe7d12cd78/nixexprs.tar.zst?lastModified=1790769526&rev=c9fe7d12cd78d1adcd12dd15e24432dde5b155a0" - }, - "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.zst" - } - }, - "nixpkgs_9": { - "locked": { - "lastModified": 1792234340, - "narHash": "sha256-QI3lSHgcDJ9iSXAHCrX2ES/3QZ+J/Of74pFI/Z+4abg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0541f3358c07bae491588b698fcca2e1abc361aa", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, "nvfetcher": { "inputs": { "flake-compat": [ @@ -1058,7 +783,9 @@ }, "pi": { "inputs": { - "nixpkgs": "nixpkgs_13", + "nixpkgs": [ + "nixpkgs" + ], "nixpkgs-darwin-x64": "nixpkgs-darwin-x64" }, "locked": { @@ -1120,13 +847,10 @@ "home-manager": "home-manager", "lazyvim": "lazyvim", "millennium": "millennium", - "nix-cachyos-kernel": "nix-cachyos-kernel", "nix-darwin": "nix-darwin", "nix-flatpak": "nix-flatpak", "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs_11", - "nixpkgs-firmware": "nixpkgs-firmware", - "nixpkgs-unstable": "nixpkgs-unstable", + "nixpkgs": "nixpkgs_3", "nixpkgs-xr": "nixpkgs-xr", "pi": "pi", "scopebuddy": "scopebuddy", @@ -1152,7 +876,9 @@ }, "scopebuddy": { "inputs": { - "nixpkgs": "nixpkgs_14" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1787088847, @@ -1230,7 +956,7 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1775636079, @@ -1311,7 +1037,9 @@ "xivlauncher-rb": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_15", + "nixpkgs": [ + "nixpkgs" + ], "xivlauncher-core-src": "xivlauncher-core-src" }, "locked": { diff --git a/flake.nix b/flake.nix index ba83116..7101279 100644 --- a/flake.nix +++ b/flake.nix @@ -1,22 +1,65 @@ { inputs = { - #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"; - cheatengine.url = "github:Hy4ri/cheatengine-flake"; - millennium.url = "github:SteamClientHomebrew/Millennium?dir=packages/nix"; - scopebuddy.url = "github:HikariKnight/ScopeBuddy"; - nix-gaming.url = "github:fufexan/nix-gaming"; - nixpkgs-xr.url = "github:nix-community/nixpkgs-xr"; - nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel"; - lazyvim.url = "github:pfassina/lazyvim-nix/v16.0.0"; - affinity-nix.url = "github:Meo98/affinity-nix-fork"; - nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.7.0"; - appimage-manager.url = "github:kem-a/AppManager"; - pi.url = "github:earendil-works/pi/stable"; - gloomberb.url = "./packages/gloomberb"; + + xivlauncher-rb = { + url = "github:dawei-nh/xivlauncher-rb-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + cheatengine = { + url = "github:Hy4ri/cheatengine-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + millennium = { + url = "github:SteamClientHomebrew/Millennium?dir=packages/nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + scopebuddy = { + url = "github:HikariKnight/ScopeBuddy"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + nix-gaming = { + url = "github:fufexan/nix-gaming"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + nixpkgs-xr = { + url = "github:nix-community/nixpkgs-xr"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + lazyvim = { + url = "github:pfassina/lazyvim-nix/v16.0.0"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + affinity-nix = { + url = "github:Meo98/affinity-nix-fork"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + nix-flatpak = { + url = "github:gmodena/nix-flatpak/?ref=latest"; + }; + + appimage-manager = { + url = "github:kem-a/AppManager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + pi = { + url = "github:earendil-works/pi/stable"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + gloomberb = { + url = "./packages/gloomberb"; + inputs.nixpkgs.follows = "nixpkgs"; + }; home-manager = { url = "github:nix-community/home-manager"; @@ -24,7 +67,7 @@ }; nix-darwin = { - url = "github:nix-darwin/nix-darwin/nix-darwin-26.05"; + url = "github:nix-darwin/nix-darwin"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -39,14 +82,12 @@ self, nixpkgs, nixpkgs-xr, - nixpkgs-firmware, - home-manager, nix-darwin, nix-flatpak, + home-manager, affinity-nix, affinity-thumbnailer-kde, millennium, - nix-cachyos-kernel, cheatengine, xivlauncher-rb, gloomberb, @@ -65,9 +106,6 @@ trusted-users-configuration = { nix, ... }: { nix.settings.trusted-users = [ "frank" ]; }; - - nixos-system = "x86_64-linux"; - nixos-pkgs = nixpkgs.legacyPackages.${nixos-system}; in { nixosConfigurations = { @@ -85,15 +123,6 @@ ./hosts/nero/hardware.nix ./hosts/nero/configuration.nix - - { - nixpkgs.overlays = [ - (final: prev: { - linux-firmware = - nixpkgs-firmware.legacyPackages.${nixos-pkgs.stdenv.hostPlatform.system}.linux-firmware; - }) - ]; - } ]; }; diff --git a/home/frank.nix b/home/frank.nix index fb0b6fe..dc37e6e 100644 --- a/home/frank.nix +++ b/home/frank.nix @@ -1,7 +1,4 @@ { inputs, pkgs, ... }: -let - unstable = inputs.nixpkgs-unstable.legacyPackages.${pkgs.stdenv.hostPlatform.system}; -in { imports = [ inputs.lazyvim.homeManagerModules.default @@ -27,7 +24,7 @@ in }; xdg = - if pkgs.stdenv.isDarwin then + if pkgs.stdenv.hostPlatform.isDarwin then { } else { @@ -100,8 +97,6 @@ in fastfetch = { enable = true; - package = unstable.fastfetch; - settings = { modules = [ "title" diff --git a/hosts/franks-macbook-pro/configuration.nix b/hosts/franks-macbook-pro/configuration.nix index 024dc6a..2f64efc 100644 --- a/hosts/franks-macbook-pro/configuration.nix +++ b/hosts/franks-macbook-pro/configuration.nix @@ -1,11 +1,7 @@ { pkgs, - inputs, ... }: -let - unstable = inputs.nixpkgs-unstable.legacyPackages.${pkgs.stdenv.hostPlatform.system}; -in { imports = [ ../shared/darwin.nix @@ -15,8 +11,7 @@ in systemPackages = with pkgs; [ bash-language-server nil - - unstable.devenv + devenv ]; shellAliases = { @@ -25,7 +20,6 @@ in }; homebrew.casks = [ - "zed" "firefox" ]; diff --git a/hosts/nero/configuration.nix b/hosts/nero/configuration.nix index 1e1b4a0..2786d16 100644 --- a/hosts/nero/configuration.nix +++ b/hosts/nero/configuration.nix @@ -3,16 +3,6 @@ inputs, ... }: -let - unstable = import inputs.nixpkgs-unstable { - system = pkgs.stdenv.hostPlatform.system; - config.allowUnfree = true; - }; - - wivrn-overlay = _final: _prev: { - inherit (unstable) wivrn; - }; -in { imports = [ ../shared/nixos-pc.nix @@ -21,7 +11,6 @@ in ]; nixpkgs.overlays = [ - wivrn-overlay inputs.millennium.overlays.default inputs.cheatengine.overlays.default ]; @@ -133,14 +122,13 @@ in cheatengine lsfg-vk lsfg-vk-ui - - unstable.qbittorrent - unstable.aseprite + qbittorrent + aseprite inputs.scopebuddy.packages.${pkgs.stdenv.hostPlatform.system}.default inputs.xivlauncher-rb.packages.${pkgs.stdenv.hostPlatform.system}.default - (callPackage ../../packages/aseprite-thumbnailer-kde/package.nix { inherit unstable; }) + (callPackage ../../packages/aseprite-thumbnailer-kde/package.nix { }) (callPackage ../../packages/undertale-mod-tool/package.nix { }) ]; }; diff --git a/hosts/pdw-frankiel/configuration.nix b/hosts/pdw-frankiel/configuration.nix index bad6289..6fa8004 100644 --- a/hosts/pdw-frankiel/configuration.nix +++ b/hosts/pdw-frankiel/configuration.nix @@ -1,11 +1,6 @@ { - pkgs, - inputs, ... }: -let - unstable = inputs.nixpkgs-unstable.legacyPackages.${pkgs.stdenv.hostPlatform.system}; -in { imports = [ ../shared/nixos-pc.nix @@ -36,7 +31,7 @@ in settings = { main = { - capslock = "oneshot(control)"; + capslock = "leftcontrol"; insert = "S-insert"; }; }; diff --git a/hosts/shared/darwin.nix b/hosts/shared/darwin.nix index 19a0501..8927f44 100644 --- a/hosts/shared/darwin.nix +++ b/hosts/shared/darwin.nix @@ -77,6 +77,7 @@ btop nerd-fonts.hack jump + ripgrep ]; }; diff --git a/hosts/shared/nixos-pc.nix b/hosts/shared/nixos-pc.nix index 55c8921..ba573a7 100644 --- a/hosts/shared/nixos-pc.nix +++ b/hosts/shared/nixos-pc.nix @@ -5,9 +5,6 @@ inputs, ... }: -let - unstable = inputs.nixpkgs-unstable.legacyPackages.${pkgs.stdenv.hostPlatform.system}; -in { boot = { loader = { @@ -359,8 +356,8 @@ in doCheck = false; }); }) + inputs.affinity-nix.overlays.default - inputs.nix-cachyos-kernel.overlays.default ]; }; @@ -410,13 +407,13 @@ in hunspellDicts.en_US hyphenDicts.en_US affinity-v3 - - unstable.libreoffice-qt - unstable.qimgv - unstable.fastfetch - unstable.vorta - unstable.distrobox - unstable.devenv + libreoffice-qt + qimgv + fastfetch + vorta + distrobox + devenv + ripgrep inputs.appimage-manager.packages.${pkgs.stdenv.hostPlatform.system}.default inputs.gloomberb.packages.${pkgs.stdenv.hostPlatform.system}.default @@ -430,7 +427,7 @@ in )) (callPackage ../../packages/virtiofsd-looking-glass/package.nix { }) - (callPackage ../../packages/heidisql/package.nix { pkgs = unstable; }) + (callPackage ../../packages/heidisql/package.nix { }) (callPackage ../../packages/looking-glass-client/package.nix { }) ]; diff --git a/hosts/shared/nixos-server.nix b/hosts/shared/nixos-server.nix index 4449e8f..df5d6cf 100644 --- a/hosts/shared/nixos-server.nix +++ b/hosts/shared/nixos-server.nix @@ -1,13 +1,8 @@ { - config, pkgs, - lib, inputs, ... }: -let - unstable = inputs.nixpkgs-unstable.legacyPackages.${pkgs.stdenv.hostPlatform.system}; -in { boot.loader = { systemd-boot.enable = true; @@ -186,8 +181,8 @@ in openjdk17 openjdk25 tmux - - unstable.fastfetch + fastfetch + ripgrep (python3.withPackages ( python-pkgs: with python-pkgs; [ diff --git a/hosts/vergil/configuration.nix b/hosts/vergil/configuration.nix index 5b0e62c..672f54e 100644 --- a/hosts/vergil/configuration.nix +++ b/hosts/vergil/configuration.nix @@ -1,11 +1,7 @@ { pkgs, - inputs, ... }: -let - unstable = inputs.nixpkgs-unstable.legacyPackages.${pkgs.stdenv.hostPlatform.system}; -in { imports = [ ../shared/nixos-server.nix diff --git a/packages/aseprite-thumbnailer-kde/package.nix b/packages/aseprite-thumbnailer-kde/package.nix index f11f719..20f9884 100644 --- a/packages/aseprite-thumbnailer-kde/package.nix +++ b/packages/aseprite-thumbnailer-kde/package.nix @@ -3,7 +3,7 @@ fetchFromGitHub, cmake, pkg-config, - unstable, + pkgs, kdePackages, }: @@ -29,7 +29,7 @@ stdenv.mkDerivation { ]; buildInputs = [ - unstable.qt6.qtbase + pkgs.qt6.qtbase kdePackages.kio ];