Rename to real dot dirs and add fish

cli/dot-config/btop/btop.conf

@@ -1,4 +1,4 @@
-#? Config file for btop v. 1.4.4
+#? Config file for btop v. 1.4.5
 
 #* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes.
 #* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes"
@@ -57,13 +57,13 @@ update_ms = 2000
 
 #* Processes sorting, "pid" "program" "arguments" "threads" "user" "memory" "cpu lazy" "cpu direct",
 #* "cpu lazy" sorts top process over time (easier to follow), "cpu direct" updates top process directly.
-proc_sorting = "user"
+proc_sorting = "cpu direct"
 
 #* Reverse sorting order, True or False.
-proc_reversed = True
+proc_reversed = False
 
 #* Show processes as a tree.
-proc_tree = True
+proc_tree = False
 
 #* Use the cpu graph colors in the process list.
 proc_colors = True
@@ -115,6 +115,9 @@ cpu_bottom = False
 #* Shows the system uptime in the CPU box.
 show_uptime = True
 
+#* Shows the CPU package current power consumption in watts. Requires running `make setcap` or `make setuid` or running with sudo.
+show_cpu_watts = True
+
 #* Show cpu temperature.
 check_temp = True
 
@@ -187,7 +190,7 @@ disk_free_priv = False
 show_io_stat = True
 
 #* Toggles io mode for disks, showing big graphs for disk read/write speeds.
-io_mode = False
+io_mode = True
 
 #* Set to True to show combined read/write io graphs in io mode.
 io_graph_combined = False

cli/dot-config/fish/config.fish

@@ -0,0 +1,3 @@
+if status is-interactive
+    # Commands to run in interactive sessions can go here
+end

cli/dot-config/fish/fish_variables

@@ -0,0 +1,39 @@
+# This file contains fish universal variable definitions.
+# VERSION: 3.0
+SETUVAR __fish_initialized:3800
+SETUVAR fish_color_autosuggestion:brblack
+SETUVAR fish_color_cancel:\x2dr
+SETUVAR fish_color_command:normal
+SETUVAR fish_color_comment:red
+SETUVAR fish_color_cwd:green
+SETUVAR fish_color_cwd_root:red
+SETUVAR fish_color_end:green
+SETUVAR fish_color_error:brred
+SETUVAR fish_color_escape:brcyan
+SETUVAR fish_color_history_current:\x2d\x2dbold
+SETUVAR fish_color_host:normal
+SETUVAR fish_color_host_remote:yellow
+SETUVAR fish_color_normal:normal
+SETUVAR fish_color_operator:brcyan
+SETUVAR fish_color_param:cyan
+SETUVAR fish_color_quote:yellow
+SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold
+SETUVAR fish_color_search_match:white\x1e\x2d\x2dbackground\x3dbrblack\x1e\x2d\x2dbold
+SETUVAR fish_color_selection:white\x1e\x2d\x2dbackground\x3dbrblack\x1e\x2d\x2dbold
+SETUVAR fish_color_status:red
+SETUVAR fish_color_user:brgreen
+SETUVAR fish_color_valid_path:\x2d\x2dunderline
+SETUVAR fish_key_bindings:fish_default_key_bindings
+SETUVAR fish_pager_color_background:\x1d
+SETUVAR fish_pager_color_completion:normal
+SETUVAR fish_pager_color_description:yellow\x1e\x2di
+SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
+SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan\x1e\x2d\x2dbold
+SETUVAR fish_pager_color_secondary_background:\x1d
+SETUVAR fish_pager_color_secondary_completion:\x1d
+SETUVAR fish_pager_color_secondary_description:\x1d
+SETUVAR fish_pager_color_secondary_prefix:\x1d
+SETUVAR fish_pager_color_selected_background:\x2dr
+SETUVAR fish_pager_color_selected_completion:\x1d
+SETUVAR fish_pager_color_selected_description:\x1d
+SETUVAR fish_pager_color_selected_prefix:\x1d

