try uwsm again

system/users/nathan/home-manager/programs/git/default.nix

@@ -31,6 +31,9 @@
                 init = {
                     defaultBranch = "master";
                 };
+
+                safe.directory = "/etc/nixos";
+
                 url = {
                     "ssh://gitea@esotericbytes.com/" = {
                         insteadOf = [

system/users/nathan/home-manager/programs/hyprland/default.nix

@@ -32,7 +32,7 @@
             enable = true;
 
             systemd = {
-                enable = true;
+                enable = false;
                 variables = [ "--all" ];
             };
 

system/users/nathan/home-manager/programs/quickshell/default.nix

@@ -12,7 +12,12 @@
 
             configs = {
 
-                default = config.homeDirectory + "/Projects/Olympus/system/users/nathan/home-manager/dotfiles/quickshell/shell.qml";
+                default = config.homeDirectory + "/${config.home.file.".config/quickshell".target}";
+            };
+
+            systemd = {
+                enable = true;
+                target = lib.mkIf config.homeconfig.hyprland.enable "wayland-session@Hyprland.target";
             };
 
             activeConfig = "default";

system/users/nathan/home-manager/programs/terminal/opencode/default.nix

@@ -0,0 +1,34 @@
+{ config, lib, ... }: {
+
+    options.homeconfig.opencode.enable = with lib; mkOption {
+        type = with types; bool;
+        default = false;
+    };
+
+    config = lib.mkIf config.homeconfig.opencode.enable {
+
+        programs.opencode = {
+            enable = true;
+
+            settings = {
+                theme = "system";
+                model = "";
+
+                provider = {
+                    ollama-local = {
+                        name = "Ollama (local)";
+
+                        npm = "@ai-sdk/openai-compatible";
+
+                        options.baseURL = "http://localhost:11434/v1";
+
+                        models = {
+                            "ministral-3:8b".name = "Ministral 3 8B";
+                        };
+
+                    };
+                };
+            };
+        };
+    };
+}

system/users/nathan/home-manager/programs/terminal/zsh/default.nix

@@ -21,6 +21,11 @@
 
       python = "python3.13";
       python3 = "python3.13";
+
+      hyprrun = with lib; mkMerge [
+        (mkIf config.programs.hyprland.withUWSM "uwsm app --")
+        (mkIf (!config.programs.hyprland.withUWSM) ";")
+      ];
     };
 
     history = {