towry · towry · Feb 8, 2025 · Feb 8, 2025 · Feb 8, 2025 · Feb 8, 2025
diff --git a/conf/ghostty/config b/conf/ghostty/config
@@ -3,7 +3,7 @@
 # https://github.com/ghostty-org/ghostty/blob/b8ffee7acbdd5ee97953f6e6d02e047d4bfda37b/src/input/key.zig#L255
 
 
-theme = dark:jetstorm-darcula,light:jetstorm-light
+theme = dark:Kanagawa Dragon,light:Builtin Solarized Light
 font-family = Berkeley Mono Nerd Font
 # font-family = Iosevka Nerd Font Mono
 font-size = 15

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -3,9 +3,9 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    nixpkgs-stable.url = "github:nixos/nixpkgs?ref=24.05";
+    nixpkgs-stable.url = "github:nixos/nixpkgs/release-24.11";
     home-manager = {
-      url = "github:nix-community/home-manager/release-24.05";
+      url = "github:nix-community/home-manager/release-24.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     darwin = {

diff --git a/nix/hm/editor.nix b/nix/hm/editor.nix
@@ -7,20 +7,6 @@ let
   path-prefix = config.vars.path-prefix.value;
 in
 {
-  nixpkgs.overlays = [
-    (_self: super: {
-      lua-language-server = super.lua-language-server.overrideAttrs (_: rec {
-        version = "3.9.1";
-        src = super.fetchFromGitHub {
-          owner = "luals";
-          repo = "lua-language-server";
-          rev = version;
-          hash = "sha256-M4eTrs5Ue2+b40TPdW4LZEACGYCE/J9dQodEk9d+gpY=";
-          fetchSubmodules = true;
-        };
-      });
-    })
-  ];
   home.packages = with pkgs; [
     ## build neovim
     ninja
@@ -30,24 +16,24 @@ in
     tree-sitter
     sqlite
     luajit
-    stylua
-    lua-language-server
+    # stylua
+    # lua-language-server
     luarocks
-    shellcheck
+    # shellcheck
     # for nix language lsp support.
     nil
     deadnix
     # markdown
-    marksman
+    # marksman
     # yaml
-    yaml-language-server
-    yamllint
+    # yaml-language-server
+    # yamllint
     # for neovim
     # nodePackages.neovim
     # jsonls
-    vscode-langservers-extracted
+    # vscode-langservers-extracted
     # pyright
-    basedpyright
+    # basedpyright
     ruff
     (python3.buildEnv.override {
       extraLibs = [
@@ -70,7 +56,6 @@ in
       env__npm_root = "${path-prefix}",
       runtime__python3_host_prog = "${path-prefix}/bin/python3",
       runtime__node_host_prog = "${path-prefix}/bin/neovim-node-host",
-      lsp_biome = "${pkgs.biome}/bin/biome",
       dap_firefox_debug_adapter_path = "${pkgs.vscode-extensions.firefox-devtools.vscode-firefox-debug}/share/vscode/extensions/firefox-devtools.vscode-firefox-debug/dist/adapter.bundle.js"
     }
   '';

diff --git a/nix/hm/frontend-dev.nix b/nix/hm/frontend-dev.nix
@@ -10,13 +10,13 @@
     nodejs
     pnpm
     # biome
-    nodePackages.prettier
-    nodePackages.eslint
-    nodePackages.typescript
-    vtsls
-    nodePackages.typescript-language-server
-    tailwindcss-language-server
-    vscode-extensions.firefox-devtools.vscode-firefox-debug
+    # nodePackages.prettier
+    # nodePackages.eslint
+    # nodePackages.typescript
+    # vtsls
+    # nodePackages.typescript-language-server
+    # tailwindcss-language-server
+    # vscode-extensions.firefox-devtools.vscode-firefox-debug
   ];
 
   home.sessionVariables = {
@@ -26,7 +26,7 @@
     PNPM_HOME = "${config.xdg.dataHome}/pnpm";
     NPM_CONFIG_CACHE = "${config.xdg.cacheHome}/npm";
     NPM_CONFIG_PREFIX = "${config.xdg.dataHome}/npm";
-    NPM_CONFIG_TMP = "${config.xdg.cacheHome}/npm-tmp";
+    # NPM_CONFIG_TMP = "${config.xdg.cacheHome}/npm-tmp";
     COREPACK_HOME = "${config.xdg.cacheHome}/node/corepack";
   };
   home.sessionPath = [

diff --git a/nix/hm/git.nix b/nix/hm/git.nix
@@ -15,7 +15,7 @@ in
     gnupg
     # git branchless, git smartlog(git sl)
     git-branchless
-    # gitu
+    gitu
   ];
   programs.git = {
     enable = true;
@@ -120,6 +120,8 @@ in
       config-fetch-origin = ''config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"'';
       clone-bare = ''!f() { git clone --bare $@ && cd $@ && git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"; }; f'';
       ahead = "rev-list --left-right --count";
+      # count commit diff between two branches
+      commit-diff-count = ''!f() { git rev-list --count HEAD ^$1; }; f'';
       # create feat branch in format of feat/YYYYMMDD-short-description, also accept other git arguments
       br-feat = "!f() { git checkout -b feat/$(date +%Y%m)-$1 $2; }; f";
       br-fix = "!f() { git checkout -b fix/$(date +%Y%m)-$1 $2; }; f";
@@ -175,8 +177,8 @@ in
         format = "ssh";
       };
       fetch = {
-        prune = false;
-        pruneTags = false;
+        prune = true;
+        pruneTags = true;
       };
       pull = {
         rebase = true;
@@ -187,6 +189,7 @@ in
         autoSetupRemote = true;
       };
       merge = {
+        autostash = true;
         tool = "nvim";
         conflictstyle = "diff3";
         prompt = true;

diff --git a/nix/overlay.nix b/nix/overlay.nix
@@ -38,9 +38,9 @@
   # zellij = inputs.zellij.packages.${prev.system}.default;
   git-smash = inputs.git-smash.packages.${prev.system}.default;
   gitu = inputs.gitu.packages.${prev.system}.default;
-  nodejs = prev.nodejs_20;
-  nodejs_22 = prev.nodejs_20;
+  nodejs = prev.nodejs_22;
+  nodejs_22 = prev.nodejs_22;
   nodePackages = prev.nodePackages.override {
-    nodejs = prev.nodejs_20;
+    nodejs = prev.nodejs_22;
   };
 })
diff --git a/nix/pkgs/node/default.nix b/nix/pkgs/node/default.nix