cli/dot-config/helix/config.toml

@@ -1,136 +1,2 @@
 # Test
 theme = "jonas"
-
-[keys.normal]
-# Quick iteration on config changes
-C-o = "jump_backward"
-
-# Some nice Helix stuff
-C-h = "select_prev_sibling"
-C-j = "shrink_selection"
-C-k = "expand_selection"
-C-l = "select_next_sibling"
-
-# Personal preference
-o = ["open_below", "normal_mode"]
-O = ["open_above", "normal_mode"]
-s = ["select_all", "select_regex"]
-
-# Muscle memory
-"{" = ["goto_prev_paragraph", "collapse_selection"]
-"}" = ["goto_next_paragraph", "collapse_selection"]
-
-0 = "goto_line_start"
-"$" = "goto_line_end"
-
-"^" = "goto_first_nonwhitespace"
-G = "goto_file_end"
-V = ["select_mode", "extend_to_line_bounds"]
-D = ["extend_to_line_end", "yank_main_selection_to_clipboard", "delete_selection"]
-S = "surround_add" # Would be nice to be able to do something after this but it isn't chainable
-
-# Clipboards over registers
-x = "delete_selection"
-p = ["paste_clipboard_after", "collapse_selection"]
-P = ["paste_clipboard_before", "collapse_selection"]
-Y = ["extend_to_line_end", "yank_main_selection_to_clipboard", "collapse_selection"]
-
-# There is no real difference if you have overridden the commands bound to 'w', 'e' and 'b' like above
-# But if you really want to get familiar with the Helix way of selecting-while-moving, comment the
-# bindings for 'w', 'e', and 'b' out and leave the bindings for 'i' and 'a' active below. A world of difference!
-i = ["insert_mode", "collapse_selection"]
-a = ["append_mode", "collapse_selection"]
-
-# Undoing the 'd' + motion commands restores the selection which is annoying
-u = ["undo", "collapse_selection"]
-
-# Escape the madness! No more fighting with the cursor! Or with multiple cursors!
-esc = ["collapse_selection", "keep_primary_selection"]
-
-
-# Search for word under cursor
-"*" = ["move_char_right", "move_prev_word_start", "move_next_word_end", "search_selection", "search_next"]
-"#" = ["move_char_right", "move_prev_word_start", "move_next_word_end", "search_selection", "search_prev"]
-
-# Make j and k behave as they do Vim when soft-wrap is enabled
-j = "move_line_down"
-k = "move_line_up"
-
-# Extend and select commands that expect a manual input can't be chained
-# I've kept d[X] commands here because it's better to at least have the stuff you want to delete
-# selected so that it's just a keystroke away to delete
-[keys.normal.d]
-d = ["extend_to_line_bounds", "yank_main_selection_to_clipboard", "delete_selection"]
-t = ["extend_till_char"]
-s = ["surround_delete"]
-i = ["select_textobject_inner"]
-a = ["select_textobject_around"]
-j = ["select_mode", "extend_to_line_bounds", "extend_line_below", "yank_main_selection_to_clipboard", "delete_selection", "normal_mode"]
-down = ["select_mode", "extend_to_line_bounds", "extend_line_below", "yank_main_selection_to_clipboard", "delete_selection", "normal_mode"]
-k = ["select_mode", "extend_to_line_bounds", "extend_line_above", "yank_main_selection_to_clipboard", "delete_selection", "normal_mode"]
-up = ["select_mode", "extend_to_line_bounds", "extend_line_above", "yank_main_selection_to_clipboard", "delete_selection", "normal_mode"]
-G = ["select_mode", "extend_to_line_bounds", "goto_last_line", "extend_to_line_bounds", "yank_main_selection_to_clipboard", "delete_selection", "normal_mode"]
-w = ["move_next_word_start", "yank_main_selection_to_clipboard", "delete_selection"]
-W = ["move_next_long_word_start", "yank_main_selection_to_clipboard", "delete_selection"]
-g = { g = ["select_mode", "extend_to_line_bounds", "goto_file_start", "extend_to_line_bounds", "yank_main_selection_to_clipboard", "delete_selection", "normal_mode"] }
-
-[keys.normal.y]
-y = ["extend_to_line_bounds", "yank_main_selection_to_clipboard", "normal_mode", "collapse_selection"]
-j = ["select_mode", "extend_to_line_bounds", "extend_line_below", "yank_main_selection_to_clipboard", "collapse_selection", "normal_mode"]
-down = ["select_mode", "extend_to_line_bounds", "extend_line_below", "yank_main_selection_to_clipboard", "collapse_selection", "normal_mode"]
-k = ["select_mode", "extend_to_line_bounds", "extend_line_above", "yank_main_selection_to_clipboard", "collapse_selection", "normal_mode"]
-up = ["select_mode", "extend_to_line_bounds", "extend_line_above", "yank_main_selection_to_clipboard", "collapse_selection", "normal_mode"]
-G = ["select_mode", "extend_to_line_bounds", "goto_last_line", "extend_to_line_bounds", "yank_main_selection_to_clipboard", "collapse_selection", "normal_mode"]
-w = ["move_next_word_start", "yank_main_selection_to_clipboard", "collapse_selection", "normal_mode"]
-W = ["move_next_long_word_start", "yank_main_selection_to_clipboard", "collapse_selection", "normal_mode"]
-g = { g = ["select_mode", "extend_to_line_bounds", "goto_file_start", "extend_to_line_bounds", "yank_main_selection_to_clipboard", "collapse_selection", "normal_mode"] }
-
-[keys.insert]
-# Escape the madness! No more fighting with the cursor! Or with multiple cursors!
-esc = ["collapse_selection", "normal_mode"]
-
-[keys.normal.space.space]
-o = ":config-open"
-r = ":config-reload"
-s = ":write-all"
-
-[keys.normal.space]
-q = ":q"
-F = "file_picker_in_current_buffer_directory"
-
-[keys.select]
-# Muscle memory
-"{" = ["extend_to_line_bounds", "goto_prev_paragraph"]
-"}" = ["extend_to_line_bounds", "goto_next_paragraph"]
-0 = "goto_line_start"
-"$" = "goto_line_end"
-"^" = "goto_first_nonwhitespace"
-G = "goto_file_end"
-D = ["extend_to_line_bounds", "delete_selection", "normal_mode"]
-"%" = "match_brackets"
-S = "surround_add"
-u = ["switch_to_lowercase", "collapse_selection", "normal_mode"]
-U = ["switch_to_uppercase", "collapse_selection", "normal_mode"]
-
-# Visual-mode specific muscle memory
-i = "select_textobject_inner"
-a = "select_textobject_around"
-
-# Some extra binds to allow us to insert/append in select mode because it's nice with multiple cursors
-tab = ["insert_mode", "collapse_selection"] # tab is read by most terminal editors as "C-i"
-C-a = ["append_mode", "collapse_selection"]
-
-# Make selecting lines in visual mode behave sensibly
-k = ["extend_line_up", "extend_to_line_bounds"]
-j = ["extend_line_down", "extend_to_line_bounds"]
-
-# Clipboards over registers ye ye
-d = ["yank_main_selection_to_clipboard", "delete_selection"]
-x = ["yank_main_selection_to_clipboard", "delete_selection"]
-y = ["yank_main_selection_to_clipboard", "normal_mode", "flip_selections", "collapse_selection"]
-Y = ["extend_to_line_bounds", "yank_main_selection_to_clipboard", "goto_line_start", "collapse_selection", "normal_mode"]
-p = "replace_selections_with_clipboard" # No life without this
-P = "paste_clipboard_before"
-
-# Escape the madness! No more fighting with the cursor! Or with multiple cursors!
-esc = ["collapse_selection", "keep_primary_selection", "normal_mode"]

