phil/dot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Temp update

Browse source
This commit is contained in:
Phil Bajsicki 2024-11-15 00:08:06 +01:00
parent f4050f23d6
commit 86260ff2af
8 changed files with 93 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
.config/doom/README.org
View file

@ -1035,29 +1035,25 @@ consider my habits.
With their context size only increasing as time goes by, this is turning into a 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. very easy way to get feedback on the ideas I have.
#+begin_src emacs-lisp :tangle config.el #+begin_src emacs-lisp :tangle config.el
(use-package! gptel (use-package! gptel)
:config (gptel-make-openai "ooba" ;Any name
(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
:key "thisisanapikey" :key "thisisanapikey"
:stream t ;Stream responses :stream t ;Stream responses
:protocol "http" :protocol "http"
:host "localhost:6666" ;Llama.cpp server location :host "localhost:6666" ;Llama.cpp server location
:models '("model")) ;Any names, doesn't matter for Llama :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 gptel--debug t)
#+end_src #+end_src
#+RESULTS: #+RESULTS:
: t
*** elfeed *** elfeed
RSS is not dead. RSS is not dead. RSS is not dead. RSS is not dead. RSS is not dead. RSS is not dead.
#+begin_src emacs-lisp :tangle config.el #+begin_src emacs-lisp :tangle config.el

21
.config/doom/config.el
View file

@ -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") (setq inferior-lisp-program "sbcl --dynamic-space-size 8192 -Q -l ~/.sbclrc")
(use-package! gptel (use-package! gptel)
:config (gptel-make-openai "ooba" ;Any name
(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
:key "thisisanapikey" :key "thisisanapikey"
:stream t ;Stream responses :stream t ;Stream responses
:protocol "http" :protocol "http"
:host "localhost:6666" ;Llama.cpp server location :host "localhost:6666" ;Llama.cpp server location
:models '("model")) ;Any names, doesn't matter for Llama :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 gptel--debug t)
(setq-default elfeed-search-filter "@1-week-ago +unread ") (setq-default elfeed-search-filter "@1-week-ago +unread ")

61
.config/fish/config.fish
View file

@ -7,14 +7,16 @@ set -U PLANTUML_LIMIT_SIZE 16384
set -e SSH_AGENT_PID set -e SSH_AGENT_PID
if not set -q gnupg_SSH_AUTH_SOCK_by or test $gnupg_SSH_AUTH_SOCK_by -ne $fish_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 end
set GPG_TTY $(tty)
set fish_greeting set fish_greeting
set TERM "xterm-256color" set TERM xterm-256color
set EDITOR "emacsclient -t -a ''" set EDITOR "emacsclient -t -a ''"
set VISUAL "emacsclient -c -a emacs" 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 SSH_AUTH_SOCK $XDG_RUNTIME_DIR/ssh-agent.socket
set GNUPGHOME "~/enc/keys/gnupg" set GNUPGHOME "~/enc/keys/gnupg"
set LEDGER_FILE "~/enc/org/hledger/2023.journal" set LEDGER_FILE "~/enc/org/hledger/2023.journal"
@ -83,7 +85,7 @@ end
function letters 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 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 end
function commits function commits
@ -91,30 +93,31 @@ function commits
end end
function __history_previous_command function __history_previous_command
switch (commandline -t) switch (commandline -t)
case "!" case "!"
commandline -t $history[1]; commandline -f repaint commandline -t $history[1]
case "*" commandline -f repaint
commandline -i ! case "*"
end commandline -i !
end
end end
function __history_previous_command_arguments function __history_previous_command_arguments
switch (commandline -t) switch (commandline -t)
case "!" case "!"
commandline -t "" commandline -t ""
commandline -f history-token-search-backward commandline -f history-token-search-backward
case "*" case "*"
commandline -i '$' commandline -i '$'
end end
end end
if [ $fish_key_bindings = "fish_vi_key_bindings" ]; if [ $fish_key_bindings = fish_vi_key_bindings ]
bind -Minsert ! __history_previous_command bind -Minsert ! __history_previous_command
bind -Minsert '$' __history_previous_command_arguments bind -Minsert '$' __history_previous_command_arguments
else else
bind ! __history_previous_command bind ! __history_previous_command
bind '$' __history_previous_command_arguments bind '$' __history_previous_command_arguments
end end
function backup --argument filename function backup --argument filename
@ -124,8 +127,8 @@ end
function copy function copy
set count (count $argv | tr -d \n) set count (count $argv | tr -d \n)
if test "$count" = 2; and test -d "$argv[1]" if test "$count" = 2; and test -d "$argv[1]"
set from (echo $argv[1] | trim-right /) set from (echo $argv[1] | trim-right /)
set to (echo $argv[2]) set to (echo $argv[2])
command cp -r $from $to command cp -r $from $to
else else
command cp $argv command cp $argv
@ -255,11 +258,11 @@ starship init fish | source
set -gx PATH "$HOME/.cabal/bin:$HOME/.ghcup/bin:$PATH" set -gx PATH "$HOME/.cabal/bin:$HOME/.ghcup/bin:$PATH"
function phil-fix-names 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 end
function polish function polish
setxkbmap -model pc104 -layout pl -option compose:rctrl setxkbmap -model pc104 -layout pl -option compose:rctrl
end end
function greek function greek
@ -267,13 +270,13 @@ function greek
end end
function vps 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 end
function vpssh 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 end
function vpsshu function vpsshu
fusermount3 -u ~/remote/vps-srv/ fusermount3 -u ~/remote/vps-srv/
end end

1
.config/fish/fish_variables
View file

@ -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_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
SETUVAR fish_pager_color_selected_background:\x2dr 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 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

6
.config/fish/functions/vps.fish
View file

@ -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' function vps
ssh -p 2222 phil@46.38.232.163 -i .ssh/id_ed25519_nopass $argv; --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 end

55
.config/hypr/hyprland.conf
View file

@ -1,12 +1,37 @@
# monitor=eDP-1, 1920x1080@60, 1920x0, 1 # monitor=eDP-1, 1920x1080@60, 1920x0, 1
monitor=eDP-1, 1920x1080@60, 0x1080, 1 monitor=eDP-2, 1920x1080@165, 0x1080, 1
monitor=DP-2, 1920x1080@60, 1920x0, 1 monitor=DP-2, 1920x1080@60, 1920x1080, 1
monitor=DP-1, 1920x1080@60, 1920x1080, 1 monitor=DP-1, 1920x1080@144, 1920x0, 1
monitor=HDMI-A-1, 1920x1080@60, 3840x0, 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 { input {
kb_layout = pl kb_layout = pl
kb_options = compose:rctrl kb_options = compose:rctrl
numlock_by_default = true
follow_mouse = 1 follow_mouse = 1
sensitivity = 0 # -1.0 - 1.0, 0 means no modification. sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
touchpad { touchpad {
@ -14,6 +39,8 @@ input {
} }
} }
debug:disable_logs = false
general { general {
gaps_in = 10 gaps_in = 10
gaps_out = 20 gaps_out = 20
@ -70,27 +97,7 @@ misc {
key_press_enables_dpms=true 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 $mainMod = SUPER
bind = CTRL_SHIFT_ALT, Q, killactive, bind = CTRL_SHIFT_ALT, Q, killactive,
@ -98,7 +105,7 @@ bind = SUPER_CTRL_SHIFT_ALT, 0, exit,
bind = $mainMod, B, togglefloating, bind = $mainMod, B, togglefloating,
bind = $mainMod, F, fullscreen, 0 bind = $mainMod, F, fullscreen, 0
bind = SUPER_SHIFT, F, fakefullscreen # bind = SUPER_SHIFT, F, fakefullscreen
bind = $mainMod, P, pseudo, # dwindle bind = $mainMod, P, pseudo, # dwindle
bind = $mainMod, J, togglesplit, # dwindle bind = $mainMod, J, togglesplit, # dwindle

6
.gitignore vendored
View file

@ -1 +1,5 @@
.env
.priv
temp/
tmp/
.el

3
.scripts/.runhyprland.sh
View file

@ -9,8 +9,9 @@ export GBM_BACKEND=nvidia-drm
export __GLX_VENDOR_LIBRARY_NAME=nvidia export __GLX_VENDOR_LIBRARY_NAME=nvidia
export XDG_SESSION_TYPE=wayland export XDG_SESSION_TYPE=wayland
export XCURSOR_SIZE=24 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 systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
exec hash dbus-update-activation-environment 2>/dev/null && \ exec hash dbus-update-activation-environment 2>/dev/null && \