organize packages

modules/hosts/defaults.nix

@@ -1,6 +1,6 @@
 {
   den.default = {
-    nixos = { pkgs, lib, ... }: {
+    nixos = { pkgs, ... }: {
       imports = [
         /etc/nixos/hardware-configuration.nix
       ];
@@ -71,6 +71,7 @@
         tree
         unzip
         wget
+        tree
       ];
 
       time.timeZone = "America/Chicago";

modules/hosts/laptop/laptop.nix

@@ -1,4 +1,3 @@
-
 { den, ... }: {
   den.aspects.laptop = {
     includes = with den.aspects; [
@@ -13,19 +12,19 @@
       syncthing
       swap
       cloudflare-warp
-      packages
       development
       cad
-      mpd
       virtualisation
       flatpak
       fish
       dns
       openssh
-      beets
       catppuccin
-      #librewolf
-      nixcord
+      music
+      social
+      gaming
+      compatibility
+      utilities
       janitor
     ];
 

modules/hosts/nix/nix.nix

@@ -14,19 +14,19 @@
       syncthing
       swap
       #cloudflare-warp
-      packages
       development
       #cad
-      mpd
       virtualisation
       flatpak
       fish
       dns
       openssh
-      beets
       catppuccin
-      # librewolf
-      nixcord
+      music
+      social
+      gaming
+      compatibility
+      utilities
     ];
 
     nixos = {

modules/software/compatibility.nix

@@ -1 +0,0 @@
-{}

modules/software/compatibility/appimage.nix

@@ -0,0 +1,14 @@
+{ ... }: {
+  den.aspects.appimage = {
+    nixos = { pkgs, ... }: {
+      environment.systemPackages = with pkgs; [
+        appimage-run
+      ];
+
+      programs.appimage = {
+        enable = true;
+        binfmt = true;
+      };
+    };
+  };
+}

modules/software/compatibility/compatibility.nix

@@ -0,0 +1,5 @@
+{ den, ... }: {
+  den.aspects.compatibility = {
+    includes = with den.aspects; [ wine appimage nix-ld ];
+  };
+}

modules/software/compatibility/nix-ld.nix

@@ -0,0 +1,23 @@
+{ ... }: {
+  den.aspects.nix-ld = {
+    nixos = { pkgs, options, ... }: {
+      programs.nix-ld = {
+        enable = true;
+
+        libraries = options.programs.nix-ld.libraries.default ++ (with pkgs; [
+          libxml2
+          udev
+          gcc
+          egl-wayland
+          mesa
+          libglvnd
+          wayland
+          libX11
+          libXcursor
+          libXrandr
+          libXi
+        ]);
+      };
+    };
+  };
+}

modules/software/compatibility/wine.nix

@@ -0,0 +1,10 @@
+{ ... }: {
+  den.aspects.wine = {
+    nixos = { pkgs, ... }: {
+      environment.systemPackages = with pkgs; [
+        wine64
+        wineWow64Packages.full
+      ];
+    };
+  };
+}

modules/software/development/development.nix

@@ -0,0 +1,5 @@
+{ den, ... }: {
+  den.aspects.development = {
+    includes = with den.aspects; [ editors ];
+  };
+}

modules/software/development/editors.nix

@@ -0,0 +1,11 @@
+{ ... }: {
+  den.aspects.editors = {
+    nixos = { pkgs, ... }: {
+      users.users.bug.packages = with pkgs; [
+        zed-editor
+        vscode
+        arduino-ide
+      ];
+    };
+  };
+}

modules/software/flatpak.nix

@@ -1,55 +1,25 @@
 { inputs, lib, ... }: {
   den.aspects.flatpak = {
-    nixos = { pkgs, ... }: {
+    nixos = { ... }: {
       imports = [ inputs.nix-flatpak.nixosModules.nix-flatpak ];
 
       services.flatpak = {
-          enable = true;
+        enable = true;
 
-          remotes = lib.mkOptionDefault [{
-              name = "flathub-beta";
-              location = "https://flathub.org/beta-repo/flathub-beta.flatpakrepo";
-          }];
+        remotes = lib.mkOptionDefault [{
+          name = "flathub-beta";
+          location = "https://flathub.org/beta-repo/flathub-beta.flatpakrepo";
+        }];
 
-          update.auto.enable = true;
-          uninstallUnmanaged = true;
+        update.auto.enable = true;
+        uninstallUnmanaged = true;
 
-          packages = [
-              "org.vinegarhq.Sober"
-              "org.vinegarhq.Vinegar"
-              "org.gnome.Decibels"
-              "org.pipewire.Helvum"
-              "community.pathofbuilding.PathOfBuilding"
-              "io.github.gaheldev.Millisecond"
-
-              {
-                  appId = "com.hytale.Launcher";
-                  sha256 = "sha256-SUxfyovC2umZmsOj5bOTZ8WfGCpnWcz7svOESwNekV0=";
-                  bundle = "${pkgs.fetchurl {
-                      url = "https://launcher.hytale.com/builds/release/linux/amd64/hytale-launcher-latest.flatpak";
-                      sha256 = "sha256-SUxfyovC2umZmsOj5bOTZ8WfGCpnWcz7svOESwNekV0=";
-                  }}";
-              }
-
-              # add Polytoria client
-              # https://cdn.polytoria.com/releases/installer/linux/Polytoria%20Setup%204.12.0.flatpak
-
-              {
-                  appId = "com.polytoria.launcher";
-                  sha256 = "sha256-VjhNiJfSdCtlH2SuP3Mn8jjOrx5xcOqhtDKaWYIwxYg=";
-                  bundle = "${pkgs.fetchurl {
-                      url = "https://github.com/4DBug/poly/releases/download/poly/poly.flatpak";
-                      sha256 = "sha256-VjhNiJfSdCtlH2SuP3Mn8jjOrx5xcOqhtDKaWYIwxYg=";
-                  }}";
-              }
-          ];
-
-          overrides = {
-              global = {
-                  Context.sockets = ["wayland" "!x11" "!fallback-x11"];
-              };
+        overrides = {
+          global = {
+            Context.sockets = [ "wayland" "!x11" "!fallback-x11" ];
           };
+        };
       };
     };
   };
-}
+}

modules/software/fonts.nix

@@ -0,0 +1,25 @@
+{ ... }: {
+  den.aspects.fonts = {
+    nixos = { pkgs, ... }: {
+      fonts = {
+        fontDir.enable = true;
+        enableDefaultPackages = true;
+
+        packages = with pkgs; [
+          twitter-color-emoji
+          nerd-fonts.fira-code
+          nerd-fonts.droid-sans-mono
+        ];
+
+        fontconfig = {
+          enable = true;
+          useEmbeddedBitmaps = true;
+
+          defaultFonts = {
+            emoji = [ "Twitter Color Emoji" ];
+          };
+        };
+      };
+    };
+  };
+}

modules/software/gaming.nix

@@ -1 +0,0 @@
-{}

modules/software/gaming/game-tools.nix

@@ -0,0 +1,18 @@
+{ ... }: {
+  den.aspects.game-tools = {
+    nixos = { pkgs, ... }: {
+      users.users.bug.packages = with pkgs; [
+        steamtinkerlaunch
+        scanmem
+        samrewritten
+        lug-helper
+        gamemode
+        steam-run
+      ];
+
+      services.flatpak.packages = [
+        "community.pathofbuilding.PathOfBuilding"
+      ];
+    };
+  };
+}

modules/software/gaming/gaming.nix

@@ -0,0 +1,5 @@
+{ den, ... }: {
+  den.aspects.gaming = {
+    includes = with den.aspects; [ steam roblox hytale polytoria game-tools ];
+  };
+}

modules/software/gaming/hytale.nix

@@ -0,0 +1,16 @@
+{ ... }: {
+  den.aspects.hytale = {
+    nixos = { pkgs, ... }: {
+      services.flatpak.packages = [
+        {
+          appId = "com.hytale.Launcher";
+          sha256 = "sha256-SUxfyovC2umZmsOj5bOTZ8WfGCpnWcz7svOESwNekV0=";
+          bundle = "${pkgs.fetchurl {
+            url = "https://launcher.hytale.com/builds/release/linux/amd64/hytale-launcher-latest.flatpak";
+            sha256 = "sha256-SUxfyovC2umZmsOj5bOTZ8WfGCpnWcz7svOESwNekV0=";
+          }}";
+        }
+      ];
+    };
+  };
+}

