apps/gui/default.nix

@@ -12,9 +12,16 @@
   ];
   home = {
     packages = with pkgs; [
+      # Tools
+      #cinny-desktop
+      delve
       discord
       obsidian
       gimp
+
+      # LSPs
+      marksman
+      nodePackages.yaml-language-server
     ];
   };
 }

apps/gui/firefox.nix

@@ -65,6 +65,10 @@
             url = "https://github.com/";
             label = "github";
           }
+          {
+            url = "https://git.jojodev.com/";
+            label = "jojodev";
+          }
           {
             url = "https://git.jolheiser.com";
             label = "ugit";
@@ -77,9 +81,6 @@
         "browser.fixup.domainwhitelist.radarr" = true;
         "browser.fixup.domainwhitelist.sonarr" = true;
         "browser.fixup.domainwhitelist.jellyfin" = true;
-        "browser.fixup.domainwhitelist.files" = true;
-        "browser.fixup.domainwhitelist.pubserve" = true;
-        "browser.fixup.domainwhitelist.privserve" = true;
       };
       bookmarks = [
         {
@@ -89,6 +90,12 @@
             {
               name = "Gitea";
               bookmarks = [
+                {
+                  name = "github";
+                  tags = [ "gitea" ];
+                  keyword = "go-gitea";
+                  url = "https://github.com/go-gitea/gitea";
+                }
                 {
                   name = "jojodev";
                   tags = [ "gitea" ];
@@ -110,6 +117,12 @@
                   keyword = "gitea";
                   url = "https://gitea.com";
                 }
+                {
+                  name = "try";
+                  tags = [ "gitea" ];
+                  keyword = "try";
+                  url = "https://try.gitea.io";
+                }
               ];
             }
             {
@@ -199,38 +212,6 @@
                     }
                   ];
                 }
