diff --git a/.Xdefaults b/.Xdefaults
index 33b6cf4..ac46e40 100644
--- a/.Xdefaults
+++ b/.Xdefaults
@@ -1,7 +1,7 @@
-*.foreground: #ABB2BF
-*.background: #1A1C1E
-*.cursorColor: #5C6370
-*.highlightColor:#3A3F4B
+*.foreground: #c0caf5
+*.background: #1a1b26
+*.cursorColor: #c0caf5
+*.highlightColor:#364A82
!*fading: 40
!*fadeColor: S_base03
@@ -20,29 +20,32 @@
! 7 White 15 White
! Black colours
-*.color0: #1A1C1E
-*.color8: #151718
+*.color0: #1D202F
+*.color8: #414868
! Red colours
-*.color1: #E06C75
-*.color9: #E06C75
+*.color1: #f7768e
+*.color9: #f7768e
! Yellow colours
-*.color2: #98C379
-*.color10: #98C379
+*.color2: #9ece6a
+*.color10: #9ece6a
! Green colours
-*.color3: #D19A66
-*.color11: #D19A66
+*.color3: #e0af68
+*.color11: #e0af68
! Blue colours
-*.color4: #61AFEF
-*.color12: #61AFEF
+*.color4: #7aa2f7
+*.color12: #7aa2f7
! Magenta (pink, !green) colours
-*.color5: #C678DD
-*.color13: #C678DD
+*.color5: #bb9af7
+*.color13: #bb9af7
! Cyan (blue + green)
-*.color6: #56B6C2
-*.color14: #56B6C2
+*.color6: #7dcfff
+*.color14: #7dcfff
! White colours
-*.color7: #ABB2BF
-*.color15: #FFFFFF
+*.color7: #a9b1d6
+*.color15: #c0caf5
+
+*.color16: #ff9e64
+*.color17: #db4b4b
! xterm.vt100.faceName: Terminus:style=Regular:size=10
! xterm.vt100.faceNameDoublesize: Cyberbit:style=Regular:size=10
@@ -61,7 +64,8 @@ URxvt*urgentOnBell: true
URxvt*scrollTtyOutput: false
URxvt*scrollWithBuffer: true
URxvt*scrollTtyKeypress: true
-URxvt.font: xft:Consolas:pixelsize=12, xft:Segoe UI Symbol:style=Regular:pixelsize=12, xft:Unifont:pixelsize=12
+URxvt.font: xft:bitstream vera sans mono:size=12:antialias=true
+URxvt.boldFont: xft:bitstream vera sans mono:bold:size=12:antialias=true
URxvt.letterSpace : -2 ! Put characters slightly closer together
URxvt.termName : rxvt-unicode-256color
!Urxvt*termName: screen-256color
diff --git a/.bash_profile b/.bash_profile
new file mode 100644
index 0000000..a4ec022
--- /dev/null
+++ b/.bash_profile
@@ -0,0 +1,10 @@
+#
+# ~/.bash_profile
+#
+
+[[ -f ~/.bashrc ]] && . ~/.bashrc
+#startx
+if [ -n "$DESKTOP_SESSION" ];then
+ eval $(gnome-keyring-daemon --start)
+ export SSH_AUTH_SOCK
+fi
diff --git a/.config/kanshi/config b/.config/kanshi/config
index 406ac4f..00cc3f3 100644
--- a/.config/kanshi/config
+++ b/.config/kanshi/config
@@ -7,4 +7,9 @@
output eDP-1 enable mode 1920x1080@60.008Hz position 0,2160
}
+{
+ output "Goldstar Company Ltd LG ULTRAGEAR 103NTXR8Q458" mode 2560x1440@99.946Hz position 0,0
+ output eDP-1 enable mode 1920x1080@60.008Hz position 0,1440
+}
+
diff --git a/.config/sway/config b/.config/sway/config
index 13c9e40..ac208de 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -1,5 +1,6 @@
######### Configuration #########
### the easy stuff ###
+ font pango: SF Pro Display 14
# Key to do all the things (Mod1=Alt, Mod4=Super/Windows)
set $mod Mod4
@@ -26,8 +27,8 @@
# Borders
# Also removes all title bars
- #for_window [class="^.*"] border pixel 2
- default_border pixel 3
+ for_window [class="^.*"] border pixel 2
+ default_border pixel 2
# Floating windows get no borders >:(
default_floating_border pixel 0
@@ -43,12 +44,12 @@
# Gaps
# I like big gaps and I can not lie
- set $default_gaps_inner 12
- set $default_gaps_outer 12
+ set $default_gaps_inner 10
+ set $default_gaps_outer 2
gaps inner $default_gaps_inner
gaps outer $default_gaps_outer
gaps top 0
- # gaps bottom 10
+ gaps bottom 10
# Hide gaps when there is only 1 window
smart_gaps on
@@ -165,9 +166,9 @@
bindsym XF86MonBrightnessUp exec light -A 5
# Screenshot / share shortcuts
- bindsym Print exec "grim ~/Pictures/Screenshot-$(date -Iseconds | cut -d'+' -f1).png"
+ bindsym Print exec "grim /home/marco/screenShares/Screenshot-$(date -Iseconds | cut -d'+' -f1).png"
bindsym $mod+Print exec "grim -g "$(slurp)" - | wl-copy"
- bindsym Shift+Print exec "wf-recorder -f ~/Pictures/Screenshot-$(date -Iseconds | cut -d'+' -f1).mp4"
+ bindsym $mod+Shift+Print exec "wf-recorder -a -o eDP-1 -f /home/marco/screenShares/Screenstream-$(date -Iseconds | cut -d'+' -f1).mp4"
######### Resizing Containers #########
@@ -213,6 +214,9 @@
for_window [app_id="firefox" title="Picture-in-Picture"] floating enable
for_window [app_id="firefox" title="Pushbullet – Mozilla Firefox"] floating enable
for_window [app_id="firefox" title="About Mozilla Firefox"] floating enable
+ for_window [class="Gimp-2.10"] floating disable
+ for_window [class="Gimp-2.10" title="Create a New Image"] floating enable
+ for_window [class="Gimp-2.10" title="Brushes - Layers | Toolbox - Tool Options"] floating enable
# Brave, chrome, chromium
for_window [title="Picture-in-picture"] floating enable
@@ -222,29 +226,42 @@
# Assign programs to workspace
assign [class="firefox"] → number 2
+ assign [app_id="firefox"] → number 2
assign [class="code"] → number 4
assign [class="discord"] → number 5
- assign [class="Spotify"] → number 5
- assign [class="Nemo"] → number 3
- for_window [class="Gimp"] floating disable
- for_window [class="Gimp-2.10"] floating disable
+ assign [class="Spotify"] → number 6
+ assign [class="Audacity"] → number 6
+ assign [class="Gmpc"] → number 6
+ assign [app_id="ario"] → number 6
+ assign [class="Thunderbird"] → number 8
+ assign [class="Bitwarden"] → number 9
+ # Some programs can be stubborn since they open a splash window before opening
+ for_window [class="discord"] move to workspace number 5
+ for_window [class="Spotify"] move to workspace number 6
+ for_window [class="Gimp-2.10"] move to workspace number 7
######### Launch Programs #########
### We need dis stuff ###
+# Notification thing
+ exec mako &
+
# Applets
exec nm-applet --indicator &
exec blueman-applet &
+# Arch update notifications
+ exec kalu &
+
# Clipboard manager
- exec wl-paste -t text --watch clipman store
+ exec wl-paste -t text --watch clipman store &
# fingerprint reader
exec lxsession &
# Auto set monitor properties
- exec kanshi &
+ exec_always pkill kanshi; exec kanshi &
# Autotiling based on window dimensions
exec autotiling &
@@ -255,6 +272,9 @@
exec code &
exec discord &
exec spotify &
+ exec ario &
+ exec gimp &
+ exec bitwarden &
# Finally start waybar
exec /home/marco/.config/waybar/launch.sh &
diff --git a/.config/waybar/config b/.config/waybar/config
index 3ee181d..b1e4dfe 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -1,9 +1,10 @@
{
"layer": "top",
"position": "top",
+ "height": 40,
"modules-left": ["sway/workspaces", "sway/mode", "sway/window"],
"modules-center": ["clock"],
- "modules-right": ["custom/recorder", "tray", "pulseaudio", "backlight", "temperature", "custom/cpu_speed", "battery", "network", "custom/powermenu"],
+ "modules-right": ["custom/recorder", "tray", "pulseaudio", "backlight", "temperature", "cpu", "memory", "battery", "network", "custom/powermenu"],
"sway/mode": {
"format": " {}"
},
@@ -13,19 +14,21 @@
"disable-markup": false,
"format": "{icon}",
"format-icons": {
- "1": "1 ",
- "2": "2 ",
- "3": "3 ",
- "4": "4 ",
- "5": "5 ",
- "6": "6 ",
- "7": "6 ",
- "8": "6 "
+ "1": "1 ",
+ "2": "2 ",
+ "3": "3 ",
+ "4": "4 ",
+ "5": "5 ",
+ "6": "6 ",
+ "7": "7 ",
+ "8": "8 ",
+ "9": "9 ",
+ "10": "0 "
}
},
"tray": {
"icon-size": 20,
- "spacing": 10
+ "spacing": 8
},
"sway/window": {
"max-length": 60,
@@ -34,41 +37,43 @@
},
"clock": {
"format": "{:%a %d %b - %H:%M}",
- "tooltip": false,
- "on-click": "gnome-calendar"
+ "tooltip": false
},
- "custom/cpu_speed": {
- "interval": 10,
- "return-type": "json",
- "exec": "~/.config/waybar/modules/cpu_speed.sh",
- "format": "{icon} {}",
- "format-icons": [""],
- "escape": true,
- "on-click": "urxvt -e htop"
+ "cpu": {
+ "interval": 5,
+ "format": "︁ {}%",
+ "max-length": 10
+ },
+ "memory": {
+ "interval": 15,
+ "format": "︁ {used:0.1f}G/{total:0.1f}G",
+ "tooltip": false
},
"custom/powermenu": {
"return-type": "json",
- "exec": "~/.config/waybar/modules/powermenu.sh",
+ "exec": "/home/marco/.config/waybar/modules/powermenu.sh",
"format": "{icon} {}",
"format-icons": [""],
"interval": 3600,
"escape": true,
- "on-click": "home/marco/.config/wofi/wofi-power.sh"
+ "on-click": "/home/marco/.config/wofi/wofi-power.sh"
},
"custom/recorder": {
- "format": "",
+ "format": "!",
"return-type": "json",
- "interval": 4,
+ "interval": 3,
"exec": "echo '{\"class\": \"recording\"}'",
- "exec-if": "pgrep wf-recorder"
+ "exec-if": "pgrep wf-recorder",
+ "tooltip": false,
+ "on-click": "killall -s SIGINT wf-recorder"
},
"battery": {
- "format": "{icon} {capacity}% - {time}",
+ "format": "{icon} {capacity}%{time}",
"format-icons": ["", "", "", "", ""],
- "format-time": "{H}h{M}m",
+ "format-time": " ({H}h{M}m)",
"format-charging": " {icon} {capacity}% - {time}",
"format-full": " {icon} Charged",
- "interval": 30,
+ "interval": 15,
"states": {
"warning": 25,
"critical": 10
@@ -77,17 +82,16 @@
},
"network": {
"format": "{icon}",
- "format-alt": "{ipaddr}/{cidr} {icon}",
- "format-alt-click": "click-right",
- "format-wifi": " {essid} ({signalStrength}%)",
- "format-ethernet": " {ifname}",
+ "format-alt": "︁ ︁{ipaddr}/{cidr} {icon}",
+ "format-alt-click": "click-left",
+ "format-wifi": " {essid} ({signalStrength}%)",
+ "format-ethernet": "︁ {ifname}",
"format-disconnected": "⚠ Disconnected",
- "on-click": "urxvt -e /home/marco/sway/scripts/network-manager",
"tooltip": false
},
"pulseaudio": {
- "format": "{icon:2} {volume:4}%",
- "format-alt": "{icon:2} {volume:4}%",
+ "format": "{icon:2}{volume}%",
+ "format-alt": "{icon:2}{volume}%",
"format-alt-click": "click-right",
"format-muted": "",
"format-icons": {
@@ -99,10 +103,10 @@
"tooltip": false
},
"backlight": {
- "format": "{icon}",
- "format-alt": "{percent}% {icon}",
- "format-alt-click": "click-right",
- "format-icons": ["", ""],
+ "format": "{icon} {percent}%",
+ "format-alt": "{icon}",
+ "format-alt-click": "click-left",
+ "format-icons": ["", ""],
"on-scroll-up": "light -A 1",
"on-scroll-down": "light -U 1"
},
@@ -111,6 +115,7 @@
"critical-threshold": 75,
"interval": 5,
"format": "{icon} {temperatureC}°",
+ "tooltip": false,
"format-icons": [
"", // Icon: temperature-empty
"", // Icon: temperature-quarter
diff --git a/.config/waybar/modules/cpu_speed.sh b/.config/waybar/modules/cpu_speed.sh
deleted file mode 100755
index 9dec0b8..0000000
--- a/.config/waybar/modules/cpu_speed.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-class=cpu_speed
-speed_mhz=$(lscpu | grep "CPU MHz" | sed --expression "s/CPU MHz:[[:space:]]*//g" | xargs printf "%.*f\n" 0)
-
-# speed_ghz=`echo $(($speed_mhz / 1000))`
-
-speed_ghz=`bc -l <<< "$speed_mhz / 1000"`
-
-info=$(echo $speed_ghz | xargs printf "%.*f\n" 2)
-
-echo -e "{\"text\":\""$info GHz"\", \"class\":\""$class"\"}"
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 79bc69a..27755a5 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -1,6 +1,6 @@
#waybar {
- font-family: "Fira Sans SemiBold";
- font-size: 13px;
+ font-family: "SF Pro Display", Cantarell, Noto Sans, sans-serif;
+ font-size: 16px;
}
#window {
@@ -14,7 +14,7 @@ window#waybar {
text-shadow: none;
transition-duration: 0s;
color: rgba(217, 216, 216, 1);
- background: rgba(0, 0, 0, 0.87);
+ background: rgba(0, 0, 0, 0.72);
}
#workspaces {
@@ -24,8 +24,9 @@ window#waybar {
#workspaces button {
padding: 0 8px;
color: rgba(217, 216, 216, 0.4);
- border: 3px solid rgba(217, 216, 216, 0);
+ border: 3px solid rgba(9, 85, 225, 0);
border-radius: 10px;
+ min-width: 33px;
}
#workspaces button.visible {
@@ -33,39 +34,35 @@ window#waybar {
}
#workspaces button.focused {
- border-top: 3px solid rgba(217, 216, 216, 1);
- border-bottom: 3px solid rgba(217, 216, 216, 1);
+ border-top: 3px solid #4470ad;
+ border-bottom: 3px solid #4470ad;
}
#workspaces button.urgent {
- background-color: #943432;
+ background-color: #a96d1f;
color: white;
}
#workspaces button:hover {
box-shadow: inherit;
- border-color: #d1be8b;
- color: #888888;
+ border-color: #1e88e5;
+ color: #1e88e5;
}
/* Repeat style here to ensure properties are overwritten as there's no !important and button:hover above resets the colour */
#workspaces button.focused {
- color: white;
+ color: #4470ad;
}
#pulseaudio {
/* font-size: 26px; */
}
-#custom-cpu_speed {
- min-width: 82px;
-}
-
#custom-recorder {
font-size: 18px;
margin: 2px 7px 0px 7px;
- color:#c9545d;
+ color:rgba(238, 46, 36, 1);
}
#tray,
diff --git a/.config/wofi/colors.rasi b/.config/wofi/colors.rasi
index 78f39bb..cfe5c00 100644
--- a/.config/wofi/colors.rasi
+++ b/.config/wofi/colors.rasi
@@ -2,9 +2,9 @@
* {
al: #00000000;
- bg: #1A1C1EFF;
- bga: #151718FF;
- fga: #ABB2BFFF;
- fg: #ABB2BFFF;
- ac: #4470adFF;
+ bg: #1a1b26FF;
+ bga: #414868FF;
+ fga: #c0caf5FF;
+ fg: #c0caf5FF;
+ ac: #364A82FF;
}
diff --git a/.config/wofi/launcher.rasi b/.config/wofi/launcher.rasi
index 4fbc64b..f42585a 100644
--- a/.config/wofi/launcher.rasi
+++ b/.config/wofi/launcher.rasi
@@ -16,9 +16,9 @@ window {
transparency: "real";
background-color: @bg;
text-color: @fg;
- border: 0px 0px 4px 0px;
+ border: 1px 3px 5px 1px;
border-color: @ac;
- border-radius: 0px;
+ border-radius: 2px;
width: 600px;
location: center;
x-offset: 0;
diff --git a/.config/wofi/launcherSmoll.rasi b/.config/wofi/launcherSmoll.rasi
new file mode 100644
index 0000000..807b1ad
--- /dev/null
+++ b/.config/wofi/launcherSmoll.rasi
@@ -0,0 +1,107 @@
+configuration {
+ font: "Iosevka Nerd Font 10";
+ show-icons: true;
+ icon-theme: "Papirus";
+ display-drun: "";
+ drun-display-format: "{name}";
+ disable-history: false;
+ fullscreen: false;
+ hide-scrollbar: true;
+ sidebar-mode: false;
+}
+
+@import "colors.rasi"
+
+window {
+ transparency: "real";
+ background-color: @bg;
+ text-color: @fg;
+ border: 1px 3px 5px 1px;
+ border-color: @ac;
+ border-radius: 2px;
+ width: 150px;
+ location: center;
+ x-offset: 0;
+ y-offset: 0;
+}
+
+prompt {
+ enabled: false;
+ padding: 2px 0px 0px 4px;
+ background-color: @ac;
+ text-color: @ac;
+ font: "feather 12";
+}
+
+entry {
+ background-color: @al;
+ text-color: @fg;
+ placeholder-color: @fg;
+ expand: true;
+ horizontal-align: 0;
+ placeholder: "Search...";
+ padding: 2px 0px 0px 6px;
+ blink: true;
+}
+
+inputbar {
+ children: [ prompt, entry ];
+ background-color: @bga;
+ text-color: @fg;
+ expand: false;
+ enabled: false;
+ border: 0px;
+ border-radius: 0px;
+ border-color: @ac;
+ margin: 0px;
+ padding: 8px;
+}
+
+listview {
+ background-color: @al;
+ padding: 0px;
+ columns: 1;
+ lines: 6;
+ spacing: 6px;
+ cycle: true;
+ dynamic: true;
+ layout: vertical;
+}
+
+mainbox {
+ background-color: @al;
+ border: 0px;
+ border-radius: 0px;
+ border-color: @ac;
+ children: [ inputbar, listview ];
+ spacing: 6px;
+ padding: 6px;
+}
+
+element {
+ background-color: @al;
+ text-color: @fga;
+ orientation: horizontal;
+ border-radius: 0px;
+ padding: 8px;
+}
+
+element-icon {
+ size: 24px;
+ border: 0px;
+}
+
+element-text {
+ expand: true;
+ horizontal-align: 0;
+ vertical-align: 0.5;
+ margin: 0px 2.5px 0px 2.5px;
+}
+
+element selected {
+ background-color: @bga;
+ text-color: @fg;
+ border: 0px 0px 0px 0px;
+ border-radius: 0px;
+ border-color: @ac;
+}
diff --git a/.config/wofi/wofi-power.sh b/.config/wofi/wofi-power.sh
index bcfe8f3..4455fd6 100755
--- a/.config/wofi/wofi-power.sh
+++ b/.config/wofi/wofi-power.sh
@@ -1,15 +1,16 @@
#!/bin/sh
-poweroff_command="systemctl poweroff"
-reboot_command="systemctl reboot"
-logout_command="swaymsg exit"
-hibernate_command="systemctl hibernate"
-suspend_command="systemctl suspend"
+Shutdown_command="systemctl poweroff"
+Reboot_command="systemctl reboot"
+Logout_command="swaymsg exit"
+Hibernate_command="systemctl hibernate"
+Suspend_command="systemctl suspend"
+Back_command=""
# you can customise the rofi command all you want ...
-rofi_command="rofi -width 10 -hide-scrollbar -bg #586e75 -opacity 100 -padding 5 -theme ~/.config/wofi/launcher.rasi"
-options=$'poweroff\nreboot\nlogout\nhibernate\nsuspend'
+rofi_command="rofi -theme /home/marco/.config/wofi/launcherSmoll.rasi"
+options=$'Back\nShutdown\nLogout\nReboot\nHibernate\nSuspend'
# ... because the essential options (-dmenu and -p) are added here
eval \$"$(echo "$options" | $rofi_command -dmenu -p "")_command"
\ No newline at end of file