From 147f6ffd7f73d8c3f32955890d70b6a53f9b6e0a Mon Sep 17 00:00:00 2001 From: Mat Jones Date: Thu, 4 Jan 2024 16:28:05 -0500 Subject: [PATCH 1/4] chore(nix): Move allowedUnfree predicates to eliminate code duplication --- nixos-modules/allowed-unfree.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 nixos-modules/allowed-unfree.nix diff --git a/nixos-modules/allowed-unfree.nix b/nixos-modules/allowed-unfree.nix new file mode 100644 index 00000000..f7e0f0b4 --- /dev/null +++ b/nixos-modules/allowed-unfree.nix @@ -0,0 +1,22 @@ +{ pkgs, lib, ... }: { + nixpkgs.config.allowUnfreePredicate = pkg: + builtins.elem (lib.getName pkg) [ + "obsidian" + "discord" + "spotify" + "nvidia-persistenced" + "nvidia-x11" + "nvidia-settings" + "1password" + "1password-cli" + "steam" + "steam-run" + "steam-original" + "parsec-bin" + # This is required for pkgs.nodePackages_latest.vscode-langservers-extracted on NixOS + # however VS Code should NOT be installed on this system! + # Use VS Codium instead: https://github.com/VSCodium/vscodium + "vscode" + ]; +} + From 1da4ed54bc974f30403ff341eac3d0cf973cbe91 Mon Sep 17 00:00:00 2001 From: Mat Jones Date: Thu, 4 Jan 2024 16:28:25 -0500 Subject: [PATCH 2/4] chore(nix): Update flake dependencies --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 05fe7a03..3545d0e0 100644 --- a/flake.lock +++ b/flake.lock @@ -138,11 +138,11 @@ ] }, "locked": { - "lastModified": 1703838268, - "narHash": "sha256-SRg5nXcdPnrsQR2MTAp7en0NyJnQ2wB1ivmsgEbvN+o=", + "lastModified": 1704383912, + "narHash": "sha256-Be7O73qoOj/z+4ZCgizdLlu+5BkVvO2KO299goZ9cW8=", "owner": "nix-community", "repo": "home-manager", - "rev": "2aff324cf65f5f98f89d878c056b779466b17db8", + "rev": "26b8adb300e50efceb51fff6859a1a6ba1ade4f7", "type": "github" }, "original": { @@ -160,11 +160,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1703807649, - "narHash": "sha256-Cqm5aejScs6pxEFCwwiHisF9Qg1BbGihcYIFtaXHAjk=", + "lastModified": 1704369792, + "narHash": "sha256-YEsYk8twrRd8qEw7PdyDfNiDHLOXEsgeGn+Y3ANY8h4=", "owner": "neovim", "repo": "neovim", - "rev": "1ef60ea6513be72a03958ed6239bfe474c85a7a3", + "rev": "6635ec113fe69157001070e809bc5611e3d52014", "type": "github" }, "original": { @@ -208,11 +208,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1703438236, - "narHash": "sha256-aqVBq1u09yFhL7bj1/xyUeJjzr92fXVvQSSEx6AdB1M=", + "lastModified": 1704194953, + "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5f64a12a728902226210bf01d25ec6cbb9d9265b", + "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6", "type": "github" }, "original": { From cde3e2929251f9e3efaab681168e682c3ef696dd Mon Sep 17 00:00:00 2001 From: Mat Jones Date: Thu, 4 Jan 2024 16:29:04 -0500 Subject: [PATCH 3/4] chore(nix): remove package alias that was removed --- nixos-modules/desktop_environment.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos-modules/desktop_environment.nix b/nixos-modules/desktop_environment.nix index 4167e8fa..a64e65a0 100644 --- a/nixos-modules/desktop_environment.nix +++ b/nixos-modules/desktop_environment.nix @@ -19,7 +19,6 @@ in { ++ (with pkgs.gnome; [ cheese # webcam tool gnome-music - gedit # text editor epiphany # web browser geary # email reader gnome-characters From 159a347293476547f0db5756428ca5d1efe9a8a2 Mon Sep 17 00:00:00 2001 From: Mat Jones Date: Thu, 4 Jan 2024 16:30:38 -0500 Subject: [PATCH 4/4] fix(nixos): Disable Obsidian app until electron version updates to non EOL --- home-manager/home.nix | 17 +++-------------- nixos-modules/common.nix | 22 +--------------------- 2 files changed, 4 insertions(+), 35 deletions(-) diff --git a/home-manager/home.nix b/home-manager/home.nix index 7f19b08a..c02db85c 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -26,7 +26,8 @@ in { stateVersion = "22.11"; packages = with pkgs; [ - obsidian + # TODO re-enable when they update to a non EOL version of electron... + # obsidian mdbook spotify (discord.override { @@ -53,19 +54,6 @@ in { "mkdir -p ${config.home.homeDirectory}/.steam && test ! -d ${config.home.homeDirectory}/_steam && ln -s ${config.home.homeDirectory}/.steam ${config.home.homeDirectory}/_steam || :"; }; # Please read the comment before changing. - nixpkgs.config.allowUnfreePredicate = pkg: - builtins.elem (lib.getName pkg) [ - "obsidian" - "spotify" - "discord" - "1password" - "1password-cli" - # This is required for pkgs.nodePackages_latest.vscode-langservers-extracted on NixOS - # however VS Code should NOT be installed on this system! - # Use VS Codium instead: https://github.com/VSCodium/vscodium - "vscode" - ]; - xdg.enable = true; # link config files, if a dedicated module exists (below) # it will handle its own config @@ -95,6 +83,7 @@ in { ./modules/wezterm.nix ./modules/librewolf.nix ./modules/gnome/default.nix + ../nixos-modules/allowed-unfree.nix ]; programs = { diff --git a/nixos-modules/common.nix b/nixos-modules/common.nix index 953bfd09..348d56df 100644 --- a/nixos-modules/common.nix +++ b/nixos-modules/common.nix @@ -1,5 +1,5 @@ { lib, pkgs, ... }: { - imports = [ ./desktop_environment.nix ./_1password.nix ]; + imports = [ ./desktop_environment.nix ./_1password.nix ./allowed-unfree.nix ]; # See https://github.com/nix-community/nix-direnv nix.extraOptions = '' @@ -71,26 +71,6 @@ extraGroups = [ "networkmanager" "wheel" ]; }; - nixpkgs.config.allowUnfreePredicate = pkg: - builtins.elem (lib.getName pkg) [ - "obsidian" - "discord" - "spotify" - "nvidia-persistenced" - "nvidia-x11" - "nvidia-settings" - "1password" - "1password-cli" - "steam" - "steam-run" - "steam-original" - "parsec-bin" - # This is required for pkgs.nodePackages_latest.vscode-langservers-extracted on NixOS - # however VS Code should NOT be installed on this system! - # Use VS Codium instead: https://github.com/VSCodium/vscodium - "vscode" - ]; - # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave