@@ -33,11 +33,13 @@ system.stateVersion = "24.05";
             })
 
             ./profiles/common/base.nix
+            ./profiles/common/dev.nix
             ./profiles/common/locale.nix
             ./profiles/common/networking.nix
 
             ./profiles/runestone/hardware-configuration.nix
             ./profiles/runestone/base.nix
+            ./profiles/runestone/borg.nix
             ./profiles/runestone/postgres.nix
           ];
         };
@@ -64,6 +66,7 @@ disko.nixosModules.disko
             ./profiles/onyx/disks.nix
 
             ./profiles/common/base.nix
+            ./profiles/common/dev.nix
             ./profiles/common/locale.nix
             ./profiles/common/networking.nix
 

@@ -0,0 +1,16 @@
+{ pkgs, unstable-pkgs, ... }:
+{
+  environment.systemPackages =
+    with pkgs;
+    [
+      volta
+      rustup
+      uv
+      ffmpeg-full
+    ]
+    ++ [
+      unstable-pkgs.zed-editor.remote_server
+    ];
+
+  virtualisation.podman.enable = true;
+}

@@ -1,6 +1,5 @@
 {
   pkgs,
-  user-pkgs,
   unstable-pkgs,
   ...
 }:

@@ -3,7 +3,6 @@ {
   programs.firefox.enable = true;
   programs.firefox.package = unstable-pkgs.firefox-devedition-bin;
 
-
   environment.systemPackages =
     (with pkgs; [
       vscode

@@ -33,7 +33,6 @@
   environment.systemPackages =
     (with pkgs; [
       vscode
-      nixpkgs-fmt
       nixfmt
       foot
       ffmpeg
@@ -44,30 +43,9 @@ # user-pkgs.berkeley-mono
       unstable-pkgs.nixd
     ];
 
-  users.users.charlotte.packages =
-    (with pkgs; [
-      stow
-      volta
-      rustup
-      uv
-    ])
-    ++ [
-      unstable-pkgs.lan-mouse
-      unstable-pkgs.zed-editor
-      unstable-pkgs.zed-editor.remote_server
-    ];
-
-  users.users.borg = {
-    isSystemUser = true;
-    group = "borg";
-    description = "borg backup user";
-    home = "/home/borg";
-    shell = pkgs.bash;
-  };
-  users.groups.borg = {};
-
-  users.users.borg.packages = [
-    pkgs.borgbackup
+  users.users.charlotte.packages = [
+    pkgs.stow
+    unstable-pkgs.zed-editor.remote_server
   ];
 
   services.cloudflare-warp.enable = true;

@@ -0,0 +1,15 @@
+{ pkgs, ... }:
+{
+  users.users.borg = {
+    isSystemUser = true;
+    group = "borg";
+    description = "borg backup user";
+    home = "/home/borg";
+    shell = pkgs.bash;
+  };
+  users.groups.borg = { };
+
+  users.users.borg.packages = [
+    pkgs.borgbackup
+  ];
+}