Merge pull request #9 from 1virgola5/main

Update versions & state

cask.nix

@@ -10,7 +10,6 @@
   "keycastr"
   "raycast"
   "ghostty"
-  "lihaoyun6/tap/quickrecorder"
   "iina"
   "shutter-encoder"
 

cli/flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774715571,
+        "lastModified": 1783963347,
-        "narHash": "sha256-MMjHif46sc/iLF9JqxBhFaueSPRcjPeP9AiujERH6N0=",
+        "narHash": "sha256-r376E2XpakiXwModDHIxlvB6qLq4iFVEq730vxOO4JY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "557f5e38ce94ef0f02f05de7ae65057d4b2a89a6",
+        "rev": "a45a7c451455a51ae740ec3bce4024b312809c29",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1774386573,
+        "lastModified": 1783776592,
-        "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
+        "narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
+        "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3",
         "type": "github"
       },
       "original": {

common/home.nix

@@ -4,7 +4,7 @@
 }:
 {
 
-  home.stateVersion = "25.11";
+  home.stateVersion = "26.05";
 
   home.packages = with pkgs; [
     # Base
@@ -26,7 +26,7 @@
     yq-go
     kubectl
     croc
-    asciinema_3
+    asciinema
     grex
     mise
 

darwin.nix

@@ -18,7 +18,7 @@
 
   # Used for backwards compatibility, please read the changelog before changing.
   # $ darwin-rebuild changelog
-  system.stateVersion = 5;
+  system.stateVersion = 7;
   nixpkgs.hostPlatform = host.platform;
   nixpkgs.config.allowUnfree = true;
 
@@ -93,7 +93,7 @@
   homebrew = {
     enable = true;
     casks = (import ./cask.nix) ++ (lib.attrByPath [ "extras" "casks" ] [ ] host);
-    taps = [ "lihaoyun6/tap" ];
+    taps = [];
     global = {
       autoUpdate = true;
     };
@@ -101,6 +101,7 @@
       autoUpdate = true;
       upgrade = true;
       cleanup = "zap";
+      extraFlags = ["--force" ];
     };
   };
 }

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1779678629,
+        "lastModified": 1783963347,
-        "narHash": "sha256-gHcIFg0mm+KFsg7iZQt67kni3+qR5U3PhEC9P7vKlZ4=",
+        "narHash": "sha256-r376E2XpakiXwModDHIxlvB6qLq4iFVEq730vxOO4JY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "612bbe3b405ad5f71d7bf9edecc04b678a061652",
+        "rev": "a45a7c451455a51ae740ec3bce4024b312809c29",
         "type": "github"
       },
       "original": {
@@ -27,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1779036909,
+        "lastModified": 1783395956,
-        "narHash": "sha256-zXcwYQGCT6pzinK+1dBB2ekTVtfxGZAapb3Evdcu4fY=",
+        "narHash": "sha256-AAbexQvDoK+6GFJdhY6kqjA+6ECKRkidgWxkn4gMwAA=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "56c666e108467d87d13508936aade6d567f2a501",
+        "rev": "d5bd9cd77aea4c0a8f49e7fd85545671a208ed15",
         "type": "github"
       },
       "original": {
@@ -42,11 +42,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1779536132,
+        "lastModified": 1783915482,
-        "narHash": "sha256-q+fF42iv/geEbHfgSzy3tS0FF/EyD6XTZ98E6yxiBO8=",
+        "narHash": "sha256-FmieJB8/OUvNxbkboi7+IGfIuSXY3nF/hZQm8kD0r50=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3d8f0f3f72a6cd4d93d0ad13203f2ea1cb7e1456",
+        "rev": "6cdc7fc76e8bf7fde9fa43a849fcaaa70e230dee",
         "type": "github"
       },
       "original": {

flake.nix

@@ -32,9 +32,6 @@
               flake = self;
             };
             modules = [
-              {
-                nixpkgs.overlays = [ (import ./overlay.nix) ];
-              }
               (import ./darwin.nix)
               home-manager.darwinModules.home-manager
               {

home/pkgs.nix

@@ -12,14 +12,20 @@ with pkgs;
   posting
   opencode
 
-  # Editor
+  # NVim
   nvs
   lua
   luajitPackages.luarocks
   ast-grep
 
+  # LSP Binaries
+  lua-language-server # Lua
+  gopls # Go
+  vtsls # JS/TS
+  nil # Nix
+  nixd # Nix
+
   # Language specific
-  nixfmt-rfc-style
   nil
   nixd
   fnm

hosts/1k5.nix

@@ -7,20 +7,22 @@
   extras = {
     casks = [
       "notion"
-      "linear-linear"
+      "linear"
       "miro"
       "loom"
       "cursor"
+      "bruno"
+      "cyberduck"
+      "slack"
     ];
     pkgs =
       pkgs: with pkgs; [
         docker-client
         colima
         google-cloud-sdk
-        gemini-cli
-        terramate
-        ffmpeg-full
         stripe-cli
+        rbw
+        pinentry-tty
       ];
   };
 }

overlay.nix

@@ -1,27 +0,0 @@
-final: prev: {
-  nvs = prev.buildGoModule rec {
-    pname = "nvs";
-    version = "1.10.5";
-
-    src = prev.fetchFromGitHub {
-      owner = "cupcakearmy";
-      repo = pname;
-      # tag = "v${version}";
-      rev = "1700f2751e969b77b7f7ab3cc16a4e0f3955ce14";
-      sha256 = "sha256-RScXYxkrfLJp1nAgN2YgSRC4mLGK4yXsYjGBrDR00b8=";
-    };
-
-    vendorHash = "sha256-l2FdnXA+vKVRekcIKt1R+MxppraTsmo0b/B7RNqnxjA=";
-
-    # Completions
-    nativeBuildInputs = [ prev.installShellFiles ];
-    postInstall = ''
-      export HOME=$TMPDIR
-      installShellCompletion --cmd nvs \
-        --bash <($out/bin/nvs completion bash) \
-        --fish <($out/bin/nvs completion fish) \
-        --zsh <($out/bin/nvs completion zsh)
-    '';
-
-  };
-}