From a5631ee6f99a58afaf0fb7f3cb7c3734199b4a94 Mon Sep 17 00:00:00 2001 From: Emile Clark-Boman Date: Sat, 19 Jul 2025 23:24:33 +1000 Subject: [PATCH] Use nixpkgs.config.allowUnfreePredicate +removed unused apps --- flake.lock | 167 ++--------------------------------- flake.nix | 26 +----- homes/me/default.nix | 3 +- hosts/lolcathost/default.nix | 47 +++++----- hosts/myputer/default.nix | 6 -- 5 files changed, 37 insertions(+), 212 deletions(-) diff --git a/flake.lock b/flake.lock index 72a6d80..c06c8b0 100755 --- a/flake.lock +++ b/flake.lock @@ -19,25 +19,6 @@ "type": "github" } }, - "ags_2": { - "inputs": { - "nixpkgs": "nixpkgs_5", - "systems": "systems_3" - }, - "locked": { - "lastModified": 1728326430, - "narHash": "sha256-tV1ABHuA1HItMdCTuNdA8fMB+qw7LpjvI945VwMSABI=", - "owner": "Aylur", - "repo": "ags", - "rev": "60180a184cfb32b61a1d871c058b31a3b9b0743d", - "type": "github" - }, - "original": { - "owner": "Aylur", - "repo": "ags", - "type": "github" - } - }, "aquamarine": { "inputs": { "hyprutils": [ @@ -127,20 +108,6 @@ } }, "flake-compat_3": { - "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" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, - "flake-compat_4": { "flake": false, "locked": { "lastModified": 1696426674, @@ -156,7 +123,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1696426674, @@ -337,25 +304,6 @@ "type": "github" } }, - "hyprpanel": { - "inputs": { - "ags": "ags_2", - "nixpkgs": "nixpkgs_6" - }, - "locked": { - "lastModified": 1731270736, - "narHash": "sha256-N0unlLf/7BqkrYx3BO9svv1+oLzKpArgiqLzkmNpD3Q=", - "owner": "Jas-SinghFSU", - "repo": "HyprPanel", - "rev": "a7855baf13c6abdd0b0e988e4390112cd7deda67", - "type": "github" - }, - "original": { - "owner": "Jas-SinghFSU", - "repo": "HyprPanel", - "type": "github" - } - }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -406,22 +354,6 @@ "type": "github" } }, - "nix-flatpak": { - "locked": { - "lastModified": 1711997201, - "narHash": "sha256-J71xzQlVYsjagA4AsVwRazhBh2rZrPpKvxTgs6UzL7c=", - "owner": "gmodena", - "repo": "nix-flatpak", - "rev": "b76fa31346db7fc958a9898f3c594696ca71c4fd", - "type": "github" - }, - "original": { - "owner": "gmodena", - "ref": "v0.4.1", - "repo": "nix-flatpak", - "type": "github" - } - }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -443,25 +375,6 @@ "type": "github" } }, - "nixcord": { - "inputs": { - "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_7" - }, - "locked": { - "lastModified": 1730720546, - "narHash": "sha256-5147A6X0MH6u/YDxLe+Nnva3oxfLQanC716LarG/uoo=", - "owner": "kaylorben", - "repo": "nixcord", - "rev": "e3e27c77316f7526b1a846778ae9c759c9377611", - "type": "github" - }, - "original": { - "owner": "kaylorben", - "repo": "nixcord", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1725634671, @@ -543,54 +456,6 @@ } }, "nixpkgs_5": { - "locked": { - "lastModified": 1725634671, - "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1739866667, - "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1730768919, - "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { "locked": { "lastModified": 1752620740, "narHash": "sha256-f3pO+9lg66mV7IMmmIqG4PL3223TYMlnlw+pnpelbss=", @@ -606,7 +471,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_6": { "locked": { "lastModified": 1730200266, "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", @@ -652,17 +517,14 @@ "colmena": "colmena", "grub2-themes": "grub2-themes", "hyprland": "hyprland", - "hyprpanel": "hyprpanel", - "nix-flatpak": "nix-flatpak", - "nixcord": "nixcord", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_5", "spicetify-nix": "spicetify-nix", "swww": "swww" } }, "spicetify-nix": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "nixpkgs": [ "nixpkgs" ] @@ -699,8 +561,8 @@ }, "swww": { "inputs": { - "flake-compat": "flake-compat_5", - "nixpkgs": "nixpkgs_9", + "flake-compat": "flake-compat_4", + "nixpkgs": "nixpkgs_6", "utils": "utils" }, "locked": { @@ -748,21 +610,6 @@ } }, "systems_3": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -779,7 +626,7 @@ }, "utils": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1726560853, diff --git a/flake.nix b/flake.nix index 85323f7..3a8be4e 100755 --- a/flake.nix +++ b/flake.nix @@ -14,26 +14,15 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nixcord.url = "github:kaylorben/nixcord"; - grub2-themes.url = "github:vinceliuice/grub2-themes"; # is this necessary? (aren't I enabling it in `configuration.nix` anyways?) hyprland.url = "github:hyprwm/Hyprland"; - hyprpanel = { - url = "github:Jas-SinghFSU/HyprPanel"; - #inputs.nixpkgs.follows = "nixpkgs"; - }; - swww.url = "github:LGFae/swww"; - # TODO: declarative flatpak management - nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; - ags.url = "github:Aylur/ags"; - # colmena.url = "github:zhaofengli/colmena"; colmena.url = "github:zhaofengli/colmena/?rev=47b6414d800c8471e98ca072bc0835345741a56a"; }; @@ -43,8 +32,6 @@ #home-manager, hyprland, grub2-themes, - nixcord, - hyprpanel, colmena, ... } @ inputs: let @@ -53,11 +40,8 @@ pkgs = import nixpkgs { inherit system; config = { - allowUnfree = true; + allowUnfree = false; # sanity check }; - overlays = [ - inputs.hyprpanel.overlay - ]; }; # TODO: come back to this its really cool @@ -75,7 +59,7 @@ # i be on my puter fr myputer = nixpkgs.lib.nixosSystem { # nix passes these to every single module - specialArgs = {inherit inputs pkgs;}; + specialArgs = {inherit inputs;}; modules = [ ./hosts/myputer @@ -85,7 +69,7 @@ # my laptop 0w0 lolcathost = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs pkgs;}; + specialArgs = {inherit inputs;}; modules = [ ./hosts/lolcathost @@ -97,7 +81,6 @@ # remote deployment to my servers!! colmenaHive = colmena.lib.makeHive { meta = { - # set nixpkgs global nixpkgs = pkgs; # set nixpkgs per server nodeNixpkgs = { @@ -106,9 +89,6 @@ config.allowUnfree = false; }; }; - - # we can use `specialArgs.inputs` to inject wishlist into hyrule's module - #specialArgs.inputs = with inputs; {inherit wishlist;}; }; # meine vps diff --git a/homes/me/default.nix b/homes/me/default.nix index 5eb2d90..ce18969 100755 --- a/homes/me/default.nix +++ b/homes/me/default.nix @@ -16,13 +16,12 @@ ../modules/bat.nix ../modules/fish.nix ../modules/editor/helix.nix - ../modules/editor/vscodium.nix + # ../modules/editor/vscodium.nix ../modules/btop.nix ../modules/term/ghostty.nix ../modules/term/rio.nix ../modules/firefox.nix - ../modules/nixcord.nix #../modules/hypr/hypridle.nix ../modules/hypr/hyprlock.nix diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix index 2f99758..b5f3780 100755 --- a/hosts/lolcathost/default.nix +++ b/hosts/lolcathost/default.nix @@ -11,7 +11,7 @@ in { imports = [ ./hardware-configuration.nix (import "${home-manager}/nixos") - inputs.spicetify-nix.nixosModules.default + # inputs.spicetify-nix.nixosModules.default ../modules/steam.nix ../modules/obsidian.nix @@ -21,18 +21,32 @@ in { ../modules/chameleonultragui.nix ]; - programs.spicetify = let - spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system}; - in { - enable = true; - enabledExtensions = with spicePkgs.extensions; [ - adblock - hidePodcasts - shuffle # shuffle+ (special characters are sanitized out of extension names) + nixpkgs.config.allowUnfreePredicate = let + whitelist = map lib.getName [ + pkgs.jetbrains.rider + pkgs.obsidian + pkgs.gitkraken + pkgs.steam + pkgs.steamcmd + pkgs.steam-unwrapped + pkgs.spotify + pkgs.dwarf-fortress ]; - #theme = spicePkgs.themes.catppuccin; - #colorScheme = "mocha"; - }; + in + pkg: builtins.elem (lib.getName pkg) whitelist; + + # programs.spicetify = let + # spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system}; + # in { + # enable = true; + # enabledExtensions = with spicePkgs.extensions; [ + # adblock + # hidePodcasts + # shuffle # shuffle+ (special characters are sanitized out of extension names) + # ]; + # #theme = spicePkgs.themes.catppuccin; + # #colorScheme = "mocha"; + # }; boot.loader = { efi = { @@ -159,13 +173,6 @@ in { nitch starfetch - hyprpanel - - # flatpak requires gnome-software - # for graphical applications - flatpak - gnome-software - colmena-latest jetbrains.rider @@ -206,8 +213,6 @@ in { #extraSpecialArgs = {inherit inputs pkgs;}; sharedModules = [ inputs.ags.homeManagerModules.default - inputs.nixcord.homeManagerModules.nixcord - #{nixpkgs.overlays = [inputs.hyprpanel.overlay];} ]; }; diff --git a/hosts/myputer/default.nix b/hosts/myputer/default.nix index 59e350c..1143a0d 100755 --- a/hosts/myputer/default.nix +++ b/hosts/myputer/default.nix @@ -153,10 +153,6 @@ in { nitch starfetch - # flatpak requires gnome-software - flatpak - gnome-software - colmena-latest gitkraken @@ -179,9 +175,7 @@ in { home-manager = { users.me = import ../../homes/me; sharedModules = [ - inputs.nixcord.homeManagerModules.nixcord inputs.ags.homeManagerModules.default - {nixpkgs.overlays = [inputs.hyprpanel.overlay];} ]; };