Merge branch 'main' of github.com:DannyDannyDanny/dotfiles

nixos/fish.nix

@@ -3,11 +3,13 @@
 {
   programs.fish = {
     enable = true;
+    shellAliases = {
+      theme = "bash ~/dotfiles/bashscripts/wsl_theme.sh";
+    };
     interactiveShellInit = ''
       fish_vi_key_bindings
       set fish_greeting 🐟: (set_color yellow; date +%T; set_color green; date --iso-8601; set_color normal)
 
-
       # name: Default
       # author: Lily Ballard
       # edits: DannyDannyDanny

nixos/neovim.nix

@@ -11,9 +11,29 @@
         set go=a
         set mouse=a
         set nohlsearch
+        let mapleader=","
 
-        set bg=dark
-        " set bg=light
+        lua << EOF
+          local config_file = os.getenv("HOME")..'/.local/share/nvim_color_scheme'
+          local f=io.open(config_file, "r")
+          if f~=nil then 
+              local system_theme = f:read()
+              -- f:close()
+              io.close(f)
+              if system_theme == 'dark' then
+                  vim.cmd("set bg=dark")
+              elseif system_theme == 'light' then
+                  vim.cmd("set bg=light")
+              else
+                  print('warning: expected value "light" or "dark"')
+                  print('  got:', system_theme)
+                  print('  expected path:', file)
+              end
+          else 
+              print('warning: nvim color scheme not found')
+              print('  expected path:', file)
+          end
+        EOF
 
         colorscheme gruvbox
 
@@ -34,6 +54,9 @@
         " Replace-all is aliased to S.
         nnoremap S :%s//g<Left><Left>
 
+        " save file with ,w
+        map <leader>w :w<cr><Space>
+
         " spellcheck
         set spell spelllang=en_us
         setlocal spell! spelllang=en_us
@@ -43,6 +66,8 @@
       packages.nix = with pkgs.vimPlugins; {
         start = [
           vim-surround  # shortcuts for setting () {} etc.
+          vim-gitgutter # git diff in sign column
+          # vim-airline   # nice and light status bar # doesn't work nicely with tmux
           # coc-nvim coc-git coc-highlight coc-python coc-rls coc-vetur coc-vimtex coc-yaml coc-html coc-json # auto completion
           vim-nix       # nix highlight
           vimtex        # latex stuff