cli/dot-config/helix/languages.toml

@@ -1,14 +1,41 @@
+# introduce new language server
+[language-server.scls]
+command = "simple-completion-language-server"
+
+[language-server.scls.config]
+feature_words = false                # enable completion by word
+feature_snippets = true              # enable snippets
+snippets_first = true                # completions will return before snippets by default
+snippets_inline_by_word_tail = false # suggest snippets by WORD tail, for example text `xsq|` become `x^2|` when snippet `sq` has body `^2`
+feature_unicode_input = false        # enable "unicode input"
+feature_paths = false                # enable path completion
+feature_citations = false            # enable citation completion (only on `citation` feature enabled)
+
+
+# write logs to /tmp/completion.log
+[language-server.scls.environment]
+RUST_LOG = "info,simple-completion-language-server=info"
+LOG_FILE = "/tmp/completion.log"
+
+# append language server to existed languages
+[[language]]
+name = "rust"
+language-servers = [ "scls", "rust-analyzer" ]
+
+[[language]]
+name = "git-commit"
+language-servers = [ "scls" ]
+
 [[language]]
 name = "python"
+language-servers = [ "ty", "scls" ]
 
-[language.debugger]
-name = "debugpy"
-transport = "stdio"
-command = "python"
-args = ["-m",  "debugpy.adapter"]
-
-[[language.debugger.templates]]
-name = "source"
-request = "launch"
-completion = [ { name = "entrypoint", completion = "filename", default = "." } ]
-args = { mode = "debug", program = "{0}" }
+# introduce a new language to enable completion on any doc by forcing set language with :set-language stub
+[[language]]
+name = "stub"
+scope = "text.stub"
+file-types = []
+shebangs = []
+roots = []
+auto-format = false
+language-servers = [ "scls" ]

