Fix dev-lt-63 env

shared/home/bash.nix

@@ -16,11 +16,49 @@ in with lib; {
   config = {
 
     # Configure the shell itself
-    programs.bash = {
+    programs.bash = with pkgs; {
       enable = true;
+      historyIgnore = [
+        "poweroff"
+        "reboot"
+        "exit"
+        "exa"
+        "fg"
+        "cd"
+        "ls"
+        "z"
+      ];
+      historyControl = [
+        "ignorespace"
+        "ignoredups"
+      ];
+      historySize = 100000;
+      sessionVariables = {
+        "EDITOR" = "${helix}/bin/hx";
+      };
       shellAliases = {
+        # General aliases
         ":q" = "exit";
-        "t"  = "exa -T";
+        "t"  = "${exa}/bin/exa -T";
+        ".." = "cd ..";
+
+        # Git command aliases
+        "rebase"      = "git rebase -i --autosquash --committer-date-is-author-date";
+        "uncommit"    = "git reset --soft HEAD~";
+
+        # Git selectors
+        ".changed"    = "git diff --name-only";
+        ".conflicted" = "git status --porcelain | rg '^UU' | sd '^.. ' ''";
+        ".branches"   = "git branch -a | rg -v '\*|HEAD' | sd 'remotes/origin/' '' | sd '^ *' '' | uniq";
+
+        # File extension selectors
+        ".hs"   = "${fd}/bin/fd -e hs";
+        ".nix"  = "${fd}/bin/fd -e nix";
+        ".py"   = "${fd}/bin/fd -e py";
+        ".rs"   = "${fd}/bin/fd -e rs";
+        ".sh"   = "${fd}/bin/fd -e sh";
+        ".yaml" = "${fd}/bin/fd -e yaml -e yml";
+        ".yml"  = ".yaml";
       } // cfg.extraAliases;
     };
 

shared/home/default.nix

@@ -5,11 +5,11 @@
   imports = [
     ./bash.nix
     ./git.nix
-    ./nix.nix
     ./mpd.nix
     ./programs.nix
     ./theme.nix
     ./gui
+    ./nix
   ];
 
   options.isNixos = lib.mkOption {
@@ -17,6 +17,8 @@
     default = false;
   };
 
-  config.theme = import ../../themes/lean.nix;
+  config = {
+    theme = import ../../themes/lean.nix;
+  };
 
 }

shared/home/gui/sway.nix

@@ -31,6 +31,8 @@ in with lib; {
   config = mkIf (cfg.enable) {
 
     home.packages = with pkgs; [
+      kitty
+      swaylock
       wl-clipboard
       (writeScriptBin "c" ''
         ${wl-clipboard}/bin/wl-copy
@@ -40,9 +42,9 @@ in with lib; {
       '')
     ];
 
-    programs.swaylock.enable = true;
+    # programs.swaylock.enable = true;
+    # services.swayidle.enable = true;
     programs.waybar.enable = true;
-    services.swayidle.enable = true;
 
     wayland.windowManager.sway = {
       # This is all required to get it to not die.
@@ -54,7 +56,7 @@ in with lib; {
         output."*".bg = "${../../data/wallpaper.jpg} fill";
         input."type:keyboard".xkb_options = "caps:escape";
 
-        terminal = "${pkgs.kitty}/bin/kitty";
+        terminal = "kitty --single-instance";
 
         # Directional keys
         modifier = mod;
@@ -83,9 +85,11 @@ in with lib; {
             "${mod}+Alt+a" = "layout toggle stacking splitv";
             "${mod}+Alt+s" = "layout toggle tabbed splith";
 
-            "${mod}+Return" = "exec ${terminal}";
+            "${mod}+q"       = "exec ${pkgs.foot}/bin/foot";
-            "${mod}+Escape" = "exec ${pkgs.swaylock}/bin/swaylock";
+            "${mod}+Return"  = "exec ${terminal}";
-            "${mod}+Tab"    = "exec ${pkgs.firefox}/bin/firefox";
+            "${mod}+Escape"  = "exec swaylock";
+            "${mod}+Tab"     = "exec ${pkgs.firefox}/bin/firefox";
+            "${mod}+Alt+Tab" = "exec ${pkgs.google-chrome}/bin/google-chrome-stable";
 
             "${mod}+Backspace" = "mode kill";
           }

shared/home/gui/term.nix

@@ -16,7 +16,7 @@ let theme = config.theme; in {
     font = {
       name = "Fira Code";
       package = pkgs.fira-code;
-      size = 8.5;
+      size = 10.5;
     };
   };
 

shared/home/nix.nix

@@ -1,19 +0,0 @@
-{ lib, pkgs, config, ... }:
-
-(lib.mkIf (!config.isNixos) {
-  nix.package = pkgs.nix;
-}) // {
-
-  nix.settings = {
-    experimental-features = [ "nix-command" "flakes" ];
-  };
-
-  nixpkgs.config = {
-    allowUnfree = true;
-  };
-
-  nixpkgs.overlays = [
-    (import ../overlay.nix)
-  ];
-
-}

shared/home/nix/default.nix

@@ -0,0 +1,20 @@
+{ lib, pkgs, config, ... }:
+
+(lib.mkIf (!config.isNixos) {
+
+  nix = {
+    enable = true;
+    package = pkgs.nix;
+    settings = {
+      experimental-features = [ "nix-command" "flakes" ];
+    };
+  };
+
+  nixpkgs.config = import ./nix-config.nix;
+  nixpkgs.overlays = [
+    (import ../../overlay.nix)
+  ];
+
+  xdg.configFile."nixpkgs/config.nix".source = ./nix-config.nix;
+
+})

shared/home/nix/nix-config.nix

@@ -0,0 +1,3 @@
+{
+  allowUnfree = true;
+}

shared/home/programs.nix

@@ -5,7 +5,11 @@
 
 { pkgs, ... }: {
 
-  home.packages = (import ../env.nix pkgs);
+  home.packages = (with pkgs; [
+    eva
+    hyperfine
+    du-dust
+  ]) ++ (import ../env.nix pkgs);
 
   # CLI for accessing my passwords
   programs.rbw = {

shared/overlay.nix

@@ -6,4 +6,4 @@ with (import ./lib.nix final); {
   github-web    = webApp "github"    "https://github.com";
   bitwarden-web = webApp "bitwarden" "https://vault.steph.tools";
   hoogle-web    = webApp "hoogle"    "https://hoogle.haskell.org";
-}
+}

system/dev-lt-63/home.nix

@@ -11,6 +11,8 @@
     home-manager.enable = false;
   };
 
+  custom.gui.sway.enable = true;
+
   xdg.systemDirs.data = [ "/usr/share" "/usr/local/share" ];
   fonts.fontconfig.enable = true;