Merge branch 'main' of ssh://git.venberg.xyz:7920/Gabe/nix-config

flake.nix

@@ -97,7 +97,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;};

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
+  ];
+}

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";

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
       ];

packages/aarch64-iso.nix

@@ -58,7 +58,7 @@
       }: {
         host = osConfig.host;
         user = {
-          nvim.enable = false;
+          nvim.enable-lsp = false;
           git = {
             profile = {
               name = "Gabe Venberg";
@@ -68,7 +68,7 @@
           };
         };
         imports = [
-          ../roles/home-manager/minimal-terminal.nix
+          ../roles/home-manager/terminal.nix
           ../configs/home-manager/common.nix
           inputs.nixvim.homeManagerModules.nixvim
         ];

packages/iso.nix

@@ -56,6 +56,7 @@
       }: {
         host = osConfig.host;
         user = {
+          nvim.enable-lsp = false;
           git = {
             profile = {
               name = "Gabe Venberg";

roles/home-manager/terminal.nix

@@ -21,6 +21,7 @@
     tre-command
     diskonaut
     hyperfine
+    fclones
   ];
 
   programs = {