Merge branch 'desktop'

btop/btop.conf

@@ -1,18 +1,23 @@
-#? Config file for btop v. 1.4.0
+#? Config file for btop v.1.4.7
 
 #* 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 = "/home/ha5pls/.config/btop/themes/catppuccin_macchiato.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
+
+#* Option to disable presets. Either the default preset, custom presets, or all presets.
+#* "Off" All presets are enabled.
+#* "Default" preset is disabled.#* "Custom" presets are disabled.#* "All" presets are disabled.
+disable_presets = "Off"
 
 #* 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 +27,16 @@ 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
+
+#* Disable all mouse events.
+disable_mouse = 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.
@@ -57,40 +68,46 @@ update_ms = 1000
 
 #* 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 = "memory"
+proc_sorting = "cpu direct"
 
 #* Reverse sorting order, True or False.
-proc_reversed = False
+proc_reversed = false
 
 #* Show processes as a tree.
-proc_tree = False
+proc_tree = false
 
 #* 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
+
+#* Should the process list follow the selected process when detailed view is open.
+proc_follow_detailed = true
 
 #* 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.
@@ -104,25 +121,28 @@ cpu_graph_lower = "Auto"
 show_gpu_info = "On"
 
 #* 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 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.
@@ -134,100 +154,118 @@ 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 = ""
 
 #* Optional filter for shown disks, should be full path of a mountpoint, separate multiple values with whitespace " ".
-#* Begin line with "exclude=" to change to exclude filter, otherwise defaults to "most include" filter. Example: disks_filter="exclude=/boot /home/user".
+#* Only disks matching the filter will be shown. Prepend exclude= to only show disks not matching the filter. Examples: disk_filter="/boot /home/user", disks_filter="exclude=/boot /home/user"
 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 = True
+show_disks = true
 
 #* 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 = True
+io_mode = true
 
 #* 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".
 io_graph_speeds = ""
 
+#* Swap the positions of the upload and download speed graphs. When true, upload will be on top.
+swap_upload_download = false
+
 #* Set fixed values for network graphs in Mebibits. Is only used if net_auto is also set to False.
 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 = ""
 
+#* "True" shows bitrates in base 10 (Kbps, Mbps). "False" shows bitrates in binary sizes (Kibps, Mibps, etc.). "Auto" uses base_10_sizes.
+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
+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
+gpu_mirror_graph = true
+
+#* Set which GPU vendors to show. Available values are "nvidia amd intel apple"
+shown_gpus = "nvidia amd intel apple"
 
 #* Custom gpu0 model name, empty string to disable.
 custom_gpu_name0 = ""

fedora.sh

@@ -118,7 +118,7 @@ dconf load /org/gnome/gedit/ < ~/.config/dconf-export/gedit.dconf
 
 # rofi & rofi-calc (compilation, because why not)
 ensure_installed rofi-wayland rofi-devel qalculate meson libtool cairo-devel
-git clone https://github.com/svenstaro/rofi-calc ~/.local/bin/build_stage/rofi-calc && cd ~/.local/bin/build_stage/rofi-calc && meson setup build && meson compile -C build && sudo meson install
+git clone https://github.com/svenstaro/rofi-calc ~/.local/bin/build_stage/rofi-calc && cd ~/.local/bin/build_stage/rofi-calc && meson setup build && cd build && meson compile -C build && sudo meson install
 cd
 
 # kdeconnect

hypr/hyprland.conf

@@ -13,7 +13,8 @@
 #autogenerated = 1 # remove this line to remove the warning
 
 # See https://wiki.hyprland.org/Configuring/Monitors/
-monitor=,preferred,auto,auto
+monitor=DP-2,preferred,0x0,1
+monitor=HDMI-A-2,1920x1080,1920x-420,1, transform,1
 
 # Source a file (multi-file configs)
 # source = ~/.config/hypr/myColors.conf
@@ -34,7 +35,6 @@ windowrule {
   match:class = ^(Rofi)$
 }
 
