diff --git a/bash/.bashrc b/bash/.bashrc index bf31eda..8aca872 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -171,18 +171,23 @@ alias sha1='openssl sha1' alias clickpaste='sleep 3; xdotool type "$(xclip -o -selection clipboard)"' +# fzf aliases +# use fp to do a fzf search and preview the files +alias fp="fzf --preview 'bat --style=numbers --color=always --line-range :500 {}'" +# search for a file and open with nvim +alias vf='nvim $(fp)' ####################################################### # SPECIAL FUNCTIONS ####################################################### -chezedit() { - if [ -z "$1" ]; then - echo "Usage: chezedit " - return 1 - fi - chezmoi edit "$1" && chezmoi apply "$1" -} +#chezedit() { +# if [ -z "$1" ]; then +# echo "Usage: chezedit " +# return 1 +# fi +# chezmoi edit "$1" && chezmoi apply "$1" +#} # Extracts any archive(s) (if unp isn't installed) extract() { diff --git a/hypr/.config/hypr/hyprland.conf b/hypr/.config/hypr/hyprland.conf index 4f24f3e..cd74cc2 100644 --- a/hypr/.config/hypr/hyprland.conf +++ b/hypr/.config/hypr/hyprland.conf @@ -136,7 +136,9 @@ dwindle { } master { - new_status = master +# new_status = master + new_status = inherit + mfact = 0.50 } misc { @@ -178,7 +180,8 @@ device { $mainMod = SUPER # Sets "Windows" key as main modifier # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more -bindd = $mainMod, return, Launch a terminal, exec, $terminal bash --rcfile ~/.dotfiles/bash/.bashrc +#bindd = $mainMod, return, Launch a terminal, exec, $terminal bash --rcfile ~/.dotfiles/bash/.bashrc +bindd = $mainMod, return, Launch a terminal, exec, $terminal bindd = $mainMod, B, Launch the default browser, exec, $browser bindd = $mainMod, C, Launch Visual Studio Code, exec, $editor bindd = $mainMod, N, Launch Neovim, exec, $editor-alt @@ -187,9 +190,11 @@ bindd = $mainMod, M, Exit Hyprland, exit, bindd = $mainMod, E, Launch the file manager, exec, $fileManager bindd = $mainMod, W, Toggle floating, togglefloating, bindd = $mainMod, space, Launch menu, exec, $menu +bind = $mainMod, O, layoutmsg, swapwithmaster bind = $mainMod, P, pseudo, # dwindle bind = $mainMod, J, togglesplit, # dwindle +bindd = $mainMod, I, Switch between master/dwingle, exec, $HOME/.config/hypr/switchlayout.sh bindd = $mainMod, S, Launch menu to modify/create script, exec, autoscriptmenu bindd = $mainMod, period, Launch the Emoji Picker, exec, jome -d | wl-copy #Emojipicker + clipboard copy @@ -239,7 +244,7 @@ bindm = $mainMod, mouse:272, movewindow bindm = $mainMod, mouse:273, resizewindow # Color picker -bindd = $mainMod, P, Color Picker, exec, $colorPicker | wl-copy +#bindd = $mainMod, P, Color Picker, exec, $colorPicker | wl-copy # Screen locking bindd = $mainMod, L, Lock the screen, exec, hyprlock diff --git a/hypr/.config/hypr/monitors.conf b/hypr/.config/hypr/monitors.conf new file mode 100644 index 0000000..3c0bae5 --- /dev/null +++ b/hypr/.config/hypr/monitors.conf @@ -0,0 +1,3 @@ +# Generated by nwg-displays on 2024-10-24 at 08:24:17. Do not edit manually. + +monitor=DP-3,3440x1440@59.97,0x0,1.0 diff --git a/hypr/.config/hypr/switchlayout.sh b/hypr/.config/hypr/switchlayout.sh new file mode 100755 index 0000000..a30b719 --- /dev/null +++ b/hypr/.config/hypr/switchlayout.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env sh +case "$(hyprctl -j getoption general:layout | jq -r .str)" in + dwindle) hyprctl keyword general:layout master + notify-send "Switched to MASTER layout" + ;; + master) hyprctl keyword general:layout dwindle + notify-send "Switch to DWINDLE layout" + ;; +esac diff --git a/hypr/.config/hypr/workspaces.conf b/hypr/.config/hypr/workspaces.conf new file mode 100644 index 0000000..6c172d6 --- /dev/null +++ b/hypr/.config/hypr/workspaces.conf @@ -0,0 +1,12 @@ +# Generated by nwg-displays on 2024-10-24 at 08:24:46. Do not edit manually. + +workspace=1,monitor:DP-3,default:true +workspace=2,monitor:DP-3 +workspace=3,monitor:DP-3 +workspace=5,monitor:DP-3 +workspace=4,monitor:DP-3 +workspace=6,monitor:DP-3 +workspace=7,monitor:DP-3 +workspace=8,monitor:DP-3 +workspace=9,monitor:DP-3 +workspace=10,monitor:DP-3 diff --git a/hypr/.config/kanshi/config b/hypr/.config/kanshi/config index 85dba84..94e1adc 100644 --- a/hypr/.config/kanshi/config +++ b/hypr/.config/kanshi/config @@ -2,3 +2,8 @@ profile home { output DP-4 position 0,0 output DP-5 disable } + +profile office { + output DP-3 position 0,0 +} + diff --git a/hypr/.config/waybar/config.jsonc b/hypr/.config/waybar/config.jsonc index 70a517e..d4a5c1e 100644 --- a/hypr/.config/waybar/config.jsonc +++ b/hypr/.config/waybar/config.jsonc @@ -13,6 +13,7 @@ "modules-center": ["hyprland/window"], "modules-right": [ "tray", + "custom/updates", "memory", "cpu", "network", @@ -25,6 +26,28 @@ // "wireplumber#microphone" ], + "custom/updates": { + "format": "{} {icon}", + "return-type": "json", + "format-icons": { + "has-updates": "󱍷", + "updated": "󰂪" + }, + "exec-if": "which waybar-module-pacman-updates", + "exec": "waybar-module-pacman-updates --interval-seconds 5 --network-interval-seconds 300" + }, + + +// "format": "{icon}{}", +// "return-type": "json", +// "format-icons": { +// "pending-updates": " ", +// "updated": " ", +// }, +// "exec-if": "which waybar-updates", +// "exec": "waybar-updates" +// }, + "hyprland/window": { "format": "󰣇 {}" }, diff --git a/hypr/.config/waybar/style.css b/hypr/.config/waybar/style.css index d8f2a97..64fb6a0 100644 --- a/hypr/.config/waybar/style.css +++ b/hypr/.config/waybar/style.css @@ -50,6 +50,7 @@ window#waybar { #memory, #workspaces, #tray, +#custom-updates, #backlight { background: #1e1e2e; padding: 0px 10px; @@ -81,7 +82,7 @@ window#waybar { } #memory { - border-radius: 10px 0px 0px 10px; +/* border-radius: 10px 0px 0px 10px;*/ } #window { @@ -97,10 +98,18 @@ window#waybar { border-right: 0px; } +#custom-updates { + color: #a6adc8; + border-radius: 10px 0px 0px 10px; +} + +#idle_inhibitor{ + color: #a6adc8; +} + #network { color: #a6adc8; border-radius: 10px 0px 0px 10px; - } #pulseaudio {