refactor(config): update config files

gerblesh · Apr 15, 2024 · bb31830 · bb31830
1 parent a8ed627
commit bb31830
Show file tree

Hide file tree

Showing 39 changed files with 1,667 additions and 2,717 deletions.
diff --git a/config/common.yml b/config/common.yml
@@ -1,7 +1,7 @@
 modules:
   - type: files
     files:
-      - homedir: /usr/etc/homedir
+      #- homedir: /usr/etc/homedir
       - usr: /usr # copy static configurations
                   # configuration you wish to end up in /etc/ on the booted system should be
                   # added into /usr/etc/ as that is the proper "distro" config directory on ostree

diff --git a/config/files/framework/foot/foot.ini b/config/files/framework/foot/foot.ini
@@ -1,6 +1,6 @@
 # -*- conf -*-
 
-shell=/bin/fish 
+shell=/bin/fish
 #(if set, otherwise user's default shell from /etc/passwd)
 #term=foot
 #(or xterm-256color if built with -Dterminfo=disabled)
@@ -10,24 +10,24 @@ shell=/bin/fish
 # title=foot
 # locked-title=no
 
-font=OverpassMono Nerd Font Mono:size=8
-# font-bold=<bold variant of regular font>
+font=JetBrainsMonoNerdFont:size=15
+#font-bold=OverpassMono Nerd Font Mono:size=16
 # font-italic=<italic variant of regular font>
 # font-bold-italic=<bold+italic variant of regular font>
-# font-size-adjustment=0.5
+font-size-adjustment=0.5
 # line-height=<font metrics>
 # letter-spacing=0
 # horizontal-letter-offset=0
 # vertical-letter-offset=0
 # underline-offset=<font metrics>
 # underline-thickness=<font underline thickness>
 # box-drawings-uses-font-glyphs=no
-dpi-aware=true
+dpi-aware=false
 
 # initial-window-size-pixels=700x500  # Or,
 # initial-window-size-chars=<COLSxROWS>
 # initial-window-mode=windowed
-pad=20x20                             
+pad=3x3 center
 # optionally append 'center'
 # resize-delay-ms=100
 
@@ -45,7 +45,7 @@ pad=20x20
 [bell]
 urgent=yes
 notify=yes
-# command=
+command=foot-bell
 # command-focused=no
 
 [scrollback]
@@ -62,18 +62,18 @@ notify=yes
 # uri-characters=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.,~:;/?#@!$&%*+="'()[]
 
 [cursor]
-# style=block
-# color=<inverse foreground/background>
+#style=beam
+color=1e1e2e f5e0dc
 # blink=no
-# beam-thickness=1.5
+#beam-thickness=0.1
 # underline-thickness=<font underline thickness>
 
 [mouse]
 # hide-when-typing=no
 # alternate-scroll-mode=yes
 
 [colors]
-alpha = 0.7
+alpha = 0.98
 foreground=cdd6f4 # Text
 background=1e1e2e # Base
 regular0=45475a   # Surface 1

diff --git a/config/files/framework/sway/config b/config/files/framework/sway/config
@@ -1,7 +1,6 @@
-exec /usr/share/ublue-os/firstboot/launcher/autostart.sh
 
 set $XDG_CONFIG_HOME ~/.config
 
 include "$XDG_CONFIG_HOME/sway/config.d/*.conf"
-include "/usr/share/sway/config.d/*.conf"
-include "/etc/sway/config.d/*.conf"
+#include "/usr/share/sway/config.d/*.conf"
+#include "/etc/sway/config.d/*.conf"
diff --git a/...iles/framework/sway/config.d/00theme.conf → ...iles/framework/sway/config.d/0-theme.conf b/...iles/framework/sway/config.d/00theme.conf → ...iles/framework/sway/config.d/0-theme.conf
@@ -1,3 +1,4 @@
+# vim:ft=config
 
 set $text_color #cdd6f4
 
