File cleanup

home/tui/config/lazygit.nix

@@ -1,21 +0,0 @@
-{
-  gui = {
-    showFileTree = true;
-    showCommandLog = false;
-    showIcons = true;
-    theme = {
-      lightTheme = false;
-      activeBorderColor = ["#a6da95" "bold"];
-      inactiveBorderColor = ["#cad3f5"];
-      optionsTextColor = ["#8aadf4"];
-      selectedLineBgColor = ["#363a4f"];
-      selectedRangeBgColor = ["#363a4f"];
-      cherryPickedCommitBgColor = ["#8bd5ca"];
-      cherryPickedCommitFgColor = ["#8aadf4"];
-      unstagedChangesColor = ["red"];
-    };
-  };
-  update.method = "never";
-  promptToReturnFromSubprocess = false;
-  notARepository = "quit";
-}

home/tui/config/tmux.conf

@@ -1,21 +0,0 @@
-version_pat='s/^tmux[^0-9]*([.0-9]+).*/\1/p'
-
-is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
-    | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"
-tmux bind-key -n C-h if-shell "$is_vim" "send-keys C-h" "select-pane -L"
-tmux bind-key -n C-j if-shell "$is_vim" "send-keys C-j" "select-pane -D"
-tmux bind-key -n C-k if-shell "$is_vim" "send-keys C-k" "select-pane -U"
-tmux bind-key -n C-l if-shell "$is_vim" "send-keys C-l" "select-pane -R"
-tmux_version="$(tmux -V | sed -En "$version_pat")"
-tmux setenv -g tmux_version "$tmux_version"
-
-tmux if-shell -b '[ "$(echo "$tmux_version < 3.0" | bc)" = 1 ]' \
-  "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\'  'select-pane -l'"
-tmux if-shell -b '[ "$(echo "$tmux_version >= 3.0" | bc)" = 1 ]' \
-  "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\\\'  'select-pane -l'"
-
-tmux bind-key -T copy-mode-vi C-h select-pane -L
-tmux bind-key -T copy-mode-vi C-j select-pane -D
-tmux bind-key -T copy-mode-vi C-k select-pane -U
-tmux bind-key -T copy-mode-vi C-l select-pane -R
-tmux bind-key -T copy-mode-vi C-\\ select-pane -l

home/tui/default.nix

@@ -1,4 +1,4 @@
 {pkgs, ...}: {
-  imports = [./neovim.nix ./lazygit.nix];
+  imports = [./neovim ./lazygit.nix];
   home.packages = [pkgs.ranger];
 }

home/tui/lazygit.nix

@@ -1,6 +1,26 @@
 {...}: {
   programs.lazygit = {
     enable = true;
-    settings = import ./config/lazygit.nix;
+    settings = {
+      gui = {
+        showFileTree = true;
+        showCommandLog = false;
+        showIcons = true;
+        theme = {
+          lightTheme = false;
+          activeBorderColor = ["#a6da95" "bold"];
+          inactiveBorderColor = ["#cad3f5"];
+          optionsTextColor = ["#8aadf4"];
+          selectedLineBgColor = ["#363a4f"];
+          selectedRangeBgColor = ["#363a4f"];
+          cherryPickedCommitBgColor = ["#8bd5ca"];
+          cherryPickedCommitFgColor = ["#8aadf4"];
+          unstagedChangesColor = ["red"];
+        };
+      };
+      update.method = "never";
+      promptToReturnFromSubprocess = false;
+      notARepository = "quit";
+    };
   };
 }

home/tui/tmux.nix

@@ -1,20 +1,16 @@
 {pkgs, ...}: {
-  imports = [./common.nix];
   programs.tmux = {
     enable = true;
     clock24 = true;
-    extraConfig =
+    extraConfig = builtins.readFile (
-      builtins.readFile ./config/tmux.conf
+      pkgs.fetchFromGitHub
-      + "\n"
+      {
-      + builtins.readFile (
+        owner = "catppuccin";
-        pkgs.fetchFromGitHub
+        repo = "tmux";
-        {
+        rev = "4e48b09a76829edc7b55fbb15467cf0411f07931";
-          owner = "catppuccin";
+        sha256 = "bXEsxt4ozl3cAzV3ZyvbPsnmy0RAdpLxHwN82gvjLdU=";
-          repo = "tmux";
+      }
-          rev = "4e48b09a76829edc7b55fbb15467cf0411f07931";
+      + "/catppuccin-macchiato.tmuxtheme"
-          sha256 = "bXEsxt4ozl3cAzV3ZyvbPsnmy0RAdpLxHwN82gvjLdU=";
+    );
-        }
-        + "/catppuccin-macchiato.tmuxtheme"
-      );
   };
 }