cli/dot-config/helix/snippets/python.toml

@@ -0,0 +1,5 @@
+[[snippets]]
+prefix = "ld"
+scope = [ "python" ]  # language id https://code.visualstudio.com/docs/languages/identifiers#_known-language-identifiers
+body = 'log.debug("$1")'
+description = "log at debug level"

cli/dot-config/helix/themes/jonas.toml

@@ -122,7 +122,7 @@
 
 
 [palette]
-bg0 = "#282828"   # main background
+bg0 = "#000000"   # main background
 bg0_s = "#32302f"
 bg1 = "#3c3836"
 bg2 = "#504945"

cli/dot-config/zellij/config.kdl

@@ -163,7 +163,7 @@ keybinds clear-defaults=true {
         bind "Alt k" { MoveFocus "up"; }
         bind "Alt l" { MoveFocusOrTab "right"; }
         bind "Alt n" { NewPane; }
-        bind "Alt o" { MoveTab "right"; }
+        bind "Alt Shift n" { NewTab; }
         bind "Alt p" { TogglePaneInGroup; }
         bind "Alt Shift p" { ToggleGroupMarking; }
     }
@@ -288,7 +288,7 @@ default_mode "locked"
 // The name of the default layout to load on startup
 // Default: "default"
 // 
-// default_layout "compact"
+default_layout "compact"
  
 // The folder in which Zellij will look for layouts
 // (Requires restart)
@@ -307,7 +307,7 @@ default_mode "locked"
 //   - true (default)
 //   - false
 // 
-// mouse_mode false
+mouse_mode false
  
 // Toggle having pane frames around the panes
 // Options:
@@ -377,7 +377,7 @@ copy_command "wl-copy"                    // wayland
 // otherwise this will error if such a session exists.
 // Default: <RANDOM>
 // 
-session_name "JonasWork"
+session_name "MainSess"
  
 // When `session_name` is provided, attaches to that session
 // if it is already running or creates it otherwise.

gui/dot-config/hypr/hyprland.conf

@@ -33,7 +33,8 @@ exec-once = wl-clip-persist --clipboard regular
 exec-once = nm-applet
 exec-once = ~/projects/scripts/shell/start_kmonad.sh
 exec-once = sleep 5 && nextcloud