-                {
-                  name = "Files";
-                  bookmarks = [
-                    {
-                      name = "files";
-                      tags = [
-                        "files"
-                        "miniserve"
-                      ];
-                      keyword = "files";
-                      url = "http://files";
-                    }
-                    {
-                      name = "privserve";
-                      tags = [
-                        "privserve"
-                        "miniserve"
-                      ];
-                      keyword = "privserve";
-                      url = "http://privserve";
-                    }
-                    {
-                      name = "pubserve";
-                      tags = [
-                        "pubserve"
-                        "miniserve"
-                      ];
-                      keyword = "pubserve";
-                      url = "http://pubserve";
-                    }
-                  ];
-                }
               ];
             }
             {

apps/nogui/bottom.nix

@@ -2,10 +2,6 @@
   programs.bottom = {
     enable = true;
     settings = {
-      flags = {
-        dot_marker = true;
-        temperature_type = "fahrenheit";
-      };
       colors = {
         table_header_color = "#f5e0dc";
         all_cpu_color = "#f5e0dc";

apps/nogui/default.nix

@@ -10,10 +10,11 @@
     ./git.nix
     ./go.nix
     ./gpg.nix
+    #./helix.nix
     ./jj.nix
+    ./jq.nix
     ./lazygit.nix
     ./llm.nix
-    ./lsp.nix
     ./nushell.nix
     ./oh-my-posh.nix
     ./senpai.nix
@@ -23,16 +24,36 @@
   ];
   home = {
     packages = with pkgs; [
+      # Tools
       age
       bitwarden-cli
       cachix
       duf
       du-dust
       fd
+      git-absorb
       just
       ripgrep
       usql
 
+      # Dhall
+      dhall
+      dhall-nix
+      dhall-lsp-server
+
+      # LSPs
+      gopls
+      nil
+
+      # Jsonnet
+      go-jsonnet
+      jsonnet-language-server
+
+      # Formatters
+      nixfmt-rfc-style
+      gofumpt
+
+      # Flake overlays
       jolheiser.gist
       jolheiser.git-age
       tclip

apps/nogui/helix.nix

@@ -0,0 +1,349 @@
+# This entire file is superceded by https://git.jolheiser.com/helix.drv
+{ pkgs, ... }:
+let
+  query =
+    scm:
+    builtins.readFile (
+      pkgs.fetchFromGitea {
+        domain = "git.jojodev.com";
+        owner = "jolheiser";
+        repo = "templ-helix";
+        rev = "2a47b9c5af0fd9ae8bba8198fd66abc6d07fdf10";
+        sha256 = "sha256-pTdOX9bPup626t+ko6k3Xq/tprAMAZCUBl+xeIBkhfs=";
+      }
+      + "/queries/templ/${scm}.scm"
+    );
+in
+{
+  programs.helix = {
+    enable = true;
+    defaultEditor = true;
+    settings = {
+      theme = "catppuccin_mocha_transparent";
+      editor = {
+        line-number = "relative";
+        mouse = false;
+        bufferline = "always";
+        color-modes = true;
+        cursor-shape = {
+          insert = "bar";
+          normal = "block";
+          select = "underline";
+        };
+        file-picker = {
+          hidden = false;
+        };
+        indent-guides = {
+          render = true;
+          skip-levels = 1;
+        };
+        soft-wrap = {
+          enable = true;
+        };
+        statusline = {
+          right = [
+            "version-control"
+            "diagnostics"
+            "selections"
+            "position"
+            "file-encoding"
+          ];
+        };
+        lsp = {
+          display-messages = true;
+        };
+      };
+      keys = {
+        normal = {
+          space = {
+            q = ":quit";
+            Q = ":quit!";
+            w = ":write";
+            W = ":write!";
+          };
+          C-c = ":config-open";
+          C-r = ":config-reload";
+          "C-/" = "toggle_comments";
+          S-right = "goto_next_buffer";
+          S-left = "goto_previous_buffer";
+          C-b = ":buffer-close";
+          C-s = [
+            "select_all"
+            "select_regex"
+          ];
+
+          C-j = "shrink_selection";
+          C-k = "expand_selection";
+          C-l = "select_next_sibling";
+          C-a = "select_all";
+          C-u = [
+            "half_page_up"
+            "align_view_center"
+          ];
+          C-d = [
+            "half_page_down"
+            "align_view_center"
+          ];
+
+          "{" = [
+            "goto_prev_paragraph"
+            "collapse_selection"
+          ];
+          "}" = [
+            "goto_next_paragraph"
+            "collapse_selection"
+          ];
+          "0" = "goto_line_start";
+          "$" = "goto_line_end";
+          "^" = "goto_first_nonwhitespace";
+          G = "goto_file_end";
+          "%" = "match_brackets";
+          V = [
+            "select_mode"
+            "extend_to_line_bounds"
+          ];
+          C = [
+            "collapse_selection"
+            "extend_to_line_end"
+            "change_selection"
+          ];
+          D = [
+            "extend_to_line_end"
+            "delete_selection"
+          ];
+          S = "surround_add";
+
+          d = {
+            d = [
+              "extend_to_line_bounds"
+              "delete_selection"
+            ];
+            t = [ "extend_till_char" ];
+            s = [ "surround_delete" ];
+            i = [ "select_textobject_inner" ];
+            a = [ "select_textobject_around" ];
+          };
+
+          x = "delete_selection";
+          p = "paste_clipboard_after";
+          P = "paste_clipboard_before";
+          y = [
+            "yank_main_selection_to_clipboard"
+            "normal_mode"
+            "flip_selections"
+            "collapse_selection"
+          ];
+          Y = [
+            "extend_to_line_bounds"
+            "yank_main_selection_to_clipboard"
+            "goto_line_start"
+            "collapse_selection"
+          ];
+
+          w = [
+            "move_next_word_start"
+            "move_char_right"
+            "collapse_selection"
+          ];
+          e = [
+            "move_next_word_end"
+            "collapse_selection"
+          ];
+          b = [
+            "move_prev_word_start"
+            "collapse_selection"
+          ];
+
+          i = [
+            "insert_mode"
+            "collapse_selection"
+          ];
+          a = [
+            "append_mode"
+            "collapse_selection"
+          ];
+
+          esc = [
+            "collapse_selection"
+            "keep_primary_selection"
+          ];
+        };
+        insert = {
+          esc = [
+            "collapse_selection"
+            "normal_mode"
+          ];
+        };
+        select = {
+          space = {
+            j = {
+              e = ":pipe jq";
+              c = ":pipe jq -c";
+            };
+          };
+          "{" = [
+            "extend_to_line_bounds"
+            "goto_prev_paragraph"
+          ];
+          "}" = [
+            "extend_to_line_bounds"
+            "goto_next_paragraph"
+          ];
+          "0" = "goto_line_start";
+          "$" = "goto_line_end";
+          "^" = "goto_first_nonwhitespace";
+          G = "goto_file_end";
+          D = [
+            "extend_to_line_bounds"
+            "delete_selection"
+            "normal_mode"
+          ];
+          C = [
+            "goto_line_start"
+            "extend_to_line_bounds"
+            "change_selection"
+          ];
+          "%" = "match_brackets";
+          S = "surround_add";
+
+          i = "select_textobject_inner";
+          a = "select_textobject_around";
+
+          tab = [
+            "insert_mode"
+            "collapse_selection"
+          ];
+          C-a = [
+            "append_mode"
+            "collapse_selection"
+          ];
+
+          k = [
+            "extend_line_up"
+            "extend_to_line_bounds"
+          ];
+          j = [
+            "extend_line_down"
+            "extend_to_line_bounds"
+          ];
+
+          d = [
+            "yank_main_selection_to_clipboard"
+            "delete_selection"
+          ];
+          x = [
+            "yank_main_selection_to_clipboard"
+            "delete_selection"
+          ];
+          y = [
+            "yank_main_selection_to_clipboard"
+            "normal_mode"
+            "flip_selections"
+            "collapse_selection"
+          ];
+          Y = [
+            "extend_to_line_bounds"
+            "yank_main_selection_to_clipboard"
+            "goto_line_start"
+            "collapse_selection"
+            "normal_mode"
+          ];
+          p = "replace_selections_with_clipboard";
+          P = "paste_clipboard_before";
+
+          esc = [
+            "collapse_selection"
+            "keep_primary_selection"
+            "normal_mode"
+          ];
+        };
+      };
+    };
+    languages = {
+      language = [
+        {
+          name = "go";
+          formatter = {
+            command = "gofumpt";
+          };
+        }
+        {
+          name = "lua";
+          formatter = {
+            command = "luafmt";
+            args = [ "--stdin" ];
+          };
+        }
+        {
+          name = "python";
+          auto-format = true;
+          formatter = {
+            command = "black";
+            args = [
+              "--quiet"
+              "-"
+            ];
+          };
+        }
+        {
+          name = "nix";
+          auto-format = true;
+          formatter = {
+            command = "alejandra";
+            args = [ "-qq" ];
+          };
+        }
+        {
+          name = "templ";
+          auto-format = true;
+          scope = "source.templ";
+          injection-regex = "templ";
+          file-types = [ "templ" ];
+          roots = [ "go.mod" ];
+          comment-token = "//";
+          language-server = {
+            command = "templ";
+            args = [ "lsp" ];
+          };
+          formatter = {
+            command = "templ";
+            args = [ "fmt" ];
+          };
+        }
+      ];
+      grammar = [
+        {
+          name = "templ";
+          source = {
+            git = "https://github.com/vrischmann/tree-sitter-templ";
+            rev = "9f63037ad08a58050d0582ef1ae0009bd0fbf2f1";
+          };
+        }
+      ];
+    };
+    themes = {
+      catppuccin_frappe_transparent = {
+        inherits = "catppuccin_frappe";
+        "ui.background" = { };
+      };
+      catppuccin_latte_transparent = {
+        inherits = "catppuccin_latte";
+        "ui.background" = { };
+      };
+      catppuccin_macchiato_transparent = {
+        inherits = "catppuccin_macchiato";
+        "ui.background" = { };
+      };
+      catppuccin_mocha_transparent = {
+        inherits = "catppuccin_mocha";
+        "ui.background" = { };
+      };
+    };
+  };
+  xdg.configFile = {
+    "helix/runtime/queries/templ/highlights.scm".text = query "highlights";
+    "helix/runtime/queries/templ/indents.scm".text = query "indents";
+    "helix/runtime/queries/templ/injections.scm".text = query "injections";
+    "helix/runtime/queries/templ/structure.scm".text = query "structure";
+  };
+}

apps/nogui/jq.nix

@@ -0,0 +1 @@
+{ programs.jq.enable = true; }

apps/nogui/lsp.nix

@@ -1,11 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    gopls # Go
-    nil # Nix
-    jsonnet-language-server # Jsonnet
-    marksman # Markdown
-    nodePackages.yaml-language-server # YAML
-    vscode-langservers-extracted # HTML/CSS/JSON
-  ];
-}

apps/nogui/senpai.nix

@@ -9,6 +9,7 @@
         "cat"
         "${config.age.secrets.irc-pw.path}"
       ];
+      #channel = "#pico.sh #gitea";
       typings = false;
     };
   };