-
 # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
 input {
     kb_layout = hu

hypr/keybinds.conf

@@ -21,8 +21,8 @@ bind = $mainMod SHIFT, PERIOD, pin
 binde = , XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+
 binde = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
 binde = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
-binde = , XF86MonBrightnessUp, exec, brightnessctl set '12.75+'
+binde = , XF86MonBrightnessUp, exec, brightnessctl set '242.42+'
-binde = , XF86MonBrightnessDown, exec, brightnessctl set '12.75-'
+binde = , XF86MonBrightnessDown, exec, brightnessctl set '242.42-'
 binde = , XF86AudioPlay, exec, playerctl play-pause
 binde = , XF86AudioNext, exec, playerctl next
 binde = , XF86AudioPrev, exec, playerctl previous

nvim/lua/configs/lspconfig.lua

@@ -2,6 +2,6 @@ local on_attach = require("nvchad.configs.lspconfig").on_attach
 local capabilities = require("nvchad.configs.lspconfig").capabilities
 
 -- if you just want default config for the servers then put them in a table
-local servers = { "hyprls", "lua-language-server", "clangd", "basedpyright", "vhdl_ls" }
+local servers = { "hyprls", "lua-language-server", "clangd", "basedpyright", "vhdl_ls", "verible" }
 
 vim.lsp.enable(servers)

nvim/lua/myinit.lua

@@ -6,6 +6,15 @@ local autocmd = vim.api.nvim_create_autocmd
 --   command = "tabdo wincmd =",
 -- })
 
+autocmd('FileType', {
+  pattern = { 'lua', 'vhdl', 'python', 'markdown', 'latex', 'c', 'cpp', 'hyprlang', 'html', 'css', 'yaml', 'json' },
+  callback = function()
+    vim.treesitter.start()                                    -- highlighting
+    vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'     -- folds
+    vim.wo.foldmethod = 'expr'
+    -- vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()" -- indentation
+  end,
+})
 
 -- disable folding on startup
 vim.opt.foldenable = false
@@ -47,3 +56,9 @@ local enable_providers = {
     end
 
 vim.g.python3_host_prog = vim.fn.expand(os.getenv("XDG_STATE_HOME") .. "/virtualenvs/neovim/bin/python3")
+
+-- Acu filetype
+autocmd({'BufRead', 'BufNewFile'}, {
+    pattern = '*.acu',
+    command = "set filetype=acu"
+})

nvim/lua/options.lua

@@ -6,6 +6,3 @@ require "nvchad.options"
 -- o.cursorlineopt ='both' -- to enable cursorline!
 
 local o = vim.o
--- Enable treesitter folding
-o.foldmethod = "expr"
-o.foldexpr = "nvim_treesitter#foldexpr()"

regreet/greetd/config.toml

@@ -5,6 +5,6 @@ vt = current
 
 # The default session, also known as the greeter.
 [default_session]
-command = "Hyprland --config /etc/greetd/hyprland.conf"
+command = "dbus-run-session start-hyprland -- -c /etc/greetd/hyprland.conf"
 user = "greetd"
 

regreet/greetd/hyprland.conf

@@ -1,8 +0,0 @@
-exec-once = regreet; hyprctl dispatch exit
-input {
-    kb_layout = hu
-}
-misc {
-    disable_hyprland_logo = true
-    disable_splash_rendering = true
-}

regreet/greetd/hyprland.lua

@@ -0,0 +1,13 @@
+hl.on("hyprland.start", function()
+    hl.exec_cmd("regreet; hyprctl dispatch 'hl.dsp.exit()'")
+end)
+hl.config({
+    misc = {
+        disable_hyprland_logo = true,
+        disable_splash_rendering = true,
+        disable_hyprland_guiutils_check = true,
+    },
+    input = {
+        kb_layout = hu
+    }
+})

waybar/config_desktop.json

@@ -1,6 +1,7 @@
-{
+[{
   "layer": "top",
   "position": "top",
+  "output": "DP-2",
   "include": [
     "~/.config/waybar/modules.jsonc"
   ],
@@ -16,4 +17,24 @@
     "icon-size": 16,
     "spacing": 10
   },
-}
+},
+{
+  "layer": "top",
+  "position": "top",
+  "output": "HDMI-A-2",
+  "include": [
+    "~/.config/waybar/modules.jsonc"
+  ],
+	"height": 40,
+  "margin-left": 3, 
+  "margin-right": 3,
+  "margin-top": 3,
+  "margin-bottom": 3,
+  "modules-left": ["custom/junkyard", "hyprland/workspaces"],
+  "modules-center": ["clock"],
+  "modules-right": ["tray", "custom/notification", "pulseaudio", "group/group-power"],
+  "tray": {
+    "icon-size": 16,
+    "spacing": 10
+  },
+}]

waybar/config_laptop.json

