xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split hoem into home and laptop

Browse Source
This commit is contained in:
xenia 2023-10-19 00:10:11 +02:00
parent 1d2bbf3598
commit b1f126168e
3 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flake.nix
View File

@ -39,18 +39,28 @@
unambig-path = unambig-path.packages.${system}.unambig-path; unambig-path = unambig-path.packages.${system}.unambig-path;
inherit pkgs xdg-runtime-dir; inherit pkgs xdg-runtime-dir;
}; };
mkLaptop = {system, pkgs} : import ./laptop.nix {
inherit pkgs xdg-runtime-dir;
};
mkMac = {system, pkgs, laptop} : import ./mac.nix {
emacs = laptop.programs.emacs.package;
inherit pkgs xdg-runtime-dir;
};
in { in {
homeConfigurations."xenia" = homeConfigurations."xenia" =
let let
system = "aarch64-darwin"; system = "aarch64-darwin";
pkgs = mkPkgs system; pkgs = mkPkgs system;
home = mkHome { inherit system pkgs; }; home = mkHome { inherit system pkgs; };
laptop = mkLaptop { inherit system pkgs; };
mac = mkMac { inherit system pkgs laptop; };
in home-manager.lib.homeManagerConfiguration { in home-manager.lib.homeManagerConfiguration {
inherit pkgs; inherit pkgs;
modules = [ modules = [
home home
( import ./mac.nix { emacs = home.programs.emacs.package; inherit pkgs xdg-runtime-dir; } ) laptop
mac
]; ];
}; };

15
home.nix
View File

@ -1,7 +1,6 @@
{ pkgs, xdg-runtime-dir, kak-pkg, unispect, ansi-utils, unambig-path }: { pkgs, xdg-runtime-dir, kak-pkg, unispect, ansi-utils, unambig-path }:
let let
alacritty = import ./alacritty/alacritty.nix pkgs;
kak = import ./kak.nix { kak = kak-pkg; inherit pkgs; }; kak = import ./kak.nix { kak = kak-pkg; inherit pkgs; };
extras = import ./extras.nix pkgs; extras = import ./extras.nix pkgs;
@ -47,9 +46,6 @@ in rec {
# # Other stuff # # Other stuff
kak-lsp kak-lsp
discord-canary
# libreoffice-bin
fira-code ibm-plex
# nix-tree # nix-tree
]; ];
@ -60,19 +56,8 @@ in rec {
# Let Home Manager install and manage itself. # Let Home Manager install and manage itself.
programs.home-manager.enable = true; programs.home-manager.enable = true;
programs.alacritty = alacritty;
programs.kakoune = kak; programs.kakoune = kak;
programs.emacs = {
package = pkgs.emacs;
enable = true;
extraPackages = epkgs: with epkgs; [
vterm bind-key rust-mode lsp-mode company meow agda2-mode haskell-mode
terraform-mode nix-mode insert-kaomoji
];
extraConfig = builtins.readFile ./dotfiles/init.el;
};
programs.zsh = { programs.zsh = {
enable = true; enable = true;
package = pkgs.zsh; package = pkgs.zsh;

24
laptop.nix Normal file
View File

@ -0,0 +1,24 @@
{ pkgs, xdg-runtime-dir }:
let
alacritty = import ./alacritty/alacritty.nix pkgs;
in rec {
home.packages = with pkgs; [
discord-canary
# libreoffice-bin
fira-code ibm-plex
];
programs.alacritty = alacritty;
programs.emacs = {
package = pkgs.emacs;
enable = true;
extraPackages = epkgs: with epkgs; [
vterm bind-key rust-mode lsp-mode company meow agda2-mode haskell-mode
terraform-mode nix-mode insert-kaomoji
];
extraConfig = builtins.readFile ./dotfiles/init.el;
};
}