feat: update-nix-fetchgit stuff

configuration.nix

@@ -40,6 +40,8 @@
           chainloader /EFI/Microsoft/Boot/bootmgfw.efi
         }
       '';
+      theme = pkgs.nixos-grub2-theme;
+
       version = 2;
     };
   };

dotfiles/fish/config.fish

@@ -14,3 +14,7 @@ function fish_user_key_bindings
   bind -M insert -m default jk 'commandline -f repaint'
   bind -M insert -m default kj 'commandline -f repaint'
 end
+
+# direnv hook, aparently
+# https://direnv.net/docs/hook.html
+direnv hook fish | source

dotfiles/kmonad/keymap.kbd

@@ -1,8 +1,8 @@
 (defcfg
   ;; For Linux
   ;; input  (device-file "$DEVICE") ;; gets dynamically replaced by nix
-  input  (device-file "/dev/input/by-path/pci-0000:00:14.0-usb-0:5:1.0-event-kbd") 
+  ;; input  (device-file "/dev/input/by-path/pci-0000:00:14.0-usb-0:1:1.0-event-kbd") 
-  ;; input  (device-file "/dev/input/by-path/platform-i8042-serio-0-event-kbd") 
+  input  (device-file "/dev/input/by-path/platform-i8042-serio-0-event-kbd") 
   output (uinput-sink "My KMonad output"
     ;; To understand the importance of the following line, see the section on
     ;; Compose-key sequences at the near-bottom of this file.

dotfiles/neovim/lua/lspconfig/server_configurations/agda.lua

@@ -1,12 +0,0 @@
-local bin_name = 'agda-language-server'
-local cmd = {bin_name, '--stdio'}
-
-if vim.fn.has 'win32' == 1 then cmd = {'cmd.exe', '/C', bin_name, '--stdio'} end
-
-return {
-    default_config = {
-        cmd = cmd,
-        filetypes = {'agda'}
-        -- root_dir = util.root_pattern('bower.json', 'psc-package.json', 'spago.dhall'),
-    }
-}

dotfiles/neovim/lua/my/helpers.lua

@@ -1,21 +1,21 @@
 local M = {}
 
-function M.global(name, value)
+function M.global(name, value) vim.g[name] = value end
-    vim.g[name] = value
-end
 
 function M.mergeTables(t1, t2)
     local t3 = {}
 
-    if t1 ~= nil then
+    if t1 ~= nil then for k, v in pairs(t1) do t3[k] = v end end
-      for k, v in pairs(t1) do t3[k] = v end
-    end
 
-    if t2 ~= nil then
+    if t2 ~= nil then for k, v in pairs(t2) do t3[k] = v end end
-      for k, v in pairs(t2) do t3[k] = v end
-    end
 
     return t3
 end
 
+function M.saveCursor(callback)
+    local cursor = vim.api.nvim_win_get_cursor()
+    callback()
+    vim.api.nvim_win_set_cursor(cursor)
+end
+
 return M

dotfiles/neovim/lua/my/helpers/update-nix-fetchgit.lua

@@ -0,0 +1,9 @@
+local M = {}
+
+function M.update()
+    require("my.helpers").saveCursor(function()
+        vim.cmd(":%!update-nix-fetchgit")
+    end)
+end
+
+return M

dotfiles/neovim/lua/my/keymaps.lua

@@ -1,5 +1,6 @@
 local helpers = require("my.helpers")
 local arpeggio = require("my.plugins.arpeggio")
+local au = require("my.helpers.augroup")
 
 local M = {}
 
@@ -31,6 +32,8 @@ function M.setup()
         arpeggio.chord("i", "<Leader>k", "<C-k><cr>") -- Rebind digraph insertion to leader+k
         arpeggio.chord("inv", "<Leader>a", "<C-6><cr>") -- Rebind switching to the last pane using leader+a
     end
+
+    return M
 end
 
 return M

dotfiles/neovim/lua/my/plugins/comment.lua

@@ -1,7 +1,7 @@
 local A = require("my.helpers.augroup")
 local M = {}
 
-local extraCommentStrings = {nix = "# %s", lean = "/- %s -/"}
+local extraCommentStrings = {nix = "# %s", lean = "/- %s -/", bkf = "-- %s"}
 
 -- Update comments for certain languages
 local function setCommentString(extension, commentString)

dotfiles/neovim/lua/my/plugins/lspconfig.lua

@@ -1,3 +1,5 @@
+local A = require("my.plugins.arpeggio")
+
 local M = {}
 
 local function map(buf, mode, lhs, rhs, opts)
@@ -53,6 +55,12 @@ local function on_attach_typescript(client, bufnr)
     M.on_attach(client, bufnr)
 end
 
+local function on_attach_lua()
+    A.chordSilent("n", "ug",
+                  ":lua require('my.helpers.update-nix-fetchgit').update()",
+                  {settings = "b"})
+end
+
 -- General server config
 local servers = {
     tsserver = {on_attach = on_attach_typescript},
@@ -89,7 +97,7 @@ local servers = {
             }
         }
     },
-    rnix = {},
+    rnix = {on_attach = on_attach_lua},
     hls = {
         haskell = {
             -- set formatter

dotfiles/neovim/syntax/bkf.vim

@@ -4,23 +4,29 @@ endif
 
 echom "Our syntax highlighting code will go here."
 
-syntax keyword kfKeyword alias template layer using
+syntax keyword kfKeyword alias template layer using path name input output assume fun as import exporting module unsafe def
-" syntax keyword kfFunction tap-macro 
+syntax keyword kfFunction LayerTemplate Sequence Chord Keycode Layer Broken
+
 syntax match kfComment "\v--.*$"
 
 syntax match kfOperator "\v_"
+syntax match kfOperator "\v\,"
+syntax match kfOperator "\v\."
 syntax match kfOperator "\v\:"
 syntax match kfOperator "\v\|"
 syntax match kfOperator "\v\="
 syntax match kfOperator "\v\=\>"
+syntax match kfOperator "\v\-\>"
+syntax match kfOperator "\v→"
 syntax match kfOperator "\v\*"
 syntax match kfOperator "\v\("
 syntax match kfOperator "\v\)"
+syntax match kfOperator "\vλ"
 
 syntax region kfString start=/\v"/ skip=/\v\\./ end=/\v"/
 
 highlight link kfKeyword Keyword
-" highlight link kfFunction Function
+highlight link kfFunction Function
 highlight link kfComment Comment
 highlight link kfOperator Operator
 highlight link kfString String

modules/applications/misc.nix

@@ -30,6 +30,7 @@
     cmake
     # kdeconnect
     sloc # line of code counter
+    update-nix-fetchgit
 
     # editors
     # vscodium

modules/applications/neovim.nix

@@ -52,6 +52,7 @@ in
       fd # file finder
       ripgrep # grep rewrite (I think?)
       nodePackages.typescript # typescript language
+      update-nix-fetchgit # useful for nix stuff
 
       texlive.combined.scheme-full # latex stuff
       python38Packages.pygments # required for latex syntax highlighting

modules/nix.nix

@@ -22,13 +22,13 @@
       "https://nix-community.cachix.org"
       "https://cm-idris2-pkgs.cachix.org"
       "https://cache.nixos.org"
-      "https://all-hies.cachix.org" # Do I even use all-hies anymore?
+      # "https://all-hies.cachix.org" # Do I even use all-hies anymore?
     ];
 
     binaryCachePublicKeys = [
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       "cm-idris2-pkgs.cachix.org-1:YB2oJSEsD5oMJjAESxolC2GQtE6B5I6jkWhte2gtXjk="
-      "all-hies.cachix.org-1:JjrzAOEUsD9ZMt8fdFbzo3jNAyEWlPAwdVuHw4RD43k="
+      # "all-hies.cachix.org-1:JjrzAOEUsD9ZMt8fdFbzo3jNAyEWlPAwdVuHw4RD43k="
     ];
   };
 }

