♻️ Replace imports with function argument, hyprpanel does not follow nixpkgs, git push alias

modules/default.nix

@@ -1,6 +1,6 @@
 {
   imports = [
-    ./development.nix
+    ./development
     ./fonts.nix
     ./gaming
     ./gnome

modules/development.nix

@@ -1,42 +0,0 @@
-{ pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    # IDEs
-    jetbrains.rust-rover
-    jetbrains.webstorm
-    jetbrains.rider
-    vscodium # TODO set up extensions
-    # Tools
-    dotnet-sdk_9
-    dotnet-aspnetcore_9
-    git
-    rustup
-    nodejs_22
-    pnpm
-    just
-    gcc # Required for C, Rust and others
-    # Language servers
-    nixd
-    nil
-    # Formatters
-    nixfmt-rfc-style
-    treefmt
-    nodePackages.prettier
-    shfmt
-  ];
-
-  virtualisation.docker = {
-    enable = true;
-    storageDriver = "btrfs";
-    rootless = {
-      enable = true;
-      setSocketVariable = true;
-    };
-  };
-
-  services.ollama = {
-    enable = true;
-    acceleration = "cuda";
-  };
-}

modules/development/default.nix

@@ -0,0 +1,24 @@
+{ pkgs, ... }:
+
+{
+  imports = [
+    ./docker.nix
+    ./dotnet.nix
+    ./nix.nix
+    ./node.nix
+    ./ollama.nix
+    ./rust.nix
+  ];
+
+  environment.systemPackages = with pkgs; [
+    # IDEs
+    vscodium # TODO set up extensions
+    # Tools
+    git
+    just
+    unstable.libpq # Required for PostgreSQL
+    # Formatters
+    treefmt
+    shfmt
+  ];
+}

modules/development/docker.nix

@@ -0,0 +1,10 @@
+{
+  virtualisation.docker = {
+    enable = true;
+    storageDriver = "btrfs";
+    rootless = {
+      enable = true;
+      setSocketVariable = true;
+    };
+  };
+}

modules/development/dotnet.nix

@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    jetbrains.rider
+    dotnet-sdk_9
+    dotnet-aspnetcore_9
+  ];
+}

modules/development/nix.nix

@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    # Language servers
+    nixd
+    nil
+    # Formatters
+    nixfmt-rfc-style
+  ];
+}

modules/development/node.nix

@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    jetbrains.webstorm
+    nodejs_22
+    pnpm
+    nodePackages.prettier
+  ];
+}

modules/development/ollama.nix

@@ -0,0 +1,6 @@
+{
+  services.ollama = {
+    enable = true;
+    acceleration = "cuda";
+  };
+}

modules/development/rust.nix

@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    jetbrains.rust-rover
+    rustup
+    gcc
+  ];
+}

modules/fonts.nix

@@ -1,23 +1,19 @@
-{ pkgs, ... }:
+{ pkgs, theme, ... }:
 
 {
   environment.systemPackages = with pkgs; [
     font-awesome # Icons
   ];
 
-  fonts =
-    let
-      theme = import ../theme.nix;
-    in
-    {
-      fontconfig.enable = true;
-      packages = with pkgs; [
-        (nerdfonts.override { fonts = [ theme.nerdFont ]; })
-        jetbrains-mono
-        # The line below will replace the lines above in 25.05
-        # nerd-fonts.jetbrains-mono
-        font-awesome
-      ];
-    };
+  fonts = {
+    fontconfig.enable = true;
+    packages = with pkgs; [
+      (nerdfonts.override { fonts = [ theme.nerdFont ]; })
+      jetbrains-mono
+      # The line below will replace the lines above in 25.05
+      # nerd-fonts.jetbrains-mono
+      font-awesome
+    ];
+  };
 
 }

modules/gnome/nautilus.nix

@@ -1,7 +1,5 @@
-{ pkgs, ... }:
-let
-  common = import ../../common.nix;
-in
+{ pkgs, common, ... }:
+
 {
   environment.systemPackages = with pkgs; [
     nautilus

modules/locale.nix

@@ -1,9 +1,8 @@
-# TODO move locale config for hyprland here
+{ common, ... }:
 let
   utf-8 = "UTF-8";
   en = "en_GB.${utf-8}";
   nb = "nb_NO.${utf-8}";
-  common = import ../common.nix;
 in
 {
   # Configure console keymap

modules/networking.nix

@@ -1,6 +1,5 @@
-let
-  common = import ../common.nix;
-in
+{ common, ... }:
+
 {
   networking = {
     networkmanager.enable = true;

modules/sddm.nix

@@ -1,6 +1,5 @@
-{ pkgs, ... }:
+{ pkgs, theme, ... }:
 let
-  theme = import ../theme.nix;
   flavor = theme.flavor;
 in
 {