From daf0ea11692734e80c6f7c5490b409398fe1774e Mon Sep 17 00:00:00 2001 From: Nathan Date: Sat, 10 Jan 2026 18:58:54 -0600 Subject: [PATCH] update ollama, add magic space, install opencode --- system/services/ollama/default.nix | 4 +- .../home-manager/dotfiles/hypr/main.conf | 8 ++-- .../nathan/home-manager/packages/default.nix | 38 +++++++++++++------ .../home-manager/packages/scripts/default.nix | 14 ++++++- .../programs/terminal/default.nix | 1 + .../programs/terminal/ohmyposh/default.nix | 16 +++++--- .../programs/terminal/opencode/default.nix | 4 +- .../programs/terminal/zsh/default.nix | 6 ++- 8 files changed, 63 insertions(+), 28 deletions(-) diff --git a/system/services/ollama/default.nix b/system/services/ollama/default.nix index e39c4ca..1743dc3 100644 --- a/system/services/ollama/default.nix +++ b/system/services/ollama/default.nix @@ -11,12 +11,12 @@ services.ollama = { enable = true; acceleration = "cuda"; - /*package = let + package = let pkgs-us = import nixpkgs-us { system = "x86_64-linux"; config.allowUnfree = true; }; - in pkgs-us.ollama;*/ + in pkgs-us.ollama-cuda; }; }; } diff --git a/system/users/nathan/home-manager/dotfiles/hypr/main.conf b/system/users/nathan/home-manager/dotfiles/hypr/main.conf index e94a5cf..3aea5ba 100644 --- a/system/users/nathan/home-manager/dotfiles/hypr/main.conf +++ b/system/users/nathan/home-manager/dotfiles/hypr/main.conf @@ -107,7 +107,7 @@ ecosystem { # Binds $mainMod = ALT -bind = $mainMod SHIFT, E, exec, hyprrun colorPrefix kitty +bind = $mainMod SHIFT, E, exec, colorPrefix hyprrun kitty bind = $mainMod, B, exec, hyprrun firefox @@ -122,7 +122,7 @@ bind = $mainMod, Q, killactive, bind = $mainMod, F, exec, hyprrun thunar bind = $mainMod SHIFT, F, fullscreen -bind = $mainMod SHIFT, semicolon, exec, hyprrun colorPrefix kitty -e lf +bind = $mainMod SHIFT, semicolon, exec, colorPrefix hyprrun kitty -e lf bind = $mainMod, Insert, exec, hyprrun libreoffice @@ -130,7 +130,7 @@ bind = $mainMod, V, togglefloating, bind = $mainMod SHIFT, V, exec, hyprrun vlc -bind = , Menu, exec, hyprrun rofi -show drun +bind = , Menu, exec, hyprrun rofi -show drun -show-icons -run-command 'hyprrun {cmd}' bind = $mainMod, Menu, exec, hyprrun hyprpanel -q; hyprrun hyprpanel @@ -144,7 +144,7 @@ bind = $mainMod, M, exec, hyprrun spotify bind = $mainMod SHIFT, M, exec, hyprrun firefox soundcloud.com/you/library -bind = $mainMod CTRL, M, exec, hyprrun colorPrefix kitty -e ncmpcpp -s browser +bind = $mainMod CTRL, M, exec, colorPrefix hyprrun kitty -e ncmpcpp -s browser bind = $mainMod, XF86AudioPlay, exec, hyprrun mpc load casual diff --git a/system/users/nathan/home-manager/packages/default.nix b/system/users/nathan/home-manager/packages/default.nix index b3058c0..dd0ecdb 100644 --- a/system/users/nathan/home-manager/packages/default.nix +++ b/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 [])); - }; + ]; + }) + ]; } diff --git a/system/users/nathan/home-manager/packages/scripts/default.nix b/system/users/nathan/home-manager/packages/scripts/default.nix index bade622..7fdd04c 100644 --- a/system/users/nathan/home-manager/packages/scripts/default.nix +++ b/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 -- ''$@ '') ]; }) diff --git a/system/users/nathan/home-manager/programs/terminal/default.nix b/system/users/nathan/home-manager/programs/terminal/default.nix index 11151e8..3ec423c 100644 --- a/system/users/nathan/home-manager/programs/terminal/default.nix +++ b/system/users/nathan/home-manager/programs/terminal/default.nix @@ -12,5 +12,6 @@ ./zsh ./ssh ./ohmyposh + ./opencode ]; } diff --git a/system/users/nathan/home-manager/programs/terminal/ohmyposh/default.nix b/system/users/nathan/home-manager/programs/terminal/ohmyposh/default.nix index 29d49be..26c4507 100644 --- a/system/users/nathan/home-manager/programs/terminal/ohmyposh/default.nix +++ b/system/users/nathan/home-manager/programs/terminal/ohmyposh/default.nix @@ -6,12 +6,16 @@ programs.zsh = { - initContent = if config.homeconfig.wal.enable then (lib.mkBefore '' - cat ${config.home.homeDirectory}/.cache/wal/sequences - eval "$(oh-my-posh init zsh --config ${config.home.homeDirectory}/.cache/wal/ohmyposh.toml)" - '') else (lib.mkBefore '' - eval "$(oh-my-posh init zsh --config ${config.home.homeDirectory}/.config/ohmyposh/ohmyposh.toml)" - ''); + initContent = with lib; mkMerge [ + (mkIf config.homeconfig.wal.enable (mkBefore '' + cat ${config.home.homeDirectory}/.cache/wal/sequences + eval "$(oh-my-posh init zsh --config ${config.home.homeDirectory}/.cache/wal/ohmyposh.toml)" + '')) + + (mkIf (!config.homeconfig.wal.enable) (mkBefore '' + eval "$(oh-my-posh init zsh --config ${config.home.homeDirectory}/.config/ohmyposh/ohmyposh.toml)" + '')) + ]; }; diff --git a/system/users/nathan/home-manager/programs/terminal/opencode/default.nix b/system/users/nathan/home-manager/programs/terminal/opencode/default.nix index a80eef1..4840a91 100644 --- a/system/users/nathan/home-manager/programs/terminal/opencode/default.nix +++ b/system/users/nathan/home-manager/programs/terminal/opencode/default.nix @@ -2,7 +2,7 @@ options.homeconfig.opencode.enable = with lib; mkOption { type = with types; bool; - default = false; + default = true; }; config = lib.mkIf config.homeconfig.opencode.enable { @@ -12,7 +12,7 @@ settings = { theme = "system"; - model = ""; + model = "ollama-local/ministral-3:8b"; provider = { ollama-local = { diff --git a/system/users/nathan/home-manager/programs/terminal/zsh/default.nix b/system/users/nathan/home-manager/programs/terminal/zsh/default.nix index be18b6a..9eecb72 100644 --- a/system/users/nathan/home-manager/programs/terminal/zsh/default.nix +++ b/system/users/nathan/home-manager/programs/terminal/zsh/default.nix @@ -1,8 +1,12 @@ -{ config, lib, pkgs, ... }: { +{ lib, ... }: { programs.zsh = { enable = true; + + initContent = lib.mkOrder 1200 '' + bindkey ' ' magic-space + ''; enableCompletion = true;