modules/software/gaming/polytoria.nix

@@ -0,0 +1,16 @@
+{ ... }: {
+  den.aspects.polytoria = {
+    nixos = { pkgs, ... }: {
+      services.flatpak.packages = [
+        {
+          appId = "com.polytoria.launcher";
+          sha256 = "sha256-VjhNiJfSdCtlH2SuP3Mn8jjOrx5xcOqhtDKaWYIwxYg=";
+          bundle = "${pkgs.fetchurl {
+            url = "https://github.com/4DBug/poly/releases/download/poly/poly.flatpak";
+            sha256 = "sha256-VjhNiJfSdCtlH2SuP3Mn8jjOrx5xcOqhtDKaWYIwxYg=";
+          }}";
+        }
+      ];
+    };
+  };
+}

modules/software/gaming/roblox.nix

@@ -0,0 +1,10 @@
+{ ... }: {
+  den.aspects.roblox = {
+    nixos = {
+      services.flatpak.packages = [
+        "org.vinegarhq.Sober"
+        "org.vinegarhq.Vinegar"
+      ];
+    };
+  };
+}

modules/software/gaming/steam.nix

@@ -0,0 +1,34 @@
+{ ... }: {
+  den.aspects.steam = {
+    nixos = { pkgs, ... }: {
+      programs = {
+        steam = {
+          enable = true;
+
+          remotePlay.openFirewall = true;
+          dedicatedServer.openFirewall = false;
+
+          localNetworkGameTransfers.openFirewall = true;
+
+          gamescopeSession.enable = true;
+
+          extraCompatPackages = with pkgs; [
+            proton-ge-bin
+          ];
+
+          #platformOptimizations.enable = true;
+        };
+
+        gamescope = {
+          enable = true;
+          capSysNice = true;
+
+          args = [
+            "--rt"
+            "--expose-wayland"
+          ];
+        };
+      };
+    };
+  };
+}

