From 300b8b1574be046519338418c90c4d24855985ad Mon Sep 17 00:00:00 2001 From: Stefan Imhoff Date: Fri, 2 Aug 2024 12:19:19 +0200 Subject: [PATCH] chore: update --- darwin/homebrew-common.nix | 1 + flake.lock | 18 ++++++++-------- home/asdf/default.nix | 1 - home/asdf/tool-versions | 9 -------- home/default.nix | 12 ++--------- home/fish/functions/update.fish | 30 ++++++++++++++++++-------- home/neovim/nvim/lazy-lock.json | 37 ++++++++++++++++----------------- 7 files changed, 51 insertions(+), 57 deletions(-) delete mode 100644 home/asdf/tool-versions diff --git a/darwin/homebrew-common.nix b/darwin/homebrew-common.nix index e5c6639..3209aa4 100644 --- a/darwin/homebrew-common.nix +++ b/darwin/homebrew-common.nix @@ -9,6 +9,7 @@ brews = [ "asdf" # Extendable version manager with support for Ruby, Node.js, Erlang & more "cava" # Console-based Audio Visualizer for ALSA + "cmake" # Cross-platform make "fileicon" # macOS CLI for managing custom icons for files and folders "gettext" # INFO: Dependency of Neovim "libiconv" # INFO: Dependency of nixpkgs_fmt diff --git a/flake.lock b/flake.lock index fbd97bf..cbfc081 100644 --- a/flake.lock +++ b/flake.lock @@ -56,11 +56,11 @@ ] }, "locked": { - "lastModified": 1721852138, - "narHash": "sha256-JH8N5uoqoVA6erV4O40VtKKHsnfmhvMGbxMNDLtim5o=", + "lastModified": 1722462338, + "narHash": "sha256-ss0G8t8RJVDewA3MyqgAlV951cWRK6EtVhVKEZ7J5LU=", "owner": "nix-community", "repo": "home-manager", - "rev": "304a011325b7ac7b8c9950333cd215a7aa146b0e", + "rev": "6e090576c4824b16e8759ebca3958c5b09659ee8", "type": "github" }, "original": { @@ -97,11 +97,11 @@ ] }, "locked": { - "lastModified": 1721719500, - "narHash": "sha256-nnkqjv4Y37Hydjh6HE9wW4kSkV5Q7q4iIXlL5lwUFOw=", + "lastModified": 1722500642, + "narHash": "sha256-Vls0TQRdplex1JslnBxEk3M26Q1vR+OSg+sk5rBG4DA=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "884f3fe6d9bf056ba0017c132c39c1f0d07d4fec", + "rev": "b47af8628624856ad6853168298f1f96364d92d6", "type": "github" }, "original": { @@ -128,11 +128,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1721743106, - "narHash": "sha256-adRZhFpBTnHiK3XIELA3IBaApz70HwCYfv7xNrHjebA=", + "lastModified": 1722421184, + "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dc14ed91132ee3a26255d01d8fd0c1f5bff27b2f", + "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58", "type": "github" }, "original": { diff --git a/home/asdf/default.nix b/home/asdf/default.nix index 15928fc..9ab909a 100644 --- a/home/asdf/default.nix +++ b/home/asdf/default.nix @@ -3,7 +3,6 @@ { home.file = { ".asdfrc" = { source = ./asdfrc; }; - ".tool-versions" = { source = ./tool-versions; }; ".default-gems" = { source = ./default-gems; }; ".default-npm-packages" = { source = ./default-npm-packages; }; ".default-python-packages" = { source = ./default-python-packages; }; diff --git a/home/asdf/tool-versions b/home/asdf/tool-versions deleted file mode 100644 index b9295de..0000000 --- a/home/asdf/tool-versions +++ /dev/null @@ -1,9 +0,0 @@ -neovim stable -nodejs 18.17.1 -ruby 3.2.2 -python 3.9.9 3.10.9 -rust 1.78.0 -deno 1.27.0 -lua 5.1 -golang 1.20 -direnv 2.32.2 diff --git a/home/default.nix b/home/default.nix index 9fcdda6..91abcad 100644 --- a/home/default.nix +++ b/home/default.nix @@ -86,6 +86,8 @@ in # ASDF "$HOME/.asdf/shims" + "/usr/bin" + # Homebrew "/opt/homebrew/bin" "/opt/homebrew/sbin" @@ -171,16 +173,6 @@ in yt-dlp # Command-line tool to download videos from YouTube.com and other sites (youtube-dl fork) zoxide # A faster way to navigate your filesystem - # Programming Languages - lua # Powerful, fast, lightweight, embeddable scripting language - # nodejs_22 # Event-driven I/O framework for the V8 JavaScript engine - # corepack_22 # Wrappers for npm, pnpm and Yarn via Node.js Corepack - perl # Standard implementation of the Perl 5 programming language - php # HTML-embedded scripting language - python3 # High-level dynamically-typed programming language - ruby # Object-oriented language for quick and easy programming - rustc # Safe, concurrent, practical language (wrapper script) - # Server & Databases mysql84 # World's most popular open source database nginx # Reverse proxy and lightweight webserver diff --git a/home/fish/functions/update.fish b/home/fish/functions/update.fish index b8a3d17..d049489 100644 --- a/home/fish/functions/update.fish +++ b/home/fish/functions/update.fish @@ -1,13 +1,25 @@ function update --description "Updating Homebrew, Ruby, Python, Node.js, Neovim, and MacOS" sudo -v - brew update && brew outdated && brew upgrade && brew cleanup - sudo gem update --system && sudo gem update && gem cleanup all - pip install --upgrade pip - pip list -o --format columns | cut -d' ' -f1 | xargs -n1 pip install -U - pnpm update -g - ~/.tmux/plugins/tpm/bin/update_plugins all - gh extension upgrade --all - fisher update + cd ~/.dotfiles + + # Update Nix flake + nix flake update + + # Add to git + git add . + + # Rebuild nix-darwin + darwin-rebuild switch --flake . + + # Update Homebrew + brew update + brew outdated + brew upgrade + brew cleanup + + # Clean up Nix + nix-collect-garbage -d + + # Update Neovim nvim --headless "+Lazy! sync" +qa - # sudo softwareupdate -i -a end diff --git a/home/neovim/nvim/lazy-lock.json b/home/neovim/nvim/lazy-lock.json index d57f64c..dece3f4 100644 --- a/home/neovim/nvim/lazy-lock.json +++ b/home/neovim/nvim/lazy-lock.json @@ -2,7 +2,7 @@ "ChatGPT.nvim": { "branch": "main", "commit": "f081338f07216a46d3915ce46c1fcb083bcb5016" }, "CopilotChat.nvim": { "branch": "canary", "commit": "4a5e07185b37d3132e5541d8fa42aa874b774476" }, "LazyVim": { "branch": "main", "commit": "12818a6cb499456f4903c5d8e68af43753ebc869" }, - "SchemaStore.nvim": { "branch": "main", "commit": "bb73383589c0aab431a100a014eed6cb0e1b3832" }, + "SchemaStore.nvim": { "branch": "main", "commit": "a86e7a0ecaf09fdb0b58ca09f34cd1e2b2b1fd75" }, "aerial.nvim": { "branch": "master", "commit": "e75a3df2c20b3a98c786f5e61587d74a7a6b61d6" }, "auto-save.nvim": { "branch": "main", "commit": "979b6c82f60cfa80f4cf437d77446d0ded0addf0" }, "aw-watcher-vim": { "branch": "master", "commit": "4ba86d05a940574000c33f280fd7f6eccc284331" }, @@ -34,13 +34,13 @@ "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, "fm-nvim": { "branch": "master", "commit": "8e6a77049330e7c797eb9e63affd75eb796fe75e" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "fzf": { "branch": "master", "commit": "d9404fcce45be6a95d697fb2229e77e5ac8bb0c4" }, - "fzf-lua": { "branch": "main", "commit": "c7288e60b8dde218f3d3b5b16e1baf32ada20ef3" }, - "fzf.vim": { "branch": "master", "commit": "f7c7b44764a601e621432b98c85709c9a53a7be8" }, + "fzf": { "branch": "master", "commit": "af4917dbb643a7991c50091ec55ec25acb7d28cb" }, + "fzf-lua": { "branch": "main", "commit": "afcc4b76ad3ab80526b6f1932a1514b22de8c187" }, + "fzf.vim": { "branch": "master", "commit": "6f28c8c7bb551161a0315a76488522204f39c1f4" }, "gen.nvim": { "branch": "main", "commit": "07fb74cf1bc533791e2c7cfca7bd3f45a3b597f9" }, "gh.nvim": { "branch": "main", "commit": "ebbaac254ef7dd6f85b439825fbce82d0dc84515" }, - "gitsigns.nvim": { "branch": "main", "commit": "f074844b60f9e151970fbcdbeb8a2cd52b6ef25a" }, - "grug-far.nvim": { "branch": "main", "commit": "4e18623ec055273e7c2e925e644a5dbba89b509e" }, + "gitsigns.nvim": { "branch": "main", "commit": "0ed466953fe5885166e0d60799172a8b1f752d16" }, + "grug-far.nvim": { "branch": "main", "commit": "724b8019fcfeee51dcc6e76c543eba30b5570a26" }, "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" }, "harpoon-lualine": { "branch": "master", "commit": "d1b873c19b701fd80d60a67d086dbb3bcc4eb00e" }, "highlight-undo.nvim": { "branch": "main", "commit": "1ea1c79372d7d93c88fd97543880927b7635e3d2" }, @@ -68,7 +68,7 @@ "neo-tree.nvim": { "branch": "main", "commit": "206241e451c12f78969ff5ae53af45616ffc9b72" }, "neogit": { "branch": "master", "commit": "2b74a777b963dfdeeabfabf84d5ba611666adab4" }, "neotest": { "branch": "master", "commit": "32ff2ac21135a372a42b38ae131e531e64833bd3" }, - "neotest-golang": { "branch": "main", "commit": "41cf5e59ca132a5cad599867de3f154429e5c148" }, + "neotest-golang": { "branch": "main", "commit": "f71d2494726c529c5d5c43813b24b3dd91ade981" }, "neotest-jest": { "branch": "main", "commit": "514fd4eae7da15fd409133086bb8e029b65ac43f" }, "neotest-rspec": { "branch": "main", "commit": "48573d5882cbe8d8bcd3b735d9ee7705168b1b87" }, "neotest-vitest": { "branch": "main", "commit": "353364aa05b94b09409cbef21b79c97c5564e2ce" }, @@ -76,26 +76,26 @@ "noctis.nvim": { "branch": "main", "commit": "0b9336e39c686a7e58de06e4dd38c2bd862a7b33" }, "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, - "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, + "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, "nvim-colorizer.lua": { "branch": "master", "commit": "194ec600488f7c7229668d0e80bd197f3a2b84ff" }, "nvim-cursorline": { "branch": "main", "commit": "804f0023692653b2b2368462d67d2a87056947f9" }, - "nvim-dap": { "branch": "master", "commit": "bc03b83c94d0375145ff5ac6a6dcf28c1241e06f" }, + "nvim-dap": { "branch": "master", "commit": "dcc85d12d6e2c18c5fa0f9a304d9f5e767e1401a" }, "nvim-dap-go": { "branch": "main", "commit": "5030d53097fed7b75524a04048d8dbf417fa0140" }, "nvim-dap-ruby": { "branch": "main", "commit": "4176405d186a93ebec38a6344df124b1689cfcfd" }, "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "484995d573c0f0563f6a66ebdd6c67b649489615" }, "nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" }, - "nvim-lspconfig": { "branch": "master", "commit": "fdc44768a09a65140aa00c92872a5381ad486485" }, + "nvim-lspconfig": { "branch": "master", "commit": "d710f5c58d3b4b010504472d58752d5cef115d99" }, "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-silicon": { "branch": "main", "commit": "feb882f04c992b797daa118101a239fb3bedfc04" }, "nvim-snippets": { "branch": "main", "commit": "56b4052f71220144689caaa2e5b66222ba5661eb" }, "nvim-transparent": { "branch": "main", "commit": "fd35a46f4b7c1b244249266bdcb2da3814f01724" }, - "nvim-treesitter": { "branch": "master", "commit": "8e569bc4b5eee3ef011c948f92493fda2e2a6a32" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "34867c69838078df7d6919b130c0541c0b400c47" }, + "nvim-treesitter": { "branch": "master", "commit": "8453015093ae156f1776d2c913b6c5206e80e26f" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "3eb733685e1aa64a26e8b46220d855fb6a0e9e46" }, "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" }, - "nvim-ufo": { "branch": "main", "commit": "1b5f2838099f283857729e820cc05e2b19df7a2c" }, + "nvim-ufo": { "branch": "main", "commit": "4cc3ba9303c0708b81fd681786a4835fd31518ac" }, "nvim-various-textobjs": { "branch": "main", "commit": "82ba233ec6f4de0e1d577c55140e6d31019d3369" }, "nvim-web-devicons": { "branch": "master", "commit": "5be6c4e685618b99c3210a69375b38a1202369b4" }, "oatmeal.nvim": { "branch": "master", "commit": "c8cdd0a182cf77f88ea5fa4703229ddb3f47c1f7" }, @@ -109,15 +109,15 @@ "rainbow_csv": { "branch": "master", "commit": "3dbbfd7d17536aebfb80f571255548495574c32b" }, "remote-nvim.nvim": { "branch": "main", "commit": "66fc20fd259401c7bb6ac5189ecb6283c2eb65d2" }, "smart-open.nvim": { "branch": "0.2.x", "commit": "87626ee8748b9bba22093adec7bb58c63e7214f0" }, - "smart-splits.nvim": { "branch": "master", "commit": "209c136a5bee236094245196986ce94920dd3fdf" }, + "smart-splits.nvim": { "branch": "master", "commit": "1a2b268a7ec7aeef879cdd15973339010ec134f7" }, "sqlite.lua": { "branch": "master", "commit": "d0ffd703b56d090d213b497ed4eb840495f14a11" }, "symbols-outline.nvim": { "branch": "master", "commit": "564ee65dfc9024bdde73a6621820866987cbb256" }, "tabular": { "branch": "master", "commit": "12437cd1b53488e24936ec4b091c9324cafee311" }, "tailwind-sorter.nvim": { "branch": "main", "commit": "1b60096635a1a1bef6b36b6c88a61ff437df5a15" }, - "tailwind-tools.nvim": { "branch": "master", "commit": "9baed3c610bc80299046db02d26e5deb66323c36" }, + "tailwind-tools.nvim": { "branch": "master", "commit": "f2e9a0a90a7181d1ab0957fa9c798828cf71ed0d" }, "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "3d3cd95e4a4135c250faf83dd5ed61b8e5502b86" }, - "telescope-file-browser.nvim": { "branch": "master", "commit": "8574946bf6d0d820d7f600f3db808f5900a2ae23" }, - "telescope-frecency.nvim": { "branch": "master", "commit": "cef01dee8bd07540216c4e4bf429565a86f68d6d" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "19a0b7f14b2ee3f6513366d9184a03cada77713f" }, + "telescope-frecency.nvim": { "branch": "master", "commit": "25d01edae8a2d74bcaa706c003b2712bce1e3301" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope-fzy-native.nvim": { "branch": "master", "commit": "282f069504515eec762ab6d6c89903377252bf5b" }, "telescope-github.nvim": { "branch": "master", "commit": "ee95c509901c3357679e9f2f9eaac3561c811736" }, @@ -126,7 +126,7 @@ "telescope-live-grep-args.nvim": { "branch": "master", "commit": "649b662a8f476fd2c0289570764459e95ebaa3f3" }, "telescope-node-modules.nvim": { "branch": "main", "commit": "b846d33ff5763176dc14fc74c30941a2067c82fd" }, "telescope-undo.nvim": { "branch": "main", "commit": "51be9ae7c42fc27c0b05505e3a0162e0f05fbb6a" }, - "telescope.nvim": { "branch": "master", "commit": "10b8a82b042caf50b78e619d92caf0910211973d" }, + "telescope.nvim": { "branch": "master", "commit": "3b1600d0fd5172ad9fae00987362ca0ef3d8895d" }, "tmux-awesome-manager.nvim": { "branch": "master", "commit": "f266ba588249965a16df77bca3f8e9a241156d37" }, "todo-comments.nvim": { "branch": "main", "commit": "8f45f353dc3649cb9b44cecda96827ea88128584" }, "toggleterm.nvim": { "branch": "main", "commit": "8ed0f52006d3207ec6c94de7db62da840937ef2a" }, @@ -153,6 +153,5 @@ "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" }, "worktrees.nvim": { "branch": "main", "commit": "9b705e702b29297009702e492c28c0277a5bb8fa" }, "wrapping.nvim": { "branch": "master", "commit": "3a823200c297885b70515fa8d974e1763c578e26" }, - "yanky.nvim": { "branch": "main", "commit": "73215b77d22ebb179cef98e7e1235825431d10e4" }, "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" } }