q

README.md

@@ -50,5 +50,8 @@ Sakamoto NixOS is built with various profiles intended for reproducibility.
     - **Linux:**
 
         ```sh
-        sudo nixos-rebuild --extra-experimental-features "nix-command flakes" -- switch --flake ~/.config/nixos#desktop
+        sudo nixos-rebuild --flake ~/.config/nixos#desktop --impure
+        sudo nix run home-manager -- init --switch
+        home-manager switch --flake ~/.config/nixos#desktop --impure
+        reboot
         ```

config.default.nix

@@ -8,17 +8,23 @@
     vpnSecretFile = "/home/biscuit/Wireguard/secret";
   };
 
+  gitProfile = {
+    user = "biscuit";
+    email = "biscuit@sakamoto.dev";
+    defaultBranch = "master";
+  };
+
   terminal = {
     termFont = "JetBrainsMono Nerd Font"; # e.g., JetBrainsMono Nerd Font
     termSize = "11";
-    termShell = "zsh";
+    termShell = "fish";
     shellAliases = {
       ls = "ls --color=auto";
       update = ''
         if [[ $(uname) == "Darwin" ]]; then
           sudo darwin-rebuild switch --flake ~/.config/nixos#macos
         else
-          sudo nixos-rebuild switch --flake ~/.config/nixos#desktop && home-manager switch --flake ~/.config/nixos#desktop
+          sudo nixos-rebuild switch --flake ~/.config/nixos#desktop --impure && home-manager switch --flake ~/.config/nixos#desktop --impure
         fi
       '';
       agu = "pkill gjs & ags run ~/.config/nixos/pkgs/ags/biscuit/app.ts & disown (jobs -p) &";

config.local.nix

@@ -4,15 +4,20 @@
   timezone = "America/Chicago";
 
   vpn = {
-    vpnEnable = true;
+    vpnEnable = false;
     vpnSecretFile = "/home/biscuit/Wireguard/secret";
   };
 
+  gitProfile = {
+    user = "biscuit";
+    email = "biscuit@sakamoto.dev";
+    defaultBranch = "master";
+  };
+
   terminal = {
     termFont = "JetBrainsMono Nerd Font"; # e.g., JetBrainsMono Nerd Font
     termSize = "18";
-    termShell = "zsh";
+    termShell = "fish";
-
     shellAliases = {
       ls = "ls --color=auto";
       update = ''
@@ -20,7 +25,7 @@
           if [ "$(uname)" = "Darwin" ]; then
             sudo darwin-rebuild switch --flake ~/.config/nixos#macos
           else
-            sudo nixos-rebuild switch --flake ~/.config/nixos#desktop && home-manager switch --flake ~/.config/nixos#desktop
+            sudo nixos-rebuild switch --flake ~/.config/nixos#desktop --impure && home-manager switch --flake ~/.config/nixos#desktop --impure
           fi
         '
       '';

nixos/desktop/configuration.nix

@@ -7,7 +7,7 @@
 }: {
   imports = [
     # Include the results of the hardware scan.
-    ./hardware-configuration.nix
+    /etc/nixos/hardware-configuration.nix
     ../../modules/system.nix
     ../../modules/display-manager.nix
     ../../modules/app.nix

nixos/desktop/hardware-configuration.nix

@@ -8,24 +8,29 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "firewire_ohci" "usb_storage" "usbhid" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/8552e23a-af9f-4af8-947f-9ea6ff1e7195";
+    { device = "/dev/disk/by-uuid/d72dddb2-a232-46aa-8d46-c4b9cd7ed95e";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/00BB-80E9";
+    { device = "/dev/disk/by-uuid/A6A3-E317";
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };
 
+  fileSystems."/home" =
+    { device = "/dev/disk/by-uuid/a60ba0ab-dd33-4570-a2e9-873439d9cccf";
+      fsType = "ext4";
+    };
+
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/2a916b88-8039-481b-9c30-4edd0f329eb3"; }
+    [ { device = "/dev/disk/by-uuid/49b9aca5-2a3a-43bf-b488-a23757979f32"; }
     ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@@ -34,7 +39,8 @@
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.eno2.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

pkgs/git/default.nix

@@ -1,3 +1,10 @@
-{ ... }: {
+{gitProfile, ...}: {
-  programs.git.enable = true;
+  programs.git = {
+    enable = true;
+    extraConfig = {
+      user.name = "${gitProfile.user}";
+      user.email = "${gitProfile.email}";
+      init.defaultBranch = "${gitProfile.defaultBranch}";
+    };
+  };
 }

system/default.nix

@@ -19,6 +19,8 @@
       gtk3
       libxml2
 
+      git
+
       cargo
       gcc
       rustc

system/users.nix

@@ -5,7 +5,7 @@
   ...
 }: {
   users = {
-    defaultUserShell = pkgs.zsh;
+    defaultUserShell = pkgs.${terminal.termShell};
     users = {
       ${username} = {
         isNormalUser = true;