From efedbbd39b72b4a615a6594cec52e12255a6a787 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Mon, 10 Jun 2024 11:06:04 -0500 Subject: [PATCH] Update to 24.11pre Update to nixpkgs past 24.05 Update hm unstable Update nur Replace nixneovim with nixvim --- flake.lock | 361 ++++++++++++++++++++-------------------- flake.nix | 5 +- home/home.nix | 5 +- home/vim.nix | 40 +++-- hosts/jude/virt.nix | 1 - modules/nixos/gnome.nix | 5 +- 6 files changed, 216 insertions(+), 201 deletions(-) diff --git a/flake.lock b/flake.lock index ae3f8df..6603df3 100644 --- a/flake.lock +++ b/flake.lock @@ -66,7 +66,43 @@ "type": "github" } }, + "devshell": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1717408969, + "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", + "owner": "numtide", + "repo": "devshell", + "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, "flake-compat": { + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -82,6 +118,43 @@ "type": "github" } }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -105,11 +178,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -136,22 +209,52 @@ "type": "github" } }, - "haumea": { + "git-hooks": { "inputs": { - "nixpkgs": "nixpkgs" + "flake-compat": "flake-compat_2", + "gitignore": "gitignore", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nixvim", + "nixpkgs" + ] }, "locked": { - "lastModified": 1685133229, - "narHash": "sha256-FePm/Gi9PBSNwiDFq3N+DWdfxFq0UKsVVTJS3cQPn94=", - "owner": "nix-community", - "repo": "haumea", - "rev": "34dd58385092a23018748b50f9b23de6266dffc2", + "lastModified": 1717664902, + "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", "type": "github" }, "original": { - "owner": "nix-community", - "ref": "v0.2.2", - "repo": "haumea", + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "nixvim", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", "type": "github" } }, @@ -183,11 +286,11 @@ ] }, "locked": { - "lastModified": 1716930911, - "narHash": "sha256-t4HT5j3Jy7skRB5PINnxcEBCkgE89rGBpwTI7YS4Ffo=", + "lastModified": 1717931644, + "narHash": "sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9b36cbe9292a649222b89fdb9ae9907e9c74086", + "rev": "3d65009effd77cb0d6e7520b68b039836a7606cf", "type": "github" }, "original": { @@ -221,16 +324,16 @@ "home-manager_2": { "inputs": { "nixpkgs": [ - "nixneovim", + "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1711133180, - "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=", + "lastModified": 1717525419, + "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb", + "rev": "a7117efb3725e6197dd95424136f79147aa35e5b", "type": "github" }, "original": { @@ -239,41 +342,24 @@ "type": "github" } }, - "nix-flake-tests": { - "locked": { - "lastModified": 1677844186, - "narHash": "sha256-ErJZ/Gs1rxh561CJeWP5bohA2IcTq1rDneu1WT6CVII=", - "owner": "antifuchs", - "repo": "nix-flake-tests", - "rev": "bbd9216bd0f6495bb961a8eb8392b7ef55c67afb", - "type": "github" - }, - "original": { - "owner": "antifuchs", - "repo": "nix-flake-tests", - "type": "github" - } - }, - "nix-github-actions": { + "nix-darwin": { "inputs": { "nixpkgs": [ - "nixneovim", - "nixneovimplugins", - "poetry2nix", + "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1688870561, - "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=", - "owner": "nix-community", - "repo": "nix-github-actions", - "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301", + "lastModified": 1716993688, + "narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "nix-github-actions", + "owner": "lnl7", + "repo": "nix-darwin", "type": "github" } }, @@ -293,83 +379,17 @@ "type": "github" } }, - "nixneovim": { - "inputs": { - "flake-utils": "flake-utils_2", - "haumea": "haumea", - "home-manager": "home-manager_2", - "nix-flake-tests": "nix-flake-tests", - "nixneovimplugins": "nixneovimplugins", - "nixpkgs": "nixpkgs_2", - "nmd": "nmd", - "nmt": "nmt" - }, - "locked": { - "lastModified": 1712087457, - "narHash": "sha256-gY+sitxzfFSKXaY0oDjhOSobvnMeAbH+A2cDQ9sh2/8=", - "owner": "NixNeovim", - "repo": "NixNeovim", - "rev": "333583b60d3f289457e1f0654248d5c8faf47889", - "type": "github" - }, - "original": { - "owner": "NixNeovim", - "repo": "NixNeovim", - "type": "github" - } - }, - "nixneovimplugins": { - "inputs": { - "flake-utils": [ - "nixneovim", - "flake-utils" - ], - "nixpkgs": [ - "nixneovim", - "nixpkgs" - ], - "poetry2nix": "poetry2nix" - }, - "locked": { - "lastModified": 1712087376, - "narHash": "sha256-HLgP3fgCzcFbw6BO3w/qBRRx0BH3c9dXqP/dhnnaMww=", - "owner": "nixneovim", - "repo": "nixneovimplugins", - "rev": "58d76e27b9cc686b8ae6ed26be985b1b9868c790", - "type": "github" - }, - "original": { - "owner": "nixneovim", - "repo": "nixneovimplugins", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1681001314, - "narHash": "sha256-5sDnCLdrKZqxLPK4KA8+f4A3YKO/u6ElpMILvX0g72c=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "367c0e1086a4eb4502b24d872cea2c7acdd557f4", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1711163522, - "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", - "owner": "nixos", + "lastModified": 1717786204, + "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", + "rev": "051f920625ab5aabe37c920346e3e69d7d34400e", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -393,11 +413,11 @@ }, "nixunstable": { "locked": { - "lastModified": 1716769173, - "narHash": "sha256-7EXDb5WBw+d004Agt+JHC/Oyh/KTUglOaQ4MNjBbo5w=", + "lastModified": 1717786204, + "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9ca3f649614213b2aaf5f1e16ec06952fe4c2632", + "rev": "051f920625ab5aabe37c920346e3e69d7d34400e", "type": "github" }, "original": { @@ -407,46 +427,38 @@ "type": "github" } }, - "nmd": { - "flake": false, - "locked": { - "lastModified": 1672949361, - "narHash": "sha256-WWg1kbilAb3sA+RoJtSYfAZvyYu1Nk79ocHaerwbQxQ=", - "owner": "~rycee", - "repo": "nmd", - "rev": "fb9cf8e991487c6923f3c654b8ae51b6f0f205ce", - "type": "sourcehut" + "nixvim": { + "inputs": { + "devshell": "devshell", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "git-hooks": "git-hooks", + "home-manager": "home-manager_2", + "nix-darwin": "nix-darwin", + "nixpkgs": "nixpkgs", + "treefmt-nix": "treefmt-nix" }, - "original": { - "owner": "~rycee", - "repo": "nmd", - "rev": "fb9cf8e991487c6923f3c654b8ae51b6f0f205ce", - "type": "sourcehut" - } - }, - "nmt": { - "flake": false, "locked": { - "lastModified": 1709382952, - "narHash": "sha256-n/BvuWVcQxaXCU30feNRqWWqabhIIO2+tRFnhLIhjiQ=", - "owner": "jooooscha", - "repo": "nmt", - "rev": "86a09994d1007c39a1f4d386e3caea9b4681d9d6", + "lastModified": 1718028681, + "narHash": "sha256-C27X1vnsxKaKd1dCUU/u3LU+3DiA3Jo/ApvDiDNPIrI=", + "owner": "nix-community", + "repo": "nixvim", + "rev": "33a32c94176feebd3ff5259ce418b989b428d5ae", "type": "github" }, "original": { - "owner": "jooooscha", - "repo": "nmt", + "owner": "nix-community", + "repo": "nixvim", "type": "github" } }, "nurpkgs": { "locked": { - "lastModified": 1713815481, - "narHash": "sha256-WyJ2WR9GCkw3cNCTp7Xe/nbeAINPLqmlEQYBVzwnq54=", + "lastModified": 1718026702, + "narHash": "sha256-B62vRJYFK7x5pJKDvXCIRgKcAS9K/KwoTBYAECfb81A=", "owner": "nix-community", "repo": "NUR", - "rev": "28a705279a74e75b4f8beeba08efc22606346585", + "rev": "f7e5fe023ea5742a1db039b6ba17f717ef24cc0f", "type": "github" }, "original": { @@ -455,34 +467,6 @@ "type": "github" } }, - "poetry2nix": { - "inputs": { - "flake-utils": [ - "nixneovim", - "nixneovimplugins", - "flake-utils" - ], - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "nixneovim", - "nixneovimplugins", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1689849924, - "narHash": "sha256-d259Z2S7CS7Na04qQNQ6LYQILuI7cf4Rpe76qc4mz40=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "1d7eda9336f336392d24e9602be5cb9be7ae405c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "poetry2nix", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -491,9 +475,9 @@ "hm": "hm", "hmunstable": "hmunstable", "nix23_05": "nix23_05", - "nixneovim": "nixneovim", "nixstable": "nixstable", "nixunstable": "nixunstable", + "nixvim": "nixvim", "nurpkgs": "nurpkgs", "wsl": "wsl" } @@ -558,9 +542,30 @@ "type": "github" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1717850719, + "narHash": "sha256-npYqVg+Wk4oxnWrnVG7416fpfrlRhp/lQ6wQ4DHI8YE=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "4fc1c45a5f50169f9f29f6a98a438fb910b834ed", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "wsl": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_3", "flake-utils": "flake-utils_3", "nixpkgs": [ "nixunstable" diff --git a/flake.nix b/flake.nix index 148529a..b8037b4 100644 --- a/flake.nix +++ b/flake.nix @@ -22,7 +22,7 @@ url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixstable"; }; - nixneovim.url = "github:NixNeovim/NixNeovim"; + nixvim.url = "github:nix-community/nixvim"; nix23_05.url = "github:NixOS/nixpkgs/nixos-23.05"; nixstable.url = "github:nixos/nixpkgs/nixos-23.11"; nixunstable.url = "github:nixos/nixpkgs/nixos-unstable"; @@ -39,10 +39,10 @@ flake-utils, hm, hmunstable, - nixneovim, nix23_05, nixstable, nixunstable, + nixvim, nurpkgs, wsl, @@ -58,7 +58,6 @@ agenix.overlays.default pkg-sets local_overlay - nixneovim.overlays.default nurpkgs.overlay ]; diff --git a/home/home.nix b/home/home.nix index 12527fa..f35e327 100644 --- a/home/home.nix +++ b/home/home.nix @@ -3,9 +3,12 @@ host ? "most", ...}: +let + system = pkgs.system; +in { imports = [ - inputs.nixneovim.nixosModules.default + inputs.nixvim.homeManagerModules.default ./modules ./ansible.nix ./bash.nix diff --git a/home/vim.nix b/home/vim.nix index 7caa14a..89ab4cd 100644 --- a/home/vim.nix +++ b/home/vim.nix @@ -27,9 +27,9 @@ in pyright ]; - programs.nixneovim = { + programs.nixvim = { enable = true; - colorscheme = "gruvbox"; + colorschemes.gruvbox.enable = true; globals = { indent_guides_enable_on_vim_startup = 1; nix_recommended_style = 0; @@ -40,7 +40,7 @@ in "\\.class$" ]; }; - options = { + opts = { background = "dark"; backup = false; copyindent = true; @@ -68,22 +68,30 @@ in wrap = false; writebackup = false; }; - mappings = { - normalVisualOp = { - "" = ''":BufExplorer"''; - "" = ''":NERDTreeToggle"''; - "" = ''":Files"''; - "" = ''"j"''; - "" = ''"k"''; - "" = ''"h"''; - "" = ''"l"''; - "" = ''":GFiles?"''; - }; - }; + keymaps = let + winMove = key: { mode = "n"; key = ""; action = "${key}"; }; + in [ { + mode = "n"; + key = ""; + action = "BufExplorer"; + } { + mode = "n"; + key = ""; + action = "NERDTreeToggle"; + } { + mode = "n"; + key = ""; + action = "GFiles?"; + } + (winMove "h") + (winMove "j") + (winMove "k") + (winMove "l") + ]; plugins = { airline = { enable = true; - theme = "gruvbox"; + settings.theme = "gruvbox"; }; gitgutter.enable = true; fugitive.enable = true; diff --git a/hosts/jude/virt.nix b/hosts/jude/virt.nix index 00faf73..4cd286d 100644 --- a/hosts/jude/virt.nix +++ b/hosts/jude/virt.nix @@ -6,7 +6,6 @@ guestfs-tools libguestfs OVMFFull - ovftool packer virt-manager vmware-workstation diff --git a/modules/nixos/gnome.nix b/modules/nixos/gnome.nix index e820feb..e127bc0 100644 --- a/modules/nixos/gnome.nix +++ b/modules/nixos/gnome.nix @@ -13,13 +13,14 @@ in with lib; { services = { accounts-daemon.enable = true; + # Trackpad support + libinput.enable = true; + xserver = { enable = true; displayManager.gdm.enable = true; desktopManager.gnome.enable = true; xkb.layout = "us"; - # Trackpad support - libinput.enable = true; }; udev.packages = with pkgs; [