[Fish] Add git pull rebase alias

This reverts commit 53d90fc8f5.

config/astal/util/colours.scss

@@ -1,6 +1,6 @@
-$fg-color: #E6E6E6;
-$bg-color: #141414;
-$accent-color: #EBC405;
-$accent-color-2: #B81C15;
-$shadow-color: rgba(40, 40, 40, 0.3);
+$fg-color: #C8DCFF;
+$bg-color: #0A0A0F;
+$accent-color: #565656;
+$accent-color-2: #565656;
+$shadow-color: rgba(0, 0, 2, 0.3);
 $monospace-font: Source Code Pro

config/fish/config.fish

@@ -3,6 +3,7 @@ alias ll='ls -la --color'
 alias v='nvim'
 alias i='vimiv'
 alias c='clear'
+alias cv='clear && nvim'
 alias zs='zathura-sandbox'
 alias z='zathura'
 alias bt='bashtop'
@@ -12,6 +13,7 @@ alias gl='git ls-files --others --exclude-standard'
 alias gm='git ls-files -m'
 alias gpu='git push'
 alias gp='git pull'
+alias gpr='git pull --rebase'
 alias gc='git commit -a -m'
 alias ga='git add ./*'
 alias cfh='nvim ~/projects/dotfiles/config/hypr/'

config/fish/fish_frozen_theme.fish

@@ -0,0 +1,37 @@
+# This file was created by fish when upgrading to version 4.3, to migrate
+# theme variables from universal to global scope.
+# Don't edit this file, as it will be written by the web-config tool (`fish_config`).
+# To customize your theme, delete this file and see
+#     help interactive#syntax-highlighting
+# or
+#     man fish-interactive | less +/^SYNTAX.HIGHLIGHTING
+# for appropriate commands to add to ~/.config/fish/config.fish instead.
+# See also the release notes for fish 4.3.0 (run `help relnotes`).
+
+set --global fish_color_autosuggestion 555 brblack
+set --global fish_color_cancel -r
+set --global fish_color_command blue
+set --global fish_color_comment red
+set --global fish_color_cwd green
+set --global fish_color_cwd_root red
+set --global fish_color_end green
+set --global fish_color_error brred
+set --global fish_color_escape brcyan
+set --global fish_color_history_current --bold
+set --global fish_color_host normal
+set --global fish_color_host_remote yellow
+set --global fish_color_normal normal
+set --global fish_color_operator brcyan
+set --global fish_color_param cyan
+set --global fish_color_quote yellow
+set --global fish_color_redirection cyan --bold
+set --global fish_color_search_match white --background=brblack
+set --global fish_color_selection white --bold --background=brblack
+set --global fish_color_status red
+set --global fish_color_user brgreen
+set --global fish_color_valid_path --underline
+set --global fish_pager_color_completion normal
+set --global fish_pager_color_description B3A06D yellow -i
+set --global fish_pager_color_prefix normal --bold --underline
+set --global fish_pager_color_progress brwhite --background=cyan
+set --global fish_pager_color_selected_background -r

config/fish/fish_variables

@@ -1,33 +0,0 @@
-# This file contains fish universal variable definitions.
-# VERSION: 3.0
-SETUVAR __fish_initialized:3800
-SETUVAR fish_color_autosuggestion:555\x1ebrblack
-SETUVAR fish_color_cancel:\x2dr
-SETUVAR fish_color_command:blue
-SETUVAR fish_color_comment:red
-SETUVAR fish_color_cwd:green
-SETUVAR fish_color_cwd_root:red
-SETUVAR fish_color_end:green
-SETUVAR fish_color_error:brred
-SETUVAR fish_color_escape:brcyan
-SETUVAR fish_color_history_current:\x2d\x2dbold
-SETUVAR fish_color_host:normal
-SETUVAR fish_color_host_remote:yellow
-SETUVAR fish_color_normal:normal
-SETUVAR fish_color_operator:brcyan
-SETUVAR fish_color_param:cyan
-SETUVAR fish_color_quote:yellow
-SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold
-SETUVAR fish_color_search_match:white\x1e\x2d\x2dbackground\x3dbrblack
-SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
-SETUVAR fish_color_status:red
-SETUVAR fish_color_user:brgreen
-SETUVAR fish_color_valid_path:\x2d\x2dunderline
-SETUVAR fish_greeting:\x1d
-SETUVAR fish_key_bindings:fish_default_key_bindings
-SETUVAR fish_pager_color_completion:normal
-SETUVAR fish_pager_color_description:B3A06D\x1eyellow\x1e\x2di
-SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
-SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
-SETUVAR fish_pager_color_selected_background:\x2dr
-SETUVAR fish_user_paths:/usr/lib/python3\x2e11/site\x2dpackages\x1e/usr/lib/python3\x2e11\x1e/usr/lib/python3\x2e11/site\x2dpackages/\x1e/home/janis/\x2elocal/lib/python3\x2e11/site\x2dpackages/\x1e/home/janis/\x2elocal/lib/python3\x2e11/

