improvements

common/bash.nix

@@ -3,30 +3,32 @@
   pkgs,
   ...
 }: {
-  programs.direnv.enable = true;
-  programs.command-not-found.enable = false;
+  programs = {
+    direnv.enable = true;
+    command-not-found.enable = false;
 
-  programs.bash = {
-    promptInit = ''
-      if [[ -v SSH_CLIENT && -v SSH_CONNECTION && -v SSH_TTY ]]; then
-        PS1='\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
-      else
-        PS1='\[\033[01;34m\]\w\[\033[00m\]\$ '
-      fi
-    '';
-    interactiveShellInit = ''
-      shopt -s histappend
-      HISTCONTROL='ignoredups:ignorespace'
-      HISTSIZE=1000
-      HISTFILESIZE=10000
+    bash = {
+      promptInit = ''
+        if [[ -v SSH_CLIENT && -v SSH_CONNECTION && -v SSH_TTY ]]; then
+          PS1='\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
+        else
+          PS1='\[\033[01;34m\]\w\[\033[00m\]\$ '
+        fi
+      '';
+      interactiveShellInit = ''
+        shopt -s histappend
+        HISTCONTROL='ignoredups:ignorespace'
+        HISTSIZE=1000
+        HISTFILESIZE=10000
 
-      shopt -s globstar
-      shopt -s nullglob
-      shopt -s extglob
+        shopt -s globstar
+        shopt -s nullglob
+        shopt -s extglob
 
-      shopt -s checkwinsize
+        shopt -s checkwinsize
 
-      eval "$(${lib.getExe pkgs.direnv} hook bash)"
-    '';
+        eval "$(${lib.getExe pkgs.direnv} hook bash)"
+      '';
+    };
   };
 }

common/default.nix

@@ -6,6 +6,8 @@
     ./dbus.nix
     ./fs.nix
     ./fwupd.nix
+    ./git.nix
+    ./helix.nix
     ./nix.nix
     ./opengl.nix
     ./openssh.nix

common/git.nix

@@ -0,0 +1,6 @@
+{
+  programs.git = {
+    enable = true;
+    lfs.enable = true;
+  };
+}

common/helix.nix

@@ -0,0 +1,15 @@
+{
+  lib,
+  pkgs,
+  ...
+}: let
+  package = pkgs.helix;
+in {
+  environment = {
+    systemPackages = [package];
+    variables = {
+      EDITOR = lib.getExe package;
+      VISUAL = lib.getExe package;
+    };
+  };
+}