diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index 4c58f1e..1b6cfdc 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -2,6 +2,7 @@ "blink.cmp": { "branch": "main", "commit": "4b18c32adef2898f95cdef6192cbd5796c1a332d" }, "cp.nvim": { "branch": "main", "commit": "029ea125b97320ff5c2884bf84bf5aa4e7077c79" }, "dial.nvim": { "branch": "master", "commit": "f2634758455cfa52a8acea6f142dcd6271a1bf57" }, + "diffs.nvim": { "branch": "main", "commit": "330e2bc9b89ebcc52b77a9fa960541c0cfbca81d" }, "fzf-lua": { "branch": "main", "commit": "fb8c50ba62a0daa433b7ac2b78834f318322b879" }, "guard-collection": { "branch": "main", "commit": "ea1d770284473bc4976a787d61d5eb781a87d899" }, "guard.nvim": { "branch": "main", "commit": "addb8d2f40662b8b62d60dd7d18f503beb2332e7" }, diff --git a/config/nvim/lua/plugins/git.lua b/config/nvim/lua/plugins/git.lua index 8163c9c..4fae54c 100644 --- a/config/nvim/lua/plugins/git.lua +++ b/config/nvim/lua/plugins/git.lua @@ -1,6 +1,3 @@ ----@type string|nil -local prev_gitsigns_signcol = nil - return { { 'tpope/vim-fugitive', @@ -9,9 +6,10 @@ return { { dir = '~/dev/diffs.nvim', 'barrettruth/diffs.nvim', + enabled = true, init = function() vim.g.diffs = { - debug = false, + debug = true, hide_prefix = true, highlights = { vim = { diff --git a/config/nvim/lua/plugins/treesitter.lua b/config/nvim/lua/plugins/treesitter.lua index f811885..0480f7a 100644 --- a/config/nvim/lua/plugins/treesitter.lua +++ b/config/nvim/lua/plugins/treesitter.lua @@ -2,7 +2,7 @@ return { { 'nvim-treesitter/nvim-treesitter', branch = 'main', - build = ':TSUpdate', + build = ':TSUpdate all', lazy = false, init = function() vim.api.nvim_create_autocmd('FileType', { diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf index 7a97031..750b797 100644 --- a/config/tmux/tmux.conf +++ b/config/tmux/tmux.conf @@ -45,13 +45,13 @@ bind -r Right resizep -R 5 bind -r Up resizep -U 5 bind -r Down resizep -D 5 -unbind c; bind c neww -c '#{pane_current_path}' +unbind w; bind w neww -c '#{pane_current_path}' unbind \'; bind \' splitw -hc '#{pane_current_path}' unbind \-; bind \- splitw -vc '#{pane_current_path}' -unbind y; bind y if -F '#{pane_in_mode}' 'send q' 'copy-mode' -unbind /; bind / if -F '#{pane_in_mode}' 'send q' 'copy-mode ; send /' -unbind ?; bind ? if -F '#{pane_in_mode}' 'send q' 'copy-mode ; send ?' +unbind y; bind y if -F '#{pane_in_mode}' 'send -X cancel' 'copy-mode' +unbind /; bind / if -F '#{pane_in_mode}' 'send -X cancel' 'copy-mode ; send -X search-forward' +unbind ?; bind ? if -F '#{pane_in_mode}' 'send -X cancel' 'copy-mode ; send -X search-backward' bind -T copy-mode-vi v send -X begin-selection bind -T copy-mode-vi y send -X copy-pipe-and-cancel 'test -n "$WAYLAND_DISPLAY" && wl-copy || xclip -in -sel c' @@ -75,12 +75,12 @@ set-hook -g client-light-theme 'source $XDG_CONFIG_HOME/tmux/themes/daylight.con set-hook -g client-dark-theme 'source $XDG_CONFIG_HOME/tmux/themes/midnight.conf' run 'tmux source "$XDG_CONFIG_HOME/tmux/themes/${THEME:-midnight}.conf"' -unbind A; bind A run 'mux ai' -unbind C; bind C run 'mux code' -unbind R; bind R run 'mux run' -unbind T; bind T run 'mux term' -unbind G; bind G run 'mux git' -unbind M; bind M run 'mux misc' +unbind a; bind a run 'mux ai' +unbind c; bind c run 'mux code' +unbind r; bind r run 'mux run' +unbind t; bind t run 'mux term' +unbind g; bind g run 'mux git' +unbind m; bind m run 'mux misc' set -g lock-after-time 300 set -g lock-command "pipes -p 2" diff --git a/flake.lock b/flake.lock index a62d9c0..04f4157 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1770491177, - "narHash": "sha256-4fB6bJg5p5jb9k/vR3KrObVquBMRVfPa1wEY/pz17nQ=", + "lastModified": 1770765099, + "narHash": "sha256-PopyCVr5w9ULY/uaZqc4F85YzIbJbyw3hHiOHUfFWeg=", "owner": "ryoppippi", "repo": "claude-code-overlay", - "rev": "be6e534fc6d9737d558f8ba41190513391fef01b", + "rev": "7203db51cb49293919a65a406d76d498e7b40f6f", "type": "github" }, "original": { @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1770491427, - "narHash": "sha256-8b+0vixdqGnIIcgsPhjdX7EGPdzcVQqYxF+ujjex654=", + "lastModified": 1770818644, + "narHash": "sha256-DYS4jIRpRoKOzJjnR/QqEd/MlT4OZZpt8CrBLv+cjsE=", "owner": "nix-community", "repo": "home-manager", - "rev": "cbd8a72e5fe6af19d40e2741dc440d9227836860", + "rev": "0acbd1180697de56724821184ad2c3e6e7202cd7", "type": "github" }, "original": { @@ -87,11 +87,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1770509107, - "narHash": "sha256-YsfKRbd5fbcb2VTxywzAGpc4txXApMXfG0vtxEldt7Q=", + "lastModified": 1770857573, + "narHash": "sha256-pSeFA1qRAdivDrrKoybJ1DOcbkXx2v/ExIc6n0DbT4U=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "0bb52596f3ea543781d2c20b1c2ee495a174a7d5", + "rev": "31e79c73c444b2e51eb34f2305792809839c58e8", "type": "github" }, "original": { @@ -103,11 +103,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1770505476, - "narHash": "sha256-HvlTxVEso/hl9lwweHerBRLtI/q05SQTxDr2l0Njfig=", + "lastModified": 1770810897, + "narHash": "sha256-6F/Z/UQxalaSoqewSQ4fL8zSws3Vy4wgA5DgyTaeqTo=", "owner": "neovim", "repo": "neovim", - "rev": "ed8fbd2e2992cb264cb62585098a1c7acc5c4585", + "rev": "6b4ec2264e1d8ba027b85f3883d532c5068be92a", "type": "github" }, "original": { @@ -118,11 +118,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1769302137, - "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=", + "lastModified": 1770631810, + "narHash": "sha256-b7iK/x+zOXbjhRqa+XBlYla4zFvPZyU5Ln2HJkiSnzc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8", + "rev": "2889685785848de940375bf7fea5e7c5a3c8d502", "type": "github" }, "original": { @@ -149,11 +149,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1770380644, - "narHash": "sha256-P7dWMHRUWG5m4G+06jDyThXO7kwSk46C1kgjEWcybkE=", + "lastModified": 1770781623, + "narHash": "sha256-RYEMTlGCVc67pxVxjOlGd8w6fpF7Bur7gKL88FB0WTs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae67888ff7ef9dff69b3cf0cc0fbfbcd3a722abe", + "rev": "c05d2232d2feaa4c7a07f1168606917402868195", "type": "github" }, "original": { @@ -165,11 +165,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1770380644, - "narHash": "sha256-P7dWMHRUWG5m4G+06jDyThXO7kwSk46C1kgjEWcybkE=", + "lastModified": 1770812194, + "narHash": "sha256-OH+lkaIKAvPXR3nITO7iYZwew2nW9Y7Xxq0yfM/UcUU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ae67888ff7ef9dff69b3cf0cc0fbfbcd3a722abe", + "rev": "8482c7ded03bae7550f3d69884f1e611e3bd19e8", "type": "github" }, "original": { @@ -211,11 +211,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1770480420, - "narHash": "sha256-zm86JvwyurSk06eZD1/Cdc4eF84gWIxeOmBJ5iUxRHw=", + "lastModified": 1770872317, + "narHash": "sha256-3EWU4/yYtR71zMK0qP3Uysd/McFaHeDfQgtrvh8ELLE=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "d1540a889b63da17f735f1d4bebd9ebfcd7c267a", + "rev": "40ec16210240665705a32ab0150e852f21fd6668", "type": "github" }, "original": { diff --git a/home/modules/git.nix b/home/modules/git.nix index 38a0b8a..783f8f5 100644 --- a/home/modules/git.nix +++ b/home/modules/git.nix @@ -6,6 +6,8 @@ }: { + home.packages = [ pkgs.pre-commit ]; + programs.git = { enable = true; lfs.enable = true; diff --git a/home/modules/shell.nix b/home/modules/shell.nix index e3b79ec..92b3809 100644 --- a/home/modules/shell.nix +++ b/home/modules/shell.nix @@ -48,6 +48,8 @@ in home.sessionVariables = lib.mkMerge [ { LESSHISTFILE = "-"; + WGETRC = "${config.xdg.configHome}/wgetrc"; + LUAROCKS_CONFIG = "${config.xdg.configHome}/luarocks/config.lua"; GRADLE_USER_HOME = "${config.xdg.configHome}/gradle"; LIBVIRT_DEFAULT_URI = "qemu:///system"; MBSYNCRC = "${config.xdg.configHome}/mbsync/config"; @@ -173,6 +175,17 @@ in ''; }; + xdg.configFile."wgetrc".text = '' + hsts_file = ${config.xdg.stateHome}/wget-hsts + ''; + + xdg.configFile."luarocks/config.lua".text = '' + rocks_trees = { + { name = "user", root = (os_getenv("XDG_DATA_HOME") or (home .. "/.local/share")) .. "/luarocks" }; + { name = "system", root = "/usr" }; + } + ''; + programs.zsh = { enable = true; dotDir = "${config.xdg.configHome}/zsh";