config/hypr/hyprland/colors.conf

@@ -4,15 +4,15 @@
 #          ╰────────────────────────────────────────────────╯
 # ────────────────────────────────────────────────────────────────────
 
-exec = swaybg -m fill -i /home/janis/NextCloud/Wallpapers/hypercar/ferrari_499p.jpg
+exec = swaybg -m fill -i /home/janis/NextCloud/Wallpapers/other/there-is-no-place-like-home.jpg
 
 general {
-    col.active_border = rgba(ebc405cc) rgba(b81c15cc) rgba(673722cc) 45deg
+    col.active_border = rgba(565656cc) rgba(565656cc) rgba(dfdfdfcc) 45deg
     col.inactive_border = rgb(000000)
 }
 
 decoration {
     shadow {
-        color = rgb(282828)
+        color = rgb(000002)
     }
 }

config/hypr/hyprland/windowrules.conf

@@ -125,6 +125,11 @@ windowrule = no_screen_share on, match:class nm-connection-editor
 windowrule = no_screen_share on, match:title (.*)(secret)(.*)
 windowrule = no_screen_share on, match:class (.*)[aA]uthentication(.*)
 
+# ── LOVR config ─────────────────────────────────────────────────────
+windowrule = float on, match:title ^(.*)LÖVR(.*)$
+windowrule = size 1400 800, match:title ^(.*)LÖVR(.*)$
+windowrule = center on, match:title ^(.*)LÖVR(.*)$
+
 
 # ┌                                                ┐
 # │                  Layer rules                   │

config/hypr/hyprland_laptop.conf

@@ -18,7 +18,7 @@
 #          ╰────────────────────────────────────────────────╯
 # ────────────────────────────────────────────────────────────────────
 
-monitor=eDP-1, 2880x1800@60, 0x0, 1.5
+monitor=eDP-1, 2880x1800@120, 0x0, 1.5
 monitor=,highres highrr, auto, 1
 
 

config/hypr/hyprlock.conf

@@ -14,7 +14,7 @@
 # └                                                ┘
 background {
     monitor = 
-    path = /home/janis/NextCloud/Wallpapers/hypercar/ferrari_499p-closeup.jpg # Or screenshot
+    path = /home/janis/NextCloud/Wallpapers/hypercar/cadillac-v-r.jpg # Or screenshot
 
     blur_passes = 1
 }
