From 791e2a69dd20606d933c99a7246324600f78cd87 Mon Sep 17 00:00:00 2001
From: DashieTM <fabio.lenherr@gmail.com>
Date: Sat, 6 Jul 2024 22:58:41 +0200
Subject: [PATCH] merge

---
 nix/base/common_hardware.nix                |  8 ++++----
 nix/base/env.nix                            |  3 ++-
 nix/base/login_manager.nix                  | 11 ++++-------
 nix/flake.nix                               |  7 ++++---
 nix/hardware/spaceship/base_config.nix      | 14 +++++++-------
 nix/programs/common.nix                     |  9 +++++----
 nix/programs/default.nix                    |  6 +++---
 nix/programs/hyprland/config.nix            |  3 ++-
 nix/programs/hyprland/ironbar.nix           | 10 +++++-----
 nix/programs/individual_configs/firefox.nix |  4 ++--
 nix/programs/individual_configs/fish.nix    |  4 ++--
 nix/programs/media.nix                      |  1 -
 nix/programs/oxi/oxinoti.nix                |  4 ++--
 nix/programs/themes/qt.nix                  |  7 ++++---
 14 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/nix/base/common_hardware.nix b/nix/base/common_hardware.nix
index 3ab990b..389af63 100644
--- a/nix/base/common_hardware.nix
+++ b/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
diff --git a/nix/base/env.nix b/nix/base/env.nix
index 4fb53bd..2235673 100644
--- a/nix/base/env.nix
+++ b/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;
   };
diff --git a/nix/base/login_manager.nix b/nix/base/login_manager.nix
index 8b7d114..5c35483 100644
--- a/nix/base/login_manager.nix
+++ b/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
diff --git a/nix/flake.nix b/nix/flake.nix
index 64a2966..b97c93a 100644
--- a/nix/flake.nix
+++ b/nix/flake.nix
@@ -55,11 +55,12 @@
         ./base/default.nix
         ./programs
       ];
