Change neovim flake to repo rather than path, include sway config in linux module.
This commit is contained in:
parent
4e4361be5d
commit
4b1a5df3d8
4 changed files with 79 additions and 56 deletions
15
flake.lock
generated
15
flake.lock
generated
|
|
@ -44,14 +44,17 @@
|
|||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737307637,
|
||||
"narHash": "sha256-lfx4/4SEtpybaHj5iIFl05XEuFyem7zTReE5pK5F8Bo=",
|
||||
"path": "/home/nixos/dev/git/neovim-flake",
|
||||
"type": "path"
|
||||
"lastModified": 1737305661,
|
||||
"narHash": "sha256-Y8JhBrvP3eRERJPkcBp/SkPoK3myWmx4etCug/zjeY0=",
|
||||
"owner": "LarssonMartin1998",
|
||||
"repo": "neovim-flake",
|
||||
"rev": "35f8497440ae4702f9b772eab03d63f443875c15",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"path": "/home/nixos/dev/git/neovim-flake",
|
||||
"type": "path"
|
||||
"owner": "LarssonMartin1998",
|
||||
"repo": "neovim-flake",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
|
|
|
|||
24
flake.nix
24
flake.nix
|
|
@ -10,22 +10,30 @@
|
|||
};
|
||||
|
||||
neovim = {
|
||||
url = "path:/home/nixos/dev/git/neovim-flake";
|
||||
url = "github:LarssonMartin1998/neovim-flake";
|
||||
};
|
||||
};
|
||||
|
||||
outputs = { nixpkgs, home-manager, neovim, ... }:
|
||||
outputs =
|
||||
{
|
||||
nixpkgs,
|
||||
home-manager,
|
||||
neovim,
|
||||
...
|
||||
}:
|
||||
let
|
||||
lib = nixpkgs.lib;
|
||||
|
||||
makeHomeConfig = {
|
||||
makeHomeConfig =
|
||||
{
|
||||
name,
|
||||
system,
|
||||
extraModules ? []
|
||||
extraModules ? [ ],
|
||||
}:
|
||||
home-manager.lib.homeManagerConfiguration {
|
||||
pkgs = import nixpkgs { inherit system; };
|
||||
modules = [
|
||||
modules =
|
||||
[
|
||||
./nix/home.nix
|
||||
./nix/local_machine.nix
|
||||
]
|
||||
|
|
@ -38,7 +46,8 @@
|
|||
neovim-flake = neovim;
|
||||
};
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
homeConfigurations = {
|
||||
"wsl" = makeHomeConfig {
|
||||
name = "wsl";
|
||||
|
|
@ -49,16 +58,19 @@
|
|||
"linux-x86" = makeHomeConfig {
|
||||
name = "linux-x86";
|
||||
system = "x86_64-linux";
|
||||
extraModules = [ ./nix/linux.nix ];
|
||||
};
|
||||
|
||||
"linux-aarch64" = makeHomeConfig {
|
||||
name = "linux-aarch64";
|
||||
system = "aarch64-linux";
|
||||
extraModules = [ ./nix/linux.nix ];
|
||||
};
|
||||
|
||||
"darwin-aarch64" = makeHomeConfig {
|
||||
name = "darwin-aarch64";
|
||||
system = "aarch64-darwin";
|
||||
extraModules = [ ./nix/darwin.nix ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@
|
|||
".config/bat".source = ../bat;
|
||||
".config/ghostty".source = ../ghostty;
|
||||
".config/confutils".source = ../confutils;
|
||||
".config/wallpapers".source = ../wallpapers;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,2 +1,9 @@
|
|||
{ ... }: {
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
home = {
|
||||
stateVersion = "24.05";
|
||||
file = {
|
||||
".config/sway".source = ../sway;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue