From c49857d2bd0e8ce4e0c1e809d9bc0ff0b6336974 Mon Sep 17 00:00:00 2001 From: Jonas Hahn Date: Mon, 22 Dec 2025 16:12:11 +0100 Subject: [PATCH] Two --- cli/dot-config/btop/btop.conf | 7 +++++-- cli/dot-config/helix/themes/jonas.toml | 2 +- cli/dot-config/zellij/config.kdl | 8 ++++---- home/.gitconfig | 3 +++ home/.zshrc | 4 ++++ home/dot-common_shell | 19 ++++++++++++++++--- 6 files changed, 33 insertions(+), 10 deletions(-) diff --git a/cli/dot-config/btop/btop.conf b/cli/dot-config/btop/btop.conf index 30e82fe..9b7bb5b 100644 --- a/cli/dot-config/btop/btop.conf +++ b/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,7 +57,7 @@ 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 @@ -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 diff --git a/cli/dot-config/helix/themes/jonas.toml b/cli/dot-config/helix/themes/jonas.toml index 6c5bcd0..bb8f536 100644 --- a/cli/dot-config/helix/themes/jonas.toml +++ b/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" diff --git a/cli/dot-config/zellij/config.kdl b/cli/dot-config/zellij/config.kdl index 58e1abe..6ce2cac 100644 --- a/cli/dot-config/zellij/config.kdl +++ b/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: // -session_name "JonasWork" +session_name "MainSess" // When `session_name` is provided, attaches to that session // if it is already running or creates it otherwise. diff --git a/home/.gitconfig b/home/.gitconfig index b932a2b..3e58d6c 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -22,6 +22,9 @@ email = "jonashahn1@gmx.net" name = "Jonas Hahn" +[diff] + tool = "vimdiff" + [core] autocrlf = input diff --git a/home/.zshrc b/home/.zshrc index c8bc06d..23ae4f4 100644 --- a/home/.zshrc +++ b/home/.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" diff --git a/home/dot-common_shell b/home/dot-common_shell index 9c9377a..fd2a202 100644 --- a/home/dot-common_shell +++ b/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#"