Split software configuration from hardware configuration to prepare for merging

2 files changed, 79 insertions, 67 deletions

diff --git a/host/Rory-devenv/configuration.nix b/host/Rory-devenv/configuration.nix
index ae1fe1a..108ff82 100755
--- a/host/Rory-devenv/configuration.nix
+++ b/host/Rory-devenv/configuration.nix
@@ -4,6 +4,7 @@
   imports =
     [
       ../../modules/base-server.nix
+      ./software.nix
     ];
 
   networking = {
@@ -18,73 +19,6 @@
     } ];
   };
 
-  systemd.tmpfiles.rules = [  "d /data/pg 0750 postgres postgres" ];
-
-  services = {
-    postgresql = {
-      enable = true;
-      package = pkgs.postgresql_14;
-      enableTCPIP = true;
-      authentication = pkgs.lib.mkOverride 10 ''
-        # TYPE, DATABASE, USER, ADDRESS, METHOD
-        local all all trust
-        host all all 127.0.0.1/32 trust
-        host all all ::1/128 trust
-        host all all 0.0.0.0/0 md5
-      '';
-      # initialScript = pkgs.writeText "backend-initScript" ''
-      #   CREATE ROLE nixcloud WITH LOGIN PASSWORD 'nixcloud' CREATEDB;
-      #   CREATE DATABASE nixcloud;
-      #   GRANT ALL PRIVILEGES ON DATABASE nixcloud TO nixcloud;
-      # '';
-
-      # we dont care about data here - this is a dev env
-      #dataDir = "/data/pg";
-      settings = {
-        "max_connections" = "100";
-        "shared_buffers" = "128MB";
-        "max_wal_size" = "1GB";
-        "min_wal_size" = "80MB";
-      };
-    };
-    xserver = {
-      enable = true;
-      desktopManager.plasma5 = {
-        enable = true;
-        #phonon-backend = "gstreamer";
-        excludePackages = with pkgs.libsForQt5; [ konsole print-manager khelpcenter oxygen okular gwenview elisa ];
-      };
-      displayManager.sddm.enable = true;
-      displayManager.sddm.autoLogin = {
-        enable = true;
-        user = "Rory";
-      };
-      libinput.enable = true;
-      videoDrivers = [ "qxl" ];
-    };
-    qemuGuest.enable = true;
-    spice-vdagentd.enable = true;
-  };
-
-  environment.systemPackages = with pkgs; [
-    zsh
-    gnome-console
-    kitty
-    feh
-    lsd
-    sshfs
-    cinnamon.nemo
-    firefox-bin
-    udisks
-    gparted
-    glxinfo
-    vscode-with-extensions
-    nodejs
-  ];
-  fonts.fonts = with pkgs; [
-    (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
-  ];
-
   system.stateVersion = "22.11"; # DO NOT EDIT!
 }
 
diff --git a/host/Rory-devenv/software.nix b/host/Rory-devenv/software.nix
new file mode 100755
index 0000000..2d26885
--- /dev/null
+++ b/host/Rory-devenv/software.nix
@@ -0,0 +1,78 @@
+{ config, pkgs, lib, ... }:
+
+{
+  imports =
+    [
+      ../../modules/base-server.nix
+    ];
+
+  systemd.tmpfiles.rules = [  "d /data/pg 0750 postgres postgres" ];
+
+  services = {
+    postgresql = {
+      enable = true;
+      package = pkgs.postgresql_14;
+      enableTCPIP = true;
+      authentication = pkgs.lib.mkOverride 10 ''
+        # TYPE, DATABASE, USER, ADDRESS, METHOD
+        local all all trust
+        host all all 127.0.0.1/32 trust
+        host all all ::1/128 trust
+        host all all 0.0.0.0/0 md5
+      '';
+      # initialScript = pkgs.writeText "backend-initScript" ''
+      #   CREATE ROLE nixcloud WITH LOGIN PASSWORD 'nixcloud' CREATEDB;
+      #   CREATE DATABASE nixcloud;
+      #   GRANT ALL PRIVILEGES ON DATABASE nixcloud TO nixcloud;
+      # '';
+
+      # we dont care about data here - this is a dev env
+      #dataDir = "/data/pg";
+      settings = {
+        "max_connections" = "100";
+        "shared_buffers" = "128MB";
+        "max_wal_size" = "1GB";
+        "min_wal_size" = "80MB";
+      };
+    };
+    xserver = {
+      enable = true;
+      desktopManager.plasma5 = {
+        enable = true;
+        #phonon-backend = "gstreamer";
+        excludePackages = with pkgs.libsForQt5; [ konsole print-manager khelpcenter oxygen okular gwenview elisa ];
+      };
+      displayManager.sddm.enable = true;
+      displayManager.sddm.autoLogin = {
+        enable = true;
+        user = "Rory";
+      };
+      libinput.enable = true;
+      videoDrivers = [ "qxl" ];
+    };
+    qemuGuest.enable = true;
+    spice-vdagentd.enable = true;
+  };
+
+  environment.systemPackages = with pkgs; [
+    zsh
+    gnome-console
+    kitty
+    feh
+    lsd
+    sshfs
+    cinnamon.nemo
+    firefox-bin
+    udisks
+    gparted
+    glxinfo
+    vscode-with-extensions
+    nodejs
+  ];
+  fonts.fonts = with pkgs; [
+    (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
+  ];
+
+  system.stateVersion = "22.11"; # DO NOT EDIT!
+}
+