Switch back to Vim

- Change default editor back to vim since doom-emacs is broken at the
  moment
- Conditionally include emacs or vim nix files in configuration.nix
- User username to find dwm-flexipatch path on system
- Add tree and btop to miscellaneous system packages
- Add some cli tools like just and git to home-manager packages
- Add more XDG env vars for config and cache

flake.nix

@@ -39,7 +39,7 @@
         theme = "dracula";            # Selected theme from themes directory
         browser = "vivaldi";          # Default browser
         term = "kitty";               # Default terminal command
-        editor = "emacsclient";       # Default editor
+        editor = "vim";               # Default editor
         spawnEditor =
           if (editor == "emacsclient") then
             "emacsclient -c -a 'emacs'"

profiles/personal/home.nix

@@ -12,6 +12,7 @@
   imports = [
     (../../user/browser + "/${userSettings.browser}.nix")
     ../../user/development/default.nix
+    (if userSettings.editor == "emacsclient" then ../../user/development/doom-emacs.nix else (../../user/development + "/${userSettings.editor}.nix"))
     ../../user/gaming/default.nix
     ../../user/launcher/default.nix
     ../../user/media/default.nix

system/gui/dwm.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, userSettings, ... }:
 
 {
   imports = [
@@ -10,7 +10,7 @@
   services.xserver.windowManager.dwm = {
     enable = true;
     package = pkgs.dwm.overrideAttrs {
-      src = ~/.config/dwm-flexipatch;
+      src = (/home + "/${userSettings.username}" + /.config/dwm-flexipatch);
       buildInputs = with pkgs; [
         xorg.libX11.dev
         xorg.libXinerama

system/utilities/miscellaneous.nix

@@ -10,5 +10,7 @@
     rsync
     cryptsetup
     home-manager
+    tree
+    btop
   ];
 }

user/development/cli.nix

@@ -0,0 +1,8 @@
+{ config, lib, pkgs, ... }:
+
+{
+  home.packages = (with pkgs; [
+    git
+    just
+  ]);
+}

user/development/default.nix

@@ -1,8 +1,8 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, userSettings, ... }:
 
 {
   imports = [
     ./vscode.nix
-    ./doom-emacs.nix
+    ./cli.nix
   ];
 }

user/development/doom-emacs.nix

@@ -1,8 +1,8 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, userSettings, ... }:
 
 {
   programs.doom-emacs = {
     enable = true;
-    doomPrivateDir = ~/.config/doom-emacs-config;
+    doomPrivateDir = (/home + "/${userSettings.username}" + /.config/doom-emacs-config);
   };
 }

user/development/vim.nix

@@ -0,0 +1,7 @@
+{ config, lib, pkgs, ... }:
+
+{
+  home.packages = (with pkgs; [
+    vim
+  ]);
+}

user/utilities/xdg.nix

@@ -15,6 +15,8 @@
     publicShare = null;
     extraConfig = {
       XDG_GAME_DIR = "${config.home.homeDirectory}/Games";
+      XDG_CONFIG_HOME = "${config.home.homeDirectory}/.config";
+      XDG_CACHE_HOME = "${config.home.homeDirectory}/.cache";
     };
   };
   xdg.mime.enable = true;