-exec-once = sleep 5 && owncloud
+# To save battery
+#exec-once = sleep 5 && owncloud
 
 # Prevent speaker damage
 exec-once = sleep 5 && wpctl set-volume @DEFAULT_AUDIO_SINK@ 42%

home/dot-common_shell

@@ -5,8 +5,8 @@
 export EDITOR='hx'
 export HTTP_HOME="duckduckgo.com"
 export RANGER_LOAD_DEFAULT_RC=false
-export PATH=$HOME/programs_local/:$HOME/.cargo/bin:~/projects/scripts:$HOME/.local/bin:/usr/local/bin:$PATH
-export PATH=$HOME/programs_local/:~/projects/scripts:$PATH
+export PATH=$HOME/programs_local/:$HOME/.cargo/bin:~/projects/scripts:/usr/local/bin:$PATH
+export PATH=$HOME/programs_local/:~/projects/scripts:~/projects/scripts/other:$PATH
 export MANPAGER="nvim +Man!"
 export GOPATH=$HOME/.go
 export PATH=$HOME/.go/bin:$PATH
@@ -15,6 +15,18 @@ export NAP_CONFIG="~/.config/nap/config.yaml"
 
 export loc="$HOME/files_local/"
 
+# Currently not working
+alias gita="GIT_PAGER=cat git cat-file --batch-all-objects --batch-check \
+| awk '$2==\"blob\"{print $1}' \
+| xargs -n1 -I{} sh -c '
+  echo; echo \"==================== {} ====================\";
+  git cat-file -p {} > /tmp/blob.bin;
+  case "$(file -b /tmp/blob.bin)" in
+    *text*) sed -n \"1,200p\" /tmp/blob.bin ;;
+    *) strings /tmp/blob.bin | sed -n \"1,200p\" ;;
+  esac
+'"
+
 alias oati="~/projects/scripts/oathi.sh"
 alias imu="immich upload -r ."
 alias chch="~/projects/scripts/check_git.sh"
@@ -28,6 +40,7 @@ alias mm="systemctl start mnt-webdav.mount"
 alias wi="wiki-tui"
 alias a="alpine"
 alias h="hx"
+alias l="lazygit"
 alias ff="~/projects/scripts/hyprfix.sh" # Fix the touchpad not working on the laptop with a simple script
 alias sp="spotify_player"
 alias ne="newsboat"
@@ -43,7 +56,7 @@ alias lg="lazygit"
 alias m="make"
 alias mn="make nix"
 alias syn="~/projects/scripts/run_unison.sh"
-alias s="sync"
+alias s="sync && source ~/.zshrc"
 alias rmt="rm /tmp/all_git_projects"
 alias fu="chch && fla && shd"
 alias fla="sudo nixos-rebuild switch --flake ~/nixos#"

home/dot-gitconfig

@@ -22,6 +22,9 @@
 	email = "jonashahn1@gmx.net"
 	name = "Jonas Hahn"
 
+[diff]
+    tool = "vimdiff"
+
 [core]
 	autocrlf = input
 

home/dot-ssh/config

@@ -8,6 +8,11 @@ Host amazon
 	User ec2-user
 	IdentityFile ~/.ssh/id_amazon
 
+Host harch
+	Hostname 192.168.178.20
+	User jonas
+	IdentityFile ~/.ssh/id_amazon
+
 
 Host gitlab.gwdg.de
 	HostName gitlab.gwdg.de

home/dot-zshrc

@@ -5,6 +5,9 @@ export TERM="alacritty"
 bindkey '^R' history-incremental-search-backward
 bindkey -v
 
+alias cat="bat"
+alias ls="exa"
+
 function rgnvim() {
   rg --vimgrep "$@" \
     | fzf --delimiter : --nth 1,2,3,4 \
@@ -79,4 +82,5 @@ fi
 export PATH=/home/jonas/.opencode/bin:$PATH
 
 # Added by GitLab Knowledge Graph installer
+# Wird auch von uv genutzt
 export PATH="$HOME/.local/bin:$PATH"