Merge branch 'master' of https://github.com/don-philipe/dotfiles

.Xdefaults

@@ -4,7 +4,7 @@ URxvt.foreground: white
 !URxvt.borderColor: dark grey
 URxvt.scrollBar: false
 URxvt.cursorColor: green
-URxvt.font: xft:monospace:size=9,xft:Noto Color Emoji
+URxvt.font: xft:Jet Brains Mono Nerd Font:size=9,xft:monospace:size=9,xft:Noto Color Emoji
 URxvt.perl-ext-common: default,matcher
 URxvt.url-launcher: /usr/bin/xdg-open
 URxvt.matcher.button: 1

.config/alacritty/alacritty.toml

@@ -5,6 +5,7 @@ text = "#000000"
 [env]
 # set this to have true color when using nvim etc. in remote tmux session
 TERM = "xterm-256color"
+WINIT_X11_SCALE_FACTOR = "1.0"
 
 [font]
 size = 9

.config/nvim/init.lua

@@ -1,5 +1,5 @@
 -- utilities functions
-require("utils")
+--require("utils")
 
 require("config.remap")
 require("config.set")
@@ -22,10 +22,11 @@ require("config.gitsigns")
 require("config.lualine")
 require("config.telescope")
 require("config.indentline")
-require("config.redmine")
+--require("config.redmine")
 require("config.diffview")
 require("config.dap")
 require("config.parrot")
+--require("config.gitea")
 
 -- for some reason this must be placed in init.lua file
 -- it doesn't work in any lua/config/*.lua files

.config/nvim/lua/config/cmp.lua

@@ -25,6 +25,7 @@ cmp.setup({
     end,
   },
   -- switch on rounded borders in floating completion windows
+  -- additionally vim.o.winborder = 'rounded' must be set (set.lua)
   window = {
     completion = cmp.config.window.bordered(),
     documentation = cmp.config.window.bordered(),

.config/nvim/lua/config/gen-private.lua

@@ -1,5 +1,11 @@
+-- return {
+--     model = "llama3.2",
+--     host = "jupiter",
+--     port = "11434",
+-- }
 return {
-    model = "llama3.2",
+    model = "llama3.3",
-    host = "foo",
+    host = "owu-zegv-api.med.tu-dresden.de",
-    port = "11343",
+    port = "443",
+    https = true,
 }

.config/nvim/lua/config/gitsigns.lua

@@ -2,7 +2,10 @@ require('gitsigns').setup()
 local gitsigns = require('gitsigns')
 vim.keymap.set('n', '<leader>gm', gitsigns.blame_line, { desc = 'Show git message for current line' })
 vim.keymap.set('n', '<leader>gd', ':Gitsigns diffthis ~ vertical=true<CR>:wincmd w<CR>', { desc = 'Show diff for current line' })
+vim.keymap.set('n', '<leader>gs', gitsigns.stage_hunk, { desc = 'Stage current hunk' })
+vim.keymap.set('n', '<leader>gS', gitsigns.stage_buffer, { desc = 'Stage current buffer' })
 vim.keymap.set('n', '<leader>gr', gitsigns.reset_hunk, { desc = 'Reset current hunk' })
+vim.keymap.set('n', '<leader>gR', gitsigns.reset_buffer, { desc = 'Reset current buffer' })
 vim.keymap.set('n', '<leader>h', gitsigns.next_hunk, { desc = 'Move to next hunk' })
 vim.keymap.set('n', '<leader>H', gitsigns.prev_hunk, { desc = 'Move to previous hunk' })
 vim.keymap.set('n', '<leader>ph', gitsigns.preview_hunk, { desc = 'Preview hunk in popup' })

.config/nvim/lua/config/lazy.lua

@@ -33,6 +33,7 @@ require("lazy").setup({
     install = { colorscheme = { "habamax" } },
     -- automatically check for plugin updates
     checker = { enabled = true },
+    change_detection = { enabled = false }, -- active change detection seems to eat up memory over time https://github.com/folke/lazy.nvim/issues/1008
     ui = {
 	border = "rounded",
     },

.config/nvim/lua/config/set.lua

@@ -18,3 +18,5 @@ vim.diagnostic.config({
 })
 
 vim.opt.undofile = true
+
+vim.o.winborder = 'rounded'

.zsh-custom/functions.zsh

@@ -21,6 +21,10 @@ checkcert()
 {
 	openssl s_client -connect "$1":443 2>/dev/null
 }
+pem2crt()
+{
+	openssl x509 -inform PEM -in "$1" -out "${1%.*}.crt"
+}
 
 # works only without tex-ending
 tex2pdf()

.zshrc

@@ -106,7 +106,7 @@ autoload -U promptinit
 promptinit
 
 export XDG_CONFIG_HOME=$HOME/.config/
-export EDITOR=vim
+export EDITOR=nvim
 
 alias ls='ls --color=always'
 alias grep='grep --color=always'
@@ -114,6 +114,7 @@ alias less='less -R'
 alias dd='dd status=progress oflag=direct'
 alias dotfiles='git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME'
 alias hibernate='sudo systemctl hibernate'
-alias ssh="TERM=linux ssh" # for not complaining urxvt about terminals without TERM set
+#alias ssh="TERM=linux ssh" # for not complaining urxvt about terminals without TERM set
 alias cpup="cp -T $0 ../$0"
 alias pythonweb="python -m SimpleHTTPServer 8090"
+alias sayhi="echo hi"