diff --git a/flake.lock b/flake.lock index 2976328..36a041f 100644 --- a/flake.lock +++ b/flake.lock @@ -3,15 +3,14 @@ "apple-silicon-support": { "inputs": { "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay" + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1745776248, - "narHash": "sha256-QrTarwIUlK/7iPnCeVF+LiCIzwd8UI5F8ZY5e+ZRtyY=", + "lastModified": 1746909655, + "narHash": "sha256-F3Ma9Yh38NFNHVQEkNCMZZKwfyYN/hHUKOwg1HjHHIw=", "owner": "tpwrules", "repo": "nixos-apple-silicon", - "rev": "a2d847358bc7eebe8bd13c89028b3efbd52325bf", + "rev": "4829c0cee5887452eed32df61937bf20bc8032fe", "type": "github" }, "original": { @@ -23,16 +22,16 @@ "brew-src": { "flake": false, "locked": { - "lastModified": 1742457334, - "narHash": "sha256-Gn7ruyb3NDFr+SsHBfA2NsJI8YkkWdECqLRj/xcjt+E=", + "lastModified": 1746795192, + "narHash": "sha256-Cv+RXuzmn2iGBY2Ny/nXBTH+LFKDWIvMxf9a+btKI6M=", "owner": "Homebrew", "repo": "brew", - "rev": "f3bd91d3afe086824d24708230e1f0c7f943135a", + "rev": "6f39076b3c2251994419215279d0525ef667fc31", "type": "github" }, "original": { "owner": "Homebrew", - "ref": "4.4.25", + "ref": "4.5.2", "repo": "brew", "type": "github" } @@ -114,11 +113,11 @@ ] }, "locked": { - "lastModified": 1746413188, - "narHash": "sha256-i6BoiQP0PasExESQHszC0reQHfO6D4aI2GzOwZMOI20=", + "lastModified": 1747106332, + "narHash": "sha256-mOdRWJzJAMp0hF8aSResyp8BeOO5VoSng1uqtEq+8xI=", "owner": "nix-community", "repo": "home-manager", - "rev": "8a318641ac13d3bc0a53651feaee9560f9b2d89a", + "rev": "535a541b429c1e89f0955c160df1d6d2bfeaf802", "type": "github" }, "original": { @@ -146,11 +145,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1746450962, - "narHash": "sha256-AXE7LbTvqL2ugIbXNOHMt6KOKA+ayJfqs5zOMF7qpS0=", + "lastModified": 1747122594, + "narHash": "sha256-wTdw/QrR6mqMbYaBfkrx8mcHnZ5bEKaI07wfGRPriS8=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "4dd590cbefa2dd57f3946919b1e9f56b9c3d08aa", + "rev": "5def7e7492910ab44a118783e3134bf59e87a225", "type": "github" }, "original": { @@ -162,11 +161,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1746451953, - "narHash": "sha256-SF02uEGvRBlwcjEdxNQrpY24l5DuXen+FM8UZm+oqe0=", + "lastModified": 1747115151, + "narHash": "sha256-K632xd7EbKo7e6Ax2YHER40Gjv6i/EHgZ0AHsrmkNTM=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "e037044c8ff6a5a0dbf19b31491d0515e3a36b2f", + "rev": "27bec7e5f28b07f94be67179ee3ca5829eb6136e", "type": "github" }, "original": { @@ -217,11 +216,11 @@ ] }, "locked": { - "lastModified": 1746254942, - "narHash": "sha256-Y062AuRx6l+TJNX8wxZcT59SSLsqD9EedAY0mqgTtQE=", + "lastModified": 1747069642, + "narHash": "sha256-a4TdGi/Ju8P3r5OIecNfM3LH3kccMY0dIo+EwiyphmM=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "760a11c87009155afa0140d55c40e7c336d62d7a", + "rev": "d642c9856003ed37ce34dab618abf37e3ade1061", "type": "github" }, "original": { @@ -256,11 +255,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1744563914, - "narHash": "sha256-0exTKCXDE/8G7gZQ9Gk3EcZBAL7lwzxhD7DtUBsnlGI=", + "lastModified": 1747063990, + "narHash": "sha256-wPffD2XB7OSpP73w1lks/XaeH3flO9FeVy1ms30lgNE=", "owner": "zhaofengli-wip", "repo": "nix-homebrew", - "rev": "53507607d69c88efc816e806b8139607c7257285", + "rev": "61ca6faf8481f15e5d0d1634c186763791b66fda", "type": "github" }, "original": { @@ -291,11 +290,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745526057, - "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", + "lastModified": 1746663147, + "narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", + "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54", "type": "github" }, "original": { @@ -336,11 +335,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", + "lastModified": 1746328495, + "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", + "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", "type": "github" }, "original": { @@ -368,11 +367,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1746328495, - "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", + "lastModified": 1746904237, + "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", + "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", "type": "github" }, "original": { @@ -391,11 +390,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1746636542, - "narHash": "sha256-iiAHFPaFDKLUJOEuAo7g1j4JKsUSM72Jwhd73DUi/lQ=", + "lastModified": 1747126556, + "narHash": "sha256-tnaDc5nVqX+u4byKLIJ5SYuUwsMdlryoeOetlc1sC/E=", "owner": "nix-community", "repo": "NUR", - "rev": "8198b22b0f398a210b787b269837925e613254b5", + "rev": "bc1db36ff4136e9f0de5c801de66e3ade462306b", "type": "github" }, "original": { @@ -420,22 +419,6 @@ "nur": "nur" } }, - "rust-overlay": { - "flake": false, - "locked": { - "lastModified": 1686795910, - "narHash": "sha256-jDa40qRZ0GRQtP9EMZdf+uCbvzuLnJglTUI2JoHfWDc=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "5c2b97c0a9bc5217fc3dfb1555aae0fb756d99f9", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/nix/home/darwin.nix b/nix/home/darwin.nix index d5d9079..47b08a8 100644 --- a/nix/home/darwin.nix +++ b/nix/home/darwin.nix @@ -1,9 +1,18 @@ { pkgs, config, ... }: +let + bitwarden_cli = pkgs.bitwarden-cli.overrideAttrs (oldAttrs: { + stdenv = pkgs.llvmPackages_18.stdenv; + nativeBuildInputs = (oldAttrs.nativeBuildInputs or [ ]) ++ [ pkgs.llvmPackages_18.stdenv.cc ]; + CXX = "${pkgs.llvmPackages_18.clang}/bin/clang++"; + CC = "${pkgs.llvmPackages_18.clang}/bin/clang"; + }); +in { home = { packages = with pkgs; [ gawk discord + bitwarden_cli ]; file = { ".config/aerospace/aerospace.toml".source = diff --git a/nix/home/default.nix b/nix/home/default.nix index 8589f13..128cb64 100644 --- a/nix/home/default.nix +++ b/nix/home/default.nix @@ -111,7 +111,6 @@ in bc cmatrix svelte-language-server - bitwarden-cli ]; file = utils.mk_symlinks { inherit config dotfiles; }; diff --git a/nix/home/linux.nix b/nix/home/linux.nix index 6470ce9..b8dc0b0 100644 --- a/nix/home/linux.nix +++ b/nix/home/linux.nix @@ -50,6 +50,7 @@ in blueman playerctl mako + bitwarden-cli ]; file = utils.mk_symlinks { inherit config dotfiles; }; diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index d683378..0583227 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,35 +1,35 @@ { "arrow.nvim": { "branch": "master", "commit": "6e0f726f55f99332dd726a53effd6813786b6d49" }, "blink.cmp": { "branch": "main", "commit": "cb5e346d9e0efa7a3eee7fd4da0b690c48d2a98e" }, - "codecompanion.nvim": { "branch": "main", "commit": "35b11dc4b292519a5c09fb2c0c0e8a8832e9e821" }, - "codesnap.nvim": { "branch": "main", "commit": "6400480aa6cc366cbd931146c429aaa64680dab9" }, - "copilot.vim": { "branch": "release", "commit": "a9228e015528c9307890c48083c925eb98a64a79" }, + "codecompanion.nvim": { "branch": "main", "commit": "d19670a44c35e9ba0674cc7a25ff3b8f22bbf062" }, + "codesnap.nvim": { "branch": "main", "commit": "be6d6b9a3b5e6999edbda76b16dace03d9bfcd3d" }, + "copilot.vim": { "branch": "release", "commit": "d1e8429bef7f7709586886b0a23a46fbecc685c4" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "gitsigns.nvim": { "branch": "main", "commit": "17ab794b6fce6fce768430ebc925347e349e1d60" }, + "gitsigns.nvim": { "branch": "main", "commit": "43b0c856ae5f32a195d83f4a27fe21d63e6c966c" }, "incline.nvim": { "branch": "main", "commit": "27040695b3bbfcd3257669037bd008d1a892831d" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "leap.nvim": { "branch": "main", "commit": "2b68ddc0802bd295e64c9e2e75f18f755e50dbcc" }, "lspsaga.nvim": { "branch": "main", "commit": "501265c9b30b191ab5e5a66d104e72fb155cf3be" }, - "lualine.nvim": { "branch": "master", "commit": "0ea56f91b7f51a37b749c050a5e5dfdd56b302b3" }, - "markview.nvim": { "branch": "main", "commit": "4f9ad36efe01c283aa886453ba75bf569c897c84" }, - "mini.diff": { "branch": "main", "commit": "7e268d0241255abaa07b8aa0ddff028f7315fe21" }, - "neogit": { "branch": "master", "commit": "97f83f1dc51dee41e08e3c7a8adf00e1083e3178" }, + "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" }, + "markview.nvim": { "branch": "main", "commit": "3fd645600961781966adcfc1c77a6af8730042d7" }, + "mini.diff": { "branch": "main", "commit": "ec8a5ae365c5d15920721ea42b1351dbc9e61f2d" }, + "neogit": { "branch": "master", "commit": "eb28dfbc54f6065c29fae41aa110d382fee8390d" }, "neovim-ayu": { "branch": "master", "commit": "f5da37a8ddd62fc3a7b28900c4d1b807a3582584" }, "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, - "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" }, + "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-dap": { "branch": "master", "commit": "7aade9e99bef5f0735cf966e715b3ce45515d786" }, + "nvim-dap": { "branch": "master", "commit": "8df427aeba0a06c6577dc3ab82de3076964e3b8d" }, "nvim-dap-go": { "branch": "main", "commit": "8763ced35b19c8dc526e04a70ab07c34e11ad064" }, - "nvim-dap-python": { "branch": "master", "commit": "34282820bb713b9a5fdb120ae8dd85c2b3f49b51" }, + "nvim-dap-python": { "branch": "master", "commit": "261ce649d05bc455a29f9636dc03f8cdaa7e0e2c" }, "nvim-dap-repl-highlights": { "branch": "master", "commit": "a7512fc0a0de0c0be8d58983939856dda6f72451" }, - "nvim-dap-ui": { "branch": "master", "commit": "bc81f8d3440aede116f821114547a476b082b319" }, + "nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "df66808cd78b5a97576bbaeee95ed5ca385a9750" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, - "nvim-surround": { "branch": "main", "commit": "caf6f633d4d77a29b6e265b560c5a035d171a913" }, - "nvim-treesitter": { "branch": "master", "commit": "0e21ee8df6235511c02bab4a5b391d18e165a58d" }, - "nvim-treesitter-context": { "branch": "master", "commit": "d0dd7ce5a9d0be1f28086e818e52fdc5c78975df" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "698b5f805722254bca3c509591c1806d268b6c2f" }, - "nvim-web-devicons": { "branch": "master", "commit": "57dfa947cc88cdf1baa2c7e13ed31edddd8fb1d1" }, + "nvim-surround": { "branch": "main", "commit": "0e62500b98f4513feaaf7425c135472457ea5b7d" }, + "nvim-treesitter": { "branch": "master", "commit": "066fd6505377e3fd4aa219e61ce94c2b8bdb0b79" }, + "nvim-treesitter-context": { "branch": "master", "commit": "5c48b8ba1b0b7b25feb6e34e7eb293ea893aedc4" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "b0debd5c424969b4baeabdc8f54db3036c691732" }, + "nvim-web-devicons": { "branch": "master", "commit": "f1420728f59843eb2ef084406b3d0201a0a0932d" }, "persistence.nvim": { "branch": "main", "commit": "166a79a55bfa7a4db3e26fc031b4d92af71d0b51" }, "persistent-breakpoints.nvim": { "branch": "main", "commit": "d1656221836207787b8a7969cc2dc72668c4742a" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, @@ -37,5 +37,5 @@ "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, "tiny-glimmer.nvim": { "branch": "main", "commit": "70234ad3d193a187c81cb16007100b790c9801fc" }, "vim-repeat": { "branch": "master", "commit": "65846025c15494983dafe5e3b46c8f88ab2e9635" }, - "visual-whitespace.nvim": { "branch": "main", "commit": "99898e2c26d06c9109820236228c7ce6df86e51c" } + "visual-whitespace.nvim": { "branch": "main", "commit": "5539f68299827e67b308c79324716c4e43f37450" } } diff --git a/nvim/lua/plugs/incline.lua b/nvim/lua/plugs/incline.lua index 081dfa0..0b92758 100644 --- a/nvim/lua/plugs/incline.lua +++ b/nvim/lua/plugs/incline.lua @@ -17,14 +17,48 @@ return { padding = 0, }, hide = { - cursorline = true, + cursorline = false, }, render = function(props) - local filename = vim.fn.fnamemodify(vim.api.nvim_buf_get_name(props.buf), ":t") + local fullpath = vim.api.nvim_buf_get_name(props.buf) + local filename = vim.fn.fnamemodify(fullpath, ":t") if filename == "" then filename = "[No Name]" end - local ft_icon, ft_color = require("nvim-web-devicons").get_icon_color(filename) + + local function get_ft_icon() + local ft_icon, ft_color = require("nvim-web-devicons").get_icon_color(filename) + return { (ft_icon or "") .. " ", guifg = ft_color, guibg = "none" } + end + + local function get_file_path() + local path_display = "" + if fullpath == "" then + path_display = filename + else + local parts = {} + for part in string.gmatch(vim.fn.fnamemodify(fullpath, ":.:h"), "[^/]+") do + table.insert(parts, part) + end + + local ellipsis = "…" + local max_path_parts = 2 + if #parts > max_path_parts then + local start_index = #parts - max_path_parts + 1 + path_display = ellipsis .. "/" .. table.concat(parts, "/", start_index) + elseif #parts > 0 then + path_display = table.concat(parts, "/") + end + + if path_display ~= "" then + path_display = path_display .. "/" .. filename + else + path_display = filename + end + end + + return { path_display .. " ┊", gui = vim.bo[props.buf].modified and "bold,italic" or "bold" } + end local function get_git_diff() local icons = { removed = "", changed = "", added = "" } @@ -76,8 +110,8 @@ return { { " " }, { get_diagnostic_label() }, { get_git_diff() }, - { (ft_icon or "") .. " ", guifg = ft_color, guibg = "none" }, - { filename .. " ┊", gui = vim.bo[props.buf].modified and "bold,italic" or "bold" }, + { get_ft_icon() }, + { get_file_path() }, { get_arrow_label() .. "  " .. vim.api.nvim_win_get_number(props.win), group = "DevIconWindows" }, { " " } } diff --git a/nvim/lua/plugs/lspsaga.lua b/nvim/lua/plugs/lspsaga.lua index 54e23bb..9d1d127 100644 --- a/nvim/lua/plugs/lspsaga.lua +++ b/nvim/lua/plugs/lspsaga.lua @@ -34,9 +34,9 @@ return { { "K", ":Lspsaga hover_doc", silent = true, }, { "rn", ":Lspsaga rename", silent = true, }, { "gr", ":Lspsaga finder", silent = true, }, - { "lt", ":Lspsaga peek_type_definition", silent = true, }, - { "ld", ":Lspsaga peek_definition", silent = true, }, + { "gt", ":Lspsaga peek_type_definition", silent = true, }, + { "gp", ":Lspsaga peek_definition", silent = true, }, { "ca", ":Lspsaga code_action", silent = true, }, - { "lc", ":Lspsaga incoming_calls", silent = true, }, + { "ic", ":Lspsaga incoming_calls", silent = true, }, }, }