diff --git a/config/fastfetch/config-v2.jsonc b/config/fastfetch/config-v2.jsonc new file mode 100644 index 0000000..cee27fd --- /dev/null +++ b/config/fastfetch/config-v2.jsonc @@ -0,0 +1,112 @@ +{ +"$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", +"logo": { + //"source": "~/.config/fastfetch/nixos.png", + //"type": "kitty-direct", + "height": 15, + "width": 30, + "padding": { + "top": 1 + } + }, +"display": { + "separator": " ➜ " +}, + +"modules": [ + "break", + { + "type": "os", + "key": " DISTRO", + "keyColor": "31", + }, + { + "type": "kernel", + "key": " ├  ", + "keyColor": "31", + }, + { + "type": "packages", + "key": " ├ 󰏖 ", + "keyColor": "31", + }, + { + "type": "shell", + "key": " └  ", + "keyColor": "31", + }, + "break", + { + "type": "wm", + "key": " DE/WM", + "keyColor": "32", + }, + { + "type": "wmtheme", + "key": " ├ 󰉼 ", + "keyColor": "32", + }, + { + "type": "icons", + "key": " ├ 󰀻 ", + "keyColor": "32", + }, + { + "type": "cursor", + "key": " ├  ", + "keyColor": "32", + }, + { + "type": "terminal", + "key": " ├  ", + "keyColor": "32", + }, + { + "type": "terminalfont", + "key": " └  ", + "keyColor": "32", + }, + "break", + { + "type": "host", + "format": "{2}", + "key": "󰌢 SYSTEM", + "keyColor": "33", + }, + { + "type": "cpu", + "format": "{1} ({3}) @ {7} GHz", + "key": " ├  ", + "keyColor": "33", + }, + { + "type": "gpu", + "format": "{2}", + "key": " ├ 󰢮 ", + "keyColor": "33", + }, + { + "type": "memory", + "key": " ├  ", + "keyColor": "33", + }, + { + "type": "swap", + "key": " ├ 󰓡 ", + "keyColor": "33", + }, + { + "type": "disk", + "key": " ├ 󰋊 ", + "keyColor": "33", + }, + { + "type": "display", + "key": " └  ", + "compactType": "original-with-refresh-rate", + "keyColor": "33", + }, + "break", + "break", +] +} diff --git a/config/fastfetch/config.jsonc b/config/fastfetch/config.jsonc index c6eb694..dfbe1c8 100644 --- a/config/fastfetch/config.jsonc +++ b/config/fastfetch/config.jsonc @@ -1,147 +1,128 @@ -// Load with --load-config examples/2.jsonc -// Note that you must replace the image path to an existing image to display it. { - "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", - "logo": { - "padding": { - "top": 3 - } - }, - "display": { - "separator": " 󰑃 " - }, - "modules": [ - { - "type": "custom", - "format": "\u001b[90m┌────────────────────────────────────────────────────────────┐" - }, - { - "type": "title", - "keyWidth": 10, - "format": " {6}{7}{8}" - }, - { - "type": "custom", - "format": "\u001b[90m└────────────────────────────────────────────────────────────┘" - }, - { - "type": "custom", - "format": "\u001b[90m \u001b[31m \u001b[32m \u001b[33m \u001b[34m \u001b[35m \u001b[36m \u001b[37m \u001b[38m \u001b[39m  \u001b[38m \u001b[37m \u001b[36m \u001b[35m \u001b[34m \u001b[33m \u001b[32m \u001b[31m \u001b[90m " - }, - { - "type": "custom", - "format": "\u001b[90m┌────────────────────────────────────────────────────────────┐" - }, - { - "type": "os", - "key": " DISTRO", - "keyColor": "yellow" - }, - { - "type": "kernel", - "key": "│ ├", - "keyColor": "yellow" - }, - { - "type": "packages", - "key": "│ ├󰏖", - "keyColor": "yellow" - }, - { - "type": "shell", - "key": "│ └", - "keyColor": "yellow" - }, - { - "type": "wm", - "key": " DE/WM", - "keyColor": "blue" - }, - { - "type": "wmtheme", - "key": "│ ├󰉼", - "keyColor": "blue" - }, - { - "type": "icons", - "key": "│ ├󰀻", - "keyColor": "blue" - }, - { - "type": "terminal", - "key": "│ ├", - "keyColor": "blue" - }, - { - "type": "wallpaper", - "key": "│ └󰸉", - "keyColor": "blue" - }, - { - "type": "host", - "key": "󰌢 SYSTEM", - "keyColor": "green" - }, - { - "type": "cpu", - "key": "│ ├󰻠", - "keyColor": "green" - }, - { - "type": "gpu", - "key": "│ ├󰻑", - "keyColor": "green" - }, - { - "type": "display", - "key": "│ ├󰍹", - "keyColor": "green", - "compactType": "original-with-refresh-rate" - }, - { - "type": "memory", - "key": "│ ├󰾆", - "keyColor": "green" - }, - { - "type": "swap", - "key": "│ ├󰓡", - "keyColor": "green" - }, - { - "type": "uptime", - "key": "│ ├󰅐", - "keyColor": "green" - }, - { +"$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", +"logo": { +"padding": { +"top": 1 +} +}, +"display": { +"separator": " 󰑃 " +}, +"modules": [ + "break", + { + "type": "os", + "key": " DISTRO", + "keyColor": "yellow" + }, + { + "type": "kernel", + "key": "│ ├", + "keyColor": "yellow" + }, + { + "type": "packages", + "key": "│ ├󰏖", + "keyColor": "yellow" + }, + { + "type": "shell", + "key": "│ └", + "keyColor": "yellow" + }, + { + "type": "wm", + "key": " DE/WM", + "keyColor": "blue" + }, + { + "type": "wmtheme", + "key": "│ ├󰉼", + "keyColor": "blue" + }, + { + "type": "icons", + "key": "│ ├󰀻", + "keyColor": "blue" + }, + { + "type": "cursor", + "key": "│ ├", + "keyColor": "blue", + }, + { + "type": "terminalfont", + "key": "│ ├", + "keyColor": "blue", + }, + { + "type": "terminal", + "key": "│ └", + "keyColor": "blue" + }, + { + "type": "host", + "key": "󰌢 SYSTEM", + "keyColor": "green" + }, + { + "type": "cpu", + "key": "│ ├󰻠", + "keyColor": "green" + }, + { + "type": "gpu", + "key": "│ ├󰻑", + "format": "{2}", + "keyColor": "green" + }, + { "type": "display", - "key": "│ └󰍹", - "keyColor": "green" - }, - { - "type": "sound", - "key": " AUDIO", - "keyColor": "cyan" - }, - { - "type": "player", - "key": "│ ├󰥠", - "keyColor": "cyan" - }, - { - "type": "media", - "key": "│ └󰝚", - "keyColor": "cyan" - }, - { - "type": "custom", - "format": "\u001b[90m└────────────────────────────────────────────────────────────┘" - }, - { - "type": "custom", - "format": "\u001b[90m \u001b[31m \u001b[32m \u001b[33m \u001b[34m \u001b[35m \u001b[36m \u001b[37m \u001b[38m \u001b[39m  \u001b[38m \u001b[37m \u001b[36m \u001b[35m \u001b[34m \u001b[33m \u001b[32m \u001b[31m \u001b[90m " - }, - "break", + "key": "│ ├󰍹", + "keyColor": "green", + "compactType": "original-with-refresh-rate" + }, + { + "type": "memory", + "key": "│ ├󰾆", + "keyColor": "green" + }, + { + "type": "swap", + "key": "│ ├󰓡", + "keyColor": "green" + }, + { + "type": "uptime", + "key": "│ ├󰅐", + "keyColor": "green" + }, + { + "type": "display", + "key": "│ └󰍹", + "keyColor": "green" + }, + { + "type": "sound", + "key": " AUDIO", + "format": "{2}", + "keyColor": "magenta" + }, + { + "type": "player", + "key": "│ ├󰥠", + "keyColor": "magenta" + }, + { + "type": "media", + "key": "│ └󰝚", + "keyColor": "magenta" + }, + { + "type": "custom", + "format": "\u001b[90m \u001b[31m \u001b[32m \u001b[33m \u001b[34m \u001b[35m \u001b[36m \u001b[37m \u001b[38m \u001b[39m \u001b[39m  \u001b[38m \u001b[37m \u001b[36m \u001b[35m \u001b[34m \u001b[33m \u001b[32m \u001b[31m \u001b[90m " + }, + "break", ] } diff --git a/config/fastfetch/nixos.png b/config/fastfetch/nixos.png new file mode 100644 index 0000000..11593f6 Binary files /dev/null and b/config/fastfetch/nixos.png differ diff --git a/config/hypr/UserConfigs/ENVariables.conf b/config/hypr/UserConfigs/ENVariables.conf index ea4af03..679a94e 100644 --- a/config/hypr/UserConfigs/ENVariables.conf +++ b/config/hypr/UserConfigs/ENVariables.conf @@ -27,22 +27,24 @@ env = MOZ_ENABLE_WAYLAND,1 env = ELECTRON_OZONE_PLATFORM_HINT,auto # NVIDIA -# This is from Hyprland Wiki. As a start, WLR_NO_HARDWARE_CURSORS 1 will be activated if nvidia gpu detected +# This is from Hyprland Wiki. Below will be activated nvidia gpu detected #env = LIBVA_DRIVER_NAME,nvidia #env = __GLX_VENDOR_LIBRARY_NAME,nvidia +#env = NVD_BACKEND,direct + +# additional ENV's for nvidia. Caution, activate with care #env = GBM_BACKEND,nvidia-drm #env = __NV_PRIME_RENDER_OFFLOAD,1 #env = __VK_LAYER_NV_optimus,NVIDIA_only #env = WLR_DRM_NO_ATOMIC,1 -#env = NVD_BACKEND,direct + # FOR VM and POSSIBLY NVIDIA -#env = WLR_NO_HARDWARE_CURSORS,1 +#env = WLR_NO_HARDWARE_CURSORS,1 # On hyprland >v0.41, now configured on variable cursor section #env = WLR_RENDERER_ALLOW_SOFTWARE,1 # nvidia firefox (for hardware acceleration on FF)? # check this post https://github.com/elFarto/nvidia-vaapi-driver#configuration #env = MOZ_DISABLE_RDD_SANDBOX,1 -#env = NVD_BACKEND,direct #env = EGL_PLATFORM,wayland \ No newline at end of file diff --git a/config/hypr/UserConfigs/UserSettings.conf b/config/hypr/UserConfigs/UserSettings.conf index 8d137cc..fe5e92f 100644 --- a/config/hypr/UserConfigs/UserSettings.conf +++ b/config/hypr/UserConfigs/UserSettings.conf @@ -3,7 +3,7 @@ # This is where you put your own settings as this will not be touched during update # if the upgrade.sh is used. -# refer to Hyprland wiki for more info https://wiki.hyprland.org/Configuring/Variables +# refer to Hyprland wiki for more info https://wiki.hyprland.org/Configuring/Variables/ # Sourcing colors generated by wallust source = $HOME/.config/hypr/wallust/wallust-hyprland.conf @@ -18,17 +18,19 @@ dwindle { } master { - new_is_master=1 + #new_is_master=1 # comment this when Hyprland release a new version or you are running the git version + new_status=master # hyprland upstream or git version (next release maybe v0.41-2 or v0.42) new_on_top=1 mfact = 0.5 } general { - sensitivity=1.00 - apply_sens_to_raw=1 + sensitivity = 1.00 + border_size = 2 + apply_sens_to_raw = 1 gaps_in = 6 gaps_out = 8 - border_size = 2 + resize_on_border = true col.active_border = $color0 $color2 $color9 $color12 $color15 90deg @@ -37,14 +39,6 @@ general { layout = dwindle } -group { - col.border_active = $color15 - - groupbar { - col.active = $color0 - } -} - decoration { rounding = 10 @@ -56,21 +50,22 @@ decoration { dim_strength = 0.1 dim_special = 0.8 - drop_shadow=true - shadow_range=6 + drop_shadow = true + shadow_range = 6 shadow_render_power = 1 col.shadow = $color12 col.shadow_inactive = 0x50000000 blur { - enabled = true - size = 6 - passes = 2 - ignore_opacity = true - new_optimizations = true - special = true + enabled = true + size = 6 + passes = 2 + ignore_opacity = true + new_optimizations = true + special = true } } + animations { enabled = yes @@ -91,63 +86,88 @@ animations { } input { - kb_layout=us - kb_variant= - kb_model= - kb_options= - kb_rules= - repeat_rate=50 - repeat_delay=300 - numlock_by_default=true - left_handed=false - follow_mouse=true - float_switch_override_focus=false + kb_layout = us + kb_variant = + kb_model = + kb_options = + kb_rules = + repeat_rate = 50 + repeat_delay = 300 + numlock_by_default = true + left_handed = false + follow_mouse = true + float_switch_override_focus = false touchpad { - disable_while_typing=true - natural_scroll=false - clickfinger_behavior=false - middle_button_emulation=true - tap-to-click=true - drag_lock=false + disable_while_typing = true + natural_scroll = false + clickfinger_behavior = false + middle_button_emulation = true + tap-to-click = true + drag_lock = false } + + # below for devices with touchdevice ie. touchscreen + touchdevice { + enabled = true + } + + # below is for table see link above for proper variables + tablet { + transform = 0 + left_handed = 0 + } } gestures { - workspace_swipe=true - workspace_swipe_fingers=3 - workspace_swipe_distance=400 - workspace_swipe_invert=true - workspace_swipe_min_speed_to_force=30 - workspace_swipe_cancel_ratio=0.5 - workspace_swipe_create_new=true - workspace_swipe_forever=true + workspace_swipe = true + workspace_swipe_fingers = 3 + workspace_swipe_distance = 500 + workspace_swipe_invert = true + workspace_swipe_min_speed_to_force = 30 + workspace_swipe_cancel_ratio = 0.5 + workspace_swipe_create_new = true + workspace_swipe_forever = true + #workspace_swipe_use_r = true #uncomment if wanted a forever create a new workspace with swipe right +} + + +group { + col.border_active = $color15 + + groupbar { + col.active = $color0 + } } misc { disable_hyprland_logo = true disable_splash_rendering = true - mouse_move_enables_dpms = true + vfr = true #vrr = 0 + mouse_move_enables_dpms = true enable_swallow = true - no_direct_scanout = true #for fullscreen games - focus_on_activate = false swallow_regex = ^(kitty)$ - #disable_autoreload = true + focus_on_activate = false + no_direct_scanout = true #for fullscreen games + initial_workspace_tracking = 0 + middle_click_paste = false } binds { - workspace_back_and_forth=true - allow_workspace_cycles=true - pass_mouse_when_bound=false + workspace_back_and_forth = true + allow_workspace_cycles = true + pass_mouse_when_bound = false } #Could help when scaling and not pixelating xwayland { - force_zero_scaling = true + force_zero_scaling = true } -# cursor section for Hyprland v0.41.0 or newer -#cursor { -# enable_hyprcursor = true -#} +# cursor section for Hyprland >= v0.41.0 +cursor { + no_hardware_cursors = false + enable_hyprcursor = true + warp_on_change_workspace = true # for -git or Hyprland >v0.41.1 +} diff --git a/config/hypr/UserScripts/QuickEdit.sh b/config/hypr/UserScripts/QuickEdit.sh index da6a893..cd60461 100755 --- a/config/hypr/UserScripts/QuickEdit.sh +++ b/config/hypr/UserScripts/QuickEdit.sh @@ -9,16 +9,16 @@ configs="$HOME/.config/hypr/configs" UserConfigs="$HOME/.config/hypr/UserConfigs" menu(){ - printf "1. view Env-variables\n" - printf "2. view Window-Rules\n" - printf "3. view Startup_Apps\n" - printf "4. view User-Keybinds\n" - printf "5. view Monitors\n" - printf "6. view Laptop-Keybinds\n" - printf "7. view User-Settings\n" - printf "8. view Workspace-Rules\n" - printf "9. view Default-Settings\n" - printf "10. view Default-Keybinds\n" + printf "1. edit Env-variables\n" + printf "2. edit Window-Rules\n" + printf "3. edit Startup_Apps\n" + printf "4. edit User-Keybinds\n" + printf "5. edit Monitors\n" + printf "6. edit Laptop-Keybinds\n" + printf "7. edit User-Settings\n" + printf "8. edit Workspace-Rules\n" + printf "9. edit Default-Settings\n" + printf "10. edit Default-Keybinds\n" } main() { diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf index 94dc637..e4362ea 100644 --- a/config/hypr/hyprlock.conf +++ b/config/hypr/hyprlock.conf @@ -51,8 +51,7 @@ label { text = cmd[update:18000000] echo " "$(date +'%A, %-d %B %Y')" " color = $color12 font_size = 34 - font_family = JetBrains Mono Nerd Font 10 - + font_family = JetBrains Mono Nerd Font Mono ExtraBold position = 0, -150 halign = center valign = top @@ -64,7 +63,7 @@ label { text = cmd[update:18000000] echo " "$(date +'Week %U')" " color = $color5 font_size = 24 - font_family = JetBrains Mono Nerd Font 10 + font_family = JetBrains Mono Nerd Font Mono ExtraBold position = 0, -250 halign = center valign = top @@ -76,9 +75,8 @@ label { #text = cmd[update:1000] echo " $(date +"%I:%M:%S %p") " # AM/PM text = cmd[update:1000] echo " $(date +"%H:%M:%S") " # 24H color = $color15 - font_size = 94 - font_family = JetBrains Mono Nerd Font 10 - + font_size = 150 + font_family = AlfaSlabOne position = 0, 0 halign = center valign = center @@ -103,19 +101,21 @@ label { text = cmd[update:60000] echo " "$(uptime -p || $Scripts/UptimeNixOS.sh)" " color = $color12 font_size = 24 - font_family = JetBrains Mono Nerd Font 10 + font_family = JetBrains Mono Nerd Font Mono ExtraBold position = 0, 0 halign = right valign = bottom } -# weather edit specific location. Note, this cause a 2-4 seconds delay in locking +# weather edit the scripts for locations +# weather scripts are located in ~/.config/hypr/UserScripts Weather.sh and/or Weather.py +# see https://github.com/JaKooLit/Hyprland-Dots/wiki/TIPS#%EF%B8%8F-weather-app-related-for-waybar-and-hyprlock label { monitor = text = cmd[update:3600000] [ -f ~/.cache/.weather_cache ] && cat ~/.cache/.weather_cache color = $color12 font_size = 24 - font_family = JetBrains Mono Nerd Font 10 + font_family = JetBrains Mono Nerd Font Mono ExtraBold position = 50, 0 halign = left valign = bottom diff --git a/config/hypr/scripts/SwitchKeyboardLayout.sh b/config/hypr/scripts/SwitchKeyboardLayout.sh index cbacd74..55bdf99 100755 --- a/config/hypr/scripts/SwitchKeyboardLayout.sh +++ b/config/hypr/scripts/SwitchKeyboardLayout.sh @@ -8,7 +8,7 @@ notif="$HOME/.config/swaync/images/bell.png" # Check if ~/.cache/kb_layout exists and create it with a default layout from Settings.conf if not found if [ ! -f "$layout_f" ]; then - default_layout=$(grep 'kb_layout=' "$settings_file" | cut -d '=' -f 2 | cut -d ',' -f 1 2>/dev/null) + default_layout=$(grep 'kb_layout = ' "$settings_file" | cut -d '=' -f 2 | cut -d ',' -f 1 2>/dev/null) if [ -z "$default_layout" ]; then default_layout="us" # Default to 'us' layout if Settings.conf or 'kb_layout' is not found fi @@ -19,7 +19,7 @@ current_layout=$(cat "$layout_f") # Read keyboard layout settings from Settings.conf if [ -f "$settings_file" ]; then - kb_layout_line=$(grep 'kb_layout=' "$settings_file" | cut -d '=' -f 2) + kb_layout_line=$(grep 'kb_layout = ' "$settings_file" | cut -d '=' -f 2) IFS=',' read -ra layout_mapping <<< "$kb_layout_line" fi diff --git a/config/hypr/v2.2.14 b/config/hypr/v2.3 similarity index 100% rename from config/hypr/v2.2.14 rename to config/hypr/v2.3 diff --git a/config/waybar/modules b/config/waybar/modules index 4590e8c..3132cc4 100644 --- a/config/waybar/modules +++ b/config/waybar/modules @@ -487,8 +487,8 @@ "network#speed": { "interval": 1, "format": "{ifname}", - "format-wifi": "{icon}  {bandwidthUpBits}  {bandwidthDownBits}", - "format-ethernet": "󰌘  {bandwidthUpBits}  {bandwidthDownBits}", + "format-wifi": "{icon}  {bandwidthUpBytes}  {bandwidthDownBytes}", + "format-ethernet": "󰌘  {bandwidthUpBytes}  {bandwidthDownBytes}", "format-disconnected": "󰌙", "tooltip-format": "{ipaddr}", "format-linked": "󰈁 {ifname} (No IP)", diff --git a/copy.sh b/copy.sh index afbe8a5..e828348 100755 --- a/copy.sh +++ b/copy.sh @@ -45,15 +45,15 @@ xdg-user-dirs-update 2>&1 | tee -a "$LOG" || true # uncommenting WLR_NO_HARDWARE_CURSORS if nvidia is detected if lspci -k | grep -A 2 -E "(VGA|3D)" | grep -iq nvidia; then echo "Nvidia GPU detected. Setting up proper env's" 2>&1 | tee -a "$LOG" || true - sed -i '/env = WLR_NO_HARDWARE_CURSORS,1/s/^#//' config/hypr/UserConfigs/ENVariables.conf sed -i '/env = LIBVA_DRIVER_NAME,nvidia/s/^#//' config/hypr/UserConfigs/ENVariables.conf sed -i '/env = __GLX_VENDOR_LIBRARY_NAME,nvidia/s/^#//' config/hypr/UserConfigs/ENVariables.conf + sed -i '/env = NVD_BACKEND,direct/s/^#//' config/hypr/UserConfigs/ENVariables.conf fi # uncommenting WLR_RENDERER_ALLOW_SOFTWARE,1 if running in a VM is detected if hostnamectl | grep -q 'Chassis: vm'; then echo "System is running in a virtual machine." 2>&1 | tee -a "$LOG" || true - sed -i '/env = WLR_NO_HARDWARE_CURSORS,1/s/^#//' config/hypr/UserConfigs/ENVariables.conf + sed -i 's/^\([[:space:]]*no_hardware_cursors[[:space:]]*=[[:space:]]*\)false/\1true/' config/hypr/UserConfigs/UserSettings.conf sed -i '/env = WLR_RENDERER_ALLOW_SOFTWARE,1/s/^#//' config/hypr/UserConfigs/ENVariables.conf sed -i '/monitor = Virtual-1, 1920x1080@60,auto,1/s/^#//' config/hypr/UserConfigs/Monitors.conf fi @@ -120,8 +120,8 @@ while true; do case $confirm in [yY]) - # If the detected layout is correct, update the 'kb_layout=' line in the file - awk -v layout="$layout" '/kb_layout/ {$0 = " kb_layout=" layout} 1' config/hypr/UserConfigs/UserSettings.conf > temp.conf + # If the detected layout is correct, update the 'kb_layout =' line in the file + awk -v layout="$layout" '/kb_layout/ {$0 = " kb_layout = " layout} 1' config/hypr/UserConfigs/UserSettings.conf > temp.conf mv temp.conf config/hypr/UserConfigs/UserSettings.conf echo "${NOTE} kb_layout $layout configured in settings. " 2>&1 | tee -a "$LOG" @@ -138,8 +138,8 @@ while true; do read -p "${CAT} - Please enter the correct keyboard layout: " new_layout - # Update the 'kb_layout=' line with the correct layout in the file - awk -v new_layout="$new_layout" '/kb_layout/ {$0 = " kb_layout=" new_layout} 1' config/hypr/UserConfigs/UserSettings.conf > temp.conf + # Update the 'kb_layout =' line with the correct layout in the file + awk -v new_layout="$new_layout" '/kb_layout/ {$0 = " kb_layout = " new_layout} 1' config/hypr/UserConfigs/UserSettings.conf > temp.conf mv temp.conf config/hypr/UserConfigs/UserSettings.conf echo "${NOTE} kb_layout $new_layout configured in settings." 2>&1 | tee -a "$LOG" break ;;