commit 7301a84f9cae0ff948f0e65128e8e739468150bf
parent 78496e15f4b797e6b494b26be32a3d551051e392
Author: Katja Ramona Sophie Kwast (zaphyra) <git@zaphyra.eu>
Date: Tue, 1 Jul 2025 20:22:47 +0200
parent 78496e15f4b797e6b494b26be32a3d551051e392
Author: Katja Ramona Sophie Kwast (zaphyra) <git@zaphyra.eu>
Date: Tue, 1 Jul 2025 20:22:47 +0200
config/home/zaphyra: don't hardcode username, use `confg.home.username`
7 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/config/home/zaphyra/programs/firefox.nix b/config/home/zaphyra/programs/firefox.nix @@ -1,5 +1,6 @@ { inputs, + config, pkgs, lib, ... @@ -13,10 +14,10 @@ home.file."firefox-gnome-theme" = { source = inputs.firefoxGnomeTheme; - target = ".mozilla/firefox/zaphyra/chrome/firefox-gnome-theme"; + target = ".mozilla/firefox/${config.home.username}/chrome/firefox-gnome-theme"; }; - home.persistence."/nix/persist/home/zaphyra".directories = [ + home.persistence."/nix/persist/home/${config.home.username}".directories = [ "firefox/.mozilla/firefox/" "firefox/.cache/mozilla/firefox" ]; @@ -26,7 +27,7 @@ package = pkgs.firefox; nativeMessagingHosts = [ pkgs.ff2mpv-rust ]; - profiles.zaphyra = { + profiles."${config.home.username}" = { id = 0; isDefault = true;
diff --git a/config/home/zaphyra/programs/fish.nix b/config/home/zaphyra/programs/fish.nix @@ -1,8 +1,8 @@ -{ pkgs, lib, ... }: +{ config, pkgs, lib, ... }: { - home.persistence."/nix/persist/home/zaphyra".directories = [ + home.persistence."/nix/persist/home/${config.home.username}".directories = [ "fish/.local/share/fish" ];
diff --git a/config/home/zaphyra/programs/fractal.nix b/config/home/zaphyra/programs/fractal.nix @@ -1,11 +1,11 @@ -{ pkgs, ... }: +{ config, pkgs, ... }: { home = { packages = [ pkgs.fractal ]; - persistence."/nix/persist/home/zaphyra".directories = [ + persistence."/nix/persist/home/${config.home.username}".directories = [ "fractal/.local/share/fractal/" "fractal/.cache/fractal/" ];
diff --git a/config/home/zaphyra/programs/mcfly.nix b/config/home/zaphyra/programs/mcfly.nix @@ -2,7 +2,7 @@ { - home.persistence."/nix/persist/home/zaphyra".directories = [ + home.persistence."/nix/persist/home/${config.home.username}".directories = [ "mcfly/.local/share/mcfly" ];
diff --git a/config/home/zaphyra/programs/ssh.nix b/config/home/zaphyra/programs/ssh.nix @@ -1,8 +1,8 @@ -{ ... }: +{ config, ... }: { - home.persistence."/nix/persist/home/zaphyra".files = [ + home.persistence."/nix/persist/home/${config.home.username}".files = [ "ssh/.ssh/known_hosts" ];
diff --git a/config/home/zaphyra/programs/thunderbird.nix b/config/home/zaphyra/programs/thunderbird.nix @@ -9,17 +9,17 @@ home.packages = [ pkgs.thunderbird ]; - home.persistence."/nix/persist/home/zaphyra".directories = [ + home.persistence."/nix/persist/home/${config.home.username}".directories = [ "thunderbird/.thunderbird/" "thunderbird/.cache/thunderbird" ]; - systemd.user.services.thunderbird = lib.mkIf config.wayland.windowManager.sway.enable { + systemd.user.services.thunderbird = { Unit.After = [ "graphical-session-pre.target" ]; Unit.PartOf = [ "graphical-session.target" ]; Service = { - Environment = "PATH=/run/wrappers/bin:/home/zaphyra/.nix-profile/bin:/etc/profiles/per-user/zaphyra/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin"; + Environment = "PATH=/run/wrappers/bin:/home/${config.home.username}/.nix-profile/bin:/etc/profiles/per-user/${config.home.username}/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin"; ExecStart = "${pkgs.thunderbird}/bin/thunderbird"; Restart = "always"; RestartSec = 5;
diff --git a/config/home/zaphyra/programs/tuba.nix b/config/home/zaphyra/programs/tuba.nix @@ -1,10 +1,10 @@ -{ lib, pkgs, ... }: +{ config, lib, pkgs, ... }: { home.packages = [ pkgs.tuba ]; - home.persistence."/nix/persist/home/zaphyra".directories = [ + home.persistence."/nix/persist/home/${config.home.username}".directories = [ "tuba/.cache/tuba" ];