From 5a3ca47ab2f9a331f76cf47d1546b9181c15862a Mon Sep 17 00:00:00 2001 From: Phil Bajsicki Date: Mon, 29 Jul 2024 12:31:22 +0200 Subject: [PATCH] Update 2024.07.29 12:31:08 CEST --- .config/doom/README.org | 16 ++++++++-------- .config/doom/config.el | 15 ++++++++------- .config/hypr/hyprland.conf | 28 ++++++++++++++++++++-------- .config/xmonad/xmonad.hs | 2 +- .scripts/.runhyprland.sh | 1 - 5 files changed, 37 insertions(+), 25 deletions(-) diff --git a/.config/doom/README.org b/.config/doom/README.org index 52dd942..d332219 100644 --- a/.config/doom/README.org +++ b/.config/doom/README.org @@ -511,8 +511,8 @@ For the files whose paths match the strings in the function, it will advise the This turns making new entries from ~C- C-i i~ into just ~C-~. Much easier, and I don't have to think about this any more. #+begin_src emacs-lisp :tangle config.el -(add-hook 'org-insert-heading-hook - (lambda () +(after! org-mode + (add-hook! 'org-insert-heading-hook (if (or (string-match-p "journal.org" buffer-file-name) @@ -528,7 +528,6 @@ This turns making new entries from ~C- C-i i~ into just ~C-~. Mu #+end_src #+RESULTS: -| lambda | nil | (if (or (string-match-p journal.org buffer-file-name) (string-match-p money buffer-file-name) (string-match-p therapy.org buffer-file-name)) ((lambda nil (interactive) (org-time-stamp-inactive '(16)) (newline))) (setq org-insert-heading-hook nil)) | **** Todo keywords @@ -1515,19 +1514,20 @@ works *offline* (without cloud or network) and amazingly well for English. #+begin_src emacs-lisp :tangle config.el (use-package! gptel :config - (setq! gptel-api-key "your key") + (setq! gptel-api-key "thisisanapikey") (setq! gptel-max-tokens 8192) - (setq - gptel-model "model" + (setq gptel-model "model" gptel-backend (gptel-make-openai "llama-cpp" + :key "thisisanapikey" :stream t :protocol "http" - :host "localhost:5000" + :host "localhost:6666" :models '("model")))) (gptel-make-openai "llama-cpp" ;Any name + :key "thisisanapikey" :stream t ;Stream responses :protocol "http" - :host "localhost:5000" ;Llama.cpp server location + :host "localhost:6666" ;Llama.cpp server location :models '("model")) ;Any names, doesn't matter for Llama (setq gptel--debug t) diff --git a/.config/doom/config.el b/.config/doom/config.el index a20a447..8bafa5d 100644 --- a/.config/doom/config.el +++ b/.config/doom/config.el @@ -281,8 +281,8 @@ and the contents of the files below the headlines." (global-set-key "\C-cii" '(lambda () (interactive) (org-time-stamp-inactive '(16)))) -(add-hook 'org-insert-heading-hook - (lambda () +(after! org-mode + (add-hook! 'org-insert-heading-hook (if (or (string-match-p "journal.org" buffer-file-name) @@ -704,19 +704,20 @@ and the contents of the files below the headlines." (use-package! gptel :config - (setq! gptel-api-key "your key") + (setq! gptel-api-key "thisisanapikey") (setq! gptel-max-tokens 8192) - (setq - gptel-model "model" + (setq gptel-model "model" gptel-backend (gptel-make-openai "llama-cpp" + :key "thisisanapikey" :stream t :protocol "http" - :host "localhost:5000" + :host "localhost:6666" :models '("model")))) (gptel-make-openai "llama-cpp" ;Any name + :key "thisisanapikey" :stream t ;Stream responses :protocol "http" - :host "localhost:5000" ;Llama.cpp server location + :host "localhost:6666" ;Llama.cpp server location :models '("model")) ;Any names, doesn't matter for Llama (setq gptel--debug t) diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index b99def8..572bca2 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -1,8 +1,8 @@ # monitor=eDP-1, 1920x1080@60, 1920x0, 1 -monitor=eDP-2, 1920x1080@60, 1920x0, 1 -monitor=HDMI-A-1, 1920x1080@60, 0x0, 1 -monitor=DP-1, 1920x1080@60, 3840x0, 1 -monitor=DP-2, 1920x1080@60, 1920x1080, 1 +monitor=eDP-1, 1920x1080@60, 0x1080, 1 +monitor=DP-2, 1920x1080@60, 1920x0, 1 +monitor=DP-1, 1920x1080@60, 1920x1080, 1 +monitor=HDMI-A-1, 1920x1080@60, 3840x0, 1 input { kb_layout = pl @@ -20,7 +20,7 @@ general { border_size = 2 col.active_border = rgba(33ccffee) rgba(00ff99ee) -45deg col.inactive_border = rgba(595959aa) - layout = master + layout = dwindle } decoration { @@ -56,7 +56,6 @@ dwindle { master { # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more - new_is_master = false inherit_fullscreen = true mfact = 0.65 } @@ -66,6 +65,11 @@ gestures { workspace_swipe = off } +misc { + mouse_move_enables_dpms=true + key_press_enables_dpms=true +} + env = XCURSOR_SIZE,24 env = GBM_BACKEND,nvidia-drm @@ -94,11 +98,19 @@ bind = SUPER_CTRL_SHIFT_ALT, 0, exit, bind = $mainMod, B, togglefloating, bind = $mainMod, F, fullscreen, 0 +bind = SUPER_SHIFT, F, fakefullscreen bind = $mainMod, P, pseudo, # dwindle bind = $mainMod, J, togglesplit, # dwindle -bind = $mainMod, a, layoutmsg, cyclenext -bind = $mainMod, o, layoutmsg, cycleprev +bind = $mainMod, a, movefocus, d +bind = $mainMod, o, movefocus, u +bind = $mainMod, n, movefocus, l +bind = $mainMod, i, movefocus, r + +bind = SUPER_SHIFT, a, swapwindow, d +bind = SUPER_SHIFT, o, swapwindow, u +bind = SUPER_SHIFT, n, swapwindow, l +bind = SUPER_SHIFT, i, swapwindow, r bind = $mainMod, BACKSPACE, layoutmsg, swapwithmaster auto diff --git a/.config/xmonad/xmonad.hs b/.config/xmonad/xmonad.hs index 0b8ff72..e810bb7 100644 --- a/.config/xmonad/xmonad.hs +++ b/.config/xmonad/xmonad.hs @@ -341,7 +341,7 @@ main = do , ("M-e", spawn "emacsclient -c -a 'emacs'") , ("M-", spawn "alacritty") - , ("M-S-", spawn "feh --randomize --bg-fill /usr/share/backgrounds/archlinux/*") + , ("M-S-", spawn "feh --randomize --bg-fill /mnt/ext1/media/Images/Wallpapers/*") , ("M-", spawn "dm-maim") , ("", spawn "flameshot gui") diff --git a/.scripts/.runhyprland.sh b/.scripts/.runhyprland.sh index 1d087d1..81ac3a6 100755 --- a/.scripts/.runhyprland.sh +++ b/.scripts/.runhyprland.sh @@ -5,7 +5,6 @@ export XKB_DEFAULT_OPTIONS="compose:rctrl" export WLR_NO_HARDWARE_CURSORS=1 export _JAVA_AWT_WM_NONREPARENTING=1 -export LIBVA_DRIVER_NAME=nvidia export GBM_BACKEND=nvidia-drm export __GLX_VENDOR_LIBRARY_NAME=nvidia export XDG_SESSION_TYPE=wayland