Move Nix files into a nix directory

Move everything from `config` to the root level.
This commit is contained in:
Oliver Davies 2024-11-20 21:37:15 +00:00
parent 9f47df62b5
commit 69a397e624
124 changed files with 14 additions and 14 deletions

View file

@ -26,7 +26,7 @@
username = "opdavies"; username = "opdavies";
mkNixos = import ./lib/nixos { mkNixos = import ./nix/lib/nixos {
inherit inherit
inputs inputs
outputs outputs
@ -36,7 +36,7 @@
username username
; ;
}; };
mkWsl = import ./lib/wsl2 { mkWsl = import ./nix/lib/wsl2 {
inherit inherit
inputs inputs
outputs outputs
@ -54,13 +54,13 @@
opdavies-nvim = buildVimPlugin { opdavies-nvim = buildVimPlugin {
name = "opdavies-nvim"; name = "opdavies-nvim";
src = ./config/neovim; src = ./nvim;
}; };
}; };
formatter.${system} = pkgs.nixfmt-rfc-style; formatter.${system} = pkgs.nixfmt-rfc-style;
overlays = import ./overlays { inherit inputs; }; overlays = import ./nix/overlays { inherit inputs; };
nixosConfigurations = { nixosConfigurations = {
lemp11 = mkNixos { lemp11 = mkNixos {

View file

@ -18,7 +18,7 @@ let
username username
; ;
}; };
shared-config = import "${self}/lib/shared/home-manager.nix" { shared-config = import "${self}/nix/lib/shared/home-manager.nix" {
inherit inherit
inputs inputs
pkgs pkgs
@ -26,7 +26,7 @@ let
username username
; ;
}; };
shared-packages = import "${self}/lib/shared/home-manager-packages.nix" { shared-packages = import "${self}/nix/lib/shared/home-manager-packages.nix" {
inherit inherit
desktop desktop
inputs inputs

View file

@ -37,7 +37,7 @@ inputs.nixpkgs.lib.nixosSystem {
}; };
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
users."${username}" = import "${self}/home/${username}"; users."${username}" = import "${self}/nix/home/${username}";
}; };
} }

View file

@ -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 inherit
inputs inputs
pkgs 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; inherit inputs pkgs username;
desktop = false; desktop = false;
}; };

View file

@ -8,7 +8,7 @@ let
inherit (lib) strings; inherit (lib) strings;
inherit (strings) toInt; inherit (strings) toInt;
theme = import "${self}/lib/theme" { inherit pkgs; }; theme = import "${self}/nix/lib/theme" { inherit pkgs; };
in in
{ {
programs.alacritty = { programs.alacritty = {

View file

@ -3,7 +3,7 @@
home.sessionPath = [ "$HOME/.local/bin" ]; home.sessionPath = [ "$HOME/.local/bin" ];
home.file.".local/bin" = { home.file.".local/bin" = {
source = "${self}/bin"; source = "${self}/nix/bin";
recursive = true; recursive = true;
}; };
} }

View file

@ -1,7 +1,7 @@
{ self, ... }: { self, ... }:
{ {
xdg.configFile.phpactor = { xdg.configFile.phpactor = {
source = "${self}/config/phpactor"; source = "${self}/phpactor";
recursive = true; recursive = true;
}; };
} }

View file

@ -5,7 +5,7 @@
}; };
xdg.configFile."zellij" = { xdg.configFile."zellij" = {
source = "${self}/config/zellij"; source = "${self}/zellij";
recursive = true; recursive = true;
}; };
} }

View file

@ -7,7 +7,7 @@
}: }:
let let
theme = import "${self}/lib/theme" { inherit pkgs; }; theme = import "${self}/nix/lib/theme" { inherit pkgs; };
modifier = "Mod4"; modifier = "Mod4";
in in

Some files were not shown because too many files have changed in this diff Show more