@@ -8,7 +9,7 @@ set $indicator_color #a6e3a1
 set $bg_color #1e1e2e
 set $unfocused_color #181825
 
-set $font_family OverpassMono Nerd Font
+set $font_family JetBrainsMonoNerdFont
 set $font_size 14
 
 set $cursor_theme Catppuccin-Mocha-Dark-Cursors
@@ -19,17 +20,18 @@ seat seat0 xcursor_theme $cursor_theme $cursor_size
 default_border pixel 2
 hide_edge_borders smart
 
-font pango:$font_family $font_size
-client.focused          $accent_color    $bg_color        $text_color $indicator_color $accent_color
-client.focused_inactive $warning_color   $bg_color        $text_color $indicator_color $unfocused_color
+font pango:$font_family Semi-Bold $font_size
+
+client.focused          $bg_color        $accent_color    $bg_color   $indicator_color $accent_color
+client.focused_inactive $bg_color        $warning_color   $bg_color   $indicator_color $unfocused_color
 client.unfocused        $unfocused_color $unfocused_color $text_color $indicator_color
-client.urgent           $urgent_color    $bg_color        $text_color $indicator_color $urgent_color
+client.urgent           $bg_color        $urgent_color    $bg_color   $indicator_color $urgent_color
 client.placeholder      #000000          #0c0c0c          $text_color #000000          #333845
 client.background       $bg_color
 
 exec_always {
     gsettings set org.gnome.desktop.interface gtk-theme 'adw-gtk3-dark'
-    gsettings set org.gnome.desktop.interface icon-theme 'Papirus-Dark'
+    gsettings set org.gnome.desktop.interface icon-theme 'Catppuccin-SE'
     gsettings set org.gnome.desktop.interface text-scaling-factor "1.25"
     gsettings set org.gnome.desktop.interface color-scheme prefer-dark
     gsettings set org.gnome.desktop.interface cursor-theme $cursor_theme

diff --git a/config/files/framework/sway/config.d/binds.conf b/config/files/framework/sway/config.d/binds.conf
@@ -1,17 +1,19 @@
+# vim:ft=config
+
 set $mod Mod4
 set $mod2 Mod1
 
-set $left $mod2+a
-set $down $mod2+s
-set $up $mod2+w
-set $right $mod2+d
+set $left h
+set $down j
+set $up k
+set $right l
 
-set $term foot
+set $term wezterm
 set $menu fuzzel
 
 #basics
     bindsym $mod+w exec $term
-    bindsym $mod+Shift+w exec $term distrobox enter fedora
+#    bindsym $mod+Shift+w exec $term fish -c ~/.local/bin/tmux-sessions.sh
 
 
     bindsym $mod+q kill
@@ -24,7 +26,7 @@ set $menu fuzzel
     bindsym $mod+Shift+c reload
 
     # Exit sway (logs you out of your Wayland session)
-    bindsym $mod+Shift+l exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'
+    bindsym $mod+Shift+t exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'
 
     bindsym $mod+$left focus left
     bindsym $mod+$down focus down
@@ -36,6 +38,8 @@ set $menu fuzzel
     bindsym $mod+Up focus up
     bindsym $mod+Right focus right
 
+    bindsym $mod+b focus prev
+
     bindsym $mod+Shift+$left move left
     bindsym $mod+Shift+$down move down
     bindsym $mod+Shift+$up move up
@@ -93,6 +97,8 @@ set $menu fuzzel
     # Move focus to the parent container
     bindsym $mod+a focus parent
 
+    # this here line is brokey broke
+
 # Scratchpad:
     # Sway has a "scratchpad", which is a bag of holding for windows.
     # You can send windows there and get them back later.
@@ -106,10 +112,10 @@ set $menu fuzzel
 
 mode "resize" {
 
-    bindsym $left resize shrink width 100px
-    bindsym $down resize shrink height 100px
-    bindsym $up resize grow height 100px
-    bindsym $right resize grow width 100px
+    bindsym $left resize shrink width 300px
+    bindsym $down resize shrink height 300px
+    bindsym $up resize grow height 300px
+    bindsym $right resize grow width 300px
 
     bindsym Left resize shrink width 100px
     bindsym Down resize shrink height 100px
@@ -120,7 +126,7 @@ mode "resize" {
     bindsym Escape mode "default"
 }
 
-bindsym $mod+Ctrl+r mode "resize"
+bindsym $mod+Shift+r mode "resize"
 
 # volume controls (special keys on keyboard)
 bindsym --locked XF86AudioMute exec wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle && /usr/bin/volume-change.sh
@@ -144,7 +150,7 @@ bindsym $mod+g exec /usr/bin/screenshot.sh screen
 bindsym $mod+Shift+g exec /usr/bin/screenshot.sh area
 
 # Screen locking
-bindsym $mod+l exec /usr/bin/lock.sh
+bindsym $mod+semicolon exec /usr/bin/lock.sh
 
 # logout menu
 bindsym $mod+Escape exec /usr/bin/logout-menu.sh
@@ -169,3 +175,9 @@ bindsym $mod+Shift+e exec thunar
 bindsym $mod+v exec cliphist list | fuzzel --dmenu --prompt=" 󱘣  " | cliphist decode | wl-copy
 bindsym $mod+Shift+v exec cliphist list | fuzzel --dmenu --prompt=" 󱘝  " | cliphist delete
 bindsym $mod+Shift+x exec wl-copy --clear && rm ~/.cache/cliphist/db && notify-send "Clipboard" "Clipboard Cleared!" --icon "xclipboard" --app-name="cliphist"
+
+
+# EXTREMELY IMPORTANT SHORTCUST!
+
+bindsym $mod+Shift+Ctrl+Alt+l exec xdg-open https://linkedin.com
+
diff --git a/config/files/framework/sway/config.d/execs.conf b/config/files/framework/sway/config.d/execs.conf
@@ -1,5 +1,4 @@
 
-exec /usr/bin/battery.sh
 exec blueman-applet
 exec nm-applet
 exec wl-paste --watch cliphist store
@@ -14,3 +13,5 @@ exec /usr/bin/sway-autoname-workspaces.py
 exec /usr/libexec/polkit-gnome-authentication-agent-1
 exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway XCURSOR_THEME=$XCURSOR_THEME XCURSOR_SIZE=$XCURSOR_SIZE
 exec systemd-notify --ready
+exec /usr/bin/battery.sh
+
diff --git a/config/files/framework/sway/config.d/monitors.conf b/config/files/framework/sway/config.d/monitors.conf
@@ -1,8 +1,7 @@
-exec wallpaper init
+exec /usr/bin/wallpaper init
 
 bar {
    swaybar_command waybar
 }
 
 output eDP-1 scale 1.0
-
diff --git a/config/files/framework/sway/config.d/rules.conf b/config/files/framework/sway/config.d/rules.conf
@@ -1 +1,5 @@
 for_window [class="^.*"] inhibit_idle fullscreen
+for_window [app_id="^.*"] inhibit_idle fullscreen
+
+for_window [app_id="floatterm"] floating enable
+for_window [app_id="imv"] floating enable
diff --git a/config/files/framework/waybar/autoname.json b/config/files/framework/waybar/autoname.json
@@ -0,0 +1,32 @@
+{
+    "firefox": "",
+    "godot_engine": "",
+    "foot": "",
+    "brave-browser": "",
+    "lite-xl": "",
+    "dev.alextren.spot": "",
+    "com.github.neithern.g4music": "󰝚",
+    "thunar": "󰪶",
+    "mpv": "󰈫",
+    "imv": "",
+    "com.obsproject.studio": "󰑋",
+    "obsidian": "󱓧",
+    "mullvad vpn": "󰒄",
+    "signal": "󰆉",
+    "librewolf": "󰈹",
+    "de.haeckerfelix.fragments": "󱑣",
+    "steamwebhelper": "󰓓",
+    "dolphin-emu": "󱢴",
+    "yuzu": "󰟡",
+    "info.cemu.cemu": "󰜭",
+    "otpclient": "󰥿",
+    "com.github.tchx84.flatseal": "",
+    "com.github.gradienceteam.gradience.devel": "",
+    "io.github.flattool.warehouse": "",
+    "io.missioncenter.missioncenter": "󰨇",
+    "gnome-boxes": "󰹑",
+    "blender": "󰂫",
+    "com.usebottles.bottles": "󰡶",
+    "org.gnome.world.pikabackup": "󰁯",
+    "org.gnome.clocks": ""
+}
diff --git a/config/files/framework/waybar/config b/config/files/framework/waybar/config
@@ -1,3 +1,4 @@
+// vim:ft=jsonc
 // =============================================================================
 //
 // Waybar configuration
@@ -11,7 +12,7 @@
     // Global configuration
     // -------------------------------------------------------------------------
 
-
+    "layer": "top",
     "position": "top",
     // If height property would be not present, it'd be calculated dynamically
     "height": 48,
@@ -30,7 +31,7 @@
         "backlight",
         "custom/power-profile",
         "battery",
-        "idle_inhibitor",
+        "idle_inhibitor"
     ],
 
 
@@ -135,6 +136,56 @@
         "format": "{value}",
     },
 
