From 86260ff2af4544761ac5e91ca77eb47ea1314f49 Mon Sep 17 00:00:00 2001 From: Phil Bajsicki Date: Fri, 15 Nov 2024 00:08:06 +0100 Subject: [PATCH] Temp update --- .config/doom/README.org | 22 +++++------- .config/doom/config.el | 21 +++++------- .config/fish/config.fish | 61 +++++++++++++++++---------------- .config/fish/fish_variables | 1 + .config/fish/functions/vps.fish | 6 ++-- .config/hypr/hyprland.conf | 55 ++++++++++++++++------------- .gitignore | 6 +++- .scripts/.runhyprland.sh | 3 +- 8 files changed, 93 insertions(+), 82 deletions(-) diff --git a/.config/doom/README.org b/.config/doom/README.org index 8f8c83d..6799832 100644 --- a/.config/doom/README.org +++ b/.config/doom/README.org @@ -1035,29 +1035,25 @@ consider my habits. With their context size only increasing as time goes by, this is turning into a very easy way to get feedback on the ideas I have. #+begin_src emacs-lisp :tangle config.el -(use-package! gptel - :config - (setq! gptel-api-key "thisisanapikey") - (setq! gptel-max-tokens 8192) - (setq gptel-model "model" - gptel-backend (gptel-make-openai "llama-cpp" - :key "thisisanapikey" - :stream t - :protocol "http" - :host "localhost:6666" - :models '("model")))) -(gptel-make-openai "llama-cpp" ;Any name +(use-package! gptel) +(gptel-make-openai "ooba" ;Any name :key "thisisanapikey" :stream t ;Stream responses :protocol "http" :host "localhost:6666" ;Llama.cpp server location :models '("model")) ;Any names, doesn't matter for Llama +(gptel-make-openai "OpenRouter" + :host "openrouter.ai" + :endpoint "/api/v1/chat/completions" + :key (getenv "GPTEL_OPENROUTER_API") + :stream t ;Stream responses + :models '(qwen/qwen-2.5-coder-32b-instruct)) + (setq gptel--debug t) #+end_src #+RESULTS: -: t *** elfeed RSS is not dead. RSS is not dead. RSS is not dead. #+begin_src emacs-lisp :tangle config.el diff --git a/.config/doom/config.el b/.config/doom/config.el index 2a63f41..e7d03f3 100644 --- a/.config/doom/config.el +++ b/.config/doom/config.el @@ -533,24 +533,21 @@ w (buffer-name (let* ((heading (org-get-heading t t)) (setq inferior-lisp-program "sbcl --dynamic-space-size 8192 -Q -l ~/.sbclrc") -(use-package! gptel - :config - (setq! gptel-api-key "thisisanapikey") - (setq! gptel-max-tokens 8192) - (setq gptel-model "model" - gptel-backend (gptel-make-openai "llama-cpp" - :key "thisisanapikey" - :stream t - :protocol "http" - :host "localhost:6666" - :models '("model")))) -(gptel-make-openai "llama-cpp" ;Any name +(use-package! gptel) +(gptel-make-openai "ooba" ;Any name :key "thisisanapikey" :stream t ;Stream responses :protocol "http" :host "localhost:6666" ;Llama.cpp server location :models '("model")) ;Any names, doesn't matter for Llama +(gptel-make-openai "OpenRouter" + :host "openrouter.ai" + :endpoint "/api/v1/chat/completions" + :key (getenv "GPTEL_OPENROUTER_API") + :stream t ;Stream responses + :models '(qwen/qwen-2.5-coder-32b-instruct)) + (setq gptel--debug t) (setq-default elfeed-search-filter "@1-week-ago +unread ") diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 3a8173e..74b3661 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -7,14 +7,16 @@ set -U PLANTUML_LIMIT_SIZE 16384 set -e SSH_AGENT_PID if not set -q gnupg_SSH_AUTH_SOCK_by or test $gnupg_SSH_AUTH_SOCK_by -ne $fish_pid - set -gx SSH_AUTH_SOCK (gpgconf --list-dirs agent-ssh-socket) + set -gx SSH_AUTH_SOCK (gpgconf --list-dirs agent-ssh-socket) end +set GPG_TTY $(tty) + set fish_greeting -set TERM "xterm-256color" +set TERM xterm-256color set EDITOR "emacsclient -t -a ''" set VISUAL "emacsclient -c -a emacs" -set QT_QPA_PLATFORMTHEME "qt6ct" +set QT_QPA_PLATFORMTHEME qt6ct set SSH_AUTH_SOCK $XDG_RUNTIME_DIR/ssh-agent.socket set GNUPGHOME "~/enc/keys/gnupg" set LEDGER_FILE "~/enc/org/hledger/2023.journal" @@ -83,7 +85,7 @@ end function letters cat $argv | awk -vFS='' '{for(i=1;i<=NF;i++){ if($i~/[a-zA-Z]/) { w[tolower($i)]++} } }END{for(i in w) print i,w[i]}' | sort | cut -c 3- | spark | lolcat - printf '%s\n' 'abcdefghijklmnopqrstuvwxyz' ' ' | lolcat + printf '%s\n' abcdefghijklmnopqrstuvwxyz ' ' | lolcat end function commits @@ -91,30 +93,31 @@ function commits end function __history_previous_command - switch (commandline -t) - case "!" - commandline -t $history[1]; commandline -f repaint - case "*" - commandline -i ! - end + switch (commandline -t) + case "!" + commandline -t $history[1] + commandline -f repaint + case "*" + commandline -i ! + end end function __history_previous_command_arguments - switch (commandline -t) - case "!" - commandline -t "" - commandline -f history-token-search-backward - case "*" - commandline -i '$' - end + switch (commandline -t) + case "!" + commandline -t "" + commandline -f history-token-search-backward + case "*" + commandline -i '$' + end end -if [ $fish_key_bindings = "fish_vi_key_bindings" ]; - bind -Minsert ! __history_previous_command - bind -Minsert '$' __history_previous_command_arguments +if [ $fish_key_bindings = fish_vi_key_bindings ] + bind -Minsert ! __history_previous_command + bind -Minsert '$' __history_previous_command_arguments else - bind ! __history_previous_command - bind '$' __history_previous_command_arguments + bind ! __history_previous_command + bind '$' __history_previous_command_arguments end function backup --argument filename @@ -124,8 +127,8 @@ end function copy set count (count $argv | tr -d \n) if test "$count" = 2; and test -d "$argv[1]" - set from (echo $argv[1] | trim-right /) - set to (echo $argv[2]) + set from (echo $argv[1] | trim-right /) + set to (echo $argv[2]) command cp -r $from $to else command cp $argv @@ -255,11 +258,11 @@ starship init fish | source set -gx PATH "$HOME/.cabal/bin:$HOME/.ghcup/bin:$PATH" function phil-fix-names - perl-rename 'y/A-Z/a-z/' * && perl-rename 'y/ /-/' * + perl-rename y/A-Z/a-z/ * && perl-rename 'y/ /-/' * end function polish - setxkbmap -model pc104 -layout pl -option compose:rctrl + setxkbmap -model pc104 -layout pl -option compose:rctrl end function greek @@ -267,13 +270,13 @@ function greek end function vps - ssh -p 2222 phil@46.38.232.163 -i ~/.ssh/id_ed25519_nopass + ssh -p 2222 phil@46.38.232.163 -i ~/.ssh/id_ed25519_nopass end function vpssh - sshfs phil@46.38.232.163:/srv/ ~/remote/vps-srv -p 2222 -o identityFile=~/.ssh/id_ed25519_nopass -o reconnect + sshfs phil@46.38.232.163:/srv/ ~/remote/vps-srv -p 2222 -o identityFile=~/.ssh/id_ed25519_nopass -o reconnect end function vpsshu - fusermount3 -u ~/remote/vps-srv/ + fusermount3 -u ~/remote/vps-srv/ end diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index 479da98..05be2c9 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -38,3 +38,4 @@ SETUVAR fish_pager_color_prefix:cyan\x1e\x2d\x2dbold\x1e\x2d\x2dunderline SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan SETUVAR fish_pager_color_selected_background:\x2dr SETUVAR fish_user_paths:/home/phil/apps/bin\x1e/home/phil/\x2elocal/bin\x1e/home/phil/Applications\x1e/home/phil/\x2ecabal/bin\x1e/home/phil/\x2eghcup/bin\x1e/home/phil/\x2edeno/bin\x1e/home/phil/\x2ecargo/bin +SETUVAR testenv:1 diff --git a/.config/fish/functions/vps.fish b/.config/fish/functions/vps.fish index 3378e44..d6669bf 100644 --- a/.config/fish/functions/vps.fish +++ b/.config/fish/functions/vps.fish @@ -1,3 +1,5 @@ -function vps --wraps='ssh -p 2222 phil@46.38.232.163 -i .ssh/id_ed25519_nopass' --wraps='ssh -p 22 phil@46.38.232.163 -i .ssh/id_ed25519_nopass' --description 'alias vps ssh -p 2222 phil@46.38.232.163 -i .ssh/id_ed25519_nopass' - ssh -p 2222 phil@46.38.232.163 -i .ssh/id_ed25519_nopass $argv; +function vps + --wraps='ssh -p 2222 phil@46.38.232.163 -i .ssh/id_ed25519_nopass' + --description 'alias vps ssh -p 2222 phil@46.38.232.163 -i .ssh/id_ed25519_nopass' + ssh -p 2222 phil@46.38.232.163 -i .ssh/id_ed25519_nopass $argv end diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index 572bca2..cc7213c 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -1,12 +1,37 @@ # monitor=eDP-1, 1920x1080@60, 1920x0, 1 -monitor=eDP-1, 1920x1080@60, 0x1080, 1 -monitor=DP-2, 1920x1080@60, 1920x0, 1 -monitor=DP-1, 1920x1080@60, 1920x1080, 1 +monitor=eDP-2, 1920x1080@165, 0x1080, 1 +monitor=DP-2, 1920x1080@60, 1920x1080, 1 +monitor=DP-1, 1920x1080@144, 1920x0, 1 monitor=HDMI-A-1, 1920x1080@60, 3840x0, 1 +env = CLUTTER_BACKEND,wayland +env = ELECTRON_OZONE_PLATFORM_HINT,auto +env = GBM_BACKEND,nvidia-drm +env = GDK_BACKEND,wayland,x11,* +env = HYPRSHOT_DIR,enc/pictures/screenshots +env = LIBVA_DRIVER_NAME,nvidia +env = NVD_BACKEND,direct +env = QT_AUTO_SCREEN_SCALE_FACTOR,1 +env = QT_QPA_PLATFORM,wayland;xcb +env = QT_QPA_PLATFORMTHEME,qt5ct +env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1 +env = SDL_VIDEODRIVER,wayland,x11,windows +env = XCURSOR_SIZE,24 +env = XDG_CURRENT_DESKTOP,Hyprland +env = XDG_SESSION_DESKTOP,Hyprland +env = XDG_SESSION_TYPE,wayland +env = __GLX_VENDOR_LIBRARY_NAME,nvidia +env = __GL_VRR_ALLOWED,0 + + +cursor { + no_hardware_cursors = false +} + input { kb_layout = pl kb_options = compose:rctrl + numlock_by_default = true follow_mouse = 1 sensitivity = 0 # -1.0 - 1.0, 0 means no modification. touchpad { @@ -14,6 +39,8 @@ input { } } +debug:disable_logs = false + general { gaps_in = 10 gaps_out = 20 @@ -70,27 +97,7 @@ misc { key_press_enables_dpms=true } -env = XCURSOR_SIZE,24 -env = GBM_BACKEND,nvidia-drm -env = __GLX_VENDOR_LIBRARY_NAME,nvidia -env = __GL_VRR_ALLOWED,0 - - -env = GDK_BACKEND,wayland,x11,* -env = SDL_VIDEODRIVER,wayland -env = CLUTTER_BACKEND,wayland - -env = XDG_CURRENT_DESKTOP,Hyprland -env = XDG_SESSION_TYPE,wayland -env = XDG_SESSION_DESKTOP,Hyprland - -env = QT_QPA_PLATFORM,wayland;xcb -env = QT_AUTO_SCREEN_SCALE_FACTOR,1 -env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1 -env = QT_QPA_PLATFORMTHEME,qt5ct - -env = HYPRSHOT_DIR,enc/pictures/screenshots $mainMod = SUPER bind = CTRL_SHIFT_ALT, Q, killactive, @@ -98,7 +105,7 @@ bind = SUPER_CTRL_SHIFT_ALT, 0, exit, bind = $mainMod, B, togglefloating, bind = $mainMod, F, fullscreen, 0 -bind = SUPER_SHIFT, F, fakefullscreen +# bind = SUPER_SHIFT, F, fakefullscreen bind = $mainMod, P, pseudo, # dwindle bind = $mainMod, J, togglesplit, # dwindle diff --git a/.gitignore b/.gitignore index 8b13789..056d3c7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,5 @@ - +.env +.priv +temp/ +tmp/ +.el diff --git a/.scripts/.runhyprland.sh b/.scripts/.runhyprland.sh index 81ac3a6..49d9eea 100755 --- a/.scripts/.runhyprland.sh +++ b/.scripts/.runhyprland.sh @@ -9,8 +9,9 @@ export GBM_BACKEND=nvidia-drm export __GLX_VENDOR_LIBRARY_NAME=nvidia export XDG_SESSION_TYPE=wayland export XCURSOR_SIZE=24 +export LIBSEAT_BACKEND=logind -LIBSEAT_BACKEND=logind /usr/bin/Hyprland +Hyprland exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK exec hash dbus-update-activation-environment 2>/dev/null && \