updated readme

.config/mimeapps.list

@@ -25,6 +25,7 @@ x-scheme-handler/msteams=teams.desktop
 x-scheme-handler/tonsite=org.telegram.desktop.desktop
 inode/directory=file-browser.desktop
 x-scheme-handler/betterdiscord=discord.desktop
+x-scheme-handler/discord=vesktop.desktop
 
 [Added Associations]
 application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop;

.config/nvim/lazy-lock.json

@@ -13,9 +13,10 @@
   "cpsm": { "branch": "master", "commit": "1a5fc1b6169bb80c29b0b986130c4f3f1a9ed82e" },
   "csvview.nvim": { "branch": "main", "commit": "bbab4c2f808fd8e11ec8dfdd128251aadba566a1" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
+  "edgy.nvim": { "branch": "main", "commit": "8bfd2808994a988c975694122f68624b8a219f5f" },
   "fterm.nvim": { "branch": "master", "commit": "d1320892cc2ebab472935242d9d992a2c9570180" },
   "fzy-lua-native": { "branch": "master", "commit": "9d720745d5c2fb563c0d86c17d77612a3519c506" },
-  "git-blame.nvim": { "branch": "master", "commit": "9874ec1ec8bc53beb33b7cd82c092b85271a578b" },
+  "git-blame.nvim": { "branch": "main", "commit": "9874ec1ec8bc53beb33b7cd82c092b85271a578b" },
   "gitsigns.nvim": { "branch": "main", "commit": "1ee5c1fd068c81f9dd06483e639c2aa4587dc197" },
   "goto-preview": { "branch": "main", "commit": "cf561d10b4b104db20375c48b86cf36af9f96e00" },
   "image.nvim": { "branch": "master", "commit": "446a8a5cc7a3eae3185ee0c697732c32a5547a0b" },
@@ -28,13 +29,14 @@
   "lsp_signature.nvim": { "branch": "master", "commit": "b58cca003d1d3311213d6db0352f58d8e57bfff0" },
   "lspkind-nvim": { "branch": "master", "commit": "3ddd1b4edefa425fda5a9f95a4f25578727c0bb3" },
   "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
-  "luasnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" },
+  "luasnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "6bdb14f230de0904229ec367b410fb817e59b072" },
   "mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" },
   "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" },
   "modes.nvim": { "branch": "main", "commit": "0932ba4e0bdc3457ac89a8aeed4d56ca0b36977a" },
   "molten-nvim": { "branch": "main", "commit": "a286aa914d9a154bc359131aab788b5a077a5a99" },
   "none-ls.nvim": { "branch": "main", "commit": "5cf63841461b49989972d35bf886e076a1ab3649" },
+  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
   "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "6ed09146ee637006367b5e225be6208a1ea02579" },
   "nvim-docs-view": { "branch": "master", "commit": "5676cc094d426edd39134b1eefca2cab441cca8a" },
@@ -49,6 +51,7 @@
   "nvim-ufo": { "branch": "main", "commit": "72d54c31079d38d8dfc5456131b1d0fb5c0264b0" },
   "nvim-web-devicons": { "branch": "master", "commit": "b8221e42cf7287c4dcde81f232f58d7b947c210d" },
   "nvim-yarp": { "branch": "master", "commit": "bb5f5e038bfe119d3b777845a76b0b919b35ebc8" },
