From 383ecccd046317487e4dc3628e2523565d77646d Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Mon, 26 Sep 2022 15:23:14 +0200 Subject: [PATCH] Update deps --- flake.lock | 36 +++++++++---------- home/config/nvim/init.fnl | 2 +- home/config/nvim/nifoc/formatting.fnl | 8 ++--- home/config/nvim/plugins/nvim-lint.fnl | 2 +- home/config/nvim/plugins/urlview.fnl | 2 +- home/programs/nvim/default.nix | 4 +-- home/programs/nvim/plugins.nix | 48 +++++++++++++------------- system/hosts/adsb-antenna.nix | 2 +- system/hosts/sail.nix | 2 +- 9 files changed, 51 insertions(+), 55 deletions(-) diff --git a/flake.lock b/flake.lock index 39997ac..3d30732 100644 --- a/flake.lock +++ b/flake.lock @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1663677921, - "narHash": "sha256-NfQnUfRrjv8DXeugdbQC5El+MMhShP42ohc8iM+UAdM=", + "lastModified": 1664143588, + "narHash": "sha256-I1qaa8VMISprKulco2bxiIJUaz1NGiKmlsQuM996yzM=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "088c98a584a38b5f844bb9e9cd32eb28479ca6d7", + "rev": "95ba7e548d55e74c36369dbd6a4bfe99a543c835", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1663835995, - "narHash": "sha256-XNHQ+mdHbjNR1Oit00SFAEcrAZoCS08E7uAFcVMtwhM=", + "lastModified": 1664146938, + "narHash": "sha256-fIvsJ3qWiD6o3qH9iU66OsL8uG5C1FGXcuaNEctJv8M=", "owner": "nix-community", "repo": "home-manager", - "rev": "bd83eab6220226085c82e637931a7ae3863d9893", + "rev": "9e7394523eb4f298528d457e316fc752bdf07151", "type": "github" }, "original": { @@ -102,11 +102,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1663899464, - "narHash": "sha256-fuDTMqSbCSQDOXktmGjGLxA533DPqVz4e0QYI2bS2zo=", + "lastModified": 1664176858, + "narHash": "sha256-SIF3XyX22GQ2u4AAq5qsVeLZ/2fHSlBX+8hd5IGQ3+Y=", "owner": "neovim", "repo": "neovim", - "rev": "7a70e9587c866c506182a32839f4c3b27b9a3b40", + "rev": "6596f7e136b7ceba2a94c708e2a179ec60b6d048", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1663921133, - "narHash": "sha256-hDYD7AzBst3d8p29/NnEja0kAa0EFWiCt8OBaUvzZBI=", + "lastModified": 1664180387, + "narHash": "sha256-5fT/Nnv4QWVASqjMBKuHZKSFV+YHVH5jbTRakvQivuw=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "57efddbd8bae3026997c2fd32af67e253068764d", + "rev": "b7c02b63405cfc346b1faecc0602aeb7aaf79ee7", "type": "github" }, "original": { @@ -145,11 +145,11 @@ ] }, "locked": { - "lastModified": 1663921941, - "narHash": "sha256-cbp8NXW2r7KxXJbO9W3I13I+fcmVCNPQNtHwpIQc/0A=", + "lastModified": 1664192580, + "narHash": "sha256-CqRMso7oeYVZtKrr9tr0Owq1YduLoW9C+EivkkNrOgU=", "owner": "nifoc", "repo": "nix-overlay", - "rev": "4e20abb62cb338c07f78918b2232babbcce7795b", + "rev": "aa04cebd9b34cf4019d5f286076404c74a9ed8dd", "type": "github" }, "original": { @@ -160,11 +160,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1663879234, - "narHash": "sha256-zCe2EVY+Jt3I7gBgMSkuGesZ57vyt/WwIUwshiwDErk=", + "lastModified": 1664177230, + "narHash": "sha256-eyo88ffm16I0K9cdcePbOsQg4MDjf1EgIdkGTLB/7iA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a8a557e233c30b60225fa5af41cc56f8409e4afb", + "rev": "ff9793cfd1a25145a7e591af604675b3d6f68987", "type": "github" }, "original": { diff --git a/home/config/nvim/init.fnl b/home/config/nvim/init.fnl index 0309bad..8958d04 100644 --- a/home/config/nvim/init.fnl +++ b/home/config/nvim/init.fnl @@ -52,7 +52,7 @@ (set o.termguicolors true) (set o.mouse :a) (set o.mousemodel :popup_setpos) - (set o.cmdheight 0) + (set o.cmdheight 1) ;; Backups (set o.backup false) (set o.swapfile false) diff --git a/home/config/nvim/nifoc/formatting.fnl b/home/config/nvim/nifoc/formatting.fnl index 296de63..567e331 100644 --- a/home/config/nvim/nifoc/formatting.fnl +++ b/home/config/nvim/nifoc/formatting.fnl @@ -16,13 +16,9 @@ :desc "Run Formatter"}))) (fn run-neoformat [formatprg] - (let [neoformat (.. "Neoformat " formatprg) - cmdheight (vim.opt.cmdheight:get)] - ;; Workaround for a prompt issue with cmdheight=0 - (set vim.opt.cmdheight 1) + (let [neoformat (.. "Neoformat " formatprg)] (cmd (.. "try | undojoin | " neoformat " | catch /E790/ | " neoformat - " | endtry")) - (set vim.opt.cmdheight cmdheight))) + " | endtry")))) (fn mod.enable-for-buffer [] (set-bufvar 0 :nifoc_formatter_disabled 0)) diff --git a/home/config/nvim/plugins/nvim-lint.fnl b/home/config/nvim/plugins/nvim-lint.fnl index 3360674..fc3753d 100644 --- a/home/config/nvim/plugins/nvim-lint.fnl +++ b/home/config/nvim/plugins/nvim-lint.fnl @@ -27,7 +27,7 @@ ;; Configure Linters per FT (set lint.linters_by_ft {:dockerfile [:hadolint] :elixir [:credo] - :fennel [:fennel] + ;:fennel [:fennel] :fish [:fish] :markdown [:vale] :nix [:deadnix :nix :statix] diff --git a/home/config/nvim/plugins/urlview.fnl b/home/config/nvim/plugins/urlview.fnl index 09bec63..1970a64 100644 --- a/home/config/nvim/plugins/urlview.fnl +++ b/home/config/nvim/plugins/urlview.fnl @@ -1,3 +1,3 @@ (let [urlview (require :urlview)] - (urlview.setup {:navigate_method :system :debug false})) + (urlview.setup {:default_action :system :log_level_min vim.log.levels.INFO})) diff --git a/home/programs/nvim/default.nix b/home/programs/nvim/default.nix index f66a707..097a7e1 100644 --- a/home/programs/nvim/default.nix +++ b/home/programs/nvim/default.nix @@ -38,7 +38,7 @@ in # Diagnostic Tools deadnix hadolint - fennel-luajit + lua51Packages.fennel fnlfmt shellcheck shfmt @@ -324,7 +324,7 @@ in xdg.configFile."nvim" = { source = pkgs.runCommand "nvim-fennel-files" { - nativeBuildInputs = with pkgs; [ fennel-luajit stylua ]; + nativeBuildInputs = with pkgs; [ lua51Packages.fennel stylua ]; } '' mkdir -p $out/lua/configuration mkdir -p $out/lua/nifoc/utils diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index 3427710..b9c92d9 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -58,34 +58,34 @@ rec { }; yanky-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "yanky.nvim"; - version = "2022-09-21"; + version = "2022-09-26"; src = pkgs.fetchFromGitHub { owner = "gbprod"; repo = "yanky.nvim"; - rev = "6c39c8373e35da4a200c71f8eb0ec68df9716702"; - sha256 = "0gwg3q70xvl7prh82d9ggd80ckdinwvr7z91a645clb8mjjidayx"; + rev = "a75846d25904b3d8f3c2afbbc5ef8ebf1c4c2a74"; + sha256 = "03s35i1xgwm6rqibyhwy4hqmyzs09nxrfhs5l832n4laqxhbr3nl"; fetchSubmodules = false; }; }; cutlass-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "cutlass.nvim"; - version = "2022-05-16"; + version = "2022-09-26"; src = pkgs.fetchFromGitHub { owner = "gbprod"; repo = "cutlass.nvim"; - rev = "7611e52cd27b3bd2f391c56352271d8d272fc637"; - sha256 = "14y95vxcaaq40bf8bf9ijx8plc5x627hj54m1k1si9a6wi60p6b9"; + rev = "e607a4787ae898fe844ea678e7f5977a9358d0b1"; + sha256 = "1lsr9c8rpcihkcbwj7l0qq7715588vnsn45r3spn5nan1w6ycwqk"; fetchSubmodules = false; }; }; substitute-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "substitute.nvim"; - version = "2022-08-24"; + version = "2022-09-26"; src = pkgs.fetchFromGitHub { owner = "gbprod"; repo = "substitute.nvim"; - rev = "974d877cd3c7f7c41449788c3d99238aeabbe1b8"; - sha256 = "0zcqzxk5gkka1h24sr363zx7vb0k0088ayihmmcj719cyspci8qz"; + rev = "1eb56f6494642cf72cf1868312e26ac3d86621be"; + sha256 = "1x952d1ym9636gdmwg3grcbw4cb72gxjz2xpvlwpqzv4vhi2r2li"; fetchSubmodules = false; }; }; @@ -113,12 +113,12 @@ rec { }; nvim-treesitter = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-09-23"; + version = "2022-09-26"; src = pkgs.fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "ebea89483d6c4a6e2d563c8b884a66d546676350"; - sha256 = "153va6km6pbd55a8xzkimk82jfa175kvkvzf3zc21c8n54kavqg1"; + rev = "37398c7d68826c8d6ae3f85cc52d83fd3dee4f84"; + sha256 = "0bjpx34m8d6fpgldj26a25wg8g5ijl0cl95rprqjqm6xf149v504"; fetchSubmodules = false; }; passthru.withPlugins = @@ -252,12 +252,12 @@ rec { }; nvim-navic = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-navic"; - version = "2022-09-05"; + version = "2022-09-25"; src = pkgs.fetchFromGitHub { owner = "SmiteshP"; repo = "nvim-navic"; - rev = "202312e93869213c574d200a40eafeff4b4caec2"; - sha256 = "0dkxsrdzplg2a3gbgjv2ddwkqv80w870nzmq767f6j8ydb5ny3la"; + rev = "e0cfb2575dc83133c623cae0350d3c16d578d274"; + sha256 = "1619b1yc0rbpjmfz7idz0q6zjnjld4lf2ahkgcda2v0lcixd3hf3"; fetchSubmodules = false; }; }; @@ -285,12 +285,12 @@ rec { }; comment-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2022-09-04"; + version = "2022-09-26"; src = pkgs.fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "30d23aa2e1ba204a74d5dfb99777e9acbe9dd2d6"; - sha256 = "1nr66wjb4y1m5dp4vr9c1x4ygm45f4j3c2dy7cvin1abaj0bz06y"; + rev = "256cea0082c404cdced10319e9fa7580d33cf255"; + sha256 = "188wbh4wx256sna6b8m3hrsdfv529g6n928l220sy65kkv2dvj6k"; fetchSubmodules = false; }; }; @@ -318,12 +318,12 @@ rec { }; nvim-cmp = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-09-08"; + version = "2022-09-26"; src = pkgs.fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "913eb8599816b0b71fe959693080917d8063b26a"; - sha256 = "1jzjp97ggx31wsyvda1h21z74yjd3d58savacnlx4mvkli3zqgm1"; + rev = "83c097699deb76b0b727c048dc46302b1afdde6e"; + sha256 = "1q3qldiwdr6mnxbpvazbd6v22089ws3fmggs2ycg5y393jjrxfm4"; fetchSubmodules = false; }; }; @@ -538,12 +538,12 @@ rec { }; urlview-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "urlview.nvim"; - version = "2022-09-19"; + version = "2022-09-25"; src = pkgs.fetchFromGitHub { owner = "axieax"; repo = "urlview.nvim"; - rev = "ac8dccaddbc00afc84a1d96bfd95c4fe9a76e222"; - sha256 = "06jvy9q1433r9ghp51inbii29d9wrqcjr78132sfn8z14pzn9bia"; + rev = "da852a2d7e2aabae6d60178267d175d02c3396e2"; + sha256 = "0v4ahqalwrj076jp7kg52hk2cididihbgkzq1z6i1f86vnm69kv8"; fetchSubmodules = false; }; }; diff --git a/system/hosts/adsb-antenna.nix b/system/hosts/adsb-antenna.nix index 73a3a34..4c717d0 100644 --- a/system/hosts/adsb-antenna.nix +++ b/system/hosts/adsb-antenna.nix @@ -19,7 +19,7 @@ in ]; nix = { - package = pkgs.nixFlakes; + package = pkgs.nixVersions.stable; settings = { auto-optimise-store = true; diff --git a/system/hosts/sail.nix b/system/hosts/sail.nix index e09cde1..d9b48d6 100644 --- a/system/hosts/sail.nix +++ b/system/hosts/sail.nix @@ -19,7 +19,7 @@ in ]; nix = { - package = pkgs.nixFlakes; + package = pkgs.nixVersions.stable; settings = { auto-optimise-store = true;