modules/software/music.nix

@@ -1 +0,0 @@
-{}

modules/software/music/music.nix

@@ -0,0 +1,5 @@
+{ den, ... }: {
+  den.aspects.music = {
+    includes = with den.aspects; [ beets player nicotine mpd ];
+  };
+}

modules/software/music/nicotine.nix

@@ -0,0 +1,9 @@
+{
+  den.aspects.nicotine = {
+    nixos = { pkgs, ... }: {
+      users.users.bug.packages = with pkgs; [
+        nicotine-plus
+      ];
+    };
+  };
+}

modules/software/music/player.nix

@@ -0,0 +1,14 @@
+{ ... }: {
+  den.aspects.player = {
+    nixos = { pkgs, ... }: {
+      users.users.bug.packages = with pkgs; [
+        euphonica
+      ];
+
+      services.flatpak.packages = [
+        "org.gnome.Decibels"
+        "org.pipewire.Helvum"
+      ];
+    };
+  };
+}

modules/software/placeholder.nix

@@ -1,195 +0,0 @@
-{
-  den.aspects.packages = {
-    nixos = { pkgs, options, ... }: {
-      environment.systemPackages = with pkgs; [
-        gnome-boxes
-
-        wine64
-        wineWow64Packages.full
-
-        appimage-run
-
-        pulseaudioFull
-
-        lug-helper
-        gamemode
-        steam-run
-
-        firmware-updater
-
-        file-roller
-
-        baobab
-
-        firefox-bin
-      ];
-
-      users.users.bug.packages = with pkgs; [
-        obsidian
-        # vesktop
-        nicotine-plus
-        fastfetch
-        gh
-        scanmem
-        samrewritten
-        impression
-
-        mission-center
-
-        authenticator
-
-        steamtinkerlaunch
-
-        #prismlauncher
-
-        euphonica
-
-        kooha
-
-        loupe
-
-        arduino-ide
-
-        geary
-
-        fractal
-
-        gnome-calendar
-      ];
-
-
-      services = {
-          /*
-          flatpak = {
-              enable = true;
-
-              remotes = lib.mkOptionDefault [{
-                  name = "flathub-beta";
-                  location = "https://flathub.org/beta-repo/flathub-beta.flatpakrepo";
-              }];
-
-              update.auto.enable = true;
-              uninstallUnmanaged = true;
-
-              packages = [
-                  "org.vinegarhq.Sober"
-                  "org.vinegarhq.Vinegar"
-                  "org.gnome.Decibels"
-                  "org.pipewire.Helvum"
-                  "community.pathofbuilding.PathOfBuilding"
-                  "io.github.gaheldev.Millisecond"
-
-                  {
-                      appId = "com.hytale.Launcher";
-                      sha256 = "sha256-SUxfyovC2umZmsOj5bOTZ8WfGCpnWcz7svOESwNekV0=";
-                      bundle = "${pkgs.fetchurl {
-                          url = "https://launcher.hytale.com/builds/release/linux/amd64/hytale-launcher-latest.flatpak";
-                          sha256 = "sha256-SUxfyovC2umZmsOj5bOTZ8WfGCpnWcz7svOESwNekV0=";
-                      }}";
-                  }
-
-                  # add Polytoria client
-                  # https://cdn.polytoria.com/releases/installer/linux/Polytoria%20Setup%204.12.0.flatpak
-
-                  {
-                      appId = "com.polytoria.launcher";
-                      sha256 = "sha256-VjhNiJfSdCtlH2SuP3Mn8jjOrx5xcOqhtDKaWYIwxYg=";
-                      bundle = "${pkgs.fetchurl {
-                          url = "https://github.com/4DBug/poly/releases/download/poly/poly.flatpak";
-                          sha256 = "sha256-VjhNiJfSdCtlH2SuP3Mn8jjOrx5xcOqhtDKaWYIwxYg=";
-                      }}";
-                  }
-              ];
-
-              overrides = {
-                  global = {
-                      Context.sockets = ["wayland" "!x11" "!fallback-x11"];
-                  };
-              };
-          };
-          */
-
-          ollama = {
-              enable = false;
-
-              loadModels = [ "llama3.2:3b" "deepseek-r1:1.5b" "deepseek-r1:8b"];
-          };
-      };
-
-      fonts = {
-          fontDir.enable = true;
-          enableDefaultPackages = true;
-
-          packages = with pkgs; [
-              twitter-color-emoji
-              nerd-fonts.fira-code
-              nerd-fonts.droid-sans-mono
-          ];
-
-          fontconfig = {
-              enable = true;
-              useEmbeddedBitmaps = true;
-
-              defaultFonts = {
-                  emoji = [ "Twitter Color Emoji" ];
-              };
-          };
-      };
-
-      programs = {
-          appimage = {
-              enable = true;
-              binfmt = true;
-          };
-
-          steam = {
-              enable = true;
-
-              remotePlay.openFirewall = true;
-              dedicatedServer.openFirewall = false;
-
-              localNetworkGameTransfers.openFirewall = true;
-
-              gamescopeSession.enable = true;
-
-              extraCompatPackages = with pkgs; [
-                  proton-ge-bin
-              ];
-
-              #platformOptimizations.enable = true;
-          };
-
-          ydotool.enable = true;
-
-          gamescope = {
-              enable = true;
-              capSysNice = true;
-              args = [
-                  "--rt"
-                  "--expose-wayland"
-              ];
-          };
-
-          virt-manager.enable = true;
-
-          nix-ld = {
-              enable = true;
-
-              libraries = options.programs.nix-ld.libraries.default ++ (with pkgs; [
-                  libxml2
-                  udev
-                  gcc
-                  egl-wayland
-                  mesa
-                  libglvnd
-                  wayland
-                  libX11
-                  libXcursor
-                  libXrandr
-                  libXi
-              ]);
-          };
-      };
-    };
-  };
-}