modules/overlays/flakes.nix

@@ -85,5 +85,12 @@ in
     kmonad-vim = plugin "kmonad-vim" vim-plugin-kmonad;
   };
 
+  # a = fetchFromGitHub {
+  #   repo = "kmonad-vim";
+  #   owner = "kmonad";
+  #   rev = "";
+  #   sha256 = "";
+  # };
+
   sddm-theme-chili = sddm-theme-chili;
 }

modules/overlays/myPackages.nix

@@ -2,7 +2,7 @@
 self: super:
 let
   allThemes = self.callPackage (import ../themes/themes.nix) { };
-  currentTheme = "github-dark";
+  currentTheme = "github-light";
 in
 with self; {
   myHelpers = self.callPackage (import ../helpers.nix) { };

modules/themes/themes.nix

@@ -6,10 +6,12 @@ lib.lists.map (theme: pkgs.callPackage theme { }) [
     variant = "light";
     # wallpaper = ./wallpapers/wall.png;
     wallpaper = ./wallpapers/synthwave.jpg;
+    # wallpaper = ./wallpapers/eye.png;
     transparency = 0.8;
   })
   (githubVariant {
     variant = "dark";
+    # wallpaper = ./wallpapers/synthwave.jpg;
     wallpaper = ./wallpapers/spaceship.jpg;
     transparency = 0.8;
   })