feat: gomodsri

Signed-off-by: jolheiser <john.olheiser@gmail.com>

apps/gui/default.nix

@@ -18,20 +18,11 @@
       spotify-player
 
       # LSPs
-      lua-language-server
       marksman
       nodePackages.yaml-language-server
 
-      # Formatters
-      nodePackages.lua-fmt
-      python3Packages.black
-
       # IDEs
       jetbrains.goland
-
-      # Flake overlays
-      jolheiser.nur.imp
-      jolheiser.nur.kv
     ];
   };
   dconf.settings = let

apps/nogui/default.nix

@@ -64,5 +64,5 @@
     domain: gist.jojodev.com
   '';
 
-  programs = {home-manager.enable = true;};
+  programs.home-manager.enable = true;
 }

apps/nogui/git.nix

@@ -45,9 +45,7 @@ in {
       diff.algorithm = "histogram";
       merge.tool = "hx";
       url =
-        {
-          "ugit@git.jolheiser.com:".insteadOf = "ssh:jo:";
-        }
+        insteadOf "jo" "git.jolheiser.com"
         // insteadOf "gh" "github.com"
         // insteadOf "jj" "git.jojodev.com"
         // insteadOf "gt" "gitea.com"

apps/nogui/helix.nix

@@ -1,3 +1,4 @@
+# This entire file is superceded by https://git.jolheiser.com/helix.drv
 {pkgs, ...}: let
   query = scm:
     builtins.readFile (pkgs.fetchFromGitea {

apps/nogui/nushell/jolheiser.nu

@@ -60,6 +60,14 @@ def fg [args ...string] {
   | ^fzf --ansi --color 'hl:-1:underline,hl+:-1:underline:reverse' --delimiter ':' --preview "bat --color=always {1} --theme='ctp-mocha' --highlight-line {2}" --preview-window 'up,60%,border-bottom,+{2}+3/3,~3' --bind $"enter:become\(($env.EDITOR) +{2} {1}\)"
 }
 
+def gomodsri [] {
+  let tmp = (mktemp -d)
+  go mod vendor -o $tmp
+  let sri = (go run tailscale.com/cmd/nardump@latest --sri $tmp)
+  $sri | save -f go.mod.sri
+  rm -rf $tmp
+}
+
 ## Other ##
 $env.EDITOR = hx
 $env.config = ($env.config | upsert "shell_integration" ("WEZTERM_PANE" not-in $env and "SSH_CLIENT" not-in $env))

flake.lock

@@ -547,11 +547,11 @@
         "tailwind-ctp-lsp": "tailwind-ctp-lsp"
       },
       "locked": {
-        "lastModified": 1709333347,
-        "narHash": "sha256-XG6MKNrQWb1sFIcbl6bXQMEwS/yTd4IfL9TBjAdqeOQ=",
+        "lastModified": 1709863186,
+        "narHash": "sha256-Qba14UPPIWl95R+QSHJaxvAhL7Uo9LfO3kHovePcrPM=",
         "ref": "refs/heads/main",
-        "rev": "67d16f4d3e3edbfaa209468f306850b00c9ae2be",
-        "revCount": 28,
+        "rev": "2615593c2f59ab25cb74d65d968a33cbc834e9c5",
+        "revCount": 29,
         "type": "git",
         "url": "https://git.jolheiser.com/ugit.git"
       },

machines/genmaicha/default.nix

@@ -12,8 +12,6 @@ in {
     };
   };
 
-  hardware = {bluetooth.enable = true;};
-
   networking = {
     hostName = "genmaicha";
     networkmanager.enable = true;