Remove unnecessary quotes

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>

hosts/eirene/base/card.sh

@@ -0,0 +1,10 @@
+AMD=/dev/dri/by-path/pci-0000:06:00.0-card
+NVIDIA=/dev/dri/by-path/pci-0000:01:00.0-card
+
+if [ -e $AMD ]; then
+  CARD=$AMD
+else
+  CARD=$NVIDIA
+fi
+
+ln -sf $CARD $HOME/.config/hypr/card

hosts/eirene/base/default.nix

@@ -58,18 +58,7 @@
       }];
     };
 
-    programs.zsh.loginExtra = lib.mkBefore ''
+    programs.zsh.loginExtra = lib.mkBefore (builtins.readFile ./card.sh);
-      AMD=/dev/dri/by-path/pci-0000:06:00.0-card
-      NVIDIA=/dev/dri/by-path/pci-0000:01:00.0-card
-
-      if [ -e $AMD ]; then
-        CARD=$AMD
-      else
-        CARD=$NVIDIA
-      fi
-
-      ln -sf $CARD $HOME/.config/hypr/card
-    '';
 
     theme = {
       cursor.size = 24;

users/common/options/home-manager/hyprland/default.nix

@@ -21,16 +21,12 @@ in
   config = {
     wayland.windowManager.hyprland.settings.exec-once = lib.meta.getExe (pkgs.writeShellApplication {
       name = "init-hyprland";
-      text = ''
+      text = cfg.initExtraConfig;
-        ${cfg.initExtraConfig}
-      '';
     });
 
     wayland.windowManager.hyprland.settings.exec = lib.meta.getExe (pkgs.writeShellApplication {
       name = "reload-hyprland";
-      text = ''
+      text = cfg.reloadExtraConfig;
-        ${cfg.reloadExtraConfig}
-      '';
     });
   };
 }

users/common/options/home-manager/theme/default.nix

@@ -6,106 +6,13 @@ let
     name = "theme";
     runtimeInputs = with pkgs; [ coreutils-full ];
     bashOptions = [ "nounset" "pipefail" ];