@@ -29,7 +29,7 @@ input-field {
     dots_size = 0.33 # Scale of input-field height, 0.2 - 0.8
     dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0
     dots_center = false
-    outer_color = rgb(235, 196, 5)
+    outer_color = rgb(86, 86, 86)
     inner_color = rgb(200, 200, 200)
     font_color = rgb(10, 10, 10)
     fade_on_empty = true

config/rofi/style.rasi

@@ -1,10 +1,10 @@
 * {
-    background: #141414;
-    background-selected: #1E1E1E;
-    foreground: #E6E6E6;
-    accent: #EBC405;
-    accent-two: #B81C15;
-    // border-color: #673722;
+    background: #0A0A0F;
+    background-selected: #141419;
+    foreground: #C8DCFF;
+    accent: #565656;
+    accent-two: #565656;
+    // border-color: #DFDFDF;
     inactive: #C8C8C8;
     spacing: 2;
     width: 30em;

config/wlogout/style.css

@@ -7,7 +7,7 @@ window {
     font-family: monospace;
     font-size: 14pt;
     color: #ffffff; /* text */
-    background-color: rgba(20, 20, 20, 0.5);
+    background-color: rgba(10, 10, 15, 0.5);
 }
 
 button {
@@ -22,12 +22,12 @@ button {
 }
 
 button:hover {
-    background-color: rgba(184, 28, 21, 0.5);
+    background-color: rgba(86, 86, 86, 0.5);
 }
 
 button:focus {
-    background-color: rgb(184, 28, 21);
-    color: rgb(230, 230, 230);
+    background-color: rgb(86, 86, 86);
+    color: rgb(200, 220, 255);
 }
 
 #lock {

config/yazi/keymap.toml

@@ -23,10 +23,12 @@ prepend_keymap = [
     { on = [ "g", "c", "n" ],   run = "cd ~/projects/nvim",                                         desc = "Go to NeoVim config" },
     { on = [ "g", "n" ],        run = "cd ~/NextCloud/Documents/",                                  desc = "Go to NextCloud Documents" },
     { on = [ "g", "w" ],        run = "cd ~/NextCloud/Wallpapers",                                  desc = "Go to Wallpapers" },
-    { on = [ "g", "e", "n" ],   run = "cd ~/NextCloud/Documents/ETH/Semester3/",                    desc = "Go to ETH Nextcloud" },
-    { on = [ "g", "e", "p" ],   run = "cd ~/projects/eth/semesters/semester4/",                     desc = "Go to ETH git folder" },
+    { on = [ "g", "e", "n" ],   run = "cd ~/NextCloud/Documents/ETH/Semester4/",                    desc = "Go to ETH Nextcloud" },
+    { on = [ "g", "e", "p" ],   run = "cd ~/projects/eth/projects/",                                desc = "Go to ETH projects folder" },
+    { on = [ "g", "e", "a" ],   run = "cd ~/projects/eth/semesters/semester4/",                     desc = "Go to ETH assignments folder" },
+    { on = [ "g", "e", "t" ],   run = "cd ~/NextCloud/Documents/ETH/Others/projects/eyetap/",       desc = "Go to eyetap data folder" },
     { on = [ "g", "e", "g" ],   run = "cd ~/projects/eth/gitlab/",                                  desc = "Go to ETH Gitlab folder" },
-    { on = [ "g", "e", "s" ],   run = "cd ~/projects/eth/eth-summaries/semester3/",                 desc = "Go to ETH Summaries folder" },
+    { on = [ "g", "e", "s" ],   run = "cd ~/projects/eth/eth-summaries/semester4/",                 desc = "Go to ETH Summaries folder" },
     { on = [ "g", "s", "h" ],   run = "cd ~/.steam/steam/steamapps/common",                         desc = "Go to ~/.steam/steam/steamapps/common" },
     { on = [ "g", "s", "g" ],   run = "cd /mnt/games/SteamLibrary",                                 desc = "Go to SteamLibrary on NTFS partition" },
     { on = [ "g", "s", "s" ],   run = "cd /mnt/secondary/SteamLibrary",                             desc = "Go to SteamLibrary on main games drive" },

config/yazi/theme.toml

@@ -1,3 +1,3 @@
 [flavor]
-dark = "vscode-dark-modern"
-light = "vscode-dark-modern"
+dark = "tokyo-night"
+light = "tokyo-night"

gtk-theme/dist/colours.css

@@ -19,13 +19,13 @@
 /*
  * ── Foreground color, main interface text colour ─────────────────────
 */
-@define-color fg #E6E6E6;
-@define-color fg_rgba_07 rgba(230, 230, 230, 0.7);
-@define-color fg_rgba_06 rgba(230, 230, 230, 0.6);
-@define-color fg_rgba_05 rgba(230, 230, 230, 0.5);
-@define-color fg_rgba_03 rgba(230, 230, 230, 0.3);
-@define-color fg_rgba_02 rgba(230, 230, 230, 0.2);
-@define-color fg_rgba_01 rgba(230, 230, 230, 0.1);
+@define-color fg #C8DCFF;
+@define-color fg_rgba_07 rgba(200, 220, 255, 0.7);
+@define-color fg_rgba_06 rgba(200, 220, 255, 0.6);
+@define-color fg_rgba_05 rgba(200, 220, 255, 0.5);
+@define-color fg_rgba_03 rgba(200, 220, 255, 0.3);
+@define-color fg_rgba_02 rgba(200, 220, 255, 0.2);
+@define-color fg_rgba_01 rgba(200, 220, 255, 0.1);
 
 /*
  * ── Foreground accent, usually brighter or darker than default ───────
@@ -40,40 +40,40 @@
 /*
  * ── Accent colour ────────────────────────────────────────────────────
 */
-@define-color accent #EBC405;
-@define-color accent_rgba_05 rgba(235, 196, 5, 0.5);
-@define-color accent_rgba_03 rgba(235, 196, 5, 0.3);
-@define-color accent_rgba_02 rgba(235, 196, 5, 0.2);
-@define-color accent_rgba_015 rgba(235, 196, 5, 0.15);
-@define-color accent_rgba_011 rgba(235, 196, 5, 0.11);
-@define-color accent_rgba_007 rgba(235, 196, 5, 0.07);
+@define-color accent #565656;
+@define-color accent_rgba_05 rgba(86, 86, 86, 0.5);
+@define-color accent_rgba_03 rgba(86, 86, 86, 0.3);
+@define-color accent_rgba_02 rgba(86, 86, 86, 0.2);
+@define-color accent_rgba_015 rgba(86, 86, 86, 0.15);
+@define-color accent_rgba_011 rgba(86, 86, 86, 0.11);
+@define-color accent_rgba_007 rgba(86, 86, 86, 0.07);
 
 /*
  * ── Accent Gradient ──────────────────────────────────────────────────
 */
-@define-color accent_gradient_1 #967D03;
-@define-color accent_gradient_2 #786403;
-@define-color accent_gradient_3 #605002;
-@define-color accent_gradient_4 #4D4002;
-@define-color accent_gradient_5 #3E3301;
-@define-color accent_gradient_inverse_1 #FFFF08;
-@define-color accent_gradient_inverse_2 #FFFF08;
-@define-color accent_gradient_inverse_3 #FFFF08;
+@define-color accent_gradient_1 #464646;
+@define-color accent_gradient_2 #3F3F3F;
+@define-color accent_gradient_3 #383838;
+@define-color accent_gradient_4 #333333;
+@define-color accent_gradient_5 #2E2E2E;
+@define-color accent_gradient_inverse_1 #6A6A6A;
+@define-color accent_gradient_inverse_2 #6A6A6A;
+@define-color accent_gradient_inverse_3 #6A6A6A;
 
 /*
  * ── Secondary accent colour ──────────────────────────────────────────
 */
-@define-color accent2 #B81C15;
-@define-color accent2_rgba_05 rgba(184, 28, 21, 0.5);
-@define-color accent2_rgba_03 rgba(184, 28, 21, 0.3);
-@define-color accent2_rgba_02 rgba(184, 28, 21, 0.2);
-@define-color accent2_rgba_015 rgba(184, 28, 21, 0.15);
-@define-color accent2_rgba_01 rgba(184, 28, 21, 0.1);
+@define-color accent2 #565656;
+@define-color accent2_rgba_05 rgba(86, 86, 86, 0.5);
+@define-color accent2_rgba_03 rgba(86, 86, 86, 0.3);
+@define-color accent2_rgba_02 rgba(86, 86, 86, 0.2);
+@define-color accent2_rgba_015 rgba(86, 86, 86, 0.15);
+@define-color accent2_rgba_01 rgba(86, 86, 86, 0.1);
 
 /*
  * ── Tertiary accent colour ───────────────────────────────────────────
 */
-@define-color accent3 #673722;
+@define-color accent3 #DFDFDF;
 
 /*
  * ── Inactive Colour ──────────────────────────────────────────────────
@@ -97,33 +97,33 @@
 /*
  * ── Background color, main interface background ──────────────────────
 */
-@define-color bg #141414;
-@define-color bg_rgba_07 rgba(20, 20, 20, 0.7);
-@define-color bg_rgba_05 rgba(20, 20, 20, 0.5);
-@define-color bg_rgba_03 rgba(20, 20, 20, 0.3);
-@define-color bg_rgba_02 rgba(20, 20, 20, 0.2);
-@define-color bg_rgba_015 rgba(20, 20, 20, 0.15);
-@define-color bg_rgba_011 rgba(20, 20, 20, 0.11);
+@define-color bg #0A0A0F;
+@define-color bg_rgba_07 rgba(10, 10, 15, 0.7);
+@define-color bg_rgba_05 rgba(10, 10, 15, 0.5);
+@define-color bg_rgba_03 rgba(10, 10, 15, 0.3);
+@define-color bg_rgba_02 rgba(10, 10, 15, 0.2);
+@define-color bg_rgba_015 rgba(10, 10, 15, 0.15);
+@define-color bg_rgba_011 rgba(10, 10, 15, 0.11);
 
 /*
  * ── Accent background color ──────────────────────────────────────────
 */
-@define-color bg_accent #1E1E1E;
-@define-color bg_accent_rgba_07 rgba(30, 30, 30, 0.7);
-@define-color bg_accent_rgba_06 rgba(30, 30, 30, 0.6);
-@define-color bg_accent_rgba_05 rgba(30, 30, 30, 0.5);
-@define-color bg_accent_rgba_04 rgba(30, 30, 30, 0.4);
-@define-color bg_accent_rgba_03 rgba(30, 30, 30, 0.3);
-@define-color bg_accent_rgba_02 rgba(30, 30, 30, 0.2);
-@define-color bg_accent_rgba_015 rgba(30, 30, 30, 0.15);
-@define-color bg_accent_rgba_01 rgba(30, 30, 30, 0.1);
+@define-color bg_accent #141419;
+@define-color bg_accent_rgba_07 rgba(20, 20, 25, 0.7);
+@define-color bg_accent_rgba_06 rgba(20, 20, 25, 0.6);
+@define-color bg_accent_rgba_05 rgba(20, 20, 25, 0.5);
+@define-color bg_accent_rgba_04 rgba(20, 20, 25, 0.4);
+@define-color bg_accent_rgba_03 rgba(20, 20, 25, 0.3);
+@define-color bg_accent_rgba_02 rgba(20, 20, 25, 0.2);
+@define-color bg_accent_rgba_015 rgba(20, 20, 25, 0.15);
+@define-color bg_accent_rgba_01 rgba(20, 20, 25, 0.1);
 
 /*
  * ── Tertiary background colour ───────────────────────────────────────
 */
-@define-color bg_tertiary #2D2D2D;
-@define-color bg_tertiary_rgba_05 rgba(45, 45, 45, 0.5);
-@define-color bg_tertiary_rgba_02 rgba(45, 45, 45, 0.2);
+@define-color bg_tertiary #000000;
+@define-color bg_tertiary_rgba_05 rgba(0, 0, 0, 0.5);
+@define-color bg_tertiary_rgba_02 rgba(0, 0, 0, 0.2);
 
 /*
  * ── Inactive background colour ───────────────────────────────────────
@@ -140,10 +140,10 @@
 /*
  * ── Shadow colours ───────────────────────────────────────────────────
 */
-@define-color shadow #282828;
-@define-color shadow_rgba_07 rgba(40, 40, 40, 0.7);
-@define-color shadow_rgba_05 rgba(40, 40, 40, 0.5);
-@define-color shadow_rgba_03 rgba(40, 40, 40, 0.3);
-@define-color shadow_rgba_02 rgba(40, 40, 40, 0.2);
-@define-color shadow_rgba_015 rgba(40, 40, 40, 0.15);
-@define-color shadow_rgba_011 rgba(40, 40, 40, 0.11);
+@define-color shadow #000002;
+@define-color shadow_rgba_07 rgba(0, 0, 2, 0.7);
+@define-color shadow_rgba_05 rgba(0, 0, 2, 0.5);
+@define-color shadow_rgba_03 rgba(0, 0, 2, 0.3);
+@define-color shadow_rgba_02 rgba(0, 0, 2, 0.2);
+@define-color shadow_rgba_015 rgba(0, 0, 2, 0.15);
+@define-color shadow_rgba_011 rgba(0, 0, 2, 0.11);