From 5aa4f174afadf4bacb655b88ecade6ccb705f2eb Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Tue, 14 May 2024 16:21:24 -0400 Subject: [PATCH] added ollama --- configs/hypr/hyprland.conf | 2 ++ configs/hypr/includes.conf | 21 +++++++++++---------- configs/nwg-panel/hyprland-0 | 10 +++++++--- configs/nwg-panel/hyprland-1 | 10 +++++++--- configs/nwg-panel/hyprland-2 | 10 +++++++--- configs/nwg-panel/hyprland-3 | 10 +++++++--- flake.nix | 1 + modules/optional/home-manager-config.nix | 6 ++++++ 8 files changed, 48 insertions(+), 22 deletions(-) diff --git a/configs/hypr/hyprland.conf b/configs/hypr/hyprland.conf index 5076d68..798b9d6 100644 --- a/configs/hypr/hyprland.conf +++ b/configs/hypr/hyprland.conf @@ -15,6 +15,8 @@ source = ~/.config/hypr/special-window-rules.conf # Include settings generated by nwg-shell-config source = ~/.config/hypr/includes.conf +env = XDG_SESSION_DESKTOP,KDE +env = XDG_CURRENT_DESKTOP,KDE # # Autostart. Feel free to add your own entries. # Shell components will be started in the includes.conf file, which we include below. diff --git a/configs/hypr/includes.conf b/configs/hypr/includes.conf index 65032a0..c7bbbb9 100644 --- a/configs/hypr/includes.conf +++ b/configs/hypr/includes.conf @@ -6,22 +6,23 @@ $browser = firefox $filemanager = dolphin $editor = code $launcher = nwg-drawer -$exit = nwg-bar -t hyprland.json -p center -a middle -i 48 -s hyprland-0.css +$theme = hyprland-1 +$exit = nwg-bar -t hyprland.json -p center -a middle -i 48 -s $theme.css # AUTOSTART -exec-once = rm /tmp/nwg-shell-check-update.lock -exec-once = wlsunset -t 4500 -T 6500 -l 52.2322 -L 20.9841 -g 1.1 -exec-once = swaync -c ~/.config/swaync/hyprland.json -s ~/.config/swaync/hyprland-0.css -exec-once = nwg-update-indicator +# exec-once = rm /tmp/nwg-shell-check-update.lock +# exec-once = wlsunset -t 4500 -T 6500 -l 52.2322 -L 20.9841 -g 1.1 +# exec-once = swaync -c ~/.config/swaync/hyprland.json -s ~/.config/swaync/$theme.css +# exec-once = nwg-update-indicator exec-once = wl-paste --type text --watch cliphist store exec-once = wl-paste --type image --watch cliphist store -exec = nwg-screenshot-applet +# exec = nwg-screenshot-applet exec = nwg-look -a -exec = nwg-drawer -r -c 6 -is 64 -fscol 2 -s hyprland-0.css -term foot -ft -exec = nwg-panel -c hyprland-0 -s hyprland-0.css -exec = nwg-shell-check-updates +exec = nwg-drawer -r -c 6 -is 64 -fscol 2 -s $theme.css -term $term -ft +exec = nwg-panel -c $theme -s $theme.css +# exec = nwg-shell-check-updates exec-once = nm-applet --indicator -exec = nwg-shell-config -s +# exec = nwg-shell-config -s # GENERAL SETTINGS general { diff --git a/configs/nwg-panel/hyprland-0 b/configs/nwg-panel/hyprland-0 index ae78118..fbd0aed 100755 --- a/configs/nwg-panel/hyprland-0 +++ b/configs/nwg-panel/hyprland-0 @@ -70,17 +70,21 @@ "icon": "system-shutdown-symbolic", "items": [ { - "name": "Lock", - "cmd": "nwg-lock" + "name": "Hibernate", + "cmd": "systemctl hibernate" }, { - "name": "Exit Hyprland session", + "name": "Logout", "cmd": "hyprctl dispatch exit" }, { "name": "Restart", "cmd": "systemctl reboot" }, + { + "name": "Restart", + "cmd": "systemctl reboot" + }, { "name": "Shutdown", "cmd": "systemctl -i poweroff" diff --git a/configs/nwg-panel/hyprland-1 b/configs/nwg-panel/hyprland-1 index 1759ff2..0a2aee5 100755 --- a/configs/nwg-panel/hyprland-1 +++ b/configs/nwg-panel/hyprland-1 @@ -72,17 +72,21 @@ "icon": "system-shutdown-symbolic", "items": [ { - "name": "Lock", - "cmd": "nwg-lock" + "name": "Hibernate", + "cmd": "systemctl hibernate" }, { - "name": "Exit Hyprland session", + "name": "Logout", "cmd": "hyprctl dispatch exit" }, { "name": "Restart", "cmd": "systemctl reboot" }, + { + "name": "Restart", + "cmd": "systemctl reboot" + }, { "name": "Shutdown", "cmd": "systemctl -i poweroff" diff --git a/configs/nwg-panel/hyprland-2 b/configs/nwg-panel/hyprland-2 index a9b0fea..67047a6 100755 --- a/configs/nwg-panel/hyprland-2 +++ b/configs/nwg-panel/hyprland-2 @@ -69,17 +69,21 @@ "icon": "system-shutdown-symbolic", "items": [ { - "name": "Lock", - "cmd": "nwg-lock" + "name": "Hibernate", + "cmd": "systemctl hibernate" }, { - "name": "Exit Hyprland session", + "name": "Logout", "cmd": "hyprctl dispatch exit" }, { "name": "Restart", "cmd": "systemctl reboot" }, + { + "name": "Restart", + "cmd": "systemctl reboot" + }, { "name": "Shutdown", "cmd": "systemctl -i poweroff" diff --git a/configs/nwg-panel/hyprland-3 b/configs/nwg-panel/hyprland-3 index d77ad91..7129272 100755 --- a/configs/nwg-panel/hyprland-3 +++ b/configs/nwg-panel/hyprland-3 @@ -68,17 +68,21 @@ "icon": "system-shutdown-symbolic", "items": [ { - "name": "Lock", - "cmd": "nwg-lock" + "name": "Hibernate", + "cmd": "systemctl hibernate" }, { - "name": "Exit Hyprland session", + "name": "Logout", "cmd": "hyprctl dispatch exit" }, { "name": "Restart", "cmd": "systemctl reboot" }, + { + "name": "Restart", + "cmd": "systemctl reboot" + }, { "name": "Shutdown", "cmd": "systemctl -i poweroff" diff --git a/flake.nix b/flake.nix index c762b70..dfb471b 100644 --- a/flake.nix +++ b/flake.nix @@ -56,6 +56,7 @@ ./modules/optional/x11.nix # still needed for things like lightdm ./modules/optional/wayland.nix ./modules/optional/kde.nix + ./modules/optional/ollama.nix (import ./modules/optional/home-manager-config.nix { user = user; hostName = hostName; diff --git a/modules/optional/home-manager-config.nix b/modules/optional/home-manager-config.nix index 6bbac4f..3295946 100644 --- a/modules/optional/home-manager-config.nix +++ b/modules/optional/home-manager-config.nix @@ -39,6 +39,12 @@ in }; programs = { bat.enable = true; + neovim = { + enable = true; + defaultEditor = true; + viAlias = true; + vimAlias = true; + }; direnv.enable = true; lsd = { enable = true;