modularized user apps + corrected networking option that was specific to puter

hosts/puter/default.nix

@@ -12,13 +12,12 @@
     ../../modules/common/nix.nix
     ../../modules/common/networking.nix
     ../../modules/common/shell.nix
-    ../../modules/common/utils.nix
     ../../modules/common/security.nix
-    ../../modules/common/steam.nix
     #../../modules/common/wine.nix
     ../../modules/common/libvirt.nix
   ];
   networking.hostName = "puter";
   # This will be overridden by system/default.nix
   system.stateVersion = "24.05";
+  security.pki.certificates = ["/home/user/.config/bigbox.local.crt"];
 }

hosts/puter/packages.nix

@@ -6,53 +6,18 @@
   nixpkgs.config.permittedInsecurePackages = ["qtwebengine-5.15.19"];
   nixpkgs.config = {chromium = {enableWideVine = true;};};
 
+  imports = [
+    ../../modules/userapps/utils.nix
+    #../../modules/common/steam.nix
+    ../../modules/userapps/devutils.nix
+    ../../modules/userapps/internet.nix
+    ../../modules/userapps/media.nix
+    ../../modules/userapps/productivity.nix
+  ];
+
   users.users.user = {
     isNormalUser = true;
     description = "user";
     extraGroups = ["networkmanager" "wheel" "video" "libvirtd"];
-    packages = with pkgs; [
-      # Dev stuff, most of it might be replaced by devenvs later on
-      ghostty
-      tealdeer
-      vscodium
-      gcc
-      python
-      alejandra
-      devenv
-      nodejs
-      mermaid-cli
-      rustup
-      delta
-      just
-      kondo
-
-      # Chatting
-      signal-desktop
-      element-desktop
-
-      # Productivity apps
-      obsidian
-      onlyoffice-desktopeditors
-      keepassxc
-      evolution
-      anki-bin
-      pomodoro-gtk
-      #ticker
-
-      # web browsers
-      ungoogled-chromium
-      tor-browser-bundle-bin
-      transmission_4-gtk
-
-      # multimedia
-      vlc
-      mpv
-      yt-dlp
-      freetube
-      jellyfin-media-player
-      feishin
-    ];
   };
-  #ciscoPacketTracer8
-  #parallel-disk-usage
 }

modules/common/networking.nix

@@ -29,10 +29,6 @@
     settings = {ControlPort = 9051;};
   };
 
-  security.pki.certificates = ["/home/user/.config/bigbox.local.crt"];
-
-  networking.extraHosts = "";
-
   services.chrony = {
     enable = true;
     enableNTS = true;

modules/common/wine.nix

@@ -4,11 +4,8 @@
   ...
 }: {
   environment.systemPackages = with pkgs; [
-    # ...
-
     # support both 32-bit and 64-bit applications
     wineWowPackages.stable
-
     lutris
   ];
 }

modules/userapps/devutils.nix

@@ -0,0 +1,34 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  programs.neovim = {defaultEditor = true;};
+  environment.systemPackages = with pkgs; [
+    # Dev stuff, most of it might be replaced by devenvs later on
+    ghostty
+    tealdeer
+    vscodium
+    gcc
+    python
+    alejandra
+    devenv
+    nodejs
+    mermaid-cli
+    rustup
+    delta
+    just
+    kondo
+    ciscoPacketTracer8
+    # stuff needed by neovim
+    vimPlugins.LazyVim
+    texliveSmall # for pdflatex
+    fzf
+    lazygit
+    tree-sitter
+    neovim
+    mcfly
+    luajitPackages.luarocks-nix
+    tectonic
+  ];
+}

modules/userapps/empty.nix

@@ -0,0 +1,9 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  programs.neovim = {defaultEditor = true;};
+  environment.systemPackages = with pkgs; [
+  ];
+}

modules/userapps/internet.nix

@@ -0,0 +1,17 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  programs.neovim = {defaultEditor = true;};
+  environment.systemPackages = with pkgs; [
+    # Chatting
+    signal-desktop
+    element-desktop
+    # web browsers
+    ungoogled-chromium
+    tor-browser-bundle-bin
+    librewolf
+    transmission_4-gtk
+  ];
+}

modules/userapps/media.nix

@@ -0,0 +1,16 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  programs.neovim = {defaultEditor = true;};
+  environment.systemPackages = with pkgs; [
+    # multimedia
+    vlc
+    mpv
+    yt-dlp
+    freetube
+    jellyfin-media-player
+    feishin
+  ];
+}

modules/userapps/productivity.nix

@@ -0,0 +1,17 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  programs.neovim = {defaultEditor = true;};
+  environment.systemPackages = with pkgs; [
+    # Productivity apps
+    obsidian
+    onlyoffice-desktopeditors
+    keepassxc
+    evolution
+    anki-bin
+    pomodoro-gtk
+    #ticker
+  ];
+}

modules/userapps/utils.nix

@@ -5,17 +5,7 @@
 }: {
   programs.neovim = {defaultEditor = true;};
   environment.systemPackages = with pkgs; [
-    vimPlugins.LazyVim
+    parallel-disk-usage
-    # stuff needed by neovim
-    texliveSmall # for pdflatex
-    fzf
-    lazygit
-    tree-sitter
-    neovim
-    mcfly
-    luajitPackages.luarocks-nix
-    tectonic
-
     pciutils
     btop
     nload