Move home-manager files to home/, rename some of the files

This commit is contained in:
xenia 2023-10-20 22:33:34 +02:00
parent daf9fb91a2
commit 8adb12733b
8 changed files with 7 additions and 7 deletions

View File

@ -36,7 +36,7 @@
xdg-runtime-dir = "/tmp/xdg-rt"; xdg-runtime-dir = "/tmp/xdg-rt";
mkPkgs = system: import nixpkgs { system = system; config.allowUnfree = true; }; mkPkgs = system: import nixpkgs { system = system; config.allowUnfree = true; };
mkHome = {username, home-dir, prompt-color, system, pkgs} : import ./home.nix { mkHome = {username, home-dir, prompt-color, system, pkgs} : import ./home/common.nix {
inherit username home-dir prompt-color pkgs xdg-runtime-dir; inherit username home-dir prompt-color pkgs xdg-runtime-dir;
kak-pkg = kak.packages.${system}.kak; kak-pkg = kak.packages.${system}.kak;
@ -44,10 +44,10 @@
ansi-utils = ansi-utils.packages.${system}; ansi-utils = ansi-utils.packages.${system};
unambig-path = unambig-path.packages.${system}.unambig-path; unambig-path = unambig-path.packages.${system}.unambig-path;
}; };
mkLaptop = {system, pkgs} : import ./laptop.nix { mkLaptop = {system, pkgs} : import ./home/graphical.nix {
inherit pkgs xdg-runtime-dir; inherit pkgs xdg-runtime-dir;
}; };
mkMac = {system, pkgs, laptop} : import ./mac.nix { mkMac = {system, pkgs, laptop} : import ./home/mac.nix {
emacs = laptop.programs.emacs.package; emacs = laptop.programs.emacs.package;
inherit pkgs xdg-runtime-dir; inherit pkgs xdg-runtime-dir;
}; };
@ -56,7 +56,7 @@
inherit system pkgs; inherit system pkgs;
}; };
in { in {
homeConfigurations."xenia" = homeConfigurations."xenia@Joe-Bidens-MacBook-Pro.local" =
let let
system = "aarch64-darwin"; system = "aarch64-darwin";
pkgs = mkPkgs system; pkgs = mkPkgs system;

View File

@ -100,7 +100,7 @@ in rec {
echo -en "%{\033[0m%} "; echo -en "%{\033[0m%} ";
)' )'
'' ''
+ builtins.readFile ./dotfiles/zshrc; + builtins.readFile ../dotfiles/zshrc;
}; };
programs.direnv = { programs.direnv = {

View File

@ -18,7 +18,7 @@ in rec {
vterm bind-key rust-mode lsp-mode company meow agda2-mode haskell-mode vterm bind-key rust-mode lsp-mode company meow agda2-mode haskell-mode
terraform-mode nix-mode insert-kaomoji terraform-mode nix-mode insert-kaomoji
]; ];
extraConfig = builtins.readFile ./dotfiles/init.el; extraConfig = builtins.readFile ../dotfiles/init.el;
}; };
} }

View File

@ -96,5 +96,5 @@ in
}; };
}; };
extraConfig = kak-lsp-config-line + "\n" + builtins.readFile ./dotfiles/kakrc ; extraConfig = kak-lsp-config-line + "\n" + builtins.readFile ../dotfiles/kakrc ;
} }