jalil/configuration.nix
1
1
Fork 0
Code Issues 1 Pull requests Projects Activity Actions

feat(flake): Use nixvim

Browse source
This commit is contained in:
Jalil David Salamé Messina 2024-03-02 20:48:34 +01:00
parent 34cd265786
commit c94c4a38df
Signed by: jalil
GPG key ID: F016B9E770737A0B
3 changed files with 105 additions and 184 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

274
flake.lock
View file

@ -168,6 +168,28 @@
"type": "github" "type": "github"
} }
}, },
"devshell": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1708939976,
"narHash": "sha256-O5+nFozxz2Vubpdl1YZtPrilcIXPcRAjqNdNE8oCRoA=",
"owner": "numtide",
"repo": "devshell",
"rev": "5ddecd67edbd568ebe0a55905273e56cc82aabe3",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "devshell",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -185,6 +207,20 @@
} }
}, },
"flake-compat_2": { "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, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
@ -200,7 +236,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_3": { "flake-compat_4": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1673956053, "lastModified": 1673956053,
@ -258,6 +294,27 @@
"type": "indirect" "type": "indirect"
} }
}, },
"flake-parts_3": {
"inputs": {
"nixpkgs-lib": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1706830856,
"narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-schemas": { "flake-schemas": {
"locked": { "locked": {
"lastModified": 1697467827, "lastModified": 1697467827,
@ -309,11 +366,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1709126324, "lastModified": 1701680307,
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "d465f4819400de7c8d874d50b982301f28a84605", "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -394,25 +451,6 @@
"type": "github" "type": "github"
} }
}, },
"haumea": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1685133229,
"narHash": "sha256-FePm/Gi9PBSNwiDFq3N+DWdfxFq0UKsVVTJS3cQPn94=",
"owner": "nix-community",
"repo": "haumea",
"rev": "34dd58385092a23018748b50f9b23de6266dffc2",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "v0.2.2",
"repo": "haumea",
"type": "github"
}
},
"hercules-ci-effects": { "hercules-ci-effects": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
@ -524,96 +562,24 @@
"type": "github" "type": "github"
} }
}, },
"nix-flake-tests": { "nix-darwin": {
"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": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixneovim", "nixvim",
"nixneovimplugins",
"poetry2nix",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1688870561, "lastModified": 1709001452,
"narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=", "narHash": "sha256-FnZ54wkil54hKvr1irdKic1TE27lHQI9dKQmOJRrtlU=",
"owner": "nix-community", "owner": "lnl7",
"repo": "nix-github-actions", "repo": "nix-darwin",
"rev": "165b1650b753316aa7f1787f3005a8d2da0f5301", "rev": "6c06334f0843c7300d1678726bb607ce526f6b36",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "lnl7",
"repo": "nix-github-actions", "repo": "nix-darwin",
"type": "github"
}
},
"nixneovim": {
"inputs": {
"flake-utils": "flake-utils_2",
"haumea": "haumea",
"home-manager": [
"home-manager"
],
"nix-flake-tests": "nix-flake-tests",
"nixneovimplugins": "nixneovimplugins",
"nixpkgs": [
"nixpkgs"
],
"nmd": "nmd",
"nmt": "nmt"
},
"locked": {
"lastModified": 1709216523,
"narHash": "sha256-8BaqUeMgwDBsXVpyE+AYVW7QBjR0DnsGnY0qZHdi9Ew=",
"owner": "NixNeovim",
"repo": "NixNeovim",
"rev": "eebce182253d8c665a8a19e0b056f6cfaf97872c",
"type": "github"
},
"original": {
"owner": "NixNeovim",
"repo": "NixNeovim",
"type": "github"
}
},
"nixneovimplugins": {
"inputs": {
"flake-utils": [
"nixneovim",
"flake-utils"
],
"nixpkgs": [
"nixneovim",
"nixpkgs"
],
"poetry2nix": "poetry2nix"
},
"locked": {
"lastModified": 1709216468,
"narHash": "sha256-3b3RFHQzea2L7lMUiS87r2A/RC+TJbBo/g7IY+5DYfk=",
"owner": "nixneovim",
"repo": "nixneovimplugins",
"rev": "03cd562d0e4700216dcf8c3e14a4eebf0b2e5681",
"type": "github"
},
"original": {
"owner": "nixneovim",
"repo": "nixneovimplugins",
"type": "github" "type": "github"
} }
}, },
@ -634,17 +600,17 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1681001314, "lastModified": 1709150264,
"narHash": "sha256-5sDnCLdrKZqxLPK4KA8+f4A3YKO/u6ElpMILvX0g72c=", "narHash": "sha256-HofykKuisObPUfj0E9CJVfaMhawXkYx3G8UIFR/XQ38=",
"owner": "nix-community", "owner": "NixOS",
"repo": "nixpkgs.lib", "repo": "nixpkgs",
"rev": "367c0e1086a4eb4502b24d872cea2c7acdd557f4", "rev": "9099616b93301d5cf84274b184a3a5ec69e94e08",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "id": "nixpkgs",
"repo": "nixpkgs.lib", "ref": "nixos-unstable",
"type": "github" "type": "indirect"
} }
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
@ -663,85 +629,39 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixvim": {
"locked": {
"lastModified": 1709150264,
"narHash": "sha256-HofykKuisObPUfj0E9CJVfaMhawXkYx3G8UIFR/XQ38=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9099616b93301d5cf84274b184a3a5ec69e94e08",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-unstable",
"type": "indirect"
}
},
"nmd": {
"flake": false,
"locked": {
"lastModified": 1672949361,
"narHash": "sha256-WWg1kbilAb3sA+RoJtSYfAZvyYu1Nk79ocHaerwbQxQ=",
"owner": "~rycee",
"repo": "nmd",
"rev": "fb9cf8e991487c6923f3c654b8ae51b6f0f205ce",
"type": "sourcehut"
},
"original": {
"owner": "~rycee",
"repo": "nmd",
"rev": "fb9cf8e991487c6923f3c654b8ae51b6f0f205ce",
"type": "sourcehut"
}
},
"nmt": {
"flake": false,
"locked": {
"lastModified": 1694274695,
"narHash": "sha256-PufoLMSuBYkga8hTqYf/cIQzSuy2lfFj+cdKcp2nLEI=",
"owner": "jooooscha",
"repo": "nmt",
"rev": "29595267923b4a6ce766ff0d85afaa930842b88d",
"type": "github"
},
"original": {
"owner": "jooooscha",
"repo": "nmt",
"type": "github"
}
},
"poetry2nix": {
"inputs": { "inputs": {
"flake-utils": [ "devshell": "devshell",
"nixneovim", "flake-compat": "flake-compat_2",
"nixneovimplugins", "flake-parts": "flake-parts_3",
"flake-utils" "home-manager": [
"home-manager"
], ],
"nix-github-actions": "nix-github-actions", "nix-darwin": "nix-darwin",
"nixpkgs": [ "nixpkgs": [
"nixneovim",
"nixneovimplugins",
"nixpkgs" "nixpkgs"
],
"pre-commit-hooks": [
"pre-commit-hooks"
] ]
}, },
"locked": { "locked": {
"lastModified": 1689849924, "lastModified": 1709387460,
"narHash": "sha256-d259Z2S7CS7Na04qQNQ6LYQILuI7cf4Rpe76qc4mz40=", "narHash": "sha256-NTfi6gAsR5EReuvFGihuDUkBqb9DuQQqFviQcXVwX0c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "poetry2nix", "repo": "nixvim",
"rev": "1d7eda9336f336392d24e9602be5cb9be7ae405c", "rev": "274293fd691250ab96985aa4a04c653ab462876e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"repo": "poetry2nix", "repo": "nixvim",
"type": "github" "type": "github"
} }
}, },
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": [
@ -769,9 +689,9 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"jpassmenu": "jpassmenu", "jpassmenu": "jpassmenu",
"neovim-nightly": "neovim-nightly", "neovim-nightly": "neovim-nightly",
"nixneovim": "nixneovim",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs",
"nixvim": "nixvim",
"pre-commit-hooks": "pre-commit-hooks", "pre-commit-hooks": "pre-commit-hooks",
"stylix": "stylix" "stylix": "stylix"
} }
@ -787,7 +707,7 @@
"base16-kitty": "base16-kitty", "base16-kitty": "base16-kitty",
"base16-tmux": "base16-tmux", "base16-tmux": "base16-tmux",
"base16-vim": "base16-vim", "base16-vim": "base16-vim",
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_4",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"home-manager": [ "home-manager": [
"home-manager" "home-manager"

