From e00412252af639602527aa622e937d1eb30083f4 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Wed, 19 Jul 2023 19:21:38 -0400 Subject: [PATCH] refactor: remove s from config path --- {configs => config}/eww/README.md | 0 {configs => config}/eww/closer/README.md | 0 {configs => config}/eww/closer/closer.yuck | 0 {configs => config}/eww/colors.scss | 0 {configs => config}/eww/date/date.scss | 0 {configs => config}/eww/date/date.yuck | 0 {configs => config}/eww/eww.scss | 0 {configs => config}/eww/eww.yuck | 0 {configs => config}/eww/powermenu/powermenu.scss | 0 {configs => config}/eww/powermenu/powermenu.yuck | 0 {configs => config}/eww/scripts/brightness.sh | 0 {configs => config}/eww/scripts/close-opened.sh | 2 +- {configs => config}/eww/scripts/close.sh | 0 {configs => config}/eww/scripts/exec | 0 {configs => config}/eww/scripts/notif.sh | 0 {configs => config}/eww/scripts/on-release.sh | 0 {configs => config}/eww/scripts/open.sh | 0 {configs => config}/eww/scripts/volume.sh | 0 {configs => config}/eww/traybuttons/traybuttons.scss | 0 {configs => config}/eww/traybuttons/traybuttons.yuck | 0 {configs => config}/eww/variables.yuck | 0 {configs => config}/hypr/hyprpaper.conf | 0 {configs => config}/hypr/main.conf | 0 {configs => config}/hypr/scripts/autorotate.sh | 0 {configs => config}/hypr/scripts/laptop-mode.sh | 0 {configs => config}/hypr/scripts/lose-focus.sh | 0 {configs => config}/hypr/scripts/osk-toggle.sh | 0 {configs => config}/hypr/scripts/tablet-mode.sh | 0 {configs => config}/swaync/config.json | 0 {configs => config}/swaync/style.css | 0 nixos/home/dotfiles.nix | 2 +- nixos/home/hyprland.nix | 6 +++--- 32 files changed, 5 insertions(+), 5 deletions(-) rename {configs => config}/eww/README.md (100%) rename {configs => config}/eww/closer/README.md (100%) rename {configs => config}/eww/closer/closer.yuck (100%) rename {configs => config}/eww/colors.scss (100%) rename {configs => config}/eww/date/date.scss (100%) rename {configs => config}/eww/date/date.yuck (100%) rename {configs => config}/eww/eww.scss (100%) rename {configs => config}/eww/eww.yuck (100%) rename {configs => config}/eww/powermenu/powermenu.scss (100%) rename {configs => config}/eww/powermenu/powermenu.yuck (100%) rename {configs => config}/eww/scripts/brightness.sh (100%) rename {configs => config}/eww/scripts/close-opened.sh (88%) rename {configs => config}/eww/scripts/close.sh (100%) rename {configs => config}/eww/scripts/exec (100%) rename {configs => config}/eww/scripts/notif.sh (100%) rename {configs => config}/eww/scripts/on-release.sh (100%) rename {configs => config}/eww/scripts/open.sh (100%) rename {configs => config}/eww/scripts/volume.sh (100%) rename {configs => config}/eww/traybuttons/traybuttons.scss (100%) rename {configs => config}/eww/traybuttons/traybuttons.yuck (100%) rename {configs => config}/eww/variables.yuck (100%) rename {configs => config}/hypr/hyprpaper.conf (100%) rename {configs => config}/hypr/main.conf (100%) rename {configs => config}/hypr/scripts/autorotate.sh (100%) rename {configs => config}/hypr/scripts/laptop-mode.sh (100%) rename {configs => config}/hypr/scripts/lose-focus.sh (100%) rename {configs => config}/hypr/scripts/osk-toggle.sh (100%) rename {configs => config}/hypr/scripts/tablet-mode.sh (100%) rename {configs => config}/swaync/config.json (100%) rename {configs => config}/swaync/style.css (100%) diff --git a/configs/eww/README.md b/config/eww/README.md similarity index 100% rename from configs/eww/README.md rename to config/eww/README.md diff --git a/configs/eww/closer/README.md b/config/eww/closer/README.md similarity index 100% rename from configs/eww/closer/README.md rename to config/eww/closer/README.md diff --git a/configs/eww/closer/closer.yuck b/config/eww/closer/closer.yuck similarity index 100% rename from configs/eww/closer/closer.yuck rename to config/eww/closer/closer.yuck diff --git a/configs/eww/colors.scss b/config/eww/colors.scss similarity index 100% rename from configs/eww/colors.scss rename to config/eww/colors.scss diff --git a/configs/eww/date/date.scss b/config/eww/date/date.scss similarity index 100% rename from configs/eww/date/date.scss rename to config/eww/date/date.scss diff --git a/configs/eww/date/date.yuck b/config/eww/date/date.yuck similarity index 100% rename from configs/eww/date/date.yuck rename to config/eww/date/date.yuck diff --git a/configs/eww/eww.scss b/config/eww/eww.scss similarity index 100% rename from configs/eww/eww.scss rename to config/eww/eww.scss diff --git a/configs/eww/eww.yuck b/config/eww/eww.yuck similarity index 100% rename from configs/eww/eww.yuck rename to config/eww/eww.yuck diff --git a/configs/eww/powermenu/powermenu.scss b/config/eww/powermenu/powermenu.scss similarity index 100% rename from configs/eww/powermenu/powermenu.scss rename to config/eww/powermenu/powermenu.scss diff --git a/configs/eww/powermenu/powermenu.yuck b/config/eww/powermenu/powermenu.yuck similarity index 100% rename from configs/eww/powermenu/powermenu.yuck rename to config/eww/powermenu/powermenu.yuck diff --git a/configs/eww/scripts/brightness.sh b/config/eww/scripts/brightness.sh similarity index 100% rename from configs/eww/scripts/brightness.sh rename to config/eww/scripts/brightness.sh diff --git a/configs/eww/scripts/close-opened.sh b/config/eww/scripts/close-opened.sh similarity index 88% rename from configs/eww/scripts/close-opened.sh rename to config/eww/scripts/close-opened.sh index 2c28d6d..59146d3 100755 --- a/configs/eww/scripts/close-opened.sh +++ b/config/eww/scripts/close-opened.sh @@ -14,6 +14,6 @@ done for element in "${array[@]}" do if [[ "$element" != "tablet-toggle" ]]; then - $HOME/.nix/configs/eww/scripts/close.sh "$element" + $EWW_PATH/close.sh "$element" fi done diff --git a/configs/eww/scripts/close.sh b/config/eww/scripts/close.sh similarity index 100% rename from configs/eww/scripts/close.sh rename to config/eww/scripts/close.sh diff --git a/configs/eww/scripts/exec b/config/eww/scripts/exec similarity index 100% rename from configs/eww/scripts/exec rename to config/eww/scripts/exec diff --git a/configs/eww/scripts/notif.sh b/config/eww/scripts/notif.sh similarity index 100% rename from configs/eww/scripts/notif.sh rename to config/eww/scripts/notif.sh diff --git a/configs/eww/scripts/on-release.sh b/config/eww/scripts/on-release.sh similarity index 100% rename from configs/eww/scripts/on-release.sh rename to config/eww/scripts/on-release.sh diff --git a/configs/eww/scripts/open.sh b/config/eww/scripts/open.sh similarity index 100% rename from configs/eww/scripts/open.sh rename to config/eww/scripts/open.sh diff --git a/configs/eww/scripts/volume.sh b/config/eww/scripts/volume.sh similarity index 100% rename from configs/eww/scripts/volume.sh rename to config/eww/scripts/volume.sh diff --git a/configs/eww/traybuttons/traybuttons.scss b/config/eww/traybuttons/traybuttons.scss similarity index 100% rename from configs/eww/traybuttons/traybuttons.scss rename to config/eww/traybuttons/traybuttons.scss diff --git a/configs/eww/traybuttons/traybuttons.yuck b/config/eww/traybuttons/traybuttons.yuck similarity index 100% rename from configs/eww/traybuttons/traybuttons.yuck rename to config/eww/traybuttons/traybuttons.yuck diff --git a/configs/eww/variables.yuck b/config/eww/variables.yuck similarity index 100% rename from configs/eww/variables.yuck rename to config/eww/variables.yuck diff --git a/configs/hypr/hyprpaper.conf b/config/hypr/hyprpaper.conf similarity index 100% rename from configs/hypr/hyprpaper.conf rename to config/hypr/hyprpaper.conf diff --git a/configs/hypr/main.conf b/config/hypr/main.conf similarity index 100% rename from configs/hypr/main.conf rename to config/hypr/main.conf diff --git a/configs/hypr/scripts/autorotate.sh b/config/hypr/scripts/autorotate.sh similarity index 100% rename from configs/hypr/scripts/autorotate.sh rename to config/hypr/scripts/autorotate.sh diff --git a/configs/hypr/scripts/laptop-mode.sh b/config/hypr/scripts/laptop-mode.sh similarity index 100% rename from configs/hypr/scripts/laptop-mode.sh rename to config/hypr/scripts/laptop-mode.sh diff --git a/configs/hypr/scripts/lose-focus.sh b/config/hypr/scripts/lose-focus.sh similarity index 100% rename from configs/hypr/scripts/lose-focus.sh rename to config/hypr/scripts/lose-focus.sh diff --git a/configs/hypr/scripts/osk-toggle.sh b/config/hypr/scripts/osk-toggle.sh similarity index 100% rename from configs/hypr/scripts/osk-toggle.sh rename to config/hypr/scripts/osk-toggle.sh diff --git a/configs/hypr/scripts/tablet-mode.sh b/config/hypr/scripts/tablet-mode.sh similarity index 100% rename from configs/hypr/scripts/tablet-mode.sh rename to config/hypr/scripts/tablet-mode.sh diff --git a/configs/swaync/config.json b/config/swaync/config.json similarity index 100% rename from configs/swaync/config.json rename to config/swaync/config.json diff --git a/configs/swaync/style.css b/config/swaync/style.css similarity index 100% rename from configs/swaync/style.css rename to config/swaync/style.css diff --git a/nixos/home/dotfiles.nix b/nixos/home/dotfiles.nix index 1130214..25d512c 100644 --- a/nixos/home/dotfiles.nix +++ b/nixos/home/dotfiles.nix @@ -1,7 +1,7 @@ { config, ... }: let - configDir = "/home/matt/.nix/configs"; + configDir = "/home/matt/.nix/config"; in { diff --git a/nixos/home/hyprland.nix b/nixos/home/hyprland.nix index ab21cf2..ca4600b 100644 --- a/nixos/home/hyprland.nix +++ b/nixos/home/hyprland.nix @@ -1,6 +1,6 @@ { pkgs, config, ... }: let - configDir = "/home/matt/.nix/configs"; + configDir = "/home/matt/.nix/config"; flake-compat = builtins.fetchTarball "https://github.com/edolstra/flake-compat/archive/master.tar.gz"; @@ -32,8 +32,8 @@ in env = XDG_DATA_DIRS, ${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}:${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}:$XDG_DATA_DIRS $kora = "$HOME/.config/share" - env = EWW_PATH, $HOME/.nix/configs/eww/scripts - env = HYPR_PATH, $HOME/.nix/configs/hypr/scripts + env = EWW_PATH, ${configDir}/eww/scripts + env = HYPR_PATH, ${configDir}/hypr/scripts exec-once = ${pkgs.plasma5Packages.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1 source = ~/.config/hypr/main.conf