update ollama, add magic space, install opencode

system/users/nathan/home-manager/packages/default.nix

@@ -23,7 +23,7 @@
             allowUnfree = true;
         };
 
-        home.packages = with pkgs; ([
+        home.packages = with pkgs; [
 
             inputs.disko.packages.${pkgs.stdenv.hostPlatform.system}.disko-install 
 
@@ -48,13 +48,23 @@
                 debugpy
                 requests
             ]))
-        ] ++ (if config.homeconfig.graphical then [
+        ];
+
+    } // lib.mkMerge [
+
+        (lib.mkIf config.homeconfig.graphical {
+            home.packages = with pkgs; [
+            
             grim
             slurp
             xfce.thunar
             wl-clipboard
             blueberry
-        ] else []) ++ (if !config.homeconfig.minimal then [
+            ];
+        })
+
+        (lib.mkIf (!config.homeconfig.minimal) {
+            home.packages = with pkgs; [
             cava 
             android-tools
             neovim-remote
@@ -65,12 +75,17 @@
             playerctl
             mpc
             ffmpeg
+            ];
+        })
 
-        ] else []) ++ (if !config.homeconfig.minimal && config.homeconfig.graphical then [
+        (lib.mkIf (!config.homeconfig.minimal && config.homeconfig.graphical) {
+            home.packages = with pkgs; [
+            
             handbrake
             quickemu
             bottles
-            
+
+            pkgs-us.runapp
             brightnessctl
             libdbusmenu-gtk3
             lmms
@@ -78,13 +93,13 @@
 #unfree {
             geogebra
             spotify
-            pkgs-us.discord
+            discord
 #}
-            pkgs-us.rustdesk-flutter
-            pkgs-us.mpv
+            rustdesk-flutter
+            mpv
             vlc
             pavucontrol
-            #rpi-imager
+            rpi-imager
             tigervnc
             keepassxc
 
@@ -98,6 +113,7 @@
 
 #games
             prismlauncher
-        ] else []));
-    };
+            ];
+        })
+    ];
 }

system/users/nathan/home-manager/packages/scripts/default.nix

@@ -1,4 +1,13 @@
-{ config, lib, pkgs, ... }: {
+{ config, lib, pkgs, inputs, ... }: let
+
+    system = "x86_64-linux";
+
+    pkgs-us = import inputs.nixpkgs-us {
+      inherit system;
+      config.allowUnfree = true;
+    };
+
+    in {
 
     options = {
         homeconfig.scripts.enable = lib.options.mkOption {
@@ -11,7 +20,8 @@
     (lib.mkIf (config.homeconfig.hyprland.enable && config.homeconfig.scripts.enable) {
         home.packages = [
             (pkgs.writeShellScriptBin "hyprrun" ''
-                uwsm app -- ''$@
+                ${pkgs-us.runapp}/bin/runapp ''$@
+                #uwsm app -- ''$@
             '')
         ];
     })