+      username = "dashie";
     in
     {
       nixosConfigurations."marmo" = inputs.nixpkgs.lib.nixosSystem {
         specialArgs = {
-          inherit inputs pkgs;
+          inherit inputs pkgs username;
           mod = ./hardware/marmo/base_config.nix;
         };
         modules = [
@@ -69,7 +70,7 @@
       };
       nixosConfigurations."overheating" = inputs.nixpkgs.lib.nixosSystem {
         specialArgs = {
-          inherit inputs pkgs;
+          inherit inputs pkgs username;
           mod = ./hardware/overheating/base_config.nix;
         };
         modules = [
@@ -78,7 +79,7 @@
       };
       nixosConfigurations."spaceship" = inputs.nixpkgs.lib.nixosSystem {
         specialArgs = {
-          inherit inputs pkgs;
+          inherit inputs pkgs username;
           mod = ./hardware/spaceship/base_config.nix;
         };
         modules = [
diff --git a/nix/hardware/spaceship/base_config.nix b/nix/hardware/spaceship/base_config.nix
index b890e87..ab1b6b7 100644
--- a/nix/hardware/spaceship/base_config.nix
+++ b/nix/hardware/spaceship/base_config.nix
@@ -1,4 +1,4 @@
-{
+{ username, ... }: {
   imports = [
     ../../modules
   ];
@@ -33,14 +33,14 @@
   programs.ironbar.monitor = "DP-1";
   programs.hyprland.hyprpaper = ''
     #load
-    preload = /home/dashie/Pictures/backgrounds/shinobu_2k.jpg
-    preload = /home/dashie/Pictures/backgrounds/shino_wide.png
-    preload = /home/dashie/Pictures/backgrounds/shinobu_1200.jpg
+    preload = /home/${username}/Pictures/backgrounds/shinobu_2k.jpg
+    preload = /home/${username}/Pictures/backgrounds/shino_wide.png
+    preload = /home/${username}/Pictures/backgrounds/shinobu_1200.jpg
 
     #set
-    wallpaper = DP-2,/home/dashie/Pictures/backgrounds/shinobu_2k.jpg
-    wallpaper = DP-1,/home/dashie/Pictures/backgrounds/shino_wide.png
-    wallpaper = HDMI-A-1,/home/dashie/Pictures/backgrounds/shinobu_1200.jpg
+    wallpaper = DP-2,/home/${username}/Pictures/backgrounds/shinobu_2k.jpg
+    wallpaper = DP-1,/home/${username}/Pictures/backgrounds/shino_wide.png
+    wallpaper = HDMI-A-1,/home/${username}/Pictures/backgrounds/shinobu_1200.jpg
     splash = true
   '';
   programs.hyprland.extra_autostart = [ "streamdeck -n" ];
diff --git a/nix/programs/common.nix b/nix/programs/common.nix
index c8b848f..2d40813 100644
--- a/nix/programs/common.nix
+++ b/nix/programs/common.nix
@@ -1,6 +1,7 @@
 { pkgs
 , inputs
 , lib
+, username
 , ...
 }:
 let callPackage = lib.callPackageWith (pkgs);
@@ -74,14 +75,14 @@ in
   ];
   programs.ReSet.config.plugin_config = {
     Keyboard = {
-      path = "/home/dashie/.config/reset/keyboard.conf";
+      path = "/home/${username}/.config/reset/keyboard.conf";
     };
   };
 
   nixpkgs.config.allowUnfree = true;
 
-  home.username = "dashie";
-  home.homeDirectory = "/home/dashie";
+  home.username = username;
+  home.homeDirectory = "/home/${username}";
   home.stateVersion = "24.05";
 
   home.sessionPath = [
@@ -122,7 +123,7 @@ in
     defaultSopsFile = ../secrets/secrets.yaml;
     secrets.hub = { };
     secrets.lab = { };
-    secrets.dashie = { };
+    secrets.${username} = { };
   };
   systemd.user.services.mbsync.Unit.After = [ "sops-nix.service" ];
 }
diff --git a/nix/programs/default.nix b/nix/programs/default.nix
index bacef2d..2926153 100644
--- a/nix/programs/default.nix
+++ b/nix/programs/default.nix
@@ -1,4 +1,4 @@
-{ inputs, pkgs, mod, ... }:
+{ inputs, pkgs, mod, username, ... }:
 let
   base_imports = [
     inputs.anyrun.homeManagerModules.default
@@ -26,10 +26,10 @@ in
   home-manager.useGlobalPkgs = true;
   home-manager.useUserPackages = true;
 
-  home-manager.users.dashie = {
+  home-manager.users.${username} = {
     imports = [
       {
-        _module = { args = { inherit inputs; }; };
+        _module = { args = { inherit inputs username; }; };
       }
       ./hyprland/default.nix
       ./flatpak.nix
diff --git a/nix/programs/hyprland/config.nix b/nix/programs/hyprland/config.nix
index 3d2b43f..7fc48f0 100644
--- a/nix/programs/hyprland/config.nix
+++ b/nix/programs/hyprland/config.nix
@@ -1,5 +1,6 @@
 { pkgs
 , inputs
+, username
 , config
 , ...
 }:
@@ -7,7 +8,7 @@
   wayland.windowManager.hyprland.enable = true;
   wayland.windowManager.hyprland.settings = {
     "$mod" = "SUPER";
-    "source" = "/home/dashie/.config/reset/keyboard.conf";
+    "source" = "/home/${username}/.config/reset/keyboard.conf";
 
     bindm = [
       "$mod, mouse:272, movewindow"
diff --git a/nix/programs/hyprland/ironbar.nix b/nix/programs/hyprland/ironbar.nix
index 0682d27..c4c5438 100644
--- a/nix/programs/hyprland/ironbar.nix
+++ b/nix/programs/hyprland/ironbar.nix
@@ -1,10 +1,10 @@
-{ config, ... }: {
+{ config, username, ... }: {
 
   programs.ironbar =
     {
       enable = true;
       style = ''
-        @import url("/home/dashie/.config/gtk-3.0/gtk.css");
+        @import url("/home/${username}/.config/gtk-3.0/gtk.css");
       
         * {
           color: #71bbe6;
@@ -176,13 +176,13 @@
                           type = "button";
                           class = "audio-button";
                           label = "";
-                          on_click = "!/home/dashie/.config/eww/scripts/audio_control.sh bluetooth";
+                          on_click = "!/home/${username}/.config/eww/scripts/audio_control.sh bluetooth";
                         }
                         {
                           type = "button";
                           class = "audio-button";
                           label = "󰋋";
-                          on_click = "!/home/dashie/.config/eww/scripts/audio_control.sh internal";
+                          on_click = "!/home/${username}/.config/eww/scripts/audio_control.sh internal";
                         }
                       ];
                       class = "audio-button-box";
@@ -222,7 +222,7 @@
                   type = "button";
                   class = "popup-button";
                   label = "";
-                  on_click = "!oxidash --css /home/dashie/gits/oxidash/style.css";
+                  on_click = "!oxidash --css /home/${username}/gits/oxidash/style.css";
                 }
               ];
               class = "popup-button-box";
diff --git a/nix/programs/individual_configs/firefox.nix b/nix/programs/individual_configs/firefox.nix
index d55a072..7bfa8e7 100644
--- a/nix/programs/individual_configs/firefox.nix
+++ b/nix/programs/individual_configs/firefox.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ pkgs, username, ... }: {
   programs.firefox = {
     enable = true;
 
@@ -13,7 +13,7 @@
       DisplayBookmarksToolbar = "never";
       DisplayMenuBar = "default-off";
     };
-    profiles.dashie = {
+    profiles.${username} = {
       extensions = with pkgs.nur.repos.rycee.firefox-addons; [
         ublock-origin
         darkreader
diff --git a/nix/programs/individual_configs/fish.nix b/nix/programs/individual_configs/fish.nix
index 1859164..0463d8d 100644
--- a/nix/programs/individual_configs/fish.nix
+++ b/nix/programs/individual_configs/fish.nix
@@ -1,4 +1,4 @@
-{
+{ username, ... }: {
   xdg.configFile."fish/config.fish" = {
     text =
       ''
@@ -15,7 +15,7 @@
 
         set EDITOR "neovide --no-fork"
 
-        alias rebuild='sudo nixos-rebuild switch --flake /home/dashie/gits/dotFiles/nix/.'
+        alias rebuild='sudo nixos-rebuild switch --flake /home/${username}/gits/dotFiles/nix/.'
         abbr --add ls 'lsd'
         abbr --add :q 'exit'
         abbr --add gh 'git push origin'
diff --git a/nix/programs/media.nix b/nix/programs/media.nix
index 70c5a4f..409e0b7 100644
--- a/nix/programs/media.nix
+++ b/nix/programs/media.nix
@@ -27,7 +27,6 @@
     gimp
     krita
     yt-dlp
-    spotdl
   ];
   programs.obs-studio.enable = true;
   programs.obs-studio.plugins = with pkgs; [
diff --git a/nix/programs/oxi/oxinoti.nix b/nix/programs/oxi/oxinoti.nix
index 9e2d4e8..b1fe112 100644
--- a/nix/programs/oxi/oxinoti.nix
+++ b/nix/programs/oxi/oxinoti.nix
@@ -1,8 +1,8 @@
-{
+{ username, ... }: {
   xdg.configFile."oxinoti/style.css" = {
     text = /*css*/
       ''
-        @import url("/home/dashie/.config/gtk-3.0/gtk.css");
+        @import url("/home/${username}/.config/gtk-3.0/gtk.css");
         
         #MainWindow {
           background-color: transparent;
diff --git a/nix/programs/themes/qt.nix b/nix/programs/themes/qt.nix
index 13a003a..007337d 100644
--- a/nix/programs/themes/qt.nix
+++ b/nix/programs/themes/qt.nix
@@ -1,3 +1,4 @@
+{ username, ... }:
 let
   color = ''
     [ColorScheme]
@@ -28,7 +29,7 @@ in
     text =
       ''
         [Appearance]
-        color_scheme_path=/home/dashie/.config/qt5ct/colors/tokyonight.conf
+        color_scheme_path=/home/${username}/.config/qt5ct/colors/tokyonight.conf
         custom_palette=true
         icon_theme=MoreWaita
         standard_dialogs=gtk3
@@ -48,7 +49,7 @@ in
         keyboard_scheme=4
         menus_have_icons=true
         show_shortcuts_in_context_menus=true
-        stylesheets=/home/dashie/.config/qt5ct/qss/tab.qss, /nix/store/5713p1pv913a6fsn8j7z6ndikcwikbcd-qt5ct-1.8/share/qt5ct/qss/fusion-fixes.qss, /nix/store/5713p1pv913a6fsn8j7z6ndikcwikbcd-qt5ct-1.8/share/qt5ct/qss/scrollbar-simple.qss, /nix/store/5713p1pv913a6fsn8j7z6ndikcwikbcd-qt5ct-1.8/share/qt5ct/qss/sliders-simple.qss, /nix/store/5713p1pv913a6fsn8j7z6ndikcwikbcd-qt5ct-1.8/share/qt5ct/qss/tooltip-simple.qss, /nix/store/5713p1pv913a6fsn8j7z6ndikcwikbcd-qt5ct-1.8/share/qt5ct/qss/traynotification-simple.qss
+        stylesheets=/home/${username}/.config/qt5ct/qss/tab.qss, /nix/store/5713p1pv913a6fsn8j7z6ndikcwikbcd-qt5ct-1.8/share/qt5ct/qss/fusion-fixes.qss, /nix/store/5713p1pv913a6fsn8j7z6ndikcwikbcd-qt5ct-1.8/share/qt5ct/qss/scrollbar-simple.qss, /nix/store/5713p1pv913a6fsn8j7z6ndikcwikbcd-qt5ct-1.8/share/qt5ct/qss/sliders-simple.qss, /nix/store/5713p1pv913a6fsn8j7z6ndikcwikbcd-qt5ct-1.8/share/qt5ct/qss/tooltip-simple.qss, /nix/store/5713p1pv913a6fsn8j7z6ndikcwikbcd-qt5ct-1.8/share/qt5ct/qss/traynotification-simple.qss
         toolbutton_style=4
         underline_shortcut=0
         wheel_scroll_lines=3
@@ -65,7 +66,7 @@ in
     text =
       ''
         [Appearance]
-        color_scheme_path=/home/dashie/.config/qt6ct/colors/toykonight.conf
+        color_scheme_path=/home/${username}/.config/qt6ct/colors/toykonight.conf
         custom_palette=true
         standard_dialogs=default
         style=Adwaita-Dark