diff --git a/README.md b/README.md
index 5c27caa..7f32da6 100644
--- a/README.md
+++ b/README.md
@@ -6,14 +6,14 @@ This repository holds my Linux config files.
New version as of January 2023:
-[![dotfiles](media/dotfiles6.png)](media/dotfiles6.png)
+[![dotfiles](media/2024-dracula.png)](media/2024-dracula.png)
-I changed the color of the terminal to match the i3bar:
-
-
+[![dotfiles](media/2024-dracula-2.png)](media/2024-dracula-2.png)
Older versions:
+- [dotfiles6](media/dotfiles6.png)
+- [dotfiles5-small](media/dotfiles-small-5.png)
- [dotfiles5](media/dotfiles5.png)
- [dotfiles4](https://raw.githubusercontent.com/Mastermindzh/dotfiles/master/media/dotfiles4.jpg)
- [dotfiles3](media/dotfiles3.png)
@@ -31,13 +31,13 @@ Older versions:
| Package managers | Pacman & Trizen |
| OS | Arch Linux |
| Terminal | xfce4-terminal |
-| Editor | nano |
+| Editor | nano & mousepad |
| Code editor | vscode |
| Browser | Firefox |
-| File manager | If I have to use one ... Thunar |
+| File manager | Thunar |
| Music | Tidal through [Tidal-hifi](https://github.com/Mastermindzh/tidal-hifi) |
-## computer specifc setup
+## computer specific setup
Nowadays I use a few different computers and I used to apply the base config and configure each pc on its own.
I've grown tired of this approach however so I added a "pc specific" setup in the installer.
@@ -49,8 +49,8 @@ This allows me to get pc specific settings synced with git and applied easily.
Some things are handled by window class/title or have custom resolutions set, the tools below help obtain the info required:
-- xprop -> displays static xwindow info including Window class
-- xwininfo -> displays xwindow info including current size/position
+- `xprop` -> displays static `xwindow` info including Window class
+- `xwininfo` -> displays `xwindow` info including current size/position
## getting icons
diff --git a/bash/.alias.sh b/bash/.alias.sh
index 2a40a38..a02680a 100644
--- a/bash/.alias.sh
+++ b/bash/.alias.sh
@@ -21,7 +21,7 @@ alias remove-orphans='sudo pacman -Rns $(pacman -Qtdq)'
alias updatekeys='sudo pacman-key --refresh-key'
alias updatemirrors='sudo reflector --latest 20 --protocol http,https --sort rate --save /etc/pacman.d/mirrorlist'
alias clean-pacmancache='sudo paccache -rk 1 && sudo paccache -ruk0'
-alias clean-trizen-cache='sudo clean-trizen-cache'
+alias clean-trizen-cache='sudo trizen -Scc'
alias clean-trash='sudo rm -rf ~/.local/share/Trash/*'
alias clean-journal='sudo journalctl --vacuum-time=2d'
alias clean-pacman-unused='sudo pacman -R $(pacman -Qtdq)'
diff --git a/config/environment b/config/environment
index 3cd03df..635dfe1 100644
--- a/config/environment
+++ b/config/environment
@@ -5,4 +5,4 @@
#
XCURSOR_THEME="Adwaita"
EDITOR="nano"
-GTK_THEME=Adwaita-dark
+#GTK_THEME=Adwaita-dark
diff --git a/config/gtk/portals.conf b/config/gtk/portals.conf
deleted file mode 100644
index 0527934..0000000
--- a/config/gtk/portals.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[preferred]
-default=gtk;wlr
diff --git a/config/gtk/settings.ini b/config/gtk/settings.ini
index dbfcc1a..e16a71f 100644
--- a/config/gtk/settings.ini
+++ b/config/gtk/settings.ini
@@ -1,8 +1,8 @@
[Settings]
-gtk-theme-name=Adwaita-dark
+gtk-theme-name="Dracula"
gtk-font-name="Ubuntu 12"
-gtk-cursor-theme-name=Adwaita
-gtk-cursor-theme-size=0
+gtk-cursor-theme-name="Adwaita"
+gtk-cursor-theme-size=48
gtk-enable-event-sounds=1
gtk-enable-input-feedback-sounds=1
gtk-toolbar-style=GTK_TOOLBAR_BOTH
@@ -11,6 +11,8 @@ gtk-button-images=1
gtk-menu-images=1
gtk-xft-antialias=1
gtk-xft-hinting=1
-gtk-xft-hintstyle=hintmedium
-gtk-xft-rgba=none
+gtk-xft-hintstyle="hintfull"
+gtk-xft-rgba="none"
gtk-application-prefer-dark-theme=1
+gtk-decoration-layout=icon:close
+gtk-enable-animations=true
diff --git a/config/polybar/themes/main/bars.ini b/config/polybar/bars.ini
similarity index 100%
rename from config/polybar/themes/main/bars.ini
rename to config/polybar/bars.ini
diff --git a/config/polybar/config.ini b/config/polybar/config.ini
index 218fa0b..1536f30 100644
--- a/config/polybar/config.ini
+++ b/config/polybar/config.ini
@@ -21,6 +21,6 @@ screenchange-reload = true
pseudo-transparency = true
; theme
-include-file = ~/.config/polybar/themes/main/modules.ini
-include-file = ~/.config/polybar/themes/main/colors.ini
-include-file = ~/.config/polybar/themes/main/bars.ini
+include-file = ~/.config/polybar/modules.ini
+include-file = ~/.config/polybar/themes/dracula.ini
+include-file = ~/.config/polybar/bars.ini
diff --git a/config/polybar/themes/main/modules.ini b/config/polybar/modules.ini
similarity index 100%
rename from config/polybar/themes/main/modules.ini
rename to config/polybar/modules.ini
diff --git a/config/polybar/themes/main/colors.ini b/config/polybar/themes/dark.ini
similarity index 100%
rename from config/polybar/themes/main/colors.ini
rename to config/polybar/themes/dark.ini
diff --git a/config/polybar/themes/dracula.ini b/config/polybar/themes/dracula.ini
new file mode 100644
index 0000000..81ff014
--- /dev/null
+++ b/config/polybar/themes/dracula.ini
@@ -0,0 +1,11 @@
+[colors]
+background = #282a36
+background-alt = #BD93F9
+foreground = #f8f8f2
+primary = #bd93f9
+secondary = #ffb86c
+alert = #ff5555
+disabled = #6272a4
+accent = #fff
+tidal = #50FA7B
+yellow = #F1FA8C
diff --git a/config/rofi/rofi.rasi b/config/rofi/config.rasi
similarity index 72%
rename from config/rofi/rofi.rasi
rename to config/rofi/config.rasi
index 5196533..3a3f5bf 100644
--- a/config/rofi/rofi.rasi
+++ b/config/rofi/config.rasi
@@ -18,4 +18,11 @@ configuration {
window-format: "{w} · {c} · {t}";
}
-@theme "~/.config/rofi/mytheme.rasi"
+
+/*---- import color theme here ----*/
+/*@import "~/.config/rofi/themes/dark.rasi"*/
+@import "~/.config/rofi/themes/dracula.rasi"
+
+/*---- import theme here ----*/
+@import "~/.config/rofi/themes/base.rasi"
+
diff --git a/config/rofi/mytheme.rasi b/config/rofi/themes/base.rasi
similarity index 80%
rename from config/rofi/mytheme.rasi
rename to config/rofi/themes/base.rasi
index 4eefaae..8815085 100644
--- a/config/rofi/mytheme.rasi
+++ b/config/rofi/themes/base.rasi
@@ -1,38 +1,4 @@
-* {
- background: #1e1e1e;
- background-alt: #282B31FF;
- background-color: @background;
- foreground: #FFFFFFFF;
- foreground-normal: @foreground;
- selected: #61AFEFFF;
- active: #98C379FF;
- urgent: #E06C75FF;
-}
- * {
- border-colour: var(selected);
- handle-colour: var(selected);
- background-colour: var(background);
- foreground-colour: var(foreground);
- alternate-background: var(background-alt);
- normal-background: var(background);
- normal-foreground: var(foreground);
- urgent-background: var(urgent);
- urgent-foreground: var(background);
- active-background: var(active);
- active-foreground: var(background);
- selected-normal-background: var(selected);
- selected-normal-foreground: var(background);
- selected-urgent-background: var(active);
- selected-urgent-foreground: var(background);
- selected-active-background: var(urgent);
- selected-active-foreground: var(background);
- alternate-normal-background: var(background);
- alternate-normal-foreground: var(foreground);
- alternate-urgent-background: var(urgent);
- alternate-urgent-foreground: var(background);
- alternate-active-background: var(active);
- alternate-active-foreground: var(background);
-}
+
/*----Main Window */
window {
/* properties for window widget */
diff --git a/config/rofi/themes/dark.rasi b/config/rofi/themes/dark.rasi
new file mode 100644
index 0000000..fd676a0
--- /dev/null
+++ b/config/rofi/themes/dark.rasi
@@ -0,0 +1,25 @@
+* {
+ border-colour: #61AFEFFF;
+ handle-colour: #61AFEFFF;
+ background-colour: #1e1e1e;
+ foreground-colour: #FFFFFFFF;
+ alternate-background: #282B31FF;
+ normal-background: #1e1e1e;
+ normal-foreground: #FFFFFFFF;
+ urgent-background: #E06C75FF;
+ urgent-foreground: #1e1e1e;
+ active-background: #98C379FF;
+ active-foreground: #1e1e1e;
+ selected-normal-background: #61AFEFFF;
+ selected-normal-foreground: #1e1e1e;
+ selected-urgent-background: #98C379FF;
+ selected-urgent-foreground: #1e1e1e;
+ selected-active-background: #E06C75FF;
+ selected-active-foreground: #1e1e1e;
+ alternate-normal-background: #1e1e1e;
+ alternate-normal-foreground: #FFFFFFFF;
+ alternate-urgent-background: #E06C75FF;
+ alternate-urgent-foreground: #1e1e1e;
+ alternate-active-background: #98C379FF;
+ alternate-active-foreground: #1e1e1e;
+}
diff --git a/config/rofi/themes/dracula.rasi b/config/rofi/themes/dracula.rasi
new file mode 100644
index 0000000..9c2a884
--- /dev/null
+++ b/config/rofi/themes/dracula.rasi
@@ -0,0 +1,25 @@
+* {
+ border-colour: #bd93f9;
+ handle-colour: #bd93f9;
+ background-colour: #282a36;
+ foreground-colour: #ffffffff;
+ alternate-background: #6272a4;
+ normal-background: #282a36;
+ normal-foreground: #ffffffff;
+ urgent-background: #ff5555;
+ urgent-foreground: #282a36;
+ active-background: #50FA7B;
+ active-foreground: #282a36;
+ selected-normal-background: #bd93f9;
+ selected-normal-foreground: #282a36;
+ selected-urgent-background: #98c379ff;
+ selected-urgent-foreground: #282a36;
+ selected-active-background: #ff5555;
+ selected-active-foreground: #282a36;
+ alternate-normal-background: #282a36;
+ alternate-normal-foreground: #ffffffff;
+ alternate-urgent-background: #ff5555;
+ alternate-urgent-foreground: #282a36;
+ alternate-active-background: #98c379ff;
+ alternate-active-foreground: #282a36;
+}
diff --git a/config/terminal/xfce4-term/terminalrc b/config/terminal/xfce4-term/terminalrc
deleted file mode 100644
index eb6bc47..0000000
--- a/config/terminal/xfce4-term/terminalrc
+++ /dev/null
@@ -1,35 +0,0 @@
-[Configuration]
-BackgroundMode=TERMINAL_BACKGROUND_TRANSPARENT
-BackgroundDarkness=0.750000
-MiscAlwaysShowTabs=FALSE
-MiscBell=FALSE
-MiscBellUrgent=FALSE
-MiscBordersDefault=FALSE
-MiscCursorBlinks=FALSE
-MiscCursorShape=TERMINAL_CURSOR_SHAPE_BLOCK
-MiscDefaultGeometry=132x43
-MiscInheritGeometry=FALSE
-MiscMenubarDefault=FALSE
-MiscMouseAutohide=FALSE
-MiscMouseWheelZoom=TRUE
-MiscToolbarDefault=FALSE
-MiscConfirmClose=FALSE
-MiscCycleTabs=TRUE
-MiscTabCloseButtons=TRUE
-MiscTabCloseMiddleClick=TRUE
-MiscTabPosition=GTK_POS_TOP
-MiscHighlightUrls=TRUE
-MiscMiddleClickOpensUri=FALSE
-MiscCopyOnSelect=FALSE
-MiscDefaultWorkingDir=
-MiscRewrapOnResize=TRUE
-MiscUseShiftArrowsToScroll=FALSE
-MiscSlimTabs=TRUE
-MiscNewTabAdjacent=FALSE
-ScrollingUnlimited=TRUE
-ScrollingBar=TERMINAL_SCROLLBAR_NONE
-MiscShowRelaunchDialog=TRUE
-ColorCursor=#c5c5c8c8c6c6
-ColorForeground=#c5c5c8c8c6c6
-ColorPalette=#28282a2a2e2e;#a5a542424242;#8c8c94944040;#dede93935f5f;#5f5f81819d9d;#858567678f8f;#5e5e8d8d8787;#707078788080;#37373b3b4141;#cccc66666666;#b5b5bdbd6868;#f0f0c6c67474;#8181a2a2bebe;#b2b29494bbbb;#8a8abebeb7b7;#c5c5c8c8c6c6
-
diff --git a/config/xfce4/thunar.xml b/config/xfce4/thunar.xml
new file mode 100644
index 0000000..7733c96
--- /dev/null
+++ b/config/xfce4/thunar.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/config/xfce4/xfce4-power-manager.xml b/config/xfce4/xfce4-power-manager.xml
new file mode 100644
index 0000000..ee83709
--- /dev/null
+++ b/config/xfce4/xfce4-power-manager.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/config/xfce4/xfce4-settings-manager.xml b/config/xfce4/xfce4-settings-manager.xml
new file mode 100644
index 0000000..2e112e3
--- /dev/null
+++ b/config/xfce4/xfce4-settings-manager.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/config/xfce4/xfce4-terminal.xml b/config/xfce4/xfce4-terminal.xml
new file mode 100644
index 0000000..a494384
--- /dev/null
+++ b/config/xfce4/xfce4-terminal.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/config/xfce4/xsettings.xml b/config/xfce4/xsettings.xml
new file mode 100644
index 0000000..6f6b43c
--- /dev/null
+++ b/config/xfce4/xsettings.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dependencies/aur.txt b/dependencies/aur.txt
index fe4bd6a..14d43e9 100644
--- a/dependencies/aur.txt
+++ b/dependencies/aur.txt
@@ -25,3 +25,4 @@ awf-gtk4
azure-cli
sysmontask
kind
+dracula-gtk-theme-full
diff --git a/dependencies/pacman.txt b/dependencies/pacman.txt
index 7dcc086..e4e81c7 100644
--- a/dependencies/pacman.txt
+++ b/dependencies/pacman.txt
@@ -141,3 +141,5 @@ noto-fonts-emoji
otf-font-awesome
ttf-font-awesome
ttf-ubuntu-font-family
+fzf
+
diff --git a/i3/config b/i3/config
index ed28fb0..a95383a 100644
--- a/i3/config
+++ b/i3/config
@@ -13,18 +13,6 @@ floating_modifier $mod
# Constants #
############################################
-set $urgentTextBackgroundColour #a6a6a6
-set $primaryBackgroundColour #1e1e1e
-set $secondaryBackgroundColour #252526
-set $tertiaryBackgroundColour #333333
-
-set $textColour #848484
-set $focusedTextColour #f6f6f7
-
-set $statusLineColour #d1d4e0
-set $urgentTextColour #ef5350
-set $indicatorColour #fcc09e
-
set $workspace1 "1: "
set $workspace2 "2: "
set $workspace3 "3: "
@@ -208,7 +196,6 @@ bindsym $mod+Shift+w move container to workspace $workspace11
bindsym $mod+Shift+p move container to workspace $workspace12
bindsym $mod+Shift+g move container to workspace $workspace13
-
############################################
# Appearance settings #
############################################
@@ -218,11 +205,18 @@ new_window 1pixel
hide_edge_borders both
# Window Colours
-# border background text indicator
-client.focused $primaryBackgroundColour $primaryBackgroundColour $focusedTextColour $indicatorColour
-client.focused_inactive $secondaryBackgroundColour $secondaryBackgroundColour $textColour $indicatorColour
-client.unfocused $secondaryBackgroundColour $secondaryBackgroundColour $textColour $indicatorColour
-client.urgent $secondaryBackgroundColour $urgentTextBackgroundColour $urgentTextColour $indicatorColour
+# class border bground text indicator child_border
+# dark
+# client.focused #1e1e1e #1e1e1e #f6f6f7 #fcc09e
+# client.focused_inactive #252526 #252526 #848484 #fcc09e
+# client.unfocused #252526 #252526 #848484 #fcc09e
+# client.urgent #252526 #a6a6a6 #ef5350 #fcc09e
+# dracula
+client.focused #BD93F9 #BD93F9 #F8F8F2 #BD93F9 #BD93F9
+client.focused_inactive #44475A #44475A #F8F8F2 #44475A #44475A
+client.unfocused #282A36 #282A36 #BFBFBF #282A36 #282A36
+client.urgent #44475A #FF5555 #F8F8F2 #FF5555 #FF5555
+client.placeholder #282A36 #282A36 #F8F8F2 #282A36 #282A36
# Floating windows
for_window [class="Pavucontrol"] floating enable
@@ -241,8 +235,6 @@ for_window [class="Alert"] floating enable
############################################
assign [class="Bitwarden"] $workspace12 # moves all windows... including the browser popup
assign [class="VirtualBox Machine"] $workspace11
-
-# database stuff
assign [class="MongoDB Compass"] $workspace8
assign [class="robo3t"] $workspace8
assign [class="Brave-browser"] $workspace9
diff --git a/install.sh b/install.sh
index cac1615..797d6b1 100644
--- a/install.sh
+++ b/install.sh
@@ -92,10 +92,8 @@ function setDateTimeConfig {
}
function install_gtk {
- mkdir -p ~/.config/xdg-desktop-portal
mkdir -p "$HOME/.config/gtk-3.0"
mkdir -p "$HOME/.config/gtk-4.0"
- ln -sf "$PWD"/config/gtk/portals.conf ~/.config/xdg-desktop-portal/portals.conf
ln -sf "$PWD"/config/gtk/settings.ini ~/.gtkrc-2.0.mine
ln -sf "$PWD"/config/gtk/settings.ini ~/.config/gtk-3.0/settings.ini
ln -sf "$PWD"/config/gtk/settings.ini ~/.config/gtk-4.0/settings.ini
@@ -113,6 +111,8 @@ function install_config {
linkDir "$PWD"/config/terminal/xfce4-term ~/.config/xfce4/terminal
linkDir "$PWD"/config/polybar ~/.config/polybar
linkDir "$PWD"/config/poshthemes ~/.config/poshthemes
+ linkDir "$PWD"/config/xfce4 ~/.config/xfce4/xfconf/xfce-perchannel-xml
+ linkdir "$PWD"/config/rofi ~/.config/rofi
# link user files
ln -sf "$PWD"/bash/.aliases ~/
@@ -128,10 +128,6 @@ function install_config {
mkdir -p ~/.config/Code/User/globalStorage/zokugun.sync-settings
ln -sf "$PWD"/config/git/settings.yml ~/.config/Code/User/globalStorage/zokugun.sync-settings/settings.yml
- mkdir -p ~/.config/rofi
- ln -sf "$PWD"/config/rofi/rofi.rasi ~/.config/rofi/config.rasi
- ln -sf "$PWD"/config/rofi/mytheme.rasi ~/.config/rofi/mytheme.rasi
-
ln -sf "$PWD"/config/.gitconfig ~/.gitconfig
ln -sf "$PWD"/config/.npmrc ~/.npmrc
ln -sf "$PWD"/config/user-dirs.dirs ~/.config/user-dirs.dirs
diff --git a/media/2024-dracula-2.png b/media/2024-dracula-2.png
new file mode 100644
index 0000000..e985713
Binary files /dev/null and b/media/2024-dracula-2.png differ
diff --git a/media/2024-dracula.png b/media/2024-dracula.png
new file mode 100644
index 0000000..d44c01d
Binary files /dev/null and b/media/2024-dracula.png differ