flake.lock

@@ -369,11 +369,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1734153556,
+        "lastModified": 1709873986,
-        "narHash": "sha256-2hnslSdVneyWggHgKVaJW4q+agEHnrrdITxqNBPWWAY=",
+        "narHash": "sha256-58zWfVOlqDLXy2BI/o/cnyhtEsdRfA4CGxstPgG2xPQ=",
         "ref": "refs/heads/main",
-        "rev": "c72f0a08b102ede3857775c4e761f452a2772b26",
+        "rev": "14884cafd8d4267777b40a3c13e3973ec9a81cf2",
-        "revCount": 10,
+        "revCount": 9,
         "type": "git",
         "url": "https://git.jolheiser.com/gomodinit.git"
       },

machines/dragonwell/restic.nix

@@ -10,12 +10,7 @@
     environmentFile = config.age.secrets.restic-env.path;
     passwordFile = config.age.secrets.restic-pass.path;
     repositoryFile = config.age.secrets.restic-repo.path;
-    paths = [
+    paths = [ "/var/lib/ugit/repos" ];
-      "/var/lib/ugit/repos"
-      "/var/lib/miniserve"
-      "/var/lib/foundryvtt/Data"
-      "/var/lib/foundryvtt/Config"
-    ];
     pruneOpts = [
       "--keep-daily 7"
       "--keep-weekly 2"