+  "ogpt.nvim": { "branch": "main", "commit": "0fae02db8cb07391f86c3dbe807f62190a2d997f" },
   "otter.nvim": { "branch": "main", "commit": "fc0aa35b1985077d11a20ddf4006bf40f2cd7397" },
   "outline.nvim": { "branch": "main", "commit": "6b62f73a6bf317531d15a7ae1b724e85485d8148" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
@@ -61,6 +64,7 @@
   "spelunker.vim": { "branch": "master", "commit": "a0bc530f62798bbe053905555a4aa9ed713485eb" },
   "tabular": { "branch": "master", "commit": "12437cd1b53488e24936ec4b091c9324cafee311" },
   "tccs.nvim": { "branch": "master", "commit": "e50c1504286b5ee2700961a600f26c9b338bd042" },
+  "telescope-words.nvim": { "branch": "main", "commit": "295d51fe1e525fee18c0c164ad0ae5fb23273aa0" },
   "telescope.nvim": { "branch": "master", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" },
   "tidy.nvim": { "branch": "main", "commit": "c8cd0e6e0108da25c3e10c3f33d8c03b3d8806f1" },
   "todo-comments.nvim": { "branch": "main", "commit": "19d461ddd543e938eb22505fb03fa878800270b6" },

.config/nvim/lua/dictionaries/dictionary_de-de.txt

@@ -1,5 +1,23 @@
 Bonitur
+Entlebucher Sennenhund
+Homeserver
+Impro-Theater
+Improtheater
+Infokratie
 Königinnensubstanz
 Magazinbeute
 Magazinbeuten
+Orgas
+Poetry
+Poetry-Slam
+Poetryslam
 Pollenhose
+Slam
+Slammern
+Slams
+Torrenting
+Uni-Theater
+Unitheater
+egozentristisch
+Meta
+shiftete

.config/nvim/lua/dictionaries/dictionary_names.txt

@@ -1,6 +1,47 @@
+APV
 Akallabêth
-Edain
-Númenor
+Annoyed Altisaur
+Aule
+Barros
+Boarding Party
+Boelsen
+CDSS
 Casper
+Caspers
+CdE
+Combi
+Commander
+Edain
+Elodie
+Eyal
+Greater
+Guttersnipe
+Habenhausen
+IFAM
+IFAMs
 Jeanine
+Kratom
+Kubitschek
+Käte
+MTG
+Magic
+Magic: The Gathering
 Mathis
+Matvey
+Mint
+Númenor
+Overwatch
+PopOS
+Precon
+Precons
+Shinies
+Shiny
+SommerAka
+SommerAkademie
+TCAV
+Weizman
+WinterAka
+WinterAkademie
+Writhing Chrysalis
+Ziegeleiweg
+Zimin

.config/nvim/lua/keymap.lua

@@ -1,5 +1,6 @@
 -- setup keymap function
 local wk = require("which-key")
+local telescope = require("telescope")
 local lazygit = require("FTerm"):new({ cmd = "lazygit" })
 
 wk.add({
@@ -8,6 +9,7 @@ wk.add({
   {mode = "n", "gp", desc = "LSP: preview"},
   {mode = "c", "w", desc = "Write"},
   {mode = "c", "w!", desc = "Write: overwrite"},
+  {mode = "n", "<leader>a", desc = "AI"},
   {mode = "n", "<leader>g", desc = "Git"},
   {mode = "n", "<leader>f", desc = "Telescope: find"},
   {mode = "n", "<leader>gd", desc = "Git: diff"},
@@ -61,7 +63,6 @@ wk.add({
   {mode = "n", "<leader>tt", require("FTerm").toggle, desc = "Terminal: open", noremap = true},
   {mode = "n", "<leader>gt", function() lazygit:toggle() end, desc = "Git: open lazygit", noremap = true},
   {mode = "n", "<leader>tg", function() lazygit:toggle() end, desc = "Terminal: open lazygit", noremap = true},
-  {mode = "n", "<leader>tg", function() lazygit:toggle() end, desc = "Terminal: open lazygit", noremap = true},
   -- sindrets/diffview.nvim
   {mode = "n", "<leader>gdo", ":DiffviewOpen<CR>", desc = "Git: open diff"},
   {mode = "n", "<leader>gdc", ":DiffviewClose<CR>", desc = "Git: close diff"},
@@ -87,6 +88,9 @@ wk.add({
   -- nvim-telescope/telescope.nvim
   {mode = "n", "<leader>ff", ":Telescope find_files<CR>", desc = "Telescope: find files", noremap = true},
   {mode = "n", "<leader>ff", ":Telescope find_files<CR>", desc = "Telescope: find files", noremap = true},
+  -- archie-judd/telescope-words.nvim
+  {mode = "n", "<leader>wd", telescope.extensions.telescope_words.search_dictionary, desc = "Telescope: search dictionary", noremap = true},
+  {mode = "n", "<leader>wt", telescope.extensions.telescope_words.search_thesaurus, desc = "Telescope: search thesaurus", noremap = true},
   -- gnikdroy/projections.nvim
   {mode = "n", "<leader>fp", function() vim.cmd("Telescope projections") end, desc = "Telescope: find projects", noremap = true},
   -- kamykn/spelunker.vim
@@ -110,4 +114,6 @@ wk.add({
   {mode = "n", "<leader>rl", require("quarto.runner").run_line, desc = "Quarto: Run line", noremap = true, silent = true},
   {mode = "n", "<leader>rr", require("quarto.runner").run_range, desc = "Quarto: Run visual range", noremap = true, silent = true},
   {mode = "n", "<leader>rL", function() require("quarto.runner").run_all(true) end, desc = "Quarto: Run all cells of all languages", noremap = true, silent = true},
+  -- huynle/ogpt-nvim
+  {mode = "n", "<leader>ai", ":OGPT<CR>", desc = "OGTP: Open AI View", noremap = true},
 })

.config/nvim/lua/plugins/ogpt.lua

@@ -0,0 +1,139 @@
+return {
+{
+  "huynle/ogpt.nvim",
+    event = "VeryLazy",
+    opts = {
+      default_provider = "ollama",
+      edgy = true, -- enable this!
+      single_window = false, -- set this to true if you want only one OGPT window to appear at a time
+      providers = {
+        ollama = {
+          api_host = "http://localhost:11434", -- free resources: https://github.com/cheahjs/free-llm-api-resources
+          api_key = "",
+          model = "deepseek-r1:7b",
+        }
+      }
+    },
+    dependencies = {
+      "MunifTanjim/nui.nvim",
+      "nvim-lua/plenary.nvim",
+      "nvim-telescope/telescope.nvim"
+    }
+},
+{
+    "folke/edgy.nvim",
+    event = "VeryLazy",
+    init = function()
+      vim.opt.laststatus = 3
+      vim.opt.splitkeep = "screen" -- or "topline" or "screen"
+    end,
+    opts = {
+      exit_when_last = false,
+      animate = {
+        enabled = false,
+      },
+      wo = {
+        winbar = true,
+        winfixwidth = true,
+        winfixheight = false,
+        winhighlight = "WinBar:EdgyWinBar,Normal:EdgyNormal",
+        spell = false,
+        signcolumn = "no",
+      },
+      keys = {
+        -- -- close window
+        ["q"] = function(win)
+          win:close()
+        end,
+        -- close sidebar
+        ["Q"] = function(win)
+          win.view.edgebar:close()
+        end,
+        -- increase width
+        ["<S-Right>"] = function(win)
+          win:resize("width", 3)
+        end,
+        -- decrease width
+        ["<S-Left>"] = function(win)
+          win:resize("width", -3)
+        end,
+        -- increase height
+        ["<S-Up>"] = function(win)
+          win:resize("height", 3)
+        end,
+        -- decrease height
+        ["<S-Down>"] = function(win)
+          win:resize("height", -3)
+        end,
+      },
+      right = {
+        {
+          title = "OGPT Popup",
+          ft = "ogpt-popup",
+          size = { width = 0.2 },
+          wo = {
+            wrap = true,
+          },
+        },
+        {
+          title = "OGPT Parameters",
+          ft = "ogpt-parameters-window",
+          size = { height = 6 },
+          wo = {
+            wrap = true,
+          },
+        },
+        {
+          title = "OGPT Template",
+          ft = "ogpt-template",
+          size = { height = 6 },
+        },
+        {
+          title = "OGPT Sessions",
+          ft = "ogpt-sessions",
+          size = { height = 6 },
+          wo = {
+            wrap = true,
+          },
+        },
+        {
+          title = "OGPT System Input",
+          ft = "ogpt-system-window",
+          size = { height = 6 },
+        },
+        {
+          title = "OGPT",
+          ft = "ogpt-window",
+          size = { height = 0.5 },
+          wo = {
+            wrap = true,
+          },
+        },
+        {
+          title = "OGPT {{{selection}}}",
+          ft = "ogpt-selection",
+          size = { width = 80, height = 4 },
+          wo = {
+            wrap = true,
+          },
+        },
+        {
+          title = "OGPt {{{instruction}}}",
+          ft = "ogpt-instruction",
+          size = { width = 80, height = 4 },
+          wo = {
+            wrap = true,
+          },
+        },
+        {
+          title = "OGPT Chat",
+          ft = "ogpt-input",
+          size = { width = 80, height = 4 },
+          wo = {
+            wrap = true,
+          },
+        },
+      },
+    },
+  }
+}

.config/nvim/lua/plugins/telescope.lua

@@ -3,7 +3,10 @@ return {
   {
     'nvim-telescope/telescope.nvim',
     version = '0.1.2',
-    dependencies = { 'nvim-lua/plenary.nvim' },
+    dependencies = {
+      'nvim-lua/plenary.nvim',
+      'archie-judd/telescope-words.nvim'
+    },
     opts = {}
   }
 }

.gitconfig

@@ -1,5 +1,6 @@
 [user]
 	email = tiyn@posteo.eu
+	; email = tiyn@mail-mk.eu
 	name = tiyn
 [filter "lfs"]
 	process = git-lfs filter-process

.local/bin/app-maps/discord

@@ -0,0 +1,6 @@
+#!/bin/sh
+if command -v vesktop >/dev/null 2>&1; then
+    exec vesktop --force-device-scale-factor=1.2 "$@"
+else
+    exec discord "$@"
+fi

.local/bin/app-maps/threema-beta

@@ -0,0 +1,3 @@
+#!/bin/sh
+export XDG_CURRENT_DESKTOP="GNOME"
+exec /usr/bin/threema-beta "$@"

.local/bin/etc/nvim/compiler

@@ -10,6 +10,7 @@ file=$(readlink -f "$1")
 dir=$(dirname "$file")
 base="${file%.*}"
 basenodir="${1%.*}"
+vipercmd="silicon" #"carbon"
 
 cd "$dir" || exit
 
@@ -25,6 +26,7 @@ textype() { \
 	}
 
 case "$file" in
+        *\.vpr) $vipercmd "$file" ;;
 	*\.ms) refer -PS -e "$file" | groff -me -ms -kept -T pdf > "$base".pdf ;;
 	*\.mom) refer -PS -e "$file" | groff -mom -kept -T pdf > "$base".pdf ;;
 	*\.[0-9]) refer -PS -e "$file" | groff -mandoc -T pdf > "$base".pdf ;;

.local/bin/etc/sxhkd/keymap

@@ -6,13 +6,13 @@ echo $variant
 case "$1" in
   toggle) if [ "$layout" = "de" -a "$variant" = "nodeadkeys" ]
     then
-        setxkbmap de && notify-send -u low 'SXHKD' 'Set keymap to german'
+        setxkbmap de -option compose:rctrl && notify-send -u low 'SXHKD' 'Set keymap to german'
     elif [ "$layout" = "de" -a "$variant" = "" ]
     then
-        setxkbmap de ru && notify-send -u low 'SXHKD' 'Set keymap to russian (german)'
+        setxkbmap de ru -option compose:rctrl && notify-send -u low 'SXHKD' 'Set keymap to russian (german)'
     elif [ "$layout" = "de" -a "$variant" = "ru" ]
     then
-        setxkbmap de nodeadkeys && notify-send -u low 'SXHKD' 'Set keymap to german (nodeadkeys)'
+        setxkbmap de nodeadkeys -option compose:rctrl && notify-send -u low 'SXHKD' 'Set keymap to german (nodeadkeys)'
     fi ;;
   *) cat << EOF
 keymap: cli script to change the keymap quickly.

.local/bin/etc/viper/carbon

@@ -0,0 +1,2 @@
+#!/bin/sh
+java -jar "$VIPER_CARBON" --z3Exe "$VIPER_Z3" --boogieExe "$VIPER_BOOGIE" "$@"

.local/bin/etc/viper/silicon

@@ -0,0 +1,2 @@
+#!/bin/sh
+java -jar "$VIPER_SILICON" "$@"

.profile

@@ -5,7 +5,7 @@
 export DISPLAY_SERVER="xorg"
 
 # Adds `~/.local/bin` and all subdirectories to $PATH
-export PATH="${PATH}:$(du "${HOME}/.local/bin/" | cut -f2 | tr '\n' ':' | sed 's/:*$//')"
+export PATH="$(du "${HOME}/.local/bin/" | cut -f2 | tr '\n' ':' | sed 's/:*$//')":${PATH}
 
 # Add flatpak to path
 export PATH="/var/lib/flatpak/exports/bin:${PATH}"
@@ -64,6 +64,12 @@ export PATH="${GOBIN}:${PATH}"
 # nim
 export PATH="${HOME}/.nimble/bin:${PATH}"
 
+# viper
+export VIPER_SILICON=""
+export VIPER_CARBON=""
+export VIPER_Z3="/bin/z3"
+export VIPER_BOOGIE="$HOME/.dotnet/tools/boogie"
+
 # python
 export PYENV_ROOT="$HOME/.pyenv"
 export PATH="$PYENV_ROOT/bin:$PATH"

README.md

@@ -62,9 +62,13 @@ having changes.
 ## Hotkeys
 
 There are various shortcuts and hotkeys used in this version. Included in my build are the following.
-[Dwm](https://github.com/tiyn/dwm)s and [st](https://github.com/tiyn/st)s hotkeys can be found in their repositories.
+[dwm](https://github.com/tiyn/dwm) and [st](https://github.com/tiyn/st)s hotkeys can be found in their repositories.
+For Wayland [dwl](https://github.com/tiyn/dwl) is used instead of dwml.
 
-### SXHKD
+### Hotkey Daemon
+
+The default hotkey daemon is `sxhkd`.
+For Wayland `swhkd` is used instead.
 
 | ModKey | Shift | Key               | Function                                                  |
 | ------ | ----- | ----------------- | --------------------------------------------------------- |
@@ -81,13 +85,14 @@ There are various shortcuts and hotkeys used in this version. Included in my bui
 | Super  |       | r                 | (program) Spawn dmenu\_run                                |
 | Super  |       | s                 | (sounds) Pause song                                       |
 | Super  |       | x                 | (sounds) Toggle shuffling of songs                        |
-| Super  | Shift | l                 | (keyboard) Toggle keymap                                  |
-| Super  | Shift | r                 | (sxhkd) Restart sxkd                                      |
+| Super  | Shift | b                 | (statusbar) Toggle statusbar (managed by dwm on x)        |
+| Super  | Shift | l                 | (keyboard) Toggle keymap (managed by dwl on wayland)      |
+| Super  | Shift | r                 | (sxhkd/swhkd) Restart sxhkd/swhkd                         |
 | Super  | Shift | Space             | (notifications) Close all notifications                   |
 | Super  |       | [                 | (notifications) Toggle dunst dnd                          |
 | Super  |       | ]                 | (sounds) Toggle mute                                      |
 | Super  |       | \                 | (sounds) Toggle deaf                                      |
-| Super  |       | F5                | (display) Enable 2 Screen Monitor                         |
+| Super  |       | F5                | (display) Enable 2 Screen Monitor (not needed on wayland) |
 | Super  |       | F6                | (keyboard) Toggle touchpad                                |
 | Super  |       | F7                | (mounting) Mounting drives                                |
 | Super  |       | F8                | (mounting) Unmounting drives                              |
@@ -98,12 +103,11 @@ There are various shortcuts and hotkeys used in this version. Included in my bui
 | Super  |       | Return            | (program) Spawn terminal                                  |
 |        |       | Print             | (program) Prompt to take a screenshot                     |
 |        |       | AudioMute         | (sound) Volume mute                                       |
-|        |       | AudioMicMute      | (sound) Mic Mute                                          |
+|        |       | AudioMicMute      | (sound) Mic Mute (currently not on wayland)               |
 |        |       | AudioLowerVolume  | (sound) Volume lower                                      |
 |        |       | AudioRaiseVolume  | (sound) Volume raise                                      |
-|        |       | MonBrightnessDown | (display) Brightness decrease                             |
-|        |       | MonBrightnessUp   | (display) Brightness increase                             |
-
+|        |       | MonBrightnessDown | (display) Brightness decrease (currently not on wayland)  |
+|        |       | MonBrightnessUp   | (display) Brightness increase (currently not on wayland)  |
 
 ## Additional Configs