From 96d988c1305370067f6d4c80c4eb83d17b59d051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Wed, 2 Mar 2022 12:45:32 +0000 Subject: [PATCH] more explicit unfree handling --- flake.nix | 11 ++--------- nixos/boxes/bolty/print-server.nix | 2 -- nixos/boxes/foureighty/default.nix | 5 ++--- nixos/common-hardware.nix | 6 +++--- nixos/common.nix | 5 ++--- nixos/gui/default.nix | 15 ++++++++------- nixos/home-manager/cli.nix | 1 - nixos/virtualbox.nix | 1 - 8 files changed, 17 insertions(+), 29 deletions(-) diff --git a/flake.nix b/flake.nix index acc25153..56361dcb 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { description = "NixOS configuration with flakes"; - outputs = { self, flake-utils, home-manager, nixpkgs-nixos-unstable, nixpkgs-stable, nixos-hardware, nur, agenix, neuron, sops, discord } @ inputs: + outputs = { self, flake-utils, home-manager, nixpkgs-nixos-unstable, nixpkgs-stable, nixos-hardware, nur, agenix, neuron, sops } @ inputs: let mkServer = pkgs: system: hostname: @@ -42,8 +42,7 @@ ]; specialArgs = { inherit inputs system; - unstableAndUnfree = import nixpkgs-nixos-unstable { inherit system; config = { allowUnfree = true; }; }; - discord = import discord { inherit system; config = { allowUnfree = true; }; }; + nixpkgs-nixos-unstable-and-unfree = import nixpkgs-nixos-unstable { inherit system; config = { allowUnfree = true; }; }; }; }; in @@ -154,12 +153,6 @@ ref = "master"; }; - discord = { - type = "github"; - owner = "NixOS"; - repo = "nixpkgs"; - ref = "e0c8e584ae000051db50c70cf6882e12e91b5e9f"; - }; }; } diff --git a/nixos/boxes/bolty/print-server.nix b/nixos/boxes/bolty/print-server.nix index ff90a2a9..1e959c89 100644 --- a/nixos/boxes/bolty/print-server.nix +++ b/nixos/boxes/bolty/print-server.nix @@ -17,8 +17,6 @@ ''; }; - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - ]; hardware.printers.ensurePrinters = [{ description = "Epson XP-540"; location = "connected to bolty"; diff --git a/nixos/boxes/foureighty/default.nix b/nixos/boxes/foureighty/default.nix index 24f00ef7..277c2196 100644 --- a/nixos/boxes/foureighty/default.nix +++ b/nixos/boxes/foureighty/default.nix @@ -1,10 +1,9 @@ -{ config, pkgs, inputs, lib, ... }: +{ config, pkgs, inputs, lib, nixpkgs-nixos-unstable-and-unfree, ... }: { networking.hostName = "foureighty"; imports = [ inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t480 - ./custom-kernel.nix ./hardware-configuration.nix ./tailscale-foureighty.nix ../../boot.nix @@ -23,6 +22,7 @@ options = [ "compress=zstd" ]; }; + boot.kernelPackages = pkgs.linuxPackages_latest; boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; zramSwap = { @@ -47,7 +47,6 @@ }; fonts.fontconfig.enable = true; - programs.steam.enable = true; home-manager.users.cyryl = { ... }: { imports = [ diff --git a/nixos/common-hardware.nix b/nixos/common-hardware.nix index c26b01a3..6cdc55cf 100644 --- a/nixos/common-hardware.nix +++ b/nixos/common-hardware.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, pkgs, nixpkgs-nixos-unstable-and-unfree, lib, ... }: { boot.kernelModules = [ "fuse" ]; services.smartd.enable = true; @@ -58,7 +58,7 @@ services.printing = { enable = true; - drivers = with pkgs; [ epson-escpr samsung-unified-linux-driver ]; + drivers = with pkgs; [ epson-escpr nixpkgs-nixos-unstable-and-unfree.samsung-unified-linux-driver ]; }; hardware.printers.ensurePrinters = [ @@ -80,7 +80,7 @@ hardware.sane = { enable = true; - extraBackends = with pkgs; [ samsung-unified-linux-driver ]; + extraBackends = with pkgs; [ nixpkgs-nixos-unstable-and-unfree.samsung-unified-linux-driver ]; }; powerManagement = { diff --git a/nixos/common.nix b/nixos/common.nix index 2ff0b6b6..ed6978d0 100644 --- a/nixos/common.nix +++ b/nixos/common.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, inputs, ... }: +{ config, pkgs, lib, inputs, nixpkgs-nixos-unstable-and-unfree, ... }: { imports = [ @@ -12,7 +12,6 @@ environment.enableDebugInfo = true; - nixpkgs.config.allowUnfree = true; environment.systemPackages = with pkgs; [ wget git @@ -27,7 +26,7 @@ fd dnsutils usbutils - veracrypt + nixpkgs-nixos-unstable-and-unfree.veracrypt ]; i18n.defaultLocale = "en_GB.UTF-8"; diff --git a/nixos/gui/default.nix b/nixos/gui/default.nix index 08788adc..1873fc92 100644 --- a/nixos/gui/default.nix +++ b/nixos/gui/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, discord, inputs, ... }: +{ config, pkgs, discord, inputs, nixpkgs-nixos-unstable-and-unfree, ... }: let unstable = inputs.nixpkgs-nixos-unstable.legacyPackages.${pkgs.system}; in @@ -31,7 +31,6 @@ in }; imports = [ - ./vscode.nix ./firejail.nix ]; @@ -42,7 +41,6 @@ in brave cheese digikam - discord.discord electrum element-desktop eog @@ -54,7 +52,6 @@ in glxinfo gnome-screenshot gsettings-desktop-schemas - hopper inkscape keybase-gui libreoffice @@ -72,8 +69,6 @@ in shotwell signal-desktop simple-scan - slack - spotify ssb-patchwork tlaplusToolbox tlaps @@ -87,7 +82,13 @@ in yubikey-manager-qt yubikey-personalization yubikey-personalization-gui - zoom-us + ] ++ + [ + nixpkgs-nixos-unstable-and-unfree.discord + nixpkgs-nixos-unstable-and-unfree.hopper + nixpkgs-nixos-unstable-and-unfree.slack + nixpkgs-nixos-unstable-and-unfree.spotify + nixpkgs-nixos-unstable-and-unfree.zoom-us ]; }; } diff --git a/nixos/home-manager/cli.nix b/nixos/home-manager/cli.nix index 30df0d7d..474c6149 100644 --- a/nixos/home-manager/cli.nix +++ b/nixos/home-manager/cli.nix @@ -42,7 +42,6 @@ tmux topgrade unzip - veracrypt wget whois wirelesstools diff --git a/nixos/virtualbox.nix b/nixos/virtualbox.nix index 0a07de21..0db6812b 100644 --- a/nixos/virtualbox.nix +++ b/nixos/virtualbox.nix @@ -1,6 +1,5 @@ { config, pkgs, ... }: { - nixpkgs.config.allowUnfree = true; virtualisation.virtualbox.host = { enable = true; enableExtensionPack = true;