-    text = ''
+    runtimeEnv = {
-      [ ! -L "${cfg.configDir}/wallpaper" ] && ln -sf "${cfg.wallpaper}" "${cfg.configDir}/wallpaper"
+      CONFIG = cfg.configDir;
-      [ ! -f "${cfg.configDir}/mode" ] && echo "${cfg.mode}" > "${cfg.configDir}/mode"
+      DEFAULT_WALLPAPER = cfg.wallpaper;
-
+      DEFAULT_MODE = cfg.mode;
-      set_wallpaper() {
+      SWITCH = lib.meta.getExe (pkgs.writeShellScriptBin "themeExtraConfig" cfg.extraConfig);
-        if [ -f "$1" ]; then
+    };
-          WALLPAPER="$1"
+    text = builtins.readFile ./theme.sh;
-        else
-          echo "Invalid wallpaper path: $1"
-          exit 1
-        fi
-      }
-
-      set_mode() {
-        if [ "$1" = "light" ] || [ "$1" = "dark" ]; then
-          MODE="$1"
-        else
-          echo "Invalid mode: $1. Use 'light' or 'dark'."
-          exit 1
-        fi
-      }
-
-      toggle_mode() {
-        if [ "$(cat "${cfg.configDir}/mode")" = "light" ]; then
-          MODE="dark"
-        else
-          MODE="light"
-        fi
-      }
-
-      show_usage() {
-        echo "Usage: theme {toggle|light|dark|mode <mode>|wallpaper <file> [mode]}"
-      }
-
-      finish() {
-        [ -n "$WALLPAPER" ] && ln -sf "$WALLPAPER" "${cfg.configDir}/wallpaper"
-        [ -n "$MODE" ] && echo "$MODE" > "${cfg.configDir}/mode"
-
-        {
-          ${cfg.extraConfig}
-        } > /dev/null
-      }
-
-      WALLPAPER=""
-      MODE=""
-
-      if [ $# -eq 0 ]; then
-        finish
-      else
-        case "$1" in
-          toggle)
-            if [ $# -eq 1 ]; then
-              toggle_mode
-            else
-              show_usage
-              exit 1
-            fi
-            ;;
-          light)
-            if [ $# -eq 1 ]; then
-              set_mode "light"
-            else
-              show_usage
-              exit 1
-            fi
-            ;;
-          dark)
-            if [ $# -eq 1 ]; then
-              set_mode "dark"
-            else
-              show_usage
-              exit 1
-            fi
-            ;;
-          mode)
-            if [ $# -eq 2 ]; then
-              set_mode "$2"
-            else
-              show_usage
-              exit 1
-            fi
-            ;;
-          wallpaper)
-            if [ $# -ge 2 ] && [ $# -le 3 ]; then
-              set_wallpaper "$2"
-              [ $# -eq 3 ] && set_mode "$3"
-            else
-              show_usage
-              exit 1
-            fi
-            ;;
-          *)
-            show_usage
-            exit 1
-            ;;
-        esac
-
-        finish
-      fi
-    '';
   };
 in
 {

users/common/options/home-manager/theme/theme.sh

@@ -0,0 +1,98 @@
+[ ! -L "$CONFIG"/wallpaper ] && ln -sf "$DEFAULT_WALLPAPER" "$CONFIG"/wallpaper
+[ ! -f "$CONFIG"/mode ] && echo "$DEFAULT_MODE" > "$CONFIG"/mode
+
+set_wallpaper() {
+  if [ -f "$1" ]; then
+    WALLPAPER="$1"
+  else
+    echo "Invalid wallpaper path: $1"
+    exit 1
+  fi
+}
+
+set_mode() {
+  if [ "$1" = "light" ] || [ "$1" = "dark" ]; then
+    MODE="$1"
+  else
+    echo "Invalid mode: $1. Use 'light' or 'dark'."
+    exit 1
+  fi
+}
+
+toggle_mode() {
+  if [ "$(cat "$CONFIG"/mode)" = "light" ]; then
+    MODE="dark"
+  else
+    MODE="light"
+  fi
+}
+
+show_usage() {
+  echo "Usage: theme {toggle|light|dark|mode <mode>|wallpaper <file> [mode]}"
+}
+
+finish() {
+  [ -n "$WALLPAPER" ] && ln -sf "$WALLPAPER" "$CONFIG"/wallpaper
+  [ -n "$MODE" ] && echo "$MODE" > "$CONFIG"/mode
+
+  {
+    "$SWITCH"
+  } > /dev/null
+}
+
+WALLPAPER=""
+MODE=""
+
+if [ $# -eq 0 ]; then
+  finish
+else
+  case "$1" in
+    toggle)
+      if [ $# -eq 1 ]; then
+        toggle_mode
+      else
+        show_usage
+        exit 1
+      fi
+      ;;
+    light)
+      if [ $# -eq 1 ]; then
+        set_mode "light"
+      else
+        show_usage
+        exit 1
+      fi
+      ;;
+    dark)
+      if [ $# -eq 1 ]; then
+        set_mode "dark"
+      else
+        show_usage
+        exit 1
+      fi
+      ;;
+    mode)
+      if [ $# -eq 2 ]; then
+        set_mode "$2"
+      else
+        show_usage
+        exit 1
+      fi
+      ;;
+    wallpaper)
+      if [ $# -ge 2 ] && [ $# -le 3 ]; then
+        set_wallpaper "$2"
+        [ $# -eq 3 ] && set_mode "$3"
+      else
+        show_usage
+        exit 1
+      fi
+      ;;
+    *)
+      show_usage
+      exit 1
+      ;;
+  esac
+
+  finish
+fi

users/configs/ags/default.nix

@@ -1,11 +1,11 @@
 { user ? throw "user argument is required" }: { config, lib, pkgs, ... }:
 
 let
-  hmConfig = config.home-manager.users."${user.name}";
+  hmConfig = config.home-manager.users.${user.name};
   agsConfig = (import ./config { inherit pkgs; });
 in
 {
-  home-manager.users."${user.name}" = {
+  home-manager.users.${user.name} = {
     home.packages = with pkgs; [ ags ];
 
     xdg.configFile.ags = {
@@ -27,9 +27,7 @@ in
         nixos-icons
         rofi-wayland
       ];
-      text = ''
+      text = "ags &> /tmp/ags.log";
-        ags &> /tmp/ags.log
-      '';
     })} &";
   };
 }