+    "pulseaudio/slider": {
+        "min": 0,
+        "max": 100,
+        "orientation": "horizontal"
+    },
+    "hyprland/workspaces": {
+        "format": "{name}{icon}{windows}",
+        "format-window-separator": " ",
+        "window-rewrite-default": "",
+        "window-rewrite": {
+            "firefox": "",
+            "class<Godot>": "",
+            "title<.*discord.*>": "󰙯",
+            "foot": "",
+            "kitty": "",
+            "brave-browser": "",
+            "pragtical": "",
+            "dev.alextren.spot": "",
+            "com.github.neithern.g4music": "󰝚",
+            "thunar": "󰪶",
+            "mpv": "󰈫",
+            "imv": "",
+            "com.obsproject.studio": "󰑋",
+            "obsidian": "󱓧",
+            "mullvad vpn": "󰒄",
+            "signal": "󰆉",
+            "librewolf": "󰈹",
+            "firefox": "󰈹",
+            "de.haeckerfelix.fragments": "󱑣",
+            "steamwebhelper": "󰓓",
+            "dolphin-emu": "󱢴",
+            "yuzu": "󰟡",
+            "info.cemu.cemu": "󰜭",
+            "otpclient": "󰥿",
+            "com.github.tchx84.flatseal": "",
+            "com.github.gradienceteam.gradience.devel": "",
+            "io.github.flattool.warehouse": "",
+            "io.missioncenter.missioncenter": "󰨇",
+            "gnome-boxes": "󰹑",
+            "blender": "󰂫",
+            "com.usebottles.bottles": "󰡶",
+            "org.gnome.world.pikabackup": "󰁯",
+            "org.gnome.clocks": ""
+        },
+        "format-icons": {
+            "default": ": ",
+            "empty": ""
+        }
+    },
+
     "pulseaudio": {
         "scroll-step": 1,
         "format": "{icon} {volume}%",
@@ -208,7 +259,7 @@
         "tooltip": true,
         "return-type": "json",
         "interval": 10,
-        "on-click": "/etc/xdg/waybar/scripts/powerprofile-menu.sh",
-        "exec": "/etc/xdg/waybar/scripts/powerprofile.sh",
+        "on-click": "$HOME/.config/waybar/scripts/powerprofile-menu.sh",
+        "exec": "$HOME/.config/waybar/scripts/powerprofile.sh",
     }
 }