move more apps and separate unfree

flake.nix

@@ -58,6 +58,7 @@
             ./modules/services/keybase.nix
             ./modules/applications/firefox.nix
             ./modules/applications/alacritty.nix
+            ./modules/applications/media.nix
             ./modules/shell/fish.nix
             ./modules/shell/utilities.nix
             ./modules/shell/git.nix

modules/applications/1password.nix

@@ -0,0 +1,9 @@
+{ pkgs, lib, gui, user, ... }: {
+
+  config = lib.mkIf gui {
+    nixpkgs.config.allowUnfree = true;
+    home-manager.users.${user} = {
+      home.packages = with pkgs; [ _1password-gui ];
+    };
+  };
+}

modules/applications/discord.nix

@@ -0,0 +1,9 @@
+{ pkgs, lib, user, gui, ... }: {
+
+  config = lib.mkIf gui {
+    home-manager.users.${user} = {
+      nixpkgs.config.allowUnfree = true;
+      home.packages = with pkgs; [ discord ];
+    };
+  };
+}

modules/applications/media.nix

@@ -0,0 +1,11 @@
+{ pkgs, lib, gui, user, ... }: {
+
+  config = lib.mkIf gui {
+    home-manager.users.${user}.home.packages = with pkgs; [
+      mpv # Video viewer
+      sxiv # Image viewer
+      zathura # PDF viewer
+    ];
+  };
+
+}

modules/desktop/xorg.nix

@@ -1,4 +1,8 @@
-{ pkgs, gui, ... }: {
+{ pkgs, user, gui, ... }:
+
+let gtkTheme = "Adwaita-dark";
+
+in {
 
   # Enable the X11 windowing system.
   services.xserver = {
@@ -13,7 +17,7 @@
         enable = gui;
 
         # Make the login screen dark
-        greeters.gtk.theme.name = "Adwaita-dark";
+        greeters.gtk.theme.name = gtkTheme;
 
       };
     };
@@ -25,5 +29,10 @@
       xclip # Clipboard
     ];
 
+  home-manager.users.${user}.gtk = {
+    enable = true;
+    theme = { name = gtkTheme; };
+  };
+
 }
 

modules/gaming/steam.nix

@@ -9,6 +9,7 @@ in {
 
   config = mkIf cfg.enable {
     hardware.steam-hardware.enable = true;
+    nixpkgs.config.allowUnfree = true;
     environment.systemPackages = with pkgs; [ steam ];
   };
 

modules/shell/fish.nix

@@ -115,5 +115,11 @@
       "starship.toml".source = ../../starship/starship.toml.configlink;
       "fish/functions".source = ../../fish.configlink/functions;
     };
+
+    programs.direnv = {
+      enable = true;
+      nix-direnv.enable = true;
+      config = { whitelist = { prefix = [ "${builtins.toString ../.}/" ]; }; };
+    };
   };
 }

nixos/configuration.nix

@@ -5,7 +5,6 @@
 { config, pkgs, user, font, ... }:
 
 {
-  nixpkgs.config.allowUnfree = true;
   nix.extraOptions = "experimental-features = nix-command flakes";
 
   # List packages installed in system profile. To search, run:

nixos/home.nix

@@ -1,25 +1,11 @@
-{ pkgs, lib, user, ... }:
-
-let
-
-  notes_path = "$HOME/dev/personal/notes";
-
-in {
+{ pkgs, lib, user, ... }: {
   home-manager.useGlobalPkgs = true;
   home-manager.useUserPackages = true;
   home-manager.users.${user} = {
 
-    nixpkgs.config.allowUnfree = true;
-
     home.packages = with pkgs; [
-      # Applications
-      _1password-gui
-      discord
       # neomutt
       himalaya # Email
-      mpv # Video viewer
-      sxiv # Image viewer
-      zathura # PDF viewer
       qbittorrent
 
       # Encryption
@@ -27,26 +13,10 @@ in {
       pass
     ];
 
-    gtk.enable = true;
-    gtk.theme = { name = "Adwaita-dark"; };
-
     home.sessionVariables = {
       NIXOS_CONFIG = builtins.toString ./.;
       DOTS = builtins.toString ../.;
-      NOTES_PATH = "${notes_path}";
-    };
-
-    # Other configs
-    xdg.configFile = {
-      "awesome/rc.lua".source = ./awesomerc.lua;
-      "qtile/config.py".source = ./qtile.py;
-      "direnvrc".text = "source $HOME/.nix-profile/share/nix-direnv/direnvrc";
-      "spectrwm/spectrwm.conf".source = ./spectrwm.conf;
-    };
-    programs.direnv = {
-      enable = true;
-      nix-direnv.enable = true;
-      config = { whitelist = { prefix = [ "${builtins.toString ../.}/" ]; }; };
+      NOTES_PATH = "$HOME/dev/personal/notes";
     };
 
     # Email