From e5dde133ea6afafd88077037203c14cd3f5e8f2a Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Wed, 11 Feb 2026 16:36:20 -0500 Subject: [PATCH] feat: format --- config/nvim/lazy-lock.json | 11 ++++------ config/nvim/lua/plugins/git.lua | 35 ----------------------------- home/modules/shell.nix | 39 ++++++++++++++++++--------------- home/modules/ui.nix | 1 - hosts/xps15/configuration.nix | 12 ++++++++-- scripts/theme | 1 - 6 files changed, 35 insertions(+), 64 deletions(-) diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index a6c3c8f..ccf3dad 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -1,11 +1,8 @@ { - "blink.cmp": { "branch": "main", "commit": "4b18c32adef2898f95cdef6192cbd5796c1a332d" }, - "blink.indent": { "branch": "main", "commit": "9c80820ca77218a8d28e70075d6f44a1609911fe" }, - "camouflage.nvim": { "branch": "main", "commit": "96f561cb4d0ff39f64a9e4ff7150d72d4efc526a" }, + "blink.cmp": { "branch": "main", "commit": "7c80e36023c5499a97e097cb5f229e9b635725a0" }, "cp.nvim": { "branch": "main", "commit": "029ea125b97320ff5c2884bf84bf5aa4e7077c79" }, "dial.nvim": { "branch": "master", "commit": "f2634758455cfa52a8acea6f142dcd6271a1bf57" }, "fzf-lua": { "branch": "main", "commit": "fb8c50ba62a0daa433b7ac2b78834f318322b879" }, - "gitsigns.nvim": { "branch": "main", "commit": "f7cc6850517b8db59a41314b83bb7994eae33cdd" }, "guard-collection": { "branch": "main", "commit": "ea1d770284473bc4976a787d61d5eb781a87d899" }, "guard.nvim": { "branch": "main", "commit": "addb8d2f40662b8b62d60dd7d18f503beb2332e7" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, @@ -18,14 +15,14 @@ "mini.misc": { "branch": "main", "commit": "b647b64321c34d4868d158282bb89e49f0d6838b" }, "mini.pairs": { "branch": "main", "commit": "4089aa6ea6423e02e1a8326a7a7a00159f6f5e04" }, "nvim-colorizer.lua": { "branch": "master", "commit": "338409dd8a6ed74767bad3eb5269f1b903ffb3cf" }, - "nvim-lspconfig": { "branch": "master", "commit": "66fd02ad1c7ea31616d3ca678fa04e6d0b360824" }, + "nvim-lspconfig": { "branch": "master", "commit": "f4e9d367d4e067d7a5fabc9fd3f1349b291eb718" }, "nvim-navic": { "branch": "master", "commit": "f5eba192f39b453675d115351808bd51276d9de5" }, "nvim-surround": { "branch": "main", "commit": "1098d7b3c34adcfa7feb3289ee434529abd4afd1" }, - "nvim-treesitter": { "branch": "main", "commit": "45a07f869b0cffba342276f2c77ba7c116d35db8" }, + "nvim-treesitter": { "branch": "main", "commit": "9f2dad22ef8bb14fd1e0a3aa8859cdc88170668b" }, "nvim-treesitter-textobjects": { "branch": "main", "commit": "a0e182ae21fda68c59d1f36c9ed45600aef50311" }, "nvim-vtsls": { "branch": "main", "commit": "0b5f73c9e50ce95842ea07bb3f05c7d66d87d14a" }, "oil.nvim": { "branch": "master", "commit": "f55b25e493a7df76371cfadd0ded5004cb9cd48a" }, - "overseer.nvim": { "branch": "master", "commit": "5828bdbd86677497613033c142f0a8624489216f" }, + "overseer.nvim": { "branch": "master", "commit": "392093e610333c0aea89bf43de7362e25783eada" }, "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" }, "treesj": { "branch": "main", "commit": "186084dee5e9c8eec40f6e39481c723dd567cb05" }, "typst-preview.nvim": { "branch": "master", "commit": "e123a7ab64e52d836e00dea9251e85b201f38966" }, diff --git a/config/nvim/lua/plugins/git.lua b/config/nvim/lua/plugins/git.lua index 33b4f79..9ae8e53 100644 --- a/config/nvim/lua/plugins/git.lua +++ b/config/nvim/lua/plugins/git.lua @@ -36,39 +36,4 @@ return { { 'Gp', 'lua Snacks.picker.gh_pr()' }, }, }, - { - 'lewis6991/gitsigns.nvim', - keys = { - { '[g', 'Gitsigns next_hunk' }, - { ']g', 'Gitsigns prev_hunk' }, - { 'Gb', 'Gitsigns toggle_current_line_blame' }, - { - 'Gs', - function() - if vim.opt.signcolumn:get() == 'no' then - prev_gitsigns_signcol = vim.opt.signcolumn:get() - vim.opt.signcolumn = 'yes' - else - vim.opt.signcolumn = prev_gitsigns_signcol - end - vim.cmd.Gitsigns('toggle_signs') - end, - }, - }, - event = 'VeryLazy', - opts = { - current_line_blame_formatter_nc = function() - return {} - end, - signs = { - -- use boxdraw chars - add = { text = '│' }, - change = { text = '│' }, - delete = { text = '＿' }, - topdelete = { text = '‾' }, - changedelete = { text = '│' }, - }, - signcolumn = false, - }, - }, } diff --git a/home/modules/shell.nix b/home/modules/shell.nix index 133b9f5..e3b79ec 100644 --- a/home/modules/shell.nix +++ b/home/modules/shell.nix @@ -23,24 +23,27 @@ let sqlite = true; in { - home.packages = with pkgs; [ - awscli2 - pure-prompt - xclip - tree - jq - curl - wget - unzip - tesseract - gnumake - gcc - file - ffmpeg - poppler-utils - librsvg - imagemagick - ]; + home.packages = + with pkgs; + [ + awscli2 + pure-prompt + xclip + tree + jq + curl + wget + unzip + tesseract + gnumake + gcc + file + ffmpeg + poppler-utils + librsvg + imagemagick + ] + ++ lib.optionals rust [ rustup ]; home.sessionVariables = lib.mkMerge [ { diff --git a/home/modules/ui.nix b/home/modules/ui.nix index 81847fa..f3099a4 100644 --- a/home/modules/ui.nix +++ b/home/modules/ui.nix @@ -176,7 +176,6 @@ in xdg.configFile."rofi/themes/daylight.rasi".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.config/nix/config/rofi/themes/daylight.rasi"; - services.dunst = { enable = true; settings = { diff --git a/hosts/xps15/configuration.nix b/hosts/xps15/configuration.nix index 1d201d9..20c8416 100644 --- a/hosts/xps15/configuration.nix +++ b/hosts/xps15/configuration.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: { imports = [ @@ -120,7 +125,10 @@ xdg-desktop-portal-hyprland ]; config.common = { - default = [ "hyprland" "gtk" ]; + default = [ + "hyprland" + "gtk" + ]; }; }; diff --git a/scripts/theme b/scripts/theme index 75aea8f..15aee09 100755 --- a/scripts/theme +++ b/scripts/theme @@ -50,7 +50,6 @@ echo "$themes" | grep -Fxq "$theme" || exit 1 case "$(uname)" in Linux) - # GTK color scheme case "$theme" in midnight) gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' ;; daylight) gsettings set org.gnome.desktop.interface color-scheme 'prefer-light' ;;