From 513f4eb518308d3e1c1856e5162db492850f8041 Mon Sep 17 00:00:00 2001 From: Gabe Venberg Date: Tue, 18 Jun 2024 14:44:27 -0500 Subject: [PATCH] broke apart home laptop and desktop config. --- flake.nix | 2 +- hosts/home-laptop.nix | 53 +++++++++++++++++++++++++++++++++ hosts/home-personal.nix | 1 - hosts/home-workstation.nix | 1 + roles/home-manager/terminal.nix | 1 + 5 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 hosts/home-laptop.nix diff --git a/flake.nix b/flake.nix index a19ecb9..4c598f3 100644 --- a/flake.nix +++ b/flake.nix @@ -96,7 +96,7 @@ # Standalone home-manager configuration entrypoint # Available through 'home-manager --flake .#your-username@your-hostname' homeConfigurations = { - "gabe@archlaptop" = import ./hosts/home-personal.nix {inherit inputs configLib;}; + "gabe@archlaptop" = import ./hosts/home-laptop.nix {inherit inputs configLib;}; "gabe@linuxgamingrig" = import ./hosts/home-personal.nix {inherit inputs configLib;}; "gabe@gv-workstation" = import ./hosts/home-workstation.nix {inherit inputs configLib;}; "gabe@gv-ubuntu" = import ./hosts/home-workstation.nix {inherit inputs configLib;}; diff --git a/hosts/home-laptop.nix b/hosts/home-laptop.nix new file mode 100644 index 0000000..1e1496e --- /dev/null +++ b/hosts/home-laptop.nix @@ -0,0 +1,53 @@ +{ + inputs, + configLib, + ... +}: +inputs.home-manager.lib.homeManagerConfiguration { + pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance + extraSpecialArgs = {inherit inputs configLib;}; + modules = [ + ({ + config, + pkgs, + lib, + configLib, + ... + }: { + # machine specific options + user = { + enable-speech = true; + git = { + profile = { + name = "Gabe Venberg"; + email = "gabevenberg@gmail.com"; + }; + workProfile.enable = false; + }; + }; + host.isLaptop = true; + + targets.genericLinux.enable = true; + home.username = "gabe"; + home.homeDirectory = /home/gabe; + imports = [ + ../roles/home-manager/terminal.nix + ../roles/home-manager/music.nix + ../configs/home-manager/common.nix + ../configs/home-manager/syncthing.nix + ../configs/home-manager/email.nix + ../configs/home-manager/tiny-irc.nix + ../configs/home-manager/secrets.nix + inputs.sops-nix.homeManagerModules.sops + ]; + + sops = lib.mkIf (inputs ? nix-secrets) { + secrets = { + gmail-password.sopsFile = "${inputs.nix-secrets}/workstations.yaml"; + irc-cert.sopsFile = "${inputs.nix-secrets}/workstations.yaml"; + }; + }; + }) + inputs.nixvim.homeManagerModules.nixvim + ]; +} diff --git a/hosts/home-personal.nix b/hosts/home-personal.nix index 1e1496e..868d988 100644 --- a/hosts/home-personal.nix +++ b/hosts/home-personal.nix @@ -25,7 +25,6 @@ inputs.home-manager.lib.homeManagerConfiguration { workProfile.enable = false; }; }; - host.isLaptop = true; targets.genericLinux.enable = true; home.username = "gabe"; diff --git a/hosts/home-workstation.nix b/hosts/home-workstation.nix index c357fa1..a2b7a41 100644 --- a/hosts/home-workstation.nix +++ b/hosts/home-workstation.nix @@ -41,6 +41,7 @@ inputs.home-manager.lib.homeManagerConfiguration { ../configs/home-manager/common.nix ../configs/home-manager/syncthing.nix ../configs/home-manager/tiny-irc.nix + ../roles/home-manager/music.nix ../configs/home-manager/secrets.nix inputs.sops-nix.homeManagerModules.sops ]; diff --git a/roles/home-manager/terminal.nix b/roles/home-manager/terminal.nix index c50109b..3340447 100644 --- a/roles/home-manager/terminal.nix +++ b/roles/home-manager/terminal.nix @@ -21,6 +21,7 @@ tre-command diskonaut hyperfine + fclones ]; programs = {