lots of dot changes

.gitignore

@@ -5,7 +5,6 @@ tags*
 vim/view
 .netrwhist
 chromedriver
-config/fish/fishd.*
 emacs.d/elpa
 midweek*
 watercooler*

__archive/shell_aliases

@@ -0,0 +1 @@
+shell_aliases

__archive/shell_funcs

@@ -0,0 +1,9 @@
+# Jupyter lab!
+function lab () {
+  source ~/JUPYTER/bin/activate
+  cd ~/scratch
+  powerpip
+  pip install -r jupyter_requirements.txt
+  jupyter lab
+  deactivate
+}

home/config/i3/config

@@ -83,8 +83,21 @@ set $ws5 5
 set $ws6 6
 set $ws7 7
 set $ws8 8
+set $ws9 9
+set $ws9 9
 
 # switch to workspace
+workspace 1 output DP-4
+workspace 2 output DP-4
+workspace 3 output DP-4
+workspace 4 output DP-4
+workspace 5 output DP-5
+workspace 6 output DP-5
+workspace 7 output DP-1
+workspace 8 output DP-1
+workspace 9 output DP-1
+workspace 10 output DP-1
+
 bindsym $mod+1 workspace $ws1
 bindsym $mod+2 workspace $ws2
 bindsym $mod+3 workspace $ws3
@@ -93,6 +106,8 @@ bindsym $mod+5 workspace $ws5
 bindsym $mod+6 workspace $ws6
 bindsym $mod+7 workspace $ws7
 bindsym $mod+8 workspace $ws8
+bindsym $mod+9 workspace $ws9
+bindsym $mod+0 workspace $ws10
 
 # Move focused container to workspace
 bindsym $mod+Ctrl+1 move container to workspace $ws1
@@ -103,6 +118,8 @@ bindsym $mod+Ctrl+5 move container to workspace $ws5
 bindsym $mod+Ctrl+6 move container to workspace $ws6
 bindsym $mod+Ctrl+7 move container to workspace $ws7
 bindsym $mod+Ctrl+8 move container to workspace $ws8
+bindsym $mod+Ctrl+9 move container to workspace $ws9
+bindsym $mod+Ctrl+0 move container to workspace $ws10
 
 # Move to workspace with focused container
 bindsym $mod+Shift+1 move container to workspace $ws1; workspace $ws1
@@ -113,6 +130,8 @@ bindsym $mod+Shift+5 move container to workspace $ws5; workspace $ws5
 bindsym $mod+Shift+6 move container to workspace $ws6; workspace $ws6
 bindsym $mod+Shift+7 move container to workspace $ws7; workspace $ws7
 bindsym $mod+Shift+8 move container to workspace $ws8; workspace $ws8
+bindsym $mod+Shift+9 move container to workspace $ws9; workspace $ws9
+bindsym $mod+Shift+0 move container to workspace $ws0; workspace $ws0
 
 # Open specific applications in floating mode
 for_window [title="alsamixer"] floating enable border pixel 1

home/config/nvim/init.lua

