diff --git a/hosts/common/default.nix b/hosts/common/default.nix index 210fa830..36a5f420 100644 --- a/hosts/common/default.nix +++ b/hosts/common/default.nix @@ -66,6 +66,8 @@ nixpkgs = { config = { + allowUnfree = true; + permittedInsecurePackages = [ "electron-27.3.11" ]; }; diff --git a/hosts/common/home.nix b/hosts/common/home.nix index 1f67d1e1..23426d12 100644 --- a/hosts/common/home.nix +++ b/hosts/common/home.nix @@ -9,6 +9,8 @@ let pkgs = import inputs.nixpkgs { inherit system; + config.allowUnfree = true; + overlays = [ outputs.overlays.additions outputs.overlays.stable-packages diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix index 6fcb1142..90f3f4ea 100644 --- a/hosts/t480/configuration.nix +++ b/hosts/t480/configuration.nix @@ -89,6 +89,7 @@ peek pmutils shotwell + slack stable.gscan2pdf sxiv tailscale @@ -96,5 +97,6 @@ xcape xsel yt-dlp + zoom-us ]; } diff --git a/modules2/browsers/librewolf/extensions.nix b/modules2/browsers/librewolf/extensions.nix index 43e0fb83..3e7f7600 100644 --- a/modules2/browsers/librewolf/extensions.nix +++ b/modules2/browsers/librewolf/extensions.nix @@ -7,6 +7,7 @@ awesome-rss bitwarden darkreader + onetab tree-style-tab ublock-origin videospeed diff --git a/modules2/games/steam.nix b/modules2/games/steam.nix index b87865eb..2fe1e902 100644 --- a/modules2/games/steam.nix +++ b/modules2/games/steam.nix @@ -1,8 +1,3 @@ { - nixpkgs.allowedUnfreePackages = [ - "steam" - "steam-unwrapped" - ]; - flake.modules.nixos.pc.programs.steam.enable = true; } diff --git a/modules2/hosts/t480/open-webui.nix b/modules2/hosts/t480/open-webui.nix index 3da64e9e..f0bbfd77 100644 --- a/modules2/hosts/t480/open-webui.nix +++ b/modules2/hosts/t480/open-webui.nix @@ -1,5 +1,3 @@ { - nixpkgs.allowedUnfreePackages = [ "open-webui" ]; - flake.modules.nixos.pc.services.open-webui.enable = true; } diff --git a/modules2/hosts/t480/slack.nix b/modules2/hosts/t480/slack.nix deleted file mode 100644 index 57965016..00000000 --- a/modules2/hosts/t480/slack.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - flake.modules.nixos."nixosConfigurations/t480" = - { config, pkgs, ... }: - { - nixpkgs.allowedUnfreePackages = [ "slack" ]; - - users.users."${config.flake.meta.owner.username}".packages = [ pkgs.slack ]; - }; -} diff --git a/modules2/hosts/t480/zoom.nix b/modules2/hosts/t480/zoom.nix deleted file mode 100644 index f86267a1..00000000 --- a/modules2/hosts/t480/zoom.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - flake.modules.nixos."nixosConfigurations/t480" = - { config, pkgs, ... }: - { - nixpkgs.allowedUnfreePackages = [ "zoom-us" ]; - - users.users."${config.flake.meta.owner.username}".packages = [ pkgs.zoom-us ]; - }; -} diff --git a/modules2/makemkv.nix b/modules2/makemkv.nix index 1eb53a2d..9e6912a8 100644 --- a/modules2/makemkv.nix +++ b/modules2/makemkv.nix @@ -1,8 +1,6 @@ { config, ... }: { - nixpkgs.allowedUnfreePackages = [ "makemkv" ]; - flake.modules.nixos.pc = { pkgs, ... }: { diff --git a/modules2/meta-output.nix b/modules2/meta-output.nix deleted file mode 100644 index dbf69e5d..00000000 --- a/modules2/meta-output.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ lib, ... }: - -{ - options.flake.meta = lib.mkOption { - type = lib.types.anything; - }; -} diff --git a/modules2/unfree-packages.nix b/modules2/unfree-packages.nix deleted file mode 100644 index 014f6055..00000000 --- a/modules2/unfree-packages.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ config, lib, ... }: - -{ - options.nixpkgs.allowedUnfreePackages = lib.mkOption { - type = lib.types.listOf lib.types.str; - default = [ ]; - }; - - config.flake = { - modules = - let - predicate = pkg: builtins.elem (lib.getName pkg) config.nixpkgs.allowedUnfreePackages; - in - { - nixos.pc.nixpkgs.config.allowUnfreePredicate = predicate; - - homeManager.base = args: { - nixpkgs.config = lib.mkIf (!(args.hasGlobalPkgs or false)) { - allowUnfreePredicate = predicate; - }; - }; - }; - - meta.nixpkgs.allowedUnfreePackages = config.nixpkgs.allowedUnfreePackages; - }; -} diff --git a/modules2/zsh/abbreviations/abbreviations.nix b/modules2/zsh/abbreviations/abbreviations.nix index ed1fba0c..84610472 100644 --- a/modules2/zsh/abbreviations/abbreviations.nix +++ b/modules2/zsh/abbreviations/abbreviations.nix @@ -1,8 +1,4 @@ { - nixpkgs.allowedUnfreePackages = [ - "zsh-abbr" - ]; - flake.modules.homeManager.base.programs.zsh.zsh-abbr.abbreviations = { cl = "clear"; cs = "create-script";