users/configs/brightnessctl/default.nix

@@ -1,7 +1,7 @@
 { user ? throw "user argument is required" }: { lib, pkgs, ... }:
 
 {
-  home-manager.users."${user.name}" = {
+  home-manager.users.${user.name} = {
     home.packages = with pkgs; [ brightnessctl ];
 
     wayland.windowManager.hyprland.settings.bindle =

users/configs/btop/default.nix

@@ -1,10 +1,10 @@
 { user ? throw "user argument is required", gpu ? false }: { config, lib, pkgs, ... }:
 
 let
-  hmConfig = config.home-manager.users."${user.name}";
+  hmConfig = config.home-manager.users.${user.name};
 in
 {
-  home-manager.users."${user.name}" = {
+  home-manager.users.${user.name} = {
     programs = {
       btop = {
         enable = true;
@@ -30,9 +30,7 @@ in
     theme.extraConfig = "${lib.meta.getExe (pkgs.writeShellApplication {
       name = "reload-btop";
       runtimeInputs = with pkgs; [ procps ];
-      text = ''
+      text = "pkill btop -SIGUSR2";
-        pkill btop -SIGUSR2
-      '';
     })} &";
   };
 }

users/configs/firefox/default.nix

@@ -1,7 +1,7 @@
 { user ? throw "user argument is required" }: { lib, pkgs, ... }:
 
 {
-  home-manager.users."${user.name}" = {
+  home-manager.users.${user.name} = {
     programs.firefox = {
       enable = true;
 

users/configs/git/default.nix

@@ -1,10 +1,10 @@
 { user ? throw "user argument is required" }: { config, lib, pkgs, ... }:
 
 let
-  hmConfig = config.home-manager.users."${user.name}";
+  hmConfig = config.home-manager.users.${user.name};
 in
 {
-  home-manager.users."${user.name}" = {
+  home-manager.users.${user.name} = {
     programs.git = {
       enable = true;
       lfs.enable = true;

users/configs/gpg-agent/default.nix

@@ -1,11 +1,11 @@
 { user ? throw "user argument is required" }: { config, lib, pkgs, ... }:
 
 let
-  hmConfig = config.home-manager.users."${user.name}";
+  hmConfig = config.home-manager.users.${user.name};
   gpgPath = "${hmConfig.xdg.dataHome}/gnupg";
 in
 {
-  home-manager.users."${user.name}" = {
+  home-manager.users.${user.name} = {
     programs.gpg = {
       enable = true;
       homedir = gpgPath;

users/configs/gtk/default.nix

@@ -1,10 +1,10 @@
 { user ? throw "user argument is required" }: { config, lib, pkgs, ... }:
 
 let
-  hmConfig = config.home-manager.users."${user.name}";
+  hmConfig = config.home-manager.users.${user.name};
 in
 {
-  home-manager.users."${user.name}" = {
+  home-manager.users.${user.name} = {
     gtk = {
       enable = true;
 

users/configs/hyprland/default.nix

@@ -1,12 +1,12 @@
 { user ? throw "user argument is required" }: { config, lib, pkgs, ... }:
 
 let
-  hmConfig = config.home-manager.users."${user.name}";
+  hmConfig = config.home-manager.users.${user.name};
 in
 {
   programs.hyprland.enable = true;
 
-  home-manager.users."${user.name}" = {
+  home-manager.users.${user.name} = {
     wayland.windowManager.hyprland = {
       enable = true;
 
@@ -110,9 +110,7 @@ in
         input.touchpad.natural_scroll = true;
       };
 
-      extraConfig = ''
+      extraConfig = "source = ./theme.conf";
-        source = ./theme.conf
-      '';
     };
 
     programs = {
@@ -131,9 +129,7 @@ in
     theme.extraConfig = "${lib.meta.getExe (pkgs.writeShellApplication {
         name = "reload-hyprland";
         runtimeInputs = with pkgs; [ hyprland ];
-        text = ''
+        text = "hyprctl reload";
-          hyprctl reload
-        '';
       })} &";
 
     home.sessionVariables.NIXOS_OZONE_WL = "1";

users/configs/hyprshot/default.nix

@@ -1,10 +1,10 @@
 { user ? throw "user argument is required" }: { config, lib, pkgs, ... }:
 
 let
-  hmConfig = config.home-manager.users."${user.name}";
+  hmConfig = config.home-manager.users.${user.name};
 in
 {
-  home-manager.users."${user.name}" = {
+  home-manager.users.${user.name} = {
     home = {
       packages = with pkgs; [ hyprshot swappy ];
       sessionVariables.HYPRSHOT_DIR = "${hmConfig.xdg.userDirs.pictures}/screenshots";
@@ -19,9 +19,7 @@ in
         swappyWrapper = lib.meta.getExe (pkgs.writeShellApplication {
           name = "swappy-wrapper";
           runtimeInputs = with pkgs; [ swappy ];
-          text = ''
+          text = "swappy -f \"$1\"";
-            swappy -f "$1"
-          '';
         });
       in
       [

users/configs/kitty/default.nix

@@ -1,10 +1,10 @@
 { user ? throw "user argument is required" }: { config, lib, pkgs, ... }:
 
 let
-  hmConfig = config.home-manager.users."${user.name}";
+  hmConfig = config.home-manager.users.${user.name};
 in
 {
-  home-manager.users."${user.name}" = {
+  home-manager.users.${user.name} = {
     programs = {
       kitty = {
         enable = true;
@@ -23,9 +23,7 @@ in
     theme.extraConfig = "${lib.meta.getExe (pkgs.writeShellApplication {
       name = "reload-kitty";
       runtimeInputs = with pkgs; [ procps ];
-      text = ''
+      text = "pkill kitty -SIGUSR1";
-        pkill kitty -SIGUSR1
-      '';
     })} &";
 
     home.persistence."/cache${user.home}".directories = [ "${hmConfig.xdg.relativeCacheHome}/kitty" ];

users/configs/matugen/default.nix

@@ -1,10 +1,10 @@
 { user ? throw "user argument is required" }: { config, lib, pkgs, ... }:
 
 let
-  hmConfig = config.home-manager.users."${user.name}";
+  hmConfig = config.home-manager.users.${user.name};
 in
 {
-  home-manager.users."${user.name}" = {
+  home-manager.users.${user.name} = {
     programs.matugen = {
       enable = true;
       settings = {

users/configs/neovim/default.nix

@@ -1,7 +1,7 @@
 { user ? throw "user argument is required" }: { ... }:
 
 {
-  home-manager.users."${user.name}" = {
+  home-manager.users.${user.name} = {
     programs.neovim = {
       enable = true;
       defaultEditor = true;

users/configs/pavucontrol/default.nix

@@ -1,5 +1,5 @@
 { user ? throw "user argument is required" }: { pkgs, ... }:
 
 {
-  home-manager.users."${user.name}".home.packages = with pkgs; [ pavucontrol ];
+  home-manager.users.${user.name}.home.packages = with pkgs; [ pavucontrol ];
 }

users/configs/pipewire/default.nix

@@ -1,7 +1,7 @@
 { user ? throw "user argument is required" }: { pkgs, ... }:
 
 {
-  home-manager.users."${user.name}" = {
+  home-manager.users.${user.name} = {
     wayland.windowManager.hyprland.settings =
       let
         wpctl = "${pkgs.wireplumber}/bin/wpctl";

users/configs/playerctl/default.nix

@@ -1,7 +1,7 @@
 { user ? throw "user argument is required" }: { lib, pkgs, ... }:
 
 {
-  home-manager.users."${user.name}" = {
+  home-manager.users.${user.name} = {
     home.packages = with pkgs; [ playerctl ];
     services.playerctld.enable = true;
 

users/configs/qalculate/default.nix

@@ -1,7 +1,7 @@
 { user ? throw "user argument is required" }: { lib, config, pkgs, ... }:
 
 {
-  home-manager.users."${user.name}" = {
+  home-manager.users.${user.name} = {
     home.packages = with pkgs; [ qalculate-gtk ];
 
     wayland.windowManager.hyprland.settings.bind = [

users/configs/rofi/default.nix

@@ -1,10 +1,10 @@
 { user ? throw "user argument is required" }: { config, lib, pkgs, ... }:
 
 let
-  hmConfig = config.home-manager.users."${user.name}";
+  hmConfig = config.home-manager.users.${user.name};
 in
 {
-  home-manager.users."${user.name}" = {
+  home-manager.users.${user.name} = {
     home = {
       packages = with pkgs; [ rofi-wayland ];
       persistence."/cache${user.home}".directories = [ "${hmConfig.xdg.relativeCacheHome}/rofi" ];

users/configs/swww/default.nix

@@ -1,10 +1,10 @@
 { user ? throw "user argument is required" }: { config, lib, pkgs, ... }:
 
 let
-  hmConfig = config.home-manager.users."${user.name}";
+  hmConfig = config.home-manager.users.${user.name};
 in
 {
-  home-manager.users."${user.name}" = {
+  home-manager.users.${user.name} = {
     home = {
       packages = with pkgs; [ swww ];
       persistence."/cache${user.home}".directories = [ "${hmConfig.xdg.relativeCacheHome}/swww" ];
@@ -31,9 +31,7 @@ in
         procps
         swww
       ];
-      text = ''
+      text = "swww img \"${hmConfig.theme.configDir}/wallpaper\"";
-        swww img "${hmConfig.theme.configDir}/wallpaper"
-      '';
     })} &";
   };
 }

users/configs/theme/default.nix

@@ -1,11 +1,11 @@
 { user ? throw "user argument is required" }: { config, inputs, lib, pkgs, ... }:
 
 let
-  hmConfig = config.home-manager.users."${user.name}";
+  hmConfig = config.home-manager.users.${user.name};
   themeBin = lib.meta.getExe hmConfig.theme.pkg;
 in
 {
-  home-manager.users."${user.name}" = {
+  home-manager.users.${user.name} = {
     theme.enable = true;
 
     wayland.windowManager.hyprland.settings.bind = [
@@ -14,10 +14,7 @@ in
     ];
 
     home = {
-      activation.themeInit = inputs.home-manager.lib.hm.dag.entryAfter [ "writeBoundary" ] ''
+      activation.themeInit = inputs.home-manager.lib.hm.dag.entryAfter [ "writeBoundary" ] "run ${themeBin}";
-        run ${themeBin}
-      '';
-
       persistence."/persist${user.home}".directories = [ "${hmConfig.xdg.relativeConfigHome}/theme" ];
     };
   };

users/configs/vscode/default.nix

@@ -1,7 +1,7 @@
 { user ? throw "user argument is required" }: { inputs, lib, pkgs, ... }:
 
 {
-  home-manager.users."${user.name}" = {
+  home-manager.users.${user.name} = {
     programs.vscode = {
       enable = true;
       mutableExtensionsDir = false;

users/configs/wev/default.nix

@@ -1,5 +1,5 @@
 { user ? throw "user argument is required" }: { pkgs, ... }:
 
 {
-  home-manager.users."${user.name}".home.packages = with pkgs; [ wev ];
+  home-manager.users.${user.name}.home.packages = with pkgs; [ wev ];
 }

users/configs/x/default.nix

@@ -1,10 +1,10 @@
 { user ? throw "user argument is required" }: { config, ... }:
 
 let
-  hmConfig = config.home-manager.users."${user.name}";
+  hmConfig = config.home-manager.users.${user.name};
 in
 {
-  home-manager.users."${user.name}" = {
+  home-manager.users.${user.name} = {
     xresources.path = "${hmConfig.xdg.configHome}/X11/xresources";
   };
 }

users/configs/zsh/default.nix

@@ -1,10 +1,10 @@
 { user ? throw "user argument is required" }: { config, ... }:
 
 let
-  hmConfig = config.home-manager.users."${user.name}";
+  hmConfig = config.home-manager.users.${user.name};
 in
 {
-  home-manager.users."${user.name}" = {
+  home-manager.users.${user.name} = {
     programs.zsh = {
       enable = true;
       dotDir = "${hmConfig.xdg.relativeConfigHome}/zsh";