Merge branch 'master' of github.com:mrjones2014/dotfiles

mrjones2014 · Jan 5, 2024 · e51d51c · e51d51c
2 parents ed9ec21 + 159a347
commit e51d51c
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 45 deletions.
diff --git a/flake.lock b/flake.lock
diff --git 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/allowed-unfree.nix 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"
+    ];
+}
+
diff --git 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

diff --git 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