Move Nix files into a nix directory
Move everything from `config` to the root level.
This commit is contained in:
parent
9f47df62b5
commit
69a397e624
|
@ -26,7 +26,7 @@
|
|||
|
||||
username = "opdavies";
|
||||
|
||||
mkNixos = import ./lib/nixos {
|
||||
mkNixos = import ./nix/lib/nixos {
|
||||
inherit
|
||||
inputs
|
||||
outputs
|
||||
|
@ -36,7 +36,7 @@
|
|||
username
|
||||
;
|
||||
};
|
||||
mkWsl = import ./lib/wsl2 {
|
||||
mkWsl = import ./nix/lib/wsl2 {
|
||||
inherit
|
||||
inputs
|
||||
outputs
|
||||
|
@ -54,13 +54,13 @@
|
|||
|
||||
opdavies-nvim = buildVimPlugin {
|
||||
name = "opdavies-nvim";
|
||||
src = ./config/neovim;
|
||||
src = ./nvim;
|
||||
};
|
||||
};
|
||||
|
||||
formatter.${system} = pkgs.nixfmt-rfc-style;
|
||||
|
||||
overlays = import ./overlays { inherit inputs; };
|
||||
overlays = import ./nix/overlays { inherit inputs; };
|
||||
|
||||
nixosConfigurations = {
|
||||
lemp11 = mkNixos {
|
||||
|
|
|
@ -18,7 +18,7 @@ let
|
|||
username
|
||||
;
|
||||
};
|
||||
shared-config = import "${self}/lib/shared/home-manager.nix" {
|
||||
shared-config = import "${self}/nix/lib/shared/home-manager.nix" {
|
||||
inherit
|
||||
inputs
|
||||
pkgs
|
||||
|
@ -26,7 +26,7 @@ let
|
|||
username
|
||||
;
|
||||
};
|
||||
shared-packages = import "${self}/lib/shared/home-manager-packages.nix" {
|
||||
shared-packages = import "${self}/nix/lib/shared/home-manager-packages.nix" {
|
||||
inherit
|
||||
desktop
|
||||
inputs
|
|
@ -37,7 +37,7 @@ inputs.nixpkgs.lib.nixosSystem {
|
|||
};
|
||||
useGlobalPkgs = true;
|
||||
useUserPackages = true;
|
||||
users."${username}" = import "${self}/home/${username}";
|
||||
users."${username}" = import "${self}/nix/home/${username}";
|
||||
};
|
||||
}
|
||||
|
|
@ -17,7 +17,7 @@ let
|
|||
];
|
||||
};
|
||||
|
||||
shared-config = import "${self}/lib/shared/home-manager.nix" {
|
||||
shared-config = import "${self}/nix/lib/shared/home-manager.nix" {
|
||||
inherit
|
||||
inputs
|
||||
pkgs
|
||||
|
@ -26,7 +26,7 @@ let
|
|||
;
|
||||
};
|
||||
|
||||
shared-packages = import "${self}/lib/shared/home-manager-packages.nix" {
|
||||
shared-packages = import "${self}/nix/lib/shared/home-manager-packages.nix" {
|
||||
inherit inputs pkgs username;
|
||||
desktop = false;
|
||||
};
|
|
@ -8,7 +8,7 @@ let
|
|||
inherit (lib) strings;
|
||||
inherit (strings) toInt;
|
||||
|
||||
theme = import "${self}/lib/theme" { inherit pkgs; };
|
||||
theme = import "${self}/nix/lib/theme" { inherit pkgs; };
|
||||
in
|
||||
{
|
||||
programs.alacritty = {
|
|
@ -3,7 +3,7 @@
|
|||
home.sessionPath = [ "$HOME/.local/bin" ];
|
||||
|
||||
home.file.".local/bin" = {
|
||||
source = "${self}/bin";
|
||||
source = "${self}/nix/bin";
|
||||
recursive = true;
|
||||
};
|
||||
}
|
|
@ -1,7 +1,7 @@
|
|||
{ self, ... }:
|
||||
{
|
||||
xdg.configFile.phpactor = {
|
||||
source = "${self}/config/phpactor";
|
||||
source = "${self}/phpactor";
|
||||
recursive = true;
|
||||
};
|
||||
}
|
|
@ -5,7 +5,7 @@
|
|||
};
|
||||
|
||||
xdg.configFile."zellij" = {
|
||||
source = "${self}/config/zellij";
|
||||
source = "${self}/zellij";
|
||||
recursive = true;
|
||||
};
|
||||
}
|
|
@ -7,7 +7,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
theme = import "${self}/lib/theme" { inherit pkgs; };
|
||||
theme = import "${self}/nix/lib/theme" { inherit pkgs; };
|
||||
|
||||
modifier = "Mod4";
|
||||
in
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue