Merge branch 'master' of github.com:fbosch/dotfiles

Author: fbosch

.config/btop/btop.conf

@@ -1,18 +1,18 @@
-#? Config file for btop v. 1.4.5
+#? Config file for btop v.1.4.6
 
 #* 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"
-color_theme = "TTY"
+color_theme = "/home/fbb/.config/btop/themes/zenwritten-dark.theme"
 
 #* If the theme set background should be shown, set to False if you want terminal background transparency.
-theme_background = True
+theme_background = true
 
 #* Sets if 24-bit truecolor should be used, will convert 24-bit colors to 256 color (6x6x6 color cube) if false.
-truecolor = True
+truecolor = true
 
 #* Set to true to force tty mode regardless if a real tty has been detected or not.
 #* Will force 16-color mode and TTY theme, set all graph symbols to "tty" and swap out other non tty friendly symbols.
-force_tty = False
+force_tty = false
 
 #* Define presets for the layout of the boxes. Preset 0 is always all boxes shown with default settings. Max 9 presets.
 #* Format: "box_name:P:G,box_name:P:G" P=(0 or 1) for alternate positions, G=graph symbol to use for box.
@@ -22,10 +22,13 @@ presets = "cpu:1:default,proc:0:default cpu:0:default,mem:0:default,net:0:defaul
 
 #* Set to True to enable "h,j,k,l,g,G" keys for directional control in lists.
 #* Conflicting keys for h:"help" and k:"kill" is accessible while holding shift.
-vim_keys = False
+vim_keys = false
 
 #* Rounded corners on boxes, is ignored if TTY mode is ON.
-rounded_corners = True
+rounded_corners = true
+
+#* Use terminal synchronized output sequences to reduce flickering on supported terminals.
+terminal_sync = true
 
 #* Default symbols to use for graph creation, "braille", "block" or "tty".
 #* "braille" offers the highest resolution but might not be included in all fonts.
@@ -37,6 +40,9 @@ graph_symbol = "braille"
 # Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
 graph_symbol_cpu = "default"
 
+# Graph symbol to use for graphs in gpu box, "default", "braille", "block" or "tty".
+graph_symbol_gpu = "default"
+
 # Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
 graph_symbol_mem = "default"
 
@@ -57,37 +63,40 @@ update_ms = 1000
 proc_sorting = "command"
 
 #* Reverse sorting order, True or False.
-proc_reversed = True
+proc_reversed = true
 
 #* Show processes as a tree.
-proc_tree = True
+proc_tree = true
 
 #* Use the cpu graph colors in the process list.
-proc_colors = True
+proc_colors = true
 
 #* Use a darkening gradient in the process list.
-proc_gradient = True
+proc_gradient = true
 
 #* If process cpu usage should be of the core it's running on or usage of the total available cpu power.
-proc_per_core = False
+proc_per_core = false
 
 #* Show process memory as bytes instead of percent.
-proc_mem_bytes = True
+proc_mem_bytes = true
 
 #* Show cpu graph for each process.
-proc_cpu_graphs = True
+proc_cpu_graphs = true
 
 #* Use /proc/[pid]/smaps for memory information in the process info box (very slow but more accurate)
-proc_info_smaps = False
+proc_info_smaps = false
 
 #* Show proc box on left side of screen instead of right.
-proc_left = False
+proc_left = false
 
 #* (Linux) Filter processes tied to the Linux kernel(similar behavior to htop).
-proc_filter_kernel = False
+proc_filter_kernel = false
 
 #* In tree-view, always accumulate child process resources in the parent process.
-proc_aggregate = False
+proc_aggregate = false
+
+#* Should cpu and memory usage display be preserved for dead processes when paused.
+keep_dead_proc_usage = false
 
 #* Sets the CPU stat shown in upper half of the CPU graph, "total" is always available.
 #* Select from a list of detected attributes from the options menu.
@@ -97,29 +106,32 @@ cpu_graph_upper = "total"
 #* Select from a list of detected attributes from the options menu.
 cpu_graph_lower = "total"
 
+#* If gpu info should be shown in the cpu box. Available values = "Auto", "On" and "Off".
+show_gpu_info = "Auto"
+
 #* Toggles if the lower CPU graph should be inverted.
-cpu_invert_lower = True
+cpu_invert_lower = true
 
 #* Set to True to completely disable the lower CPU graph.
-cpu_single_graph = False
+cpu_single_graph = false
 
 #* Show cpu box at bottom of screen instead of top.
-cpu_bottom = False
+cpu_bottom = false
 
 #* Shows the system uptime in the CPU box.
-show_uptime = True
+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_watts = true
 
 #* Show cpu temperature.
-check_temp = True
+check_temp = true
 
 #* Which sensor to use for cpu temperature, use options menu to select from list of available sensors.
 cpu_sensor = "Auto"
 
 #* Show temperatures for cpu cores also if check_temp is True and sensors has been found.
-show_coretemp = True
+show_coretemp = true
 
 #* Set a custom mapping between core and coretemp, can be needed on certain cpus to get correct temperature for correct core.
 #* Use lm-sensors or similar to see which cores are reporting temperatures on your machine.