modules/software/social.nix

@@ -1 +0,0 @@
-{}

modules/software/social/mail.nix

@@ -0,0 +1,9 @@
+{ ... }: {
+  den.aspects.mail = {
+    nixos = { pkgs, ... }: {
+      users.users.bug.packages = with pkgs; [
+        geary
+      ];
+    };
+  };
+}

modules/software/social/matrix.nix

@@ -0,0 +1,9 @@
+{ ... }: {
+  den.aspects.matrix-client = {
+    nixos = { pkgs, ... }: {
+      users.users.bug.packages = with pkgs; [
+        fractal
+      ];
+    };
+  };
+}

modules/software/social/social.nix

@@ -0,0 +1,5 @@
+{ den, ... }: {
+  den.aspects.social = {
+    includes = with den.aspects; [ nixcord matrix-client mail ];
+  };
+}

modules/software/utilities/desktop.nix

@@ -1,21 +1,17 @@
-{
-  den.aspects.development = {
+{ ... }: {
+  den.aspects.desktop-utils = {
     nixos = { pkgs, ... }: {
       environment.systemPackages = with pkgs; [
         file-roller
       ];
 
       users.users.bug.packages = with pkgs; [
-        zed-editor
-
-        vscode
-
-        tree
-        gh
-        scanmem
-
-        arduino-ide
+        obsidian
+        impression
+        kooha
+        loupe
+        authenticator
       ];
     };
   };
-}
+}

modules/software/utilities/system.nix

@@ -0,0 +1,28 @@
+{ ... }: {
+  den.aspects.system-utils = {
+    nixos = { pkgs, ... }: {
+      environment.systemPackages = with pkgs; [
+        gnome-boxes
+        pulseaudioFull
+        firmware-updater
+      ];
+
+      users.users.bug.packages = with pkgs; [
+        mission-center
+        baobab
+        fastfetch
+      ];
+
+      programs = {
+        ydotool.enable = true;
+
+        virt-manager.enable = true;
+      };
+
+      services.ollama = {
+        enable = false;
+        loadModels = [ "llama3.2:3b" "deepseek-r1:1.5b" "deepseek-r1:8b" ];
+      };
+    };
+  };
+}

modules/software/utilities/utilities.nix

@@ -0,0 +1,5 @@
+{ den, ... }: {
+  den.aspects.utilities = {
+    includes = with den.aspects; [ system-utils desktop-utils fonts ];
+  };
+}