diff --git a/flake.lock b/flake.lock index 5332878..c8ed260 100644 --- a/flake.lock +++ b/flake.lock @@ -16,29 +16,6 @@ "type": "github" } }, - "devshell": { - "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": [ - "nixvim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1711099426, - "narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=", - "owner": "numtide", - "repo": "devshell", - "rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -56,20 +33,6 @@ } }, "flake-compat_2": { - "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_3": { "flake": false, "locked": { "lastModified": 1696426674, @@ -127,28 +90,6 @@ "type": "indirect" } }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": [ - "nixvim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -167,83 +108,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixvim", - "pre-commit-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" - } - }, "hercules-ci-effects": { "inputs": { "flake-parts": "flake-parts_2", @@ -287,28 +151,6 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712645849, - "narHash": "sha256-67v20E0gH7nvAaMsah2oRIocnxGO25fATUyzQHIywxQ=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "40a99619da804a78a0b166e5c6911108c059c3a8", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "hyprcursor": { "inputs": { "hyprlang": [ @@ -505,6 +347,23 @@ "type": "github" } }, + "neovim-src": { + "flake": false, + "locked": { + "lastModified": 1713716176, + "narHash": "sha256-RXKbZ40QQ1IvksBIRAmj9uWgHkGvER2dlpZVEBeaMnI=", + "owner": "neovim", + "repo": "neovim", + "rev": "f694d020c576fb037eb92bae3bbf03a69d8686b6", + "type": "github" + }, + "original": { + "owner": "neovim", + "ref": "f694d020c576fb037eb92bae3bbf03a69d8686b6", + "repo": "neovim", + "type": "github" + } + }, "nix-colors": { "inputs": { "base16-schemes": "base16-schemes", @@ -524,28 +383,6 @@ "type": "github" } }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1711763326, - "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1713596654, @@ -609,25 +446,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1712757991, - "narHash": "sha256-kR7C7Fqt3JP40h0mzmSZeWI5pk1iwqj4CSeGjnUbVHc=", + "lastModified": 1713895582, + "narHash": "sha256-cfh1hi+6muQMbi9acOlju3V1gl8BEaZBXBR9jQfQi4U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d6b3ddd253c578a7ab98f8011e59990f21dc3932", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1712439257, - "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", + "rev": "572af610f6151fd41c212f897c71f7056e3fb518", "type": "github" }, "original": { @@ -637,77 +460,23 @@ "type": "github" } }, - "nixvim": { + "nvim-flake": { "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_3", - "nixvim": "nixvim_2" - }, - "locked": { - "lastModified": 1713955030, - "narHash": "sha256-7EnP7DTs5zai0HyfSlLW03ZDZUhqv4SLRXbwOiPZBZY=", - "owner": "eRgo35", - "repo": "nixvim", - "rev": "29cab4c3ff9e79769778862e35a3047d3d0ea00f", - "type": "github" - }, - "original": { - "owner": "eRgo35", - "repo": "nixvim", - "type": "github" - } - }, - "nixvim_2": { - "inputs": { - "devshell": "devshell", "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_3", - "home-manager": "home-manager_2", - "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_4", - "pre-commit-hooks": "pre-commit-hooks" + "neovim-src": "neovim-src", + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1712741888, - "narHash": "sha256-G4HDgs27bwy6/snFHIhU4OZKWdFBHFuxDyCkYj2L9bw=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "ffa3020522e210fcae934f10440c24ea1d46f6ea", + "lastModified": 1714040289, + "narHash": "sha256-DZJCNtoGOxnNT7y3rXXqzRaQfilQPGJpkmcAEkc14Tk=", + "owner": "Gerg-L", + "repo": "nvim-flake", + "rev": "0d64affe1e384b1a90043a3cb7fb050d78e9434b", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "nixvim", - "type": "github" - } - }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_4", - "gitignore": "gitignore", - "nixpkgs": [ - "nixvim", - "nixvim", - "nixpkgs" - ], - "nixpkgs-stable": [ - "nixvim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712579741, - "narHash": "sha256-igpsH+pa6yFwYOdah3cFciCk8gw+ytniG9quf5f/q84=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "70f504012f0a132ac33e56988e1028d88a48855c", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", + "owner": "Gerg-L", + "repo": "nvim-flake", "type": "github" } }, @@ -721,7 +490,7 @@ "nix-colors": "nix-colors", "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", - "nixvim": "nixvim" + "nvim-flake": "nvim-flake" } }, "systems": { @@ -754,51 +523,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "wlroots": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 83b4d1f..c4ec8a3 100644 --- a/flake.nix +++ b/flake.nix @@ -24,7 +24,9 @@ neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; - nixvim.url = "github:eRgo35/nixvim"; + nvim-flake = { + url = "github:Gerg-L/nvim-flake"; + }; hyprland = { url = "github:hyprwm/hyprland"; @@ -47,7 +49,6 @@ nixpkgs, nixpkgs-unstable, home-manager, - nixvim, ... } @ inputs: let inherit (self) outputs; @@ -70,9 +71,6 @@ # Other options beside 'alejandra' include 'nixpkgs-fmt' formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); - nixpkgs.overlays = [ - nixvim.overlays.default - ]; # Your custom packages and modifications, exported as overlays overlays = import ./overlays {inherit inputs;}; # Reusable nixos modules you might want to export diff --git a/home-manager/home.nix b/home-manager/home.nix index 6279877..339c300 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -19,7 +19,7 @@ ./features/cli ./features/desktop/dwm ./features/kitty.nix - # ./features/neovim.nix + ./features/neovim.nix ./features/tmux.nix ./features/neovide.nix ./features/emacs.nix @@ -145,14 +145,14 @@ ]; }; - #programs.keychain = { - # enable = true; - # enableZshIntegration = true; - # keys = [ - # "id_rsa" - # ]; - # enableXsessionIntegration = true; - #}; + programs.keychain = { + enable = true; + enableZshIntegration = true; + keys = [ + "id_rsa" + ]; + enableXsessionIntegration = true; + }; systemd.user.sessionVariables.SSH_AUTH_SOCK = "/run/user/1000/keyring/ssh";