@@ -131,17 +143,20 @@ cpu_core_map = ""
 temp_scale = "celsius"
 
 #* Use base 10 for bits/bytes sizes, KB = 1000 instead of KiB = 1024.
-base_10_sizes = False
+base_10_sizes = false
 
 #* Show CPU frequency.
-show_cpu_freq = True
+show_cpu_freq = true
+
+#* How to calculate CPU frequency, available values: "first", "range", "lowest", "highest" and "average".
+freq_mode = "first"
 
 #* Draw a clock at top of screen, formatting according to strftime, empty string to disable.
 #* Special formatting: /host = hostname | /user = username | /uptime = system uptime
 clock_format = "%X"
 
 #* Update main ui in background when menus are showing, set this to false if the menus is flickering too much for comfort.
-background_update = True
+background_update = true
 
 #* Custom cpu model name, empty string to disable.
 custom_cpu_name = ""
@@ -151,43 +166,43 @@ custom_cpu_name = ""
 disks_filter = ""
 
 #* Show graphs instead of meters for memory values.
-mem_graphs = True
+mem_graphs = true
 
 #* Show mem box below net box instead of above.
-mem_below_net = False
+mem_below_net = false
 
 #* Count ZFS ARC in cached and available memory.
-zfs_arc_cached = True
+zfs_arc_cached = true
 
 #* If swap memory should be shown in memory box.
-show_swap = True
+show_swap = true
 
 #* Show swap as a disk, ignores show_swap value above, inserts itself after first disk.
-swap_disk = True
+swap_disk = true
 
 #* If mem box should be split to also show disks info.
-show_disks = False
+show_disks = false
 
 #* Filter out non physical disks. Set this to False to include network disks, RAM disks and similar.
-only_physical = True
+only_physical = true
 
 #* Read disks list from /etc/fstab. This also disables only_physical.
-use_fstab = True
+use_fstab = true
 
 #* Setting this to True will hide all datasets, and only show ZFS pools. (IO stats will be calculated per-pool)
-zfs_hide_datasets = False
+zfs_hide_datasets = false
 
 #* Set to true to show available disk space for privileged users.
-disk_free_priv = False
+disk_free_priv = false
 
 #* Toggles if io activity % (disk busy time) should be shown in regular disk usage view.
-show_io_stat = True
+show_io_stat = true
 
 #* Toggles io mode for disks, showing big graphs for disk read/write speeds.
-io_mode = False
+io_mode = false
 
 #* Set to True to show combined read/write io graphs in io mode.
-io_graph_combined = False
+io_graph_combined = false
 
 #* Set the top speed for the io graphs in MiB/s (100 by default), use format "mountpoint:speed" separate disks with whitespace " ".
 #* Example: "/mnt/media:100 /:20 /boot:1".
@@ -199,10 +214,10 @@ net_download = 100
 net_upload = 100
 
 #* Use network graphs auto rescaling mode, ignores any values set above and rescales down to 10 Kibibytes at the lowest.
-net_auto = True
+net_auto = true
 
 #* Sync the auto scaling for download and upload to whichever currently has the highest scale.
-net_sync = True
+net_sync = true
 
 #* Starts with the Network Interface specified here.
 net_iface = ""
@@ -211,14 +226,47 @@ net_iface = ""
 base_10_bitrate = "Auto"
 
 #* Show battery stats in top right if battery is present.
-show_battery = True
+show_battery = true
 
 #* Which battery to use if multiple are present. "Auto" for auto detection.
 selected_battery = "Auto"
 
 #* Show power stats of battery next to charge indicator.
-show_battery_watts = True
+show_battery_watts = true
 
-#* Set loglevel for "~/.config/btop/btop.log" levels are: "ERROR" "WARNING" "INFO" "DEBUG".
+#* Set loglevel for "~/.local/state/btop.log" levels are: "ERROR" "WARNING" "INFO" "DEBUG".
 #* The level set includes all lower levels, i.e. "DEBUG" will show all logging info.
 log_level = "WARNING"
+
+#* Automatically save current settings to config file on exit.
+save_config_on_exit = true
+
+#* Measure PCIe throughput on NVIDIA cards, may impact performance on certain cards.
+nvml_measure_pcie_speeds = true
+
+#* Measure PCIe throughput on AMD cards, may impact performance on certain cards.
+rsmi_measure_pcie_speeds = true
+
+#* Horizontally mirror the GPU graph.
+gpu_mirror_graph = true
+
+#* Set which GPU vendors to show. Available values are "nvidia amd intel"
+shown_gpus = "nvidia amd intel"
+
+#* Custom gpu0 model name, empty string to disable.
+custom_gpu_name0 = ""
+
+#* Custom gpu1 model name, empty string to disable.
+custom_gpu_name1 = ""
+
+#* Custom gpu2 model name, empty string to disable.
+custom_gpu_name2 = ""
+
+#* Custom gpu3 model name, empty string to disable.
+custom_gpu_name3 = ""
+
+#* Custom gpu4 model name, empty string to disable.
+custom_gpu_name4 = ""
+
+#* Custom gpu5 model name, empty string to disable.
+custom_gpu_name5 = ""

