From 085088a3029ff7c5484bedafbf36b7e226aeec33 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Tue, 3 Oct 2023 09:48:12 -0400
Subject: [PATCH] feat(nix): add vars.nix to source global vars in nix config
 and refactor

---
 nixos/home/dotfiles.nix |  7 ++-----
 nixos/home/hyprland.nix | 10 +---------
 nixos/home/main.nix     |  2 +-
 nixos/home/misc.nix     | 19 -------------------
 nixos/home/packages.nix | 16 ++++++++++++++++
 nixos/home/theme.nix    | 12 ++++++++++++
 nixos/vars.nix          |  3 +++
 7 files changed, 35 insertions(+), 34 deletions(-)
 delete mode 100644 nixos/home/misc.nix
 create mode 100644 nixos/home/theme.nix
 create mode 100644 nixos/vars.nix

diff --git a/nixos/home/dotfiles.nix b/nixos/home/dotfiles.nix
index 6fd3ba43..a372f780 100644
--- a/nixos/home/dotfiles.nix
+++ b/nixos/home/dotfiles.nix
@@ -1,9 +1,6 @@
-{ config, pkgs, ... }:
-
-let
-  configDir = "/home/matt/.nix/config";
+{ config, pkgs, ... }: let
+  configDir = (import ../vars.nix).configDir;
 in
-
 {
   xdg.configFile = {
     "swayosd/style.css".source     = config.lib.file.mkOutOfStoreSymlink "${configDir}/swayosd/style.css";
diff --git a/nixos/home/hyprland.nix b/nixos/home/hyprland.nix
index c10b27e1..68712f55 100644
--- a/nixos/home/hyprland.nix
+++ b/nixos/home/hyprland.nix
@@ -1,5 +1,5 @@
 { pkgs, config, hyprland, hyprgrass, ags, ... }: let
-  configDir = "/home/matt/.nix/config";
+  configDir = (import ../vars.nix).configDir;
 in
 {
   home.packages = [
@@ -39,15 +39,7 @@ in
     '';
   };
 
-  # https://www.reddit.com/r/NixOS/comments/vc3srj/comment/iccqxw1/?utm_source=share&utm_medium=web2x&context=3
   xdg.configFile = {
-    "../.themes/Dracula".source   = "${pkgs.dracula-theme}/share/themes/Dracula";
-
-    "Kvantum/Dracula".source              = "${pkgs.dracula-theme}/share/Kvantum/Dracula";
-    "Kvantum/Dracula-Solid".source        = "${pkgs.dracula-theme}/share/Kvantum/Dracula-Solid";
-    "Kvantum/Dracula-purple".source       = "${pkgs.dracula-theme}/share/Kvantum/Dracula-purple";
-    "Kvantum/Dracula-purple-solid".source = "${pkgs.dracula-theme}/share/Kvantum/Dracula-purple-solid";
-
     "hypr/main.conf".source       = config.lib.file.mkOutOfStoreSymlink "${configDir}/hypr/main.conf";
     "hypr/hyprpaper.conf".source  = config.lib.file.mkOutOfStoreSymlink "${configDir}/hypr/hyprpaper.conf";
   };
diff --git a/nixos/home/main.nix b/nixos/home/main.nix
index 271b2c3a..d7f8cafb 100644
--- a/nixos/home/main.nix
+++ b/nixos/home/main.nix
@@ -20,11 +20,11 @@
 
     imports = [
       ./dconf.nix
+      ./theme.nix
       ./hyprland.nix
       ./bashdots.nix
       ./dotfiles.nix
       ./packages.nix
-      ./misc.nix
       ./nvim.nix
     ];
 
diff --git a/nixos/home/misc.nix b/nixos/home/misc.nix
deleted file mode 100644
index 2d59ab2e..00000000
--- a/nixos/home/misc.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ ... }:
-
-{
-  xdg.desktopEntries.gparted = {
-    name = "GParted";
-    genericName = "Partition Editor";
-    comment = "Create, reorganize, and delete partitions";
-    exec = "Gparted";
-    icon = "gparted";
-    terminal = false;
-    type = "Application";
-    categories = [ "GNOME" "System" "Filesystem" ];
-    startupNotify = true;
-    settings = {
-      Keywords = "Partition";
-      X-GNOME-FullName = "GParted Partition Editor";
-    };
-  };
-}
diff --git a/nixos/home/packages.nix b/nixos/home/packages.nix
index b4445645..932ac56f 100644
--- a/nixos/home/packages.nix
+++ b/nixos/home/packages.nix
@@ -19,6 +19,22 @@
     };
   };
 
+  xdg.desktopEntries.gparted = {
+    name = "GParted";
+    genericName = "Partition Editor";
+    comment = "Create, reorganize, and delete partitions";
+    exec = "Gparted";
+    icon = "gparted";
+    terminal = false;
+    type = "Application";
+    categories = [ "GNOME" "System" "Filesystem" ];
+    startupNotify = true;
+    settings = {
+      Keywords = "Partition";
+      X-GNOME-FullName = "GParted Partition Editor";
+    };
+  };
+
   home.packages = with pkgs;
     (with python311Packages; [
       python
diff --git a/nixos/home/theme.nix b/nixos/home/theme.nix
new file mode 100644
index 00000000..2e49302f
--- /dev/null
+++ b/nixos/home/theme.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+
+{
+  xdg.configFile = {
+    "../.themes/Dracula".source   = "${pkgs.dracula-theme}/share/themes/Dracula";
+
+    "Kvantum/Dracula".source              = "${pkgs.dracula-theme}/share/Kvantum/Dracula";
+    "Kvantum/Dracula-Solid".source        = "${pkgs.dracula-theme}/share/Kvantum/Dracula-Solid";
+    "Kvantum/Dracula-purple".source       = "${pkgs.dracula-theme}/share/Kvantum/Dracula-purple";
+    "Kvantum/Dracula-purple-solid".source = "${pkgs.dracula-theme}/share/Kvantum/Dracula-purple-solid";
+  };
+}
diff --git a/nixos/vars.nix b/nixos/vars.nix
new file mode 100644
index 00000000..ae22435f
--- /dev/null
+++ b/nixos/vars.nix
@@ -0,0 +1,3 @@
+{
+  configDir = "/home/matt/.nix/config";
+}