From d3b93d1064a3d985fbc5826b98cf207e05fdc14a Mon Sep 17 00:00:00 2001
From: cswimr <seaswimmerthefsh@gmail.com>
Date: Tue, 4 Feb 2025 14:37:32 -0600
Subject: [PATCH] cleanup

---
 flake.nix               |  2 +-
 home-manager/plasma.nix |  1 -
 home-manager/user.nix   | 21 ++++++++++-----------
 nixos/environment.nix   |  4 ++--
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/flake.nix b/flake.nix
index 9d73d8d..2e34c31 100644
--- a/flake.nix
+++ b/flake.nix
@@ -111,7 +111,7 @@
                 boot.loader.systemd-boot.enable = lib.mkForce false;
                 boot.lanzaboote = {
                   enable = true;
-                  pkiBundle = "/etc/secureboot";
+                  pkiBundle = "/var/lib/sbctl";
                 };
               }
             )
diff --git a/home-manager/plasma.nix b/home-manager/plasma.nix
index 91ff76c..842efd0 100644
--- a/home-manager/plasma.nix
+++ b/home-manager/plasma.nix
@@ -80,7 +80,6 @@
                   "applications:vesktop.desktop"
                   "applications:steam.desktop"
                   "applications:org.prismlauncher.PrismLauncher.desktop"
-                  "applications:code.desktop"
                   "applications:kitty.desktop"
                   "applications:org.kde.dolphin.desktop"
                 ];
diff --git a/home-manager/user.nix b/home-manager/user.nix
index 01e34ce..48d3161 100755
--- a/home-manager/user.nix
+++ b/home-manager/user.nix
@@ -9,22 +9,21 @@
   home.homeDirectory = "/home/${user}";
 
   home.file = {
-    ".face.icon".source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/assets/img/clownfish.png";
+    ".face.icon".source = config.lib.file.mkOutOfStoreSymlink ../assets/img/clownfish.png;
     ".config/fastfetch/config.jsonc".source =
-      config.lib.file.mkOutOfStoreSymlink "/etc/nixos/config/fastfetch.jsonc";
-    ".psqlrc".source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/config/.psqlrc";
-    ".config/btop/btop.conf".source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/config/btop.conf";
+      config.lib.file.mkOutOfStoreSymlink ../config/fastfetch.jsonc;
+    ".psqlrc".source = config.lib.file.mkOutOfStoreSymlink ../config/.psqlrc;
+    ".config/btop/btop.conf".source = config.lib.file.mkOutOfStoreSymlink ../config/btop.conf;
     ".config/btop/themes/catppuccin_mocha.theme".source =
-      config.lib.file.mkOutOfStoreSymlink "/etc/nixos/config/themes/btop.theme";
+      config.lib.file.mkOutOfStoreSymlink ../config/themes/btop.theme;
     ".config/gauntlet/theme.toml".source =
-      config.lib.file.mkOutOfStoreSymlink "/etc/nixos/config/themes/gauntlet.toml";
-    ".config/glow/glow.yml".source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/config/glow.yml";
-    ".config/glow/theme.json".source =
-      config.lib.file.mkOutOfStoreSymlink "/etc/nixos/config/themes/glow.json";
+      config.lib.file.mkOutOfStoreSymlink ../config/themes/gauntlet.toml;
+    ".config/glow/glow.yml".source = config.lib.file.mkOutOfStoreSymlink ../config/glow.yml;
+    ".config/glow/theme.json".source = config.lib.file.mkOutOfStoreSymlink ../config/themes/glow.json;
     ".config/vinegar/config.toml".source =
-      config.lib.file.mkOutOfStoreSymlink "/etc/nixos/config/vinegar.toml";
+      config.lib.file.mkOutOfStoreSymlink ../etc/nixos/config/vinegar.toml;
     ".local/share/kio/servicemenus" = {
-      source = "/etc/nixos/config/servicemenus";
+      source = ../config/servicemenus;
       recursive = true;
       executable = true;
     };
diff --git a/nixos/environment.nix b/nixos/environment.nix
index c82d6de..e20c4ff 100644
--- a/nixos/environment.nix
+++ b/nixos/environment.nix
@@ -2,7 +2,7 @@
 {
   environment.variables = rec {
     EDITOR = "nvim";
-    VISUAL = "code";
+    VISUAL = "nvim";
 
     # XDG settings
     XDG_CACHE_HOME = "$HOME/.cache";
@@ -19,7 +19,7 @@
 
     PATH = [
       "${XDG_BIN_HOME}"
-      "/etc/nixos/scripts"
+      ../scripts
     ];
   };