merge

nix/base/common_hardware.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ pkgs, config, username, ... }:
 {
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
@@ -51,14 +51,14 @@
   };
 
   nix.settings.trusted-users = [
-    "dashie"
+    username
   ];
 
   # allows user change later on
   users.mutableUsers = true;
-  users.users.dashie = {
+  users.users.${username} = {
     isNormalUser = true;
-    description = "dashie";
+    description = username;
     extraGroups = [ "networkmanager" "wheel" "gamemode" "docker" "vboxusers" ];
     packages = with pkgs; [
       home-manager

nix/base/env.nix

@@ -1,4 +1,5 @@
 { pkgs
+, username
 , ...
 }: {
   environment.variables = {
@@ -12,7 +13,7 @@
   environment.sessionVariables = {
     NIXOS_OZONE_WL = "1";
     GOPATH = "$HOME/.go";
-    FLAKE = "home/dashie/gits/dotFiles/nix";
+    FLAKE = "home/${username}/gits/dotFiles/nix";
     # don't ask... marksman somehow requires this
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = 1;
   };

nix/base/login_manager.nix

@@ -1,16 +1,13 @@
-{ inputs
-, lib
+{ lib
 , config
 , pkgs
+, username
 , ...
 }:
 let
-  regreet_override = pkgs.greetd.regreet.overrideAttrs (final: prev: {
-    SESSION_DIRS = "${config.services.xserver.displayManager.sessionData.desktops}/share";
-  });
   session = {
     command = "${lib.getExe pkgs.hyprland} --config /etc/greetd/hyprgreet.conf";
-    user = "dashie";
+    user = username;
   };
 in
 {
@@ -53,7 +50,7 @@ in
         disable_hyprland_logo = true
     }
 
-    exec-once=regreet --style /home/dashie/.config/gtk-3.0/gtk.css; hyprctl dispatch exit
+    exec-once=regreet --style /home/${username}/.config/gtk-3.0/gtk.css; hyprctl dispatch exit
   '';
 
   # unlock GPG keyring on login