From c8a036edc248449ba948778ced6d357f814ac22b Mon Sep 17 00:00:00 2001 From: blake Date: Thu, 6 Nov 2025 00:05:12 -0600 Subject: [PATCH] all hardcoded paths in home man --- users/blake/dots/core/zsh/default.nix | 35 ++++++++-------------- users/blake/dots/desktop/dunst/default.nix | 7 +++-- users/blake/dots/desktop/hypr/default.nix | 16 +++++----- 3 files changed, 25 insertions(+), 33 deletions(-) diff --git a/users/blake/dots/core/zsh/default.nix b/users/blake/dots/core/zsh/default.nix index b3fc5a5..167c8c4 100644 --- a/users/blake/dots/core/zsh/default.nix +++ b/users/blake/dots/core/zsh/default.nix @@ -6,6 +6,7 @@ }: let program = "zsh"; cfg = config.dots.${program}; + home_dir = config.home.homeDirectory; #sec = sops.secrets; in { options.dots.${program} = { @@ -41,12 +42,12 @@ in { shellAliases = { # --- zsh --- - cfz = "nvim $HOME/.config/zsh/.zshrc"; - src = "source $HOME/.config/zsh/.zshrc"; + cfz = "nvim ${home_dir}/.config/zsh/.zshrc"; + src = "source ${home_dir}/.config/zsh/.zshrc"; # --- config editing --- - cfh = "nvim $HOME/.config/hypr/hyprland.conf"; - cfl = "nvim $HOME/.config/lf/lfrc"; + cfh = "nvim ${home_dir}/.config/hypr/hyprland.conf"; + cfl = "nvim ${home_dir}/.config/lf/lfrc"; # --- navigation --- ls = "ls --color=auto --group-directories-first"; @@ -58,8 +59,8 @@ in { ds = "du -hs"; # --- shortcuts --- - vswap = "cd ~/.local/state/nvim/swap"; - rswap = "rm ~/.local/state/nvim/swap/*"; + vswap = "cd ${home_dir}/.local/state/nvim/swap"; + rswap = "rm ${home_dir}/.local/state/nvim/swap/*"; v = "nvim"; sv = "sudo nvim"; vim = "nvim"; @@ -75,9 +76,9 @@ in { egrep = "egrep --color=auto"; # --- scripts --- - rebuild = "sh ~/.nix/bin/rebuild.sh"; - perms = "sudo sh ~/.nix/bin/perms.sh"; - bb = "sudo sh ~/.nix/bin/lf_borg.sh"; + rebuild = "sh ${home_dir}/.nix/bin/rebuild.sh"; + perms = "sudo sh ${home_dir}/.nix/bin/perms.sh"; + bb = "sudo sh ${home_dir}/.nix/bin/lf_borg.sh"; # --- git --- status = "git status"; @@ -85,9 +86,9 @@ in { commit = "git commit -am"; push = "git push"; pull = "git pull"; - dotfiles = "/usr/bin/git --git-dir=$HOME/.dotfiles --work-tree=$HOME"; - dtf = "/usr/bin/git --git-dir=$HOME/.dotfiles --work-tree=$HOME"; - sec = "sops ~/.nix/secrets/secrets.yaml"; + dotfiles = "/usr/bin/git --git-dir=${home_dir}/.dotfiles --work-tree=$HOME"; + dtf = "/usr/bin/git --git-dir=${home_dir}/.dotfiles --work-tree=$HOME"; + sec = "sops ${home_dir}/.nix/secrets/secrets.yaml"; # --- systemd --- stat = "sudo systemctl status"; @@ -141,16 +142,6 @@ in { "back-double-quoted-argument" = "fg=blue"; }; }; - - # zplug = { - # enable = true; - # zplugHome = "$XDG_STATE_HOME/zsh/zplug"; - # plugins = [ - # {name = "zsh-users/zsh-syntax-highlighting";} - # ]; - # }; }; - # rid the world of ~/.zshenv - #home.file.".zshenv".enable = false; }; } diff --git a/users/blake/dots/desktop/dunst/default.nix b/users/blake/dots/desktop/dunst/default.nix index 48b1e7f..3870f11 100644 --- a/users/blake/dots/desktop/dunst/default.nix +++ b/users/blake/dots/desktop/dunst/default.nix @@ -6,6 +6,7 @@ }: let program = "dunst"; cfg = config.dots.${program}; + home_dir = config.home.homeDirectory; in { options.dots.${program} = { enable = lib.mkEnableOption "enables ${program}"; @@ -106,7 +107,7 @@ in { foreground = lib.mkDefault "#888888"; frame_color = lib.mkDefault "#000000"; timeout = 7; - default_icon = "~/.nix/users/blake/assets/icons/normal_64px.png"; + default_icon = "${home_dir}/.nix/users/blake/assets/icons/normal_64px.png"; }; urgency_normal = { @@ -115,7 +116,7 @@ in { frame_color = lib.mkDefault "#000000"; timeout = 7; override_pause_level = 30; - default_icon = "~/.nix/users/blake/assets/icons/normal_64px.png"; + default_icon = "${home_dir}/.nix/users/blake/assets/icons/normal_64px.png"; }; urgency_critical = { @@ -124,7 +125,7 @@ in { frame_color = lib.mkDefault "#ff0000"; timeout = 0; override_pause_level = 60; - default_icon = "~/.nix/users/blake/assets/icons/critical_128px.png"; + default_icon = "${home_dir}/.nix/users/blake/assets/icons/critical_128px.png"; }; }; }; diff --git a/users/blake/dots/desktop/hypr/default.nix b/users/blake/dots/desktop/hypr/default.nix index 5f48b1d..e200c61 100644 --- a/users/blake/dots/desktop/hypr/default.nix +++ b/users/blake/dots/desktop/hypr/default.nix @@ -6,7 +6,7 @@ }: let program = "hypr"; cfg = config.dots.${program}; - #sec = sops.secrets; + home_dir = config.home.homeDirectory; in { options.dots.${program} = { enable = lib.mkEnableOption "enables ${program}"; @@ -26,8 +26,8 @@ in { settings = { # --- displays --- source = [ - "~/.config/hypr/monitors.conf" - "~/.config/hypr/workspaces.conf" + "${home_dir}/.config/hypr/monitors.conf" + "${home_dir}/.config/hypr/workspaces.conf" ]; # --- environment variables --- @@ -129,7 +129,7 @@ in { "$mainMod CONTROL, T, exec, cliphist wipe" # screenshots - "$mainMod SHIFT, C, exec, hyprshot --mode region --output-folder ~/pictures/screenshots" + "$mainMod SHIFT, C, exec, hyprshot --mode region --output-folder ${home_dir}/pictures/screenshots" # multimedia ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" @@ -218,8 +218,8 @@ in { services.hyprpaper = { enable = true; settings = { - preload = lib.mkDefault ["~/.nix/users/blake/assets/wallpapers/antartica.png"]; - wallpaper = lib.mkDefault [",~/.nix/users/blake/assets/wallpapers/antartica.png"]; + preload = lib.mkDefault ["${home_dir}/.nix/users/blake/assets/wallpapers/antartica.png"]; + wallpaper = lib.mkDefault [",${home_dir}/.nix/users/blake/assets/wallpapers/antartica.png"]; ipc = "off"; splash = false; }; @@ -237,7 +237,7 @@ in { background = lib.mkDefault [ { monitor = ""; - path = lib.mkDefault "~/.nix/users/blake/assets/wallpapers/antartica.png"; + path = lib.mkDefault "${home_dir}/.nix/users/blake/assets/wallpapers/antartica.png"; blur_passes = 1; color = lib.mkDefault "rgb(0047ab)"; } @@ -280,7 +280,7 @@ in { image = [ { monitor = ""; - path = "~/.nix/users/blake/assets/pfps/pikacig.jpg"; + path = "${home_dir}/.nix/users/blake/assets/pfps/pikacig.jpg"; size = 350; border_color = lib.mkDefault "rgb(0047ab)"; rounding = -1;