13
flake.nix
View file

@ -16,9 +16,10 @@
inputs.audiomenu.url = "github:jalil-salame/audiomenu"; inputs.audiomenu.url = "github:jalil-salame/audiomenu";
inputs.audiomenu.inputs.nixpkgs.follows = "nixpkgs"; inputs.audiomenu.inputs.nixpkgs.follows = "nixpkgs";
inputs.nixneovim.url = "github:NixNeovim/NixNeovim"; inputs.nixvim.url = "github:nix-community/nixvim";
inputs.nixneovim.inputs.nixpkgs.follows = "nixpkgs"; inputs.nixvim.inputs.nixpkgs.follows = "nixpkgs";
inputs.nixneovim.inputs.home-manager.follows = "home-manager"; inputs.nixvim.inputs.home-manager.follows = "home-manager";
inputs.nixvim.inputs.pre-commit-hooks.follows = "pre-commit-hooks";
# WARN: Flakehub is outdated (39 days out of date) # WARN: Flakehub is outdated (39 days out of date)
# inputs.home-manager.url = "https://flakehub.com/f/nix-community/home-manager/0.1.*.tar.gz"; # inputs.home-manager.url = "https://flakehub.com/f/nix-community/home-manager/0.1.*.tar.gz";
@ -43,7 +44,7 @@
, pre-commit-hooks , pre-commit-hooks
, jpassmenu , jpassmenu
, audiomenu , audiomenu
, nixneovim , nixvim
, neovim-nightly , neovim-nightly
}: }:
let let
@ -70,7 +71,7 @@
# Provide necessary overlays # Provide necessary overlays
overlays = { overlays = {
nixneovim = nixneovim.overlays.default; nixvim = nixvim.overlays.default;
neovim-nightly = neovim-nightly.overlays.default; neovim-nightly = neovim-nightly.overlays.default;
jpassmenu = jpassmenu.overlays.default; jpassmenu = jpassmenu.overlays.default;
audiomenu = audiomenu.overlays.default; audiomenu = audiomenu.overlays.default;
@ -124,7 +125,7 @@
nixosModules = nixosModules =
let let
nvim-config.imports = [ nvim-config.imports = [
nixneovim.nixosModules.homeManager nixvim.homeManagerModules.nixvim
./nvim ./nvim
]; ];
overlays = builtins.attrValues self.overlays; overlays = builtins.attrValues self.overlays;

2
nvim/default.nix
View file

@ -8,7 +8,7 @@ in
]; ];
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
programs.nixneovim = { programs.nixvim = {
enable = true; enable = true;
package = pkgs.neovim-nightly; package = pkgs.neovim-nightly;
defaultEditor = true; defaultEditor = true;