@@ -11,7 +11,7 @@
   "margin-bottom": 3,
   "modules-left": ["custom/junkyard", "hyprland/workspaces"],
   "modules-center": ["clock"],
-  "modules-right": ["tray", "custom/notification", "pulseaudio", "bluetooth", "backlight", "network", "battery", "group/group-power" ],
+  "modules-right": ["tray", "custom/notification", "pulseaudio", "backlight", "bluetooth", "network", "battery", "group/group-power" ],
   "tray": {
     "icon-size": 16,
     "spacing": 10

waybar/modules.jsonc

@@ -26,12 +26,12 @@
     "pulseaudio": {
         // "scroll-step": 1, // %, can be a float
         //"reverse-scrolling": 1,
-        "format": "{icon} {volume}% {format_source}",
+        "format": "{volume}% {icon} {format_source}",
-        "format-bluetooth": "{icon} {volume}% {format_source}",
+        "format-bluetooth": "{volume}% {icon} {format_source}",
-        "format-bluetooth-muted": "{icon} {format_source}",
+        "format-bluetooth-muted": "{volume}% {icon}󰂲 {format_source}",
-        "format-muted": "󰝟 {volume}% {format_source}",
+        "format-muted": "{volume}% 󰝟 {format_source}",
-        "format-source": " {volume}%",
+        "format-source": "{volume}% ",
-        "format-source-muted": "",
+        "format-source-muted": "{volume}% ",
         "format-icons": {
             "headphone": "󰋋",
             "hands-free": "󱡒",
@@ -48,7 +48,7 @@
     "bluetooth": {
         "format": "",
         "format-disabled": "",
-        "format-connected": " {num_connections}",
+        "format-connected": "{num_connections} ",
         "tooltip-format-enumerate-connected": "{device_alias}",
         "tooltip-format-connected": "{device_enumerate}",
         "on-click": "uwsm app blueman-manager"
@@ -94,7 +94,7 @@
 
     "cpu": {
         "interval": 1,
-        "format": "  {usage:02d}%{icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}",
+        "format": "{usage:02d}%{icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7} ",
         "format-icons": [
             "<span color='#a6da95'>▁</span>", // green
             "<span color='#8aadf4'>▂</span>", // blue
@@ -109,7 +109,7 @@
 
     "memory": {
         "interval": 5,
-        "format": "󰍛 {percentage}%"
+        "format": "{percentage}% 󰍛"
     },
 
     "group/group-power": {
@@ -148,7 +148,7 @@
         "on-click": "systemctl reboot"
     },
     "custom/power": {
-        "format": "  ",
+        "format": "󰐥",
         "tooltip": false,
         "on-click": "systemctl poweroff"
     },
@@ -158,7 +158,7 @@
             "warning": 20,
             "critical": 5
         },
-        "format": "{icon}{capacity}%",
+        "format": "{capacity}% {icon}",
         "format-charging": "{capacity}% 󰂄",
         "format-plugged": "{capacity}% 󰚥",
         // "format-alt": "{time} {icon}",
@@ -170,7 +170,7 @@
     },
 
     "backlight": {
-        "format": "{icon}  {percent}%",
+        "format": "{percent}% {icon}",
         "format-icons": ["󰃞", "󰃟", "󰃠"]
     },
 

waybar/style.css

@@ -75,7 +75,7 @@ button {
 #bluetooth {
     background-color: @base; /* Change this to any gray color you want */
     border-radius: 0px; /* Adjust as needed */
-    padding: 3px 3px;
+    padding: 3px 5px;
     color: @text;
     margin: 0px;
 }
@@ -91,7 +91,7 @@ button {
 #battery {
       background-color: @base; /* Change this to any gray color you want */
       border-radius: 0px 10px 10px 0px; /* Adjust as needed */
-      padding: 3px 10px;
+      padding: 3px 10px 3px 5px;
       color: @text;
 }
 
@@ -128,11 +128,23 @@ button {
 #group-power {
     background-color: @base;
     border-radius: 10px;
-    padding: 3px 5px;
+    padding: 3px 8px;
     margin-left: 3px;
     color: @text;
 }
 
+#custom-quit,
+#custom-lock,
+#custom-suspend,
+#custom-reboot,
+#custom-power {
+    padding: 3px 6px;
+}
+
+#custom-power{
+    font-size: 20px;
+}
+
 @keyframes blink {
     to {
         background-color: @subtext1;