[Setup] Fix syntax error

README.md

@@ -1,4 +1,36 @@
-# janishutz Hyprland
+<div id="title" align="center">
+    <img src="https://static.janishutz.com/logo.jpg" width="300">
+    <h1>janishutz Hyprland</h1>
+</div>
+
+Collection of dotfiles for my personal Hyprland setup, running on Arch Linux. Includes a setup and install script (that one is not complete yet though). For my neovim config, see [here](https://git.janishutz.com/janishutz/nvim)
+
+## Features
+- Astal4 based Status Bar and Quick Actions menu
+    - System info
+    - Hyprland info
+    - Date & Time
+    - Bluetooth picker
+    - some networking settings (more coming later)
+    - Audio and brightness control
+    - battery monitoring
+    - Logout, Reboot, Shutdown, etc
+- Rofi config for App launcher
+- Wlogout config
+- Theming script that generates a GTK theme and theming for bar, Hyprland, etc
+- Fish config (with some handy aliases, based on one from ohh-my-fish)
+- Fastfetch config
+- kitty config with cursor trail
+- Linter configs (currently only eslint, which is not complete yet)
+- mpv config
+- zathura configs
+- yazi configs with links to various directories I use commonly plus a few plugins and themes that are applied by the script
+- Astal3 based Notifications (due to be migrated to Astal4)
+
+## Installing
+Clone your repo to any folder and adapt what you need. Some folders are still hard-coded, which I will be changing later on, so you will likely run into issues.
+
+You may then run the `setup` script. That won't install all dependencies though. The `install` script is what serves that purpose, but that is not complete yet
 
 
 ## Setting up to develop

build/helpers/render.js

@@ -30,7 +30,7 @@ const build = ( wallpaper, lockpaper, theme ) => {
             name: 'confirm-proceed-build',
             message: 'Okay to proceed with these colours?'
         } ] ).then( answer => {
-            if ( answer ) proceedWithBuild( wallpaper, lockpaper, theme, palette );
+            if ( answer['confirm-proceed-build'] ) proceedWithBuild( wallpaper, lockpaper, theme, palette );
             else {
                 // Have the user pick any other of the extracted colours instead
                 let counter = -1;

config/astal/components/QuickActions/modules/Battery.tsx

@@ -29,11 +29,13 @@ export const BatteryBox = () => {
                 cssClasses={["battery-time"]}
                 visible={bind(battery, "charging").as(c => !c)}
                 label={bind(battery, "timeToEmpty").as(t => `(${toTime(t)})`)}
+                tooltipText={bind(battery, 'energyRate').as(er => `Time to empty. Power usage: ${batteryEnergy(er)}`)}
             />
             <label
                 cssClasses={["battery-time"]}
                 visible={bind(battery, "charging")}
                 label={bind(battery, "timeToFull").as(t => `(${toTime(t)})`)}
+                tooltipText={bind(battery, 'energyRate').as(er => `Time to full. Charge rate: ${batteryEnergy(er)}`)}
             />
         </box>
     );
@@ -43,7 +45,7 @@ const toTime = (time: number) => {
     const MINUTE = 60;
     const HOUR = MINUTE * 60;
 
-    if (time > 24 * HOUR) return "";
+    if (time > 24 * HOUR) return "24h+";
 
     const hours = Math.round(time / HOUR);
     const minutes = Math.round((time - hours * HOUR) / MINUTE);

config/astal/components/QuickActions/modules/Brightness/Brightness.tsx

@@ -4,7 +4,6 @@ import Brightness from "../../../../util/brightness";
 const brightness = Brightness.get_default();
 
 const BrightnessModule = () => {
-    print( brightness.screen * 100 );
     const setBrightness = (value: number) => {
         brightness.screen = value;
     }

config/astal/components/QuickActions/modules/Player/Player.tsx

@@ -135,8 +135,9 @@ const PlayerItem = ({ player }: { player: AstalMpris.Player }) => {
 };
 
 const secondsToFriendlyTime = (time: number) => {
-    const minutes = Math.floor(time / 60);
+    const m = Math.floor(time / 60);
-    const hours = Math.floor(minutes / 60);
+    const minutes = Math.floor(m % 60);
+    const hours = Math.floor(m / 60 % 24);
     const seconds = Math.floor(time % 60);
     if (hours > 0) {
         return `${hours}:${expandTime(minutes)}:${expandTime(seconds)}`;

config/astal/components/bar/modules/Hyprland.tsx

@@ -2,6 +2,7 @@ import AstalTray from "gi://AstalTray";
 import { bind, GObject } from "astal";
 import AstalHyprland from "gi://AstalHyprland";
 import { Gtk } from "astal/gtk4";
+import Pango from "gi://Pango?version=1.0";
 
 const hypr = AstalHyprland.get_default();
 const SYNC = GObject.BindingFlags.SYNC_CREATE;
@@ -105,7 +106,10 @@ const ActiveWindow = () => {
                     focused.as(
                         client =>
                             client && (
-                                <label label={bind(client, "title").as(String)} />
+                                <label
+                                    maxWidthChars={70}
+                                    ellipsize={Pango.EllipsizeMode.END}
+                                    label={bind(client, "title").as(String)} />
                             ),
                     )
                 }></button>
@@ -128,7 +132,7 @@ const WindowPopoverBox = () => {
                             <label label={bind(client, 'title')}></label>
                         </box>
                     }
-                    onClicked={() => client.focus()}
+                        onClicked={() => client.focus()}
                     ></button>
                 })
             })}

config/astal/components/bar/modules/QuickView.tsx

@@ -125,9 +125,9 @@ const BatteryWidget = () => {
     if (battery.get_is_present()) {
         return (
             <image
-                iconName={bind(battery, "iconName").as(icon => icon)}
+                iconName={bind(battery, "batteryIconName").as(icon => icon)}
                 cssClasses={["quick-view-symbol"]}
-                tooltipText={bind(battery, 'percentage').as(p => `${Math.round(p * 100)}%`)}
+                tooltipText={bind(battery, 'percentage').as(p => `Battery Level: ${Math.round(p * 100)}%`)}
             ></image>
         );
     } else {

config/astal/components/bar/modules/SystemInfo.tsx

@@ -75,7 +75,7 @@ const SystemInfo = () => {
                         <box
                             cssClasses={[ 'quick-view-symbol' ]}
                         >
-                            <image iconName={"histogram-symbolic"}></image>
+                            <image iconName={"memory"}></image>
                             <label label={sysinfo.ramUtil(util => util)}></label>
                         </box>
                         <box

config/astal/util/colours.scss

@@ -1,5 +1,5 @@
-$fg-color: #E6E6E6;
+$fg-color: #C8DCFF;
-$bg-color: #141414;
+$bg-color: #0A0A0F;
 $accent-color: #591641;
 $accent-color-2: #97103A;
-$shadow-color: rgba(40, 40, 40, 0.3);
+$shadow-color: rgba(0, 0, 2, 0.3);

config/fish/config.fish

@@ -1,10 +1,12 @@
 alias ls='ls -l --color'
 alias ll='ls -la --color'
 alias v='nvim'
+alias i='vimiv'
 alias c='clear'
 alias zs='zathura-sandbox'
+alias z='zathura'
 alias bt='bluetui'
-alias vicfg='cd ~/.config/nvim/ && nvim'
+alias vicfg='nvim ~/projects/active/nvim/'
 alias fm='thunar .'
 alias gl='git ls-files --others --exclude-standard'
 alias gm='gti ls-files -m'
@@ -15,8 +17,7 @@ alias ga='git add ./*'
 alias cfh='nvim ~/projects/active/dotfiles/config/hypr/'
 alias cfn='nvim ~/projects/active/nvim/'
 alias cff='nvim ~/projects/active/dotfiles/config/fish/'
-alias cfw='nvim ~/projects/archive/dotfiles-old/pc/configs/waybar/'
+alias cfa='nvim ~/projects/active/dotfiles/config/astal/'
-alias cfa='nvim ~/projects/active/dotfiles/config/ags/'
 alias cf='nvim ~/projects/active/dotfiles/'
 alias g='lazygit'
 alias open-webui='sudo systemctl start docker && sudo docker start -i open-webui'

config/hypr/hypridle.conf

@@ -16,23 +16,12 @@ general {
 }
 
 listener {
-    timeout = 100
+    timeout = 300
-    on-timeout = notify-send "Entering idle state... (200s to screen off)"
-    on-resume = notify-send "Welcome back!"
-}
-
-listener {
-    timeout = 200
-    on-timeout = notify-send "100s to screen off"
-}
-
-listener {
-    timeout = 210
     on-timeout = hyprlock
 }
 
 listener {
-    timeout = 300
+    timeout = 360
     on-timeout = hyprctl dispatch dpms off
     on-resume = hyprctl dispatch dpms on
 }

config/hypr/hyprland/binds.conf

@@ -8,9 +8,7 @@ $mainMod = SUPER
 # These key-binds are non-specific, laptop config has a separate file that includes 
 # extra config for it specifically
 bind = $mainMod, Q, killactive
-# bind = $mainMod SHIFT, Q, exit
 bind = $mainMod, Return, exec, kitty
-# bind = $mainMod, E, exec, thunar
 bind = $mainMod SHIFT, E, exec, thunar
 bind = $mainMod, E, exec, kitty --hold fish -c "y"
 bind = $mainMod, V, togglefloating,
@@ -50,9 +48,7 @@ bind = $mainMod SHIFT, H, exec, heroic
 bind = $mainMod SHIFT, Z, exec, zathura
 bind = $mainMod SHIFT, I, exec, notify-send 'AirPlay video server starting...' --app-name="AirPlay Video" && terminator -e "systemctl start avahi-daemon && sleep 5 && uxplay -n LinuxVideoPlay -nh"
 bind = $mainMod SHIFT, A, exec, notify-send 'AirPlay server starting...' --app-name="AirPlay Audio" && terminator -T "hidden-terminator" -e "systemctl start avahi-daemon && shairport-sync -a LinuxPlay"
-bind = $mainMod SHIFT, G, exec, notify-send 'Preparing system for gaming...' --app-name="Util" && corectrl
 bind = $mainMod SHIFT, P, exec, notify-send 'Steam is launching...' --app-name="Steam" && steam
-bind = $mainMod SHIFT, R, exec, notify-send 'Launching in Remoteplay optimised session' --app-name="Steam" && steam -pipewire
 bind = $mainMod CTRL, K, exec, notify-send 'Insta-Kill activated' --app-name="Hyprctl" && hyprctl kill
 bind = $mainMod SHIFT, O, exec, terminator -e "~/projects/dotfiles/ai.sh"
 
@@ -75,7 +71,6 @@ bind = $mainMod, Space, exec, killall rofi || rofi -show combi -modes combi -com
 # │                Logout commands                 │
 # └                                                ┘
 bind = $mainMod, escape, exec, wlogout
-bind = $mainMod ALT CTRL, L, exec, hyprlock --immediate
 
 
 # ────────────────────────────────────────────────────────────────────
@@ -160,8 +155,6 @@ bind = $mainMod, mouse_up, workspace, e-1
 # │         ALT + Tab / SHIFT + ALT + Tab          │
 # └                                                ┘
 bind = ALT SHIFT, tab, cyclenext, prev
-# bind = ALT, tab, cyclenext, next
-# bind = ALT CTRL, tab, focusurgentorlast
 bind = ALT, tab, focusurgentorlast
 
 
@@ -181,6 +174,12 @@ bind = $mainMod SHIFT CTRL, left, layoutmsg, orientationprev
 bindm = $mainMod, mouse:272, movewindow
 bindm = $mainMod, mouse:273, resizewindow
 
+# ┌                                                ┐
+# │   Resize window with keybinds (change split)   │
+# └                                                ┘
+bind = $mainMod CTRL ALT, H, splitratio, -0.01
+bind = $mainMod CTRL ALT, L, splitratio, +0.01
+
 
 # ┌                                                ┐
 # │                     Freeze                     │
@@ -199,8 +198,8 @@ bind = ,code:121, exec, pamixer -t
 # ┌                                                ┐
 # │               Brightness-Control               │
 # └                                                ┘
-bind = ,code:232, exec, light -U 5 && notify-send 'Display brightness decreased by 5%' --app-name="Brightness"
+bind = ,code:232, exec, light -U 5
-bind = ,code:233, exec, light -A 5 && notify-send 'Display brightness increased by 5%' --app-name="Brightness"
+bind = ,code:233, exec, light -A 5
 
 
 # ┌                                                ┐

config/hypr/hyprland/colors.conf

@@ -13,6 +13,6 @@ general {
 
 decoration {
     shadow {
-        color = rgb(282828)
+        color = rgb(000002)
     }
 }

config/hypr/hyprland/general.conf

@@ -13,10 +13,10 @@ exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 exec-once = hypridle
 exec-once = nm-applet
 exec-once = nextcloud --background
-# exec-once = sleep 2 && bash -c "ags run -d ~/projects/active/dotfiles/config/astal/ --gtk4 >> ~/log 2>&1"
+exec-once = sleep 2 && bash -c "ags run -d ~/projects/active/dotfiles/config/astal/ --gtk4 >> /tmp/runner-log 2>&1"
-exec-once = sleep 2 && bash -c "ags run -d ~/projects/active/dotfiles/config/astal/ --gtk4"
+# exec-once = sleep 2 && bash -c "ags run -d ~/projects/active/dotfiles/config/astal/ --gtk4"
-# exec-once = bash -c "ags run -d ~/projects/active/dotfiles/config/ags/notifications/ >> ~/logn 2>&1"
+exec-once = bash -c "ags run -d ~/projects/active/dotfiles/config/ags/notifications/ >> /tmp/notifier-log 2>&1"
-exec-once = bash -c "ags run -d ~/projects/active/dotfiles/config/ags/notifications/"
+# exec-once = bash -c "ags run -d ~/projects/active/dotfiles/config/ags/notifications/"
 
 
 
@@ -47,13 +47,14 @@ input {
 
     focus_on_close = 1
 
-    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
+    sensitivity = 0
 }
 
 gestures {
-    # See https://wiki.hyprland.org/Configuring/Variables/ for more
     workspace_swipe = true
-    workspace_swipe_distance = 300
+    workspace_swipe_distance = 200
+    workspace_swipe_cancel_ratio = 0.3
+    workspace_swipe_forever = true
 }
 
 
@@ -63,27 +64,21 @@ gestures {
 #          ╰────────────────────────────────────────────────╯
 # ────────────────────────────────────────────────────────────────────
 general {
-    # See https://wiki.hyprland.org/Configuring/Variables/ for more
-
     gaps_in = 3
     gaps_out = 4
     border_size = 1
-    # col.active_border = rgba(cc5c00ff) rgba(cc5c00ff) rgba(ff0000ff) 45deg
-    # col.inactive_border = rgba(595959aa)
 
-    layout = master
+    layout = dwindle
     no_border_on_floating = false
 }
 
 decoration {
-    # See https://wiki.hyprland.org/Configuring/Variables/ for more
     inactive_opacity = 1
     rounding = 10
 
     shadow {
         enabled = true
         range = 4
-        # color = rgba(1a1a1aee)
     }
 
     blur {
@@ -100,8 +95,6 @@ decoration {
 animations {
     enabled = yes
 
-    # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
-
     bezier = myBezier, 0.05, 0.9, 0.1, 1.05
 
     animation = windows, 1, 7, myBezier
@@ -119,17 +112,11 @@ misc {
 }
 
 dwindle {
-    # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
+    pseudotile = true
-    pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
+    force_split = 2
-    preserve_split = yes # you probably want this
+    preserve_split = true
 }
 
-master {
-    # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
-#     no_gaps_when_only = true
-}
-
-
 cursor {
     no_warps = false
     inactive_timeout = 60

config/hypr/hyprlock.conf

@@ -18,7 +18,7 @@ general {
 # └                                                ┘
 background {
     monitor = 
-    path = /home/janis/NextCloud/Wallpapers/dark/colour-splash.jpg # Or screenshot
+    path = /home/janis/NextCloud/Wallpapers/dark/mountains.jpg # Or screenshot
 
     blur_passes = 1
 }

config/kitty/kitty.conf

@@ -17,6 +17,7 @@ font_size 12.0
 # │                 Cursor config                  │
 # └                                                ┘
 cursor_trail 1
+cursor_trail_start_threshold 0
 
 
 # ┌                                                ┐

config/lint/dump

@@ -0,0 +1,65 @@
+// @ts-check
+
+import eslint from '@eslint/js';
+import tseslint from 'typescript-eslint';
+import stylistic from '@stylistic/eslint-plugin';
+
+export default tseslint.config(
+    eslint.configs.recommended,
+    ...tseslint.configs.recommended,
+    {
+        'plugins': {
+            '@stylistic/js': stylistic,
+            '@stylistic/ts': stylistic,
+        },
+        'rules': {
+            // Formatting
+            '@stylistic/js/array-bracket-newline': [ 'error', { 'multiline': true, 'minItems': 4 } ],
+            '@stylistic/js/array-bracket-spacing': [ 'error', 'always' ],
+            '@stylistic/js/array-element-newline': [ 'error', { 'multiline': true, 'minItems': 4 } ],
+            '@stylistic/js/arrow-parens': [ 'error', 'always' ],
+            '@stylistic/js/arrow-spacing': [ 'error', { 'before': true, 'after': true } ],
+            '@stylistic/js/block-spacing': [ 'error', 'always' ],
+            '@stylistic/js/brace-style': [ 'error', '1tbs' ],
+            '@stylistic/js/comma-spacing': [ 'error', { 'before': false, 'after': true } ],
+            '@stylistic/js/comma-style': [ 'error', 'last' ],
+            '@stylistic/js/dot-location': [ 'error', 'property' ],
+            '@stylistic/js/eol-last': [ 'error', 'always' ],
+            '@stylistic/js/function-call-spacing': [ 'error', 'never' ],
+            '@stylistic/js/implicit-arrow-linebreak': [ 'error', 'beside' ],
+            '@stylistic/js/indent': [ 'error', 4 ],
+            '@stylistic/js/key-spacing': [ 'error', { 'beforeColon': false, 'afterColon': true } ],
+            '@stylistic/js/keyword-spacing': [ 'error', { 'before': true, 'after': true } ],
+            '@stylistic/js/lines-between-class-members': [ 'error', 'always' ],
+            '@stylistic/js/new-parens': [ 'error', 'always' ],
+            '@stylistic/js/no-extra-parens': [ 'error', 'all' ],
+            '@stylistic/js/no-extra-semi': 'error',
+            '@stylistic/js/no-floating-decimal': 'error',
+            '@stylistic/js/no-mixed-operators': 'error',
+            '@stylistic/js/no-mixed-spaces-and-tabs': 'error',
+            '@stylistic/js/no-multi-spaces': 'error',
+            '@stylistic/js/no-trailing-spaces': 'error',
+            '@stylistic/js/no-whitespace-before-property': 'error',
+            '@stylistic/js/object-curly-newline': [ 'error', { 'multiline': true, 'minProperties': 3 } ],
+            '@stylistic/js/object-curly-spacing': [ 'error', 'always' ],
+            '@stylistic/js/one-var-declaration-per-line': 'error',
+            '@stylistic/js/quote-props': [ 'error', 'always' ],
+            '@stylistic/js/quotes': [ 'error', 'single' ],
+            '@stylistic/js/rest-spread-spacing': [ 'error', 'never' ],
+            '@stylistic/js/semi': [ 'error', 'always' ],
+            '@stylistic/js/semi-spacing': [ 'error', { 'before': false, 'after': true } ],
+            '@stylistic/js/semi-style': [ 'error', 'last' ],
+            '@stylistic/js/space-before-blocks': [ 'error', 'always' ],
+            '@stylistic/js/space-before-function-paren': [ 'error', 'always' ],
+            '@stylistic/js/space-in-parens': [ 'error', 'always' ],
+            '@stylistic/js/space-infix-ops': [ 'error', { 'int32Hint': false } ],
+            '@stylistic/js/space-unary-ops': 'error',
+            '@stylistic/js/spaced-comment': [ 'error', 'always' ],
+            '@stylistic/js/switch-colon-spacing': 'error',
+            '@stylistic/js/template-curly-spacing': [ 'error', 'always' ],
+            '@stylistic/js/wrap-iife': [ 'error', 'inside' ],
+            '@stylistic/js/wrap-regex': 'error',
+            '@stylistic/ts/type-annotation-spacing': 'error',
+        }
+    }
+);

config/lint/eslint.config.mjs

@@ -1,65 +1,118 @@
-// @ts-check
+import vue from 'eslint-plugin-vue';
-
 import eslint from '@eslint/js';
-import tseslint from 'typescript-eslint';
+import typescript from '@typescript-eslint/eslint-plugin';
 import stylistic from '@stylistic/eslint-plugin';
+import tseslint from 'typescript-eslint';
 
+const style = {
+    'plugins': {
+        '@stylistic': stylistic,
+        '@stylistic/js': stylistic,
+        '@stylistic/ts': stylistic,
+    },
+    'rules': {
+        // Formatting
+        '@stylistic/array-bracket-newline': ['error', { 'multiline': true, 'minItems': 4 }],
+        '@stylistic/array-bracket-spacing': ['error', 'always'],
+        '@stylistic/array-element-newline': ['error', { 'multiline': true, 'minItems': 4 }],
+        '@stylistic/arrow-parens': ['error', 'as-needed'],
+        '@stylistic/arrow-spacing': ['error', { 'before': true, 'after': true }],
+        '@stylistic/block-spacing': ['error', 'always'],
+        '@stylistic/brace-style': ['error', '1tbs'],
+        '@stylistic/comma-spacing': ['error', { 'before': false, 'after': true }],
+        '@stylistic/comma-style': ['error', 'last'],
+        '@stylistic/dot-location': ['error', 'property'],
+        '@stylistic/eol-last': ['error', 'always'],
+        '@stylistic/function-call-spacing': ['error', 'never'],
+        '@stylistic/implicit-arrow-linebreak': ['error', 'beside'],
+        '@stylistic/indent': ['error', 4],
+        '@stylistic/key-spacing': ['error', { 'beforeColon': false, 'afterColon': true }],
+        '@stylistic/keyword-spacing': ['error', { 'before': true, 'after': true }],
+        '@stylistic/lines-between-class-members': ['error', 'always'],
+        '@stylistic/new-parens': ['error', 'always'],
+        '@stylistic/no-extra-parens': ['error', 'all'],
+        '@stylistic/no-extra-semi': 'error',
+        '@stylistic/no-floating-decimal': 'error',
+        '@stylistic/no-mixed-operators': 'error',
+        '@stylistic/no-mixed-spaces-and-tabs': 'error',
+        '@stylistic/no-multi-spaces': 'error',
+        '@stylistic/no-trailing-spaces': 'error',
+        '@stylistic/no-whitespace-before-property': 'error',
+        '@stylistic/object-curly-newline': ['error', { 'multiline': true, 'minProperties': 3 }],
+        '@stylistic/object-curly-spacing': ['error', 'always'],
+        '@stylistic/one-var-declaration-per-line': 'error',
+        '@stylistic/quote-props': ['error', 'always'],
+        '@stylistic/quotes': ['error', 'single'],
+        '@stylistic/rest-spread-spacing': ['error', 'never'],
+        '@stylistic/semi': ['error', 'always'],
+        '@stylistic/semi-spacing': ['error', { 'before': false, 'after': true }],
+        '@stylistic/semi-style': ['error', 'last'],
+        '@stylistic/space-before-blocks': ['error', 'always'],
+        '@stylistic/space-before-function-paren': ['error', 'always'],
+        '@stylistic/space-in-parens': ['error', 'always'],
+        '@stylistic/space-infix-ops': ['error', { 'int32Hint': false }],
+        '@stylistic/space-unary-ops': 'error',
+        '@stylistic/spaced-comment': ['error', 'always'],
+        '@stylistic/switch-colon-spacing': 'error',
+        '@stylistic/template-curly-spacing': ['error', 'always'],
+        '@stylistic/wrap-iife': ['error', 'inside'],
+        '@stylistic/wrap-regex': 'error',
+        '@stylistic/ts/type-annotation-spacing': 'error',
+    }
+}
+
+/** @type {import('eslint').Linter.FlatConfig[]} */
 export default tseslint.config(
+    // Base JavaScript rules
     eslint.configs.recommended,
     ...tseslint.configs.recommended,
+    style,
+
+    // TypeScript support
+    // {
+    //     files: ['**/*.ts', '**/*.tsx'],
+    //     languageOptions: {
+    //         parser: parserTs,
+    //         parserOptions: {
+    //             ecmaVersion: 'latest',
+    //             sourceType: 'module',
+    //             project: './tsconfig.json',
+    //             ecmaFeatures: {
+    //                 jsx: true,
+    //             },
+    //         },
+    //     },
+    //     plugins: {
+    //         '@typescript-eslint': typescript,
+    //     },
+    //     rules: {
+    //         ...typescript.configs.recommended.rules,
+    //         ...style.rules,
+    //     },
+    // },
+
+    // Vue support (including TS and JSX inside SFCs)
     {
-        'plugins': {
+        files: ['**/*.vue'],
-            '@stylistic/js': stylistic,
+        extends: [
-            '@stylistic/ts': stylistic,
+            'plugin: vue/recommended'
+        ],
+        plugins: {
+            'vue-eslint-parser': vue,
+            '@typescript-eslint': typescript,
         },
-        'rules': {
+        rules: {
-            // Formatting
+            ...typescript.configs.recommended.rules,
-            '@stylistic/js/array-bracket-newline': [ 'error', { 'multiline': true, 'minItems': 4 } ],
+            ...style.rules,
-            '@stylistic/js/array-bracket-spacing': [ 'error', 'always' ],
+
-            '@stylistic/js/array-element-newline': [ 'error', { 'multiline': true, 'minItems': 4 } ],
+            // You can override any Vue or TS rules here
-            '@stylistic/js/arrow-parens': [ 'error', 'always' ],
+            'vue/html-indent': ['error', 4],
-            '@stylistic/js/arrow-spacing': [ 'error', { 'before': true, 'after': true } ],
+            'vue/html-comment-indent': ['error', 4],
-            '@stylistic/js/block-spacing': [ 'error', 'always' ],
+            'vue/script-indent': ['error', 4],
-            '@stylistic/js/brace-style': [ 'error', '1tbs' ],
+            'vue/max-attributes-per-line': ['error', {
-            '@stylistic/js/comma-spacing': [ 'error', { 'before': false, 'after': true } ],
+                singleline: 3,
-            '@stylistic/js/comma-style': [ 'error', 'last' ],
+                multiline: { max: 1, allowFirstLine: false },
-            '@stylistic/js/dot-location': [ 'error', 'property' ],
+            }],
-            '@stylistic/js/eol-last': [ 'error', 'always' ],
+        },
-            '@stylistic/js/function-call-spacing': [ 'error', 'never' ],
+    },
-            '@stylistic/js/implicit-arrow-linebreak': [ 'error', 'beside' ],
-            '@stylistic/js/indent': [ 'error', 4 ],
-            '@stylistic/js/key-spacing': [ 'error', { 'beforeColon': false, 'afterColon': true } ],
-            '@stylistic/js/keyword-spacing': [ 'error', { 'before': true, 'after': true } ],
-            '@stylistic/js/lines-between-class-members': [ 'error', 'always' ],
-            '@stylistic/js/new-parens': [ 'error', 'always' ],
-            '@stylistic/js/no-extra-parens': [ 'error', 'all' ],
-            '@stylistic/js/no-extra-semi': 'error',
-            '@stylistic/js/no-floating-decimal': 'error',
-            '@stylistic/js/no-mixed-operators': 'error',
-            '@stylistic/js/no-mixed-spaces-and-tabs': 'error',
-            '@stylistic/js/no-multi-spaces': 'error',
-            '@stylistic/js/no-trailing-spaces': 'error',
-            '@stylistic/js/no-whitespace-before-property': 'error',
-            '@stylistic/js/object-curly-newline': [ 'error', { 'multiline': true, 'minProperties': 3 } ],
-            '@stylistic/js/object-curly-spacing': [ 'error', 'always' ],
-            '@stylistic/js/one-var-declaration-per-line': 'error',
-            '@stylistic/js/quote-props': [ 'error', 'always' ],
-            '@stylistic/js/quotes': [ 'error', 'single' ],
-            '@stylistic/js/rest-spread-spacing': [ 'error', 'never' ],
-            '@stylistic/js/semi': [ 'error', 'always' ],
-            '@stylistic/js/semi-spacing': [ 'error', { 'before': false, 'after': true } ],
-            '@stylistic/js/semi-style': [ 'error', 'last' ],
-            '@stylistic/js/space-before-blocks': [ 'error', 'always' ],
-            '@stylistic/js/space-before-function-paren': [ 'error', 'always' ],
-            '@stylistic/js/space-in-parens': [ 'error', 'always' ],
-            '@stylistic/js/space-infix-ops': [ 'error', { 'int32Hint': false } ],
-            '@stylistic/js/space-unary-ops': 'error',
-            '@stylistic/js/spaced-comment': [ 'error', 'always' ],
-            '@stylistic/js/switch-colon-spacing': 'error',
-            '@stylistic/js/template-curly-spacing': [ 'error', 'always' ],
-            '@stylistic/js/wrap-iife': [ 'error', 'inside' ],
-            '@stylistic/js/wrap-regex': 'error',
-            '@stylistic/ts/type-annotation-spacing': 'error',
-        }
-    }
 );

config/rofi/style.rasi

@@ -1,7 +1,7 @@
 * {
-    background: #141414;
+    background: #0A0A0F;
-    background-selected: #1E1E1E;
+    background-selected: #141419;
-    foreground: #E6E6E6;
+    foreground: #C8DCFF;
     accent: #591641;
     accent-two: #97103A;
     // border-color: #2D2057;

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 {
@@ -27,7 +27,7 @@ button:hover {
 
 button:focus {
     background-color: rgb(151, 16, 58);
-    color: rgb(230, 230, 230);
+    color: rgb(200, 220, 255);
 }
 
 #lock {

config/yazi/keymap.toml

@@ -8,22 +8,27 @@ prepend_keymap = [
     # Goto
     { on = [ "g", "h" ],        run = "cd ~",                     desc = "Go to ~" },
     { on = [ "g", "c", "c" ],   run = "cd ~/.config",             desc = "Go to ~/.config" },
-    { on = [ "g", "c", "h" ],   run = "cd ~/.config/hypr",        desc = "Go to Hyprland config" },
-    { on = [ "g", "c", "f" ],   run = "cd ~/.config/fish",        desc = "Go to Fish config" },
-    { on = [ "g", "c", "y" ],   run = "cd ~/.config/yazi",        desc = "Go to Yazi config" },
-    { on = [ "g", "c", "w" ],   run = "cd ~/.config/waybar",      desc = "Go to waybar config" },
-    { on = [ "g", "c", "n" ],   run = "cd ~/.config/nvim",        desc = "Go to NeoVim config" },
     { on = [ "g", "a" ],        run = "cd ~/.cache",              desc = "Go to ~/.cache" },
+    { on = [ "g", "l", "b" ],   run = "cd ~/.local/bin",          desc = "Go to ~/.local/bin" },
+    { on = [ "g", "l", "s" ],   run = "cd ~/.local/share",        desc = "Go to ~/.local/share" },
+    { on = [ "g", "c", "h" ],   run = "cd ~/projects/active/dotfiles/config/hypr",                  desc = "Go to Hyprland config" },
+    { on = [ "g", "c", "f" ],   run = "cd ~/projects/active/dotfiles/config/fish",                  desc = "Go to Fish config" },
+    { on = [ "g", "c", "y" ],   run = "cd ~/projects/active/dotfiles/config/yazi",                  desc = "Go to Yazi config" },
+    { on = [ "g", "c", "a" ],   run = "cd ~/projects/active/dotfiles/config/astal",                 desc = "Go to astal config" },
+    { on = [ "g", "c", "l" ],   run = "cd ~/projects/active/dotfiles/config/lint",                  desc = "Go to linter configs" },
+    { on = [ "g", "c", "k" ],   run = "cd ~/projects/active/dotfiles/config/kitty",                 desc = "Go to kitty config" },
+    { on = [ "g", "c", "r" ],   run = "cd ~/projects/active/dotfiles/config/rofi",                  desc = "Go to rofi config" },
+    { on = [ "g", "c", "s" ],   run = "cd ~/projects/active/dotfiles/scripts",                      desc = "Go to script" },
+    { on = [ "g", "c", "n" ],   run = "cd ~/projects/active/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", "c" ],   run = "cd ~/projects/active/eth-gitlab/eth-code-expert/Semester2/", desc = "Go to ETH-Code-Expert" },
     { on = [ "g", "e", "n" ],   run = "cd ~/NextCloud/Documents/ETH/Semester2",                     desc = "Go to ETH Nextcloud" },
     { on = [ "g", "e", "p" ],   run = "cd ~/projects/active/eth/semester2/",                        desc = "Go to ETH notes folder" },
     { on = [ "g", "e", "g" ],   run = "cd ~/projects/active/eth-gitlab/pprog25-jahutz/",            desc = "Go to ETH Gitlab folder" },
-    { on = [ "g", "l", "b" ],   run = "cd ~/.local/bin",          desc = "Go to ~/.local/bin" },
+    { on = [ "g", "s", "h" ],   run = "cd ~/.steam/steam/steamapps/common",                         desc = "Go to ~/.steam/steam/steamapps/common" },
-    { on = [ "g", "l", "s" ],   run = "cd ~/.local/share",        desc = "Go to ~/.local/share" },
+    { on = [ "g", "s", "g" ],   run = "cd /mnt/games/SteamLibrary",                                 desc = "Go to SteamLibrary on NTFS partition" },
-    { on = [ "g", "s", "h" ],   run = "cd ~/.steam/steam/steamapps/common",        desc = "Go to ~/.steam/steam/steamapps/common" },
+    { on = [ "g", "s", "s" ],   run = "cd /mnt/secondary/SteamLibrary",                             desc = "Go to SteamLibrary on main games drive" },
-    { 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" },
     { on = [ "g", "o" ],        run = "cd /mnt/janis/Documents",  desc = "Go to Documents" },
     { on = [ "g", "d" ],        run = "cd ~/Downloads",           desc = "Go to ~/Downloads" },
     { on = [ "g", "p", "a" ],   run = "cd ~/projects/active",     desc = "Go to Active projects" },

config/yazi/theme.toml

@@ -1,2 +1,2 @@
 [flavor]
-use = "vscode-dark-modern"
+use = "tokyo-night"

gtk-theme/dist/colours.css

@@ -19,13 +19,13 @@
 /*
  * ── Foreground color, main interface text colour ─────────────────────
 */
-@define-color fg #E6E6E6;
+@define-color fg #C8DCFF;
-@define-color fg_rgba_07 rgba(230, 230, 230, 0.7);
+@define-color fg_rgba_07 rgba(200, 220, 255, 0.7);
-@define-color fg_rgba_06 rgba(230, 230, 230, 0.6);
+@define-color fg_rgba_06 rgba(200, 220, 255, 0.6);
-@define-color fg_rgba_05 rgba(230, 230, 230, 0.5);
+@define-color fg_rgba_05 rgba(200, 220, 255, 0.5);
-@define-color fg_rgba_03 rgba(230, 230, 230, 0.3);
+@define-color fg_rgba_03 rgba(200, 220, 255, 0.3);
-@define-color fg_rgba_02 rgba(230, 230, 230, 0.2);
+@define-color fg_rgba_02 rgba(200, 220, 255, 0.2);
-@define-color fg_rgba_01 rgba(230, 230, 230, 0.1);
+@define-color fg_rgba_01 rgba(200, 220, 255, 0.1);
 
 /*
  * ── Foreground accent, usually brighter or darker than default ───────
@@ -51,14 +51,14 @@
 /*
  * ── Accent Gradient ──────────────────────────────────────────────────
 */
-@define-color accent_gradient_1 #390E2A;
+@define-color accent_gradient_1 #481235;
-@define-color accent_gradient_2 #2E0B21;
+@define-color accent_gradient_2 #41102F;
-@define-color accent_gradient_3 #24091B;
+@define-color accent_gradient_3 #3A0E2B;
-@define-color accent_gradient_4 #1D0715;
+@define-color accent_gradient_4 #350D26;
-@define-color accent_gradient_5 #170611;
+@define-color accent_gradient_5 #2F0C23;
-@define-color accent_gradient_inverse_1 #8B2266;
+@define-color accent_gradient_inverse_1 #6E1B50;
-@define-color accent_gradient_inverse_2 #8B2266;
+@define-color accent_gradient_inverse_2 #6E1B50;
-@define-color accent_gradient_inverse_3 #8B2266;
+@define-color accent_gradient_inverse_3 #6E1B50;
 
 /*
  * ── Secondary accent colour ──────────────────────────────────────────
@@ -97,33 +97,33 @@
 /*
  * ── Background color, main interface background ──────────────────────
 */
-@define-color bg #141414;
+@define-color bg #0A0A0F;
-@define-color bg_rgba_07 rgba(20, 20, 20, 0.7);
+@define-color bg_rgba_07 rgba(10, 10, 15, 0.7);
-@define-color bg_rgba_05 rgba(20, 20, 20, 0.5);
+@define-color bg_rgba_05 rgba(10, 10, 15, 0.5);
-@define-color bg_rgba_03 rgba(20, 20, 20, 0.3);
+@define-color bg_rgba_03 rgba(10, 10, 15, 0.3);
-@define-color bg_rgba_02 rgba(20, 20, 20, 0.2);
+@define-color bg_rgba_02 rgba(10, 10, 15, 0.2);
-@define-color bg_rgba_015 rgba(20, 20, 20, 0.15);
+@define-color bg_rgba_015 rgba(10, 10, 15, 0.15);
-@define-color bg_rgba_011 rgba(20, 20, 20, 0.11);
+@define-color bg_rgba_011 rgba(10, 10, 15, 0.11);
 
 /*
  * ── Accent background color ──────────────────────────────────────────
 */
-@define-color bg_accent #1E1E1E;
+@define-color bg_accent #141419;
-@define-color bg_accent_rgba_07 rgba(30, 30, 30, 0.7);
+@define-color bg_accent_rgba_07 rgba(20, 20, 25, 0.7);
-@define-color bg_accent_rgba_06 rgba(30, 30, 30, 0.6);
+@define-color bg_accent_rgba_06 rgba(20, 20, 25, 0.6);
-@define-color bg_accent_rgba_05 rgba(30, 30, 30, 0.5);
+@define-color bg_accent_rgba_05 rgba(20, 20, 25, 0.5);
-@define-color bg_accent_rgba_04 rgba(30, 30, 30, 0.4);
+@define-color bg_accent_rgba_04 rgba(20, 20, 25, 0.4);
-@define-color bg_accent_rgba_03 rgba(30, 30, 30, 0.3);
+@define-color bg_accent_rgba_03 rgba(20, 20, 25, 0.3);
-@define-color bg_accent_rgba_02 rgba(30, 30, 30, 0.2);
+@define-color bg_accent_rgba_02 rgba(20, 20, 25, 0.2);
-@define-color bg_accent_rgba_015 rgba(30, 30, 30, 0.15);
+@define-color bg_accent_rgba_015 rgba(20, 20, 25, 0.15);
-@define-color bg_accent_rgba_01 rgba(30, 30, 30, 0.1);
+@define-color bg_accent_rgba_01 rgba(20, 20, 25, 0.1);
 
 /*
  * ── Tertiary background colour ───────────────────────────────────────
 */
-@define-color bg_tertiary #2D2D2D;
+@define-color bg_tertiary #000000;
-@define-color bg_tertiary_rgba_05 rgba(45, 45, 45, 0.5);
+@define-color bg_tertiary_rgba_05 rgba(0, 0, 0, 0.5);
-@define-color bg_tertiary_rgba_02 rgba(45, 45, 45, 0.2);
+@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 #000002;
-@define-color shadow_rgba_07 rgba(40, 40, 40, 0.7);
+@define-color shadow_rgba_07 rgba(0, 0, 2, 0.7);
-@define-color shadow_rgba_05 rgba(40, 40, 40, 0.5);
+@define-color shadow_rgba_05 rgba(0, 0, 2, 0.5);
-@define-color shadow_rgba_03 rgba(40, 40, 40, 0.3);
+@define-color shadow_rgba_03 rgba(0, 0, 2, 0.3);
-@define-color shadow_rgba_02 rgba(40, 40, 40, 0.2);
+@define-color shadow_rgba_02 rgba(0, 0, 2, 0.2);
-@define-color shadow_rgba_015 rgba(40, 40, 40, 0.15);
+@define-color shadow_rgba_015 rgba(0, 0, 2, 0.15);
-@define-color shadow_rgba_011 rgba(40, 40, 40, 0.11);
+@define-color shadow_rgba_011 rgba(0, 0, 2, 0.11);

install

@@ -6,7 +6,6 @@ read -p "Choose the configs to install, Laptop or Desktop (l/D): " platform
 # Packages to be added to install: aylurs-gtk-shell-git, brightnessctl, zoxide, trash-cli, fzf, ouch
 # Install yazi plugins using ya pack -a ndtoan96/ouch and ya pack -a boydaihungst/restore
 #
-# TODO: get configs from current setup
 # Hyprland
 yay -S hyprland hypridle hyprfreeze hyprlock plymouth aylurs-gtk-shell-git brightnessctl pulsemixer xdg-desktop-portal-hyprland 
 
@@ -21,17 +20,17 @@ ya pack -a boydaihungst/restore
 yay -S adobe-source-code-pro-fonts gnome-font-viewer gnome-characters gnome-tweaks lxappearance kvantum gnome-keyring smartmontools ffmpeg polkit-gnome swaybg network-manager-applet polkit-kde-agent cpupower-gui ttf-fantasque-nerd ttf-jetbrains-mono-nerd ttf-fluentui-system-icons ttf-comfortaa
 
 # Programming
-yay -S meld docker vscodium kitty fish docker terminator ghex nodejs npm python-pip git-credential-manager-core-bin wine kate rustup cargo filezilla typescript-language-server php jdk vscode-css-languageserver vscode-html-languageserver bash-language-server lazygit
+yay -S meld docker vscodium kitty fish docker terminator ghex nodejs npm python-pip git-credential-manager-core-bin wine kate rustup cargo filezilla php jdk 
-sudo npm i -g @vue/typescript-plugin
 
 # nvim
-yay -S neovim lua lua-language-server tree-sitter texlab stylua luarocks jdtls perl julia autojump pyright
+yay -S neovim lua lua-language-server tree-sitter texlab stylua luarocks jdtls perl julia autojump pyright vscode-css-languageserver vscode-html-languageserver bash-language-server lazygit python-black proselint asmfmt typescript-language-server
+sudo npm i -g @vue/typescript-plugin
 
 # Internet
 yay -S librewolf-bin webcord-bin thunderbird rustdesk brave-bin
 
 # Utilities
-yay -S okular vlc nextcloud-client p7zip zip unzip gnome-keyring noto-fonts thunderbird pamixer pavucontrol light neofetch bashtop hugo sddm uxplay upower
+yay -S okular vlc nextcloud-client p7zip zip unzip gnome-keyring noto-fonts thunderbird pamixer pavucontrol light neofetch bashtop hugo sddm uxplay upower gdu
 
 # LaTeX
 yay -S texlive biber

notes.md

@@ -17,12 +17,14 @@
     - [ ] AppLauncher (possibly, if anyrun is no good, probably not)
     - [ ] OSD (see [here](https://github.com/Aylur/astal/tree/main/examples/gtk3/js))
     - [x] Open Window List for bar when hovering over window title and per-workspace when hovering over workspace
+    - [ ] Keybind to open QuickActions
+    - [ ] Improve handling of tray items (crashes on update of submenus)
 - [ ] Text recognition
 - [ ] Theming
     - [x] Vivado dark mode
     - [x] GTK
     - [x] QT (via environment variable)
-    - [x] ~Librewolf~
+    - [x] Librewolf
     - [x] Astal
     - [x] Hyprland
     - [x] Rofi
@@ -41,23 +43,26 @@
     - [ ] Read docs
     - [ ] battery management
 - [ ] Programs
-    - [ ] New image viewer (eog, vimiv)
+    - [ ] Switch to vimiv (make default and configure)
     - [x] Other pdf reader (maybe -> zathura)
     - [x] Maybe TUI archive manager (~felix-rs~, ouch in yazi)
+- [ ] vimiv
+    - [ ] Configure
+    - [ ] Theme
 - [ ] Lazygit: Configure
 - [ ] Nvim (other repo)
     - [x] Replace notification handler (noice)
     - [ ] Configure formatters (of Java, Cpp, TS/JS/Vue, Python)
     - [ ] Maybe: Add extra configs to commentbox
     - [ ] Remove trouble (useless for my purposes)
-- [ ] Yazi
+- [x] Yazi
     - [x] More keybinds
-    - [ ] Configure
+    - [x] Configure
-    - [ ] Drag and drop support?
+    - [ ] ~Drag and drop support?~
-    - [ ] Check out plugins
+    - [x] Check out plugins
     - [x] Use as file picker
-- [ ] SDDM
+- [x] SDDM
-    - [ ] Replace with LightDM or ensure theming works, but prefer replacing, consider greetd + tuigreet
+    - [x] Replace with LightDM or ensure theming works, but prefer replacing, consider greetd + tuigreet
 - [ ] Scripts
     - [ ] Installer (after the basic OS setup is done (= from chroot onwards))
     - [x] Theming script

scripts/setup-eslint

@@ -5,5 +5,5 @@ SCRIPT_DIR=$(dirname "$0")
 cp "$SCRIPT_DIR/../config/lint/eslint.config.mjs" .
 
 # TODO: Improve eslint config to include JSX and Vue configs too, read on website
-npm i --save-dev @eslint/js typescript-eslint @stylistic/eslint-plugin
+npm i --save-dev @eslint/js typescript-eslint @stylistic/eslint-plugin eslint-plugin-vue
 

setup

@@ -39,7 +39,7 @@ platform=$(echo "$platform" | tr '[:upper:]' '[:lower:]')
 # Get user preference for regenerating the styling
 regen=""
 read -p "Would you like to regenerate styling? (y/N) " regen
-if [ $regen == "y" ]; then
+if [[ "$regen" == "y" ]]; then
     cd build
     node build.js
     if [ $? -ne 0 ]; then
@@ -100,13 +100,16 @@ sudo cp ./system/environment /etc/environment
 sudo cp -r ./system/greetd/* /etc/greetd/
 hyprctl reload
 
-# echo "
+echo "
-#     => Restarting bars, etc
+    => Restarting bars, etc
-# "
+        -> This will take a couple of seconds to ensure them quitting properly
-# killall gjs
+"
-# sleep 1
+killall gjs
-# ags run -d ./config/astal --gtk4 & disown 2>&1 > /dev/null
+killall ags
-# ags run -d ./config/ags/notifications/ & disown 2>&1 > /dev/null
+sleep 5
+ags run -d ~/projects/active/dotfiles/config/astal --gtk4 & disown
+sleep 2
+ags run -d ~/projects/active/dotfiles/config/ags/notifications & disown
 
 echo "