Blunkall-Technologies/Olympus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update ollama, add magic space, install opencode

Browse Source
This commit is contained in:
Nathan
2026-01-10 18:58:54 -06:00
parent bd20e9a29b
commit daf0ea1169
8 changed files with 63 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
system/services/ollama/default.nix
View File

@@ -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;
};
};
}

8
system/users/nathan/home-manager/dotfiles/hypr/main.conf
View File

@@ -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

36
system/users/nathan/home-manager/packages/default.nix
View File

@@ -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
];
})
(lib.mkIf (!config.homeconfig.minimal && config.homeconfig.graphical) {
home.packages = with pkgs; [
] else []) ++ (if !config.homeconfig.minimal && config.homeconfig.graphical then [
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 []));
};
];
})
];
}

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

@@ -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 -- ''$@
'')
];
})

1
system/users/nathan/home-manager/programs/terminal/default.nix
View File

@@ -12,5 +12,6 @@
./zsh
./ssh
./ohmyposh
./opencode
];
}

16
system/users/nathan/home-manager/programs/terminal/ohmyposh/default.nix
View File

@@ -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)"
''))
];
};

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

@@ -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 = {

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

@@ -1,9 +1,13 @@
{ config, lib, pkgs, ... }: {
{ lib, ... }: {
programs.zsh = {
enable = true;
initContent = lib.mkOrder 1200 ''
bindkey ' ' magic-space
'';
enableCompletion = true;
autosuggestion.enable = true;