@@ -126,7 +126,7 @@ return require('packer').startup(function(use)
   })
 
 	require("nvim-treesitter.configs").setup({
-		highlight = { enable = false, disable = { "lua" } },
+		highlight = { enable = true, disable = { "lua" } },
 		indent = { enable = true },
 		refactor = { highlight_definitions = { enable = true } },
 		incremental_selection = { enable = true },

home/config/nvim/legacy.vim

@@ -5,7 +5,7 @@ let mapleader = " "
 set autoindentz
 set preserveindent
 set copyindent
-set shell=~/.nix-profile/bin/fish
+set shell=~/.nix-profile/bin/zsh
 
 " Set Colors
 if (has("termguicolors"))
@@ -83,3 +83,15 @@ nmap <silent> <leader>mp :Mypy<CR>
 " Rust tags
 autocmd BufRead *.rs :setlocal tags=./rusty-tags.vi;/
 autocmd BufWritePost *.rs :silent! exec "!rusty-tags vi --quiet --start-dir=" . expand('%:p:h') . "&" | redraw!
+
+
+highlight Cursor guibg=#5f87af ctermbg=67
+highlight iCursor guibg=#ffffaf ctermbg=229
+highlight rCursor guibg=#d70000 ctermbg=124
+
+set guicursor=n-v-c:block-Cursor/lCursor
+            \,i-ci-ve:ver100-iCursor
+            \,r-cr:block-rCursor
+            \,o:hor50-Cursor/lCursor
+            \,sm:block-iCursor
+            \,a:blinkwait1000-blinkon500-blinkoff250

home/config/nvim/lua/settings.lua

@@ -1,7 +1,7 @@
 vim.g.mapleader = " "
 vim.g.maplocalleader = " "
 
-vim.opt.shell = "/usr/local/bin/fish"
+vim.opt.shell = "~/.nix-profile/bin/zsh"
 
 vim.opt.history = 1000
 vim.opt.termguicolors = true
@@ -128,3 +128,5 @@ vim.api.nvim_set_keymap("n", "<F2>",":SearchSession<CR>", {silent = true })
 vim.api.nvim_set_keymap("n", "<F8>", ":Tagbar<CR>", {silent = true })
 
 
+
+

home/gitconfig

@@ -39,8 +39,6 @@
     logtree=  "log --graph --oneline --decorate --all" # show a tree with branches merging
     noop="!git commit --allow-empty -m 'no op'"
     ob = "!$EDITOR $(git diff --name-only origin/main)" # Open all files in editor that differ between origin/main and staged/unstaged
-    amanda = "!git commit --amend --author='Amanda P McDermott <amanda@tidelift.com>'"
-    oscar = "!git commit --amend --author='Oscar Spencer <oscar@tidelift.com>'"
     od = "!$EDITOR $(git diff --name-only HEAD)" # Open all changed files differ from current HEAD
     p = push
     recent = "!git for-each-ref --format=\"%(committerdate:relative) | %(refname)\" --sort=-committerdate refs/heads | sed '/main/d' | head -n 15" # get the most 10 recent branches worked on

home/shell_aliases

@@ -6,3 +6,4 @@ alias gp='git push -u'
 alias ls="exa -lhFgxUm --git --time-style long-iso --group-directories-first"
 alias vimini="vim ~/.config/nvim/init.vim"
 alias vim=nvim
+alias tree=tree -I 'node_modules|venv'

home/shell_funcs

@@ -46,12 +46,4 @@ function new_dock_space (){
     defaults write com.apple.dock persistent-apps -array-add '{"tile-type"="spacer-tile";}'; killall Dock
 }
 
-# Jupyter lab!
-function lab () {
-  source ~/JUPYTER/bin/activate
-  cd ~/scratch
-  powerpip
-  pip install -r jupyter_requirements.txt
-  jupyter lab
-  deactivate
-}
+

home/ssh/vostro.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDO+wxqydmjwKarrCKTlcBMTOd1WfAaS7UQkci5llnwi tyrel@vostro

home/zshrc

@@ -0,0 +1,4 @@
+nitch
+autoload -Uz promptinit
+promptinit
+prompt steeef

hosts/_common/home.nix

@@ -14,7 +14,6 @@
       fzf
       fd
       go
-      nodejs
       p7zip
       ripgrep
       tree-sitter

hosts/_common/programs.nix

@@ -39,33 +39,6 @@
       '';
     };
 
-    programs.fish = {
-      enable = true;
-      plugins = with pkgs.fishPlugins; [
-          {
-            name = "fish-ssh-agent";
-            src = pkgs.fetchFromGitHub {
-              owner = "danhper";
-              repo = "fish-ssh-agent";
-	      rev = "fd70a2afdd03caf9bf609746bf6b993b9e83be57";
-	      sha256 = "e94Sd1GSUAxwLVVo5yR6msq0jZLOn2m+JZJ6mvwQdLs=";
-            };
-          }
-
-          {
-            name = "nix-env.fish";
-            src = pkgs.fetchFromGitHub {
-              owner = "lilyball";
-              repo = "nix-env.fish";
-	      rev = "7b65bd228429e852c8fdfa07601159130a818cfa";
-	      sha256 = "RG/0rfhgq6aEKNZ0XwIqOaZ6K5S4+/Y5EEMnIdtfPhk=";
-            };
-          }
-      ];
-    };
-    
-
-
     programs.htop = {
       enable = true;
     };

hosts/_common/xdg.nix

@@ -10,8 +10,8 @@
           recursive = true;
       };
       "nvim/legacy.vim".source = config.lib.file.mkOutOfStoreSymlink ../../home/config/nvim/legacy.vim;
-      "fish" = {
-        source = ../../home/config/fish;
+      "htop" = {
+        source = ../../home/config/htop;
         recursive = true;
       };
     };