.config/fish/functions/hyprprop_kill.fish

@@ -0,0 +1,60 @@
+function hyprprop_kill --description 'Select a window with hyprprop and kill it with pkill'
+    set -l options h/help
+    argparse -n hyprprop_kill $options -- $argv
+    or return
+
+    if set -q _flag_help
+        echo "Usage: hyprprop_kill"
+        echo "Interactively select a window with hyprprop and kill its process"
+        return 0
+    end
+
+    # Check if hyprprop is available
+    if not command -v hyprprop >/dev/null
+        echo "hyprprop_kill: hyprprop not found" >&2
+        return 1
+    end
+
+    # Get window info as JSON
+    set -l window_json (hyprprop --raw 2>/dev/null)
+    
+    if test $status -ne 0
+        echo "hyprprop_kill: Failed to get window information (selection cancelled?)" >&2
+        return 1
+    end
+
+    # Extract PID and process info from JSON
+    set -l pid (echo $window_json | jq -r '.pid // empty' 2>/dev/null)
+    set -l title (echo $window_json | jq -r '.title // empty' 2>/dev/null)
+    set -l class (echo $window_json | jq -r '.class // .initialClass // empty' 2>/dev/null)
+    
+    if test -z "$pid"
+        echo "hyprprop_kill: Could not determine PID from window" >&2
+        return 1
+    end
+
+    # Show process info for confirmation
+    set -l display_name "$class"
+    if test -n "$title"
+        set display_name "$class ($title)"
+    end
+
+    # Confirm before killing
+    if not gum confirm "Kill process: $display_name [PID: $pid]?"
+        echo "Cancelled"
+        return 0
+    end
+
+    # Kill the process by PID
+    if kill $pid 2>/dev/null
+        echo "Killed: $display_name [PID: $pid]"
+    else
+        # Try with force if regular kill failed
+        if kill -9 $pid 2>/dev/null
+            echo "Force killed: $display_name [PID: $pid]"
+        else
+            echo "hyprprop_kill: Failed to kill PID $pid" >&2
+            return 1
+        end
+    end
+end

.config/hypr/generated-rules.conf

@@ -22,3 +22,11 @@ windowrule = match:class ^(be\.alexandervanhee\.gradia)$, hyprbars:no_bar 1
 # Generated by hypr-quickrule for be.alexandervanhee.gradia
 windowrule = match:class ^(be\.alexandervanhee\.gradia)$, float on
 windowrule = match:class ^(be\.alexandervanhee\.gradia)$, center on
+
+# Generated by hypr-quickrule for net.davidotek.pupgui2
+windowrule = match:class ^(net\.davidotek\.pupgui2)$, float on
+windowrule = match:class ^(net\.davidotek\.pupgui2)$, size 750 900
+
+# Generated by hypr-quickrule for net.davidotek.pupgui2
+windowrule = match:class ^(net\.davidotek\.pupgui2)$, float on
+windowrule = match:class ^(net\.davidotek\.pupgui2)$, size 360 620

.config/hypr/hyprland.conf

@@ -25,6 +25,7 @@ opengl {
 # Set programs that you use
 $terminal = uwsm app -- mullvad-exclude wezterm
 $fileManager = uwsm app -- nemo
+$browser = bash ~/.config/hypr/scripts/launch-browser.sh
 $menu = vicinae toggle
 
 # Load Hyprland plugins from Nix BEFORE config files are sourced
@@ -83,7 +84,7 @@ exec-once = uwsm app -- swaync -c ~/.config/swaync/config.json -s ~/.config/sway
 exec-once = uwsm app -- ~/.config/hypr/scripts/window-state.sh
 exec-once = uwsm app -- bash -c 'while ! pw-cli info 0 &>/dev/null; do sleep 0.1; done && uwsm app -- pw-play ~/.config/hypr/assets/bootup.ogg'
 exec-once = ~/.config/hypr/scripts/window-capture-daemon.sh
-exec-once = steam -nochatui -nofriendsui -silent
+exec-once = uwsm app -- mullvad-exclude steam -nochatui -nofriendsui -silent
 
 # Alternatively, for apps with systemd services, you can enable them instead:
 # systemctl --user enable --now waybar.service

.config/hypr/keybinds.conf

@@ -40,6 +40,7 @@ bind = CTRL SHIFT, O, exec, bash ~/.config/hypr/scripts/screenshot.sh ocr
 
 # Example binds, see https://wiki.hypr.land/Configuring/Binds/ for more
 bind = $mainMod, Q, exec, $terminal
+bind = $mainMod, B, exec, $browser
 bind = $mainMod, C, killactive
 bind = $mainMod, M, exec, bash ~/.config/hypr/scripts/confirm-exit.sh  # Show confirmation dialog before exit
 bind = $mainMod SHIFT, R, exec, ~/.config/hypr/scripts/reset-desktop.sh