feat: adapted waybar to rose-pine

.config/hypr/hyprland.conf

@@ -28,8 +28,10 @@ monitor= eDP-1,1920x1080@60.04900,0x0,1
 
 monitor= desc:Hewlett Packard HP 24es 3CM6310XHM,1920x1080@60.00,-1920x-1440,1
 monitor= desc:AOC Q3279WG5B 0x00005175, 2560x1440@74.97,0x-1440,1
+monitor= desc:Acer Technologies VG272U P 0x033000FF, 2560x1440@59.95100,0x-1440,1
 
-monitor = , preferred, auto, 1, mirror, eDP-1
+
+#monitor = , preferred, auto, 1, mirror, eDP-1
 
 #monitor= DP-3,1600x1200@60.00,auto,auto
 ###################
@@ -232,10 +234,7 @@ input {
 }
 
 # https://wiki.hyprland.org/Configuring/Variables/#gestures
-gestures {
+gesture = 3, horizontal, workspace
-    workspace_swipe = true
-    workspace_swipe_fingers = 3
-}
 
 # Example per-device config
 # See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more
@@ -379,3 +378,14 @@ opengl {
 #bind = $mainMod, S, togglespecialworkspace, magic
 #bind = $mainMod, S, movetoworkspace, special:magic
 #bind = $mainMod, S, togglespecialworkspace, magic
+
+plugin {
+    hyprexpo {
+        columns = 3
+        gap_size = 10
+        bg_col = rgb(111111)
+        workspace_method = center current # [center/first] [workspace] e.g. first 1 or center m+1
+        skip_empty = true
+        gesture_distance = 300 # how far is the "max" for the gesture
+    }
+}

.config/kitty/current-theme.conf

@@ -1,51 +1,56 @@
-# vim:ft=kitty
+## name: Rosé Pine Moon
-
+## author: mvllow
-## name: Adwaita darker
 ## license: MIT
-## author: Emil Löfquist (https://github.com/ewal)
+## upstream: https://github.com/rose-pine/kitty/blob/main/dist/rose-pine-moon.conf
-## upstream: https://github.com/ewal/kitty-adwaita/blob/main/adwaita_darker.conf
+## blurb: All natural pine, faux fur and a bit of soho vibes for the classy minimalist
-## blurb: Adwaita darker - based on https://github.com/Mofiqul/adwaita.nvim
 
-background                #232136
+foreground               #e0def4
-foreground                #deddda
+background               #232136
+selection_foreground     #e0def4
+selection_background     #44415a
 
-selection_background      #1c1c1c
+cursor                   #56526e
-selection_foreground      #c0bfbc
+cursor_text_color        #e0def4
 
-url_color                 #1a5fb4
+url_color                #c4a7e7
 
-wayland_titlebar_color    system
+active_tab_foreground    #e0def4
-macos_titlebar_color      system
+active_tab_background    #393552
+inactive_tab_foreground  #6e6a86
+inactive_tab_background  #232136
 
-cursor                    #deddda
+active_border_color      #3e8fb0
-cursor_text_color         #000000
+inactive_border_color    #44415a
 
-active_border_color       #1e1e1e
+# black
-inactive_border_color     #282828
+color0   #393552
-bell_border_color         #ed333b
+color8   #6e6a86
-visual_bell_color         none
 
-active_tab_background     #101010
+# red
-active_tab_foreground     #fcfcfc
+color1   #eb6f92
-inactive_tab_background   #1c1c1c
+color9   #eb6f92
-inactive_tab_foreground   #b0afac
-tab_bar_background        none
-tab_bar_margin_color      none
 
-color0                    #000000
+# green
-color1                    #ed333b
+color2   #3e8fb0
-color2                    #57e389
+color10  #3e8fb0
-color3                    #ff7800
+
-color4                    #62a0ea
+# yellow
-color5                    #9141ac
+color3   #f6c177
-color6                    #5bc8af
+color11  #f6c177
-color7                    #deddda
+
+# blue
+color4   #9ccfd8
+color12  #9ccfd8
+
+# magenta
+color5   #c4a7e7
+color13  #c4a7e7
+
+# cyan
+color6   #ea9a97
+color14  #ea9a97
+
+# white
+color7   #e0def4
+color15  #e0def4
 
-color8                    #9a9996
-color9                    #f66151
-color10                   #8ff0a4
-color11                   #ffa348
-color12                   #99c1f1
-color13                   #dc8add
-color14                   #93ddc2
-color15                   #f6f5f4

.config/kitty/kitty.conf

@@ -3,21 +3,21 @@ window_padding_width 5
 window_border_width 0
 
 tab_bar_edge top
-active_tab_foreground #fff
+# active_tab_foreground #fff
 active_tab_font_style bold-italic
-active_tab_background #8631B4
+# active_tab_background #8631B4
-inactive_tab_foreground #c2c2c2
+# inactive_tab_foreground #c2c2c2
-inactive_tab_background #955bb4
+# inactive_tab_background #955bb4
 
 # BEGIN_KITTY_THEME
-# Adwaita darker
+# Rosé Pine Moon
 include current-theme.conf
 # END_KITTY_THEME
-active_tab_foreground #fff
+# active_tab_foreground #fff
 active_tab_font_style bold-italic
-active_tab_background #8631B4
+# active_tab_background #8631B4
-inactive_tab_foreground #c2c2c2
+# inactive_tab_foreground #c2c2c2
-inactive_tab_background #955bb4
+# inactive_tab_background #955bb4
 
 
 # BEGIN_KITTY_FONTS

.config/nvim/init.lua

@@ -9,6 +9,7 @@ vim.o.wrap = false -- Disable line wrapping
 vim.o.cursorline = true -- Highlight the current line
 vim.o.termguicolors = true -- Enable 24-bit RGB colors
 vim.o.clipboard = "unnamedplus"
+vim.filetype.add({extension = {svx = "markdown"}})
 
 -- Syntax highlighting and filetype plugins
 vim.cmd('syntax enable')

.config/nvim/lua/config/lazy.lua

@@ -31,5 +31,5 @@ require("lazy").setup({
   -- colorscheme that will be used when installing plugins.
   install = { colorscheme = {"tokyonight", "habamax" } },
   -- automatically check for plugin updates
-  checker = { enabled = true },
+  checker = { enabled = true, notify = false },
 })

.config/waybar/config.jsonc

@@ -0,0 +1,219 @@
+// -*- mode: jsonc -*-
+{
+    // "layer": "top", // Waybar at top layer
+    // "position": "bottom", // Waybar position (top|bottom|left|right)
+    "height": 30, // Waybar height (to be removed for auto height)
+    // "width": 1280, // Waybar width
+    "spacing": 4, // Gaps between modules (4px)
+    // Choose the order of the modules
+    "modules-left": [
+        "sway/workspaces",
+        "sway/mode",
+        "sway/scratchpad",
+        "custom/media"
+    ],
+    "modules-center": [
+        "sway/window"
+    ],
+    "modules-right": [
+        "mpd",
+        "idle_inhibitor",
+        "pulseaudio",
+        //"network",
+        "power-profiles-daemon",
+        "cpu",
+        "memory",
+        "temperature",
+        "backlight",
+        "keyboard-state",
+        "sway/language",
+        "battery",
+        "battery#bat2",
+        "clock",
+        "tray",
+        "custom/power"
+    ],
+    // Modules configuration
+    // "sway/workspaces": {
+    //     "disable-scroll": true,
+    //     "all-outputs": true,
+    //     "warp-on-scroll": false,
+    //     "format": "{name}: {icon}",
+    //     "format-icons": {
+    //         "1": "",
+    //         "2": "",
+    //         "3": "",
+    //         "4": "",
+    //         "5": "",
+    //         "urgent": "",
+    //         "focused": "",
+    //         "default": ""
+    //     }
+    // },
+    "keyboard-state": {
+        "numlock": true,
+        "capslock": true,
+        "format": "{name} {icon}",
+        "format-icons": {
+            "locked": "",
+            "unlocked": ""
+        }
+    },
+    "sway/mode": {
+        "format": "<span style=\"italic\">{}</span>"
+    },
+    "sway/scratchpad": {
+        "format": "{icon} {count}",
+        "show-empty": false,
+        "format-icons": ["", ""],
+        "tooltip": true,
+        "tooltip-format": "{app}: {title}"
+    },
+    "mpd": {
+        "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ",
+        "format-disconnected": "Disconnected ",
+        "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ",
+        "unknown-tag": "N/A",
+        "interval": 5,
+        "consume-icons": {
+            "on": " "
+        },
+        "random-icons": {
+            "off": "<span color=\"#f53c3c\"></span> ",
+            "on": " "
+        },
+        "repeat-icons": {
+            "on": " "
+        },
+        "single-icons": {
+            "on": "1 "
+        },
+        "state-icons": {
+            "paused": "",
+            "playing": ""
+        },
+        "tooltip-format": "MPD (connected)",
+        "tooltip-format-disconnected": "MPD (disconnected)"
+    },
+    "idle_inhibitor": {
+        "format": "{icon}",
+        "format-icons": {
+            "activated": "",
+            "deactivated": ""
+        }
+    },
+    "tray": {
+        // "icon-size": 21,
+        "spacing": 10,
+        // "icons": {
+        //   "blueman": "bluetooth",
+        //   "TelegramDesktop": "$HOME/.local/share/icons/hicolor/16x16/apps/telegram.png"
+        // }
+    },
+    "clock": {
+        // "timezone": "America/New_York",
+        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
+        "format-alt": "{:%Y-%m-%d}"
+    },
+    "cpu": {
+        "format": "{usage}% ",
+        "tooltip": false
+    },
+    "memory": {
+        "format": "{}% "
+    },
+    "temperature": {
+        "thermal-zone": 7,
+        // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
+        "critical-threshold": 80,
+        // "format-critical": "{temperatureC}°C {icon}",
+        "format": "{temperatureC}°C {icon}",
+        "format-icons": ["", "", ""]
+    },
+    "backlight": {
+        // "device": "acpi_video1",
+        "format": "{percent}% {icon}",
+        "format-icons": ["", "", "", "", "", "", "", "", ""]
+    },
+    "battery": {
+        "states": {
+            // "good": 95,
+            "warning": 30,
+            "critical": 15
+        },
+        "format": "{capacity}% {icon}",
+        "format-full": "{capacity}% {icon}",
+        "format-charging": "{capacity}% ",
+        "format-plugged": "{capacity}% ",
+        "format-alt": "{time} {icon}",
+        // "format-good": "", // An empty format will hide the module
+        // "format-full": "",
+        "format-icons": ["", "", "", "", ""]
+    },
+    "battery#bat2": {
+        "bat": "BAT2"
+    },
+    "power-profiles-daemon": {
+      "format": "{icon}",
+      "tooltip-format": "Power profile: {profile}\nDriver: {driver}",
+      "tooltip": true,
+      "format-icons": {
+        "default": "",
+        "performance": "",
+        "balanced": "",
+        "power-saver": ""
+      }
+    },
+    // "network": {
+    //     // "interface": "wlp2*", // (Optional) To force the use of this interface
+    //     "format-wifi": "{essid} ({signalStrength}%) ",
+    //     "format-ethernet": "{ipaddr}/{cidr} ",
+    //     "tooltip-format": "{ifname} via {gwaddr} ",
+    //     "format-linked": "{ifname} (No IP) ",
+    //     "format-disconnected": "Disconnected ⚠",
+    //     "format-alt": "{ifname}: {ipaddr}/{cidr}"
+    // },
+    "pulseaudio": {
+        // "scroll-step": 1, // %, can be a float
+        "format": "{volume}% {icon} {format_source}",
+        "format-bluetooth": "{volume}% {icon} {format_source}",
+        "format-bluetooth-muted": " {icon} {format_source}",
+        "format-muted": " {format_source}",
+        "format-source": "{volume}% ",
+        "format-source-muted": "",
+        "format-icons": {
+            "headphone": "",
+            "hands-free": "",
+            "headset": "",
+            "phone": "",
+            "portable": "",
+            "car": "",
+            "default": ["", "", ""]
+        },
+        "on-click": "pavucontrol"
+    },
+    "custom/media": {
+        "format": "{icon} {text}",
+        "return-type": "json",
+        "max-length": 40,
+        "format-icons": {
+            "spotify": "",
+            "default": "🎜"
+        },
+        "escape": true,
+        "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
+        // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
+    },
+    "custom/power": {
+        "format" : "⏾",
+		"tooltip": false,
+		"menu": "on-click",
+		"menu-file": "$HOME/.config/waybar/power_menu.xml", // Menu file in resources folder
+		"menu-actions": {
+			"shutdown": "shutdown",
+			"reboot": "reboot",
+			"suspend": "systemctl suspend",
+			"hibernate": "systemctl hibernate"
+		}
+    }
+}

.config/waybar/power_menu.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <object class="GtkMenu" id="menu">
+    <child>
+		<object class="GtkMenuItem" id="suspend">
+			<property name="label">Suspend</property>
+        </object>
+	</child>
+	<child>
+        <object class="GtkMenuItem" id="hibernate">
+			<property name="label">Hibernate</property>
+        </object>
+	</child>
+    <child>
+        <object class="GtkMenuItem" id="shutdown">
+			<property name="label">Shutdown</property>
+        </object>
+    </child>
+    <child>
+      <object class="GtkSeparatorMenuItem" id="delimiter1"/>
+    </child>
+    <child>
+		<object class="GtkMenuItem" id="reboot">
+			<property name="label">Reboot</property>
+		</object>
+    </child>
+  </object>
+</interface>

.config/waybar/style.css

@@ -1,16 +1,19 @@
+@define-color primary-bg #191724;
+
+
 * {
     border: none;
     border-radius: 4px;
     /*border-bottom-right-radius: 4px;*/
     /* `ttf-font-awesome` is required to be installed for icons */
-    font-family: "Roboto Mono Medium", Helvetica, Arial, sans-serif;
+    font-family: Inter;
 
     /* adjust font-size value to your liking: */
     font-size: 10px;
 
     min-height: 0;
-}
     
+}
 window#waybar {
     background-color: rgba(0, 0, 0, 0.5);
     /* border-bottom: 3px solid rgba(100, 114, 125, 0.5); */
@@ -35,11 +38,11 @@ window#waybar.solo {
 */
 
 /* window#waybar.termite {
-    background-color: #000000;
+    background-color: @primary-bg;
 }
 
 window#waybar.chromium {
-    background-color: #000000;
+    background-color: @primary-bg;
     border: none;
 } */
 
@@ -83,6 +86,7 @@ window#waybar.chromium {
 #tray,
 #mode,
 #idle_inhibitor,
+#custom-power,
 #mpd {
     padding: 0 10px;
     margin: 6px 3px; 
@@ -105,18 +109,18 @@ window#waybar.chromium {
 }
 
 #clock {
-    background-color: #000000;
+    background-color: @primary-bg;
     color: white;
 }
 
 #battery {
-    background-color: #000000;
+    background-color: @primary-bg;
     color: white;
 }
 
 #battery.charging {
     color: #ffffff;
-    background-color: #000000;
+    background-color: @primary-bg;
 }
 
 @keyframes blink {
@@ -137,26 +141,26 @@ window#waybar.chromium {
 }
 
 label:focus {
-    background-color: #000000;
+    background-color: @primary-bg;
 }
 
 #cpu {
-    background-color: #000000;
+    background-color: @primary-bg;
     color: #ffffff;
 }
 
 #memory {
-    background-color: #000000;
+    background-color: @primary-bg;
     color: white;
 }
 
 #backlight {
-    background-color: #000000;
+    background-color: @primary-bg;
     color:white;
 }
 
 #network {
-    background-color: #000000;
+    background-color: @primary-bg;
     color:white;
 
 }
@@ -166,12 +170,12 @@ label:focus {
 }
 
 #pulseaudio {
-    background-color: #000000;
+    background-color: @primary-bg;
     color: #ffffff;
 }
 
 #pulseaudio.muted {
-    background-color: #000000;
+    background-color: @primary-bg;
     color: #ffffff;
 }
 
@@ -190,15 +194,15 @@ label:focus {
 }
 
 #temperature {
-    background-color: #f0932b;
+    background-color: #9ccfd8;
 }
 
 #temperature.critical {
-    background-color: #eb4d4b;
+    background-color: #eb6f92;
 }
 
 #tray {
-    background-color: #2980b9;
+    background-color: #26233a;
 }
 
 #idle_inhibitor {
@@ -238,7 +242,11 @@ label:focus {
 #power-profiles-daemon{
     color: #ffffff;
     padding: 0 10px 0px 7px;
-    background-color: #000000;
+    background-color: @primary-bg;
     margin: 6px 3px;
 
 }
+#custom-power{
+   color: #ffffff;
+    background-color: #26233a;
+}

.config/zsh_custom/90-aliases.zsh

@@ -1 +1,2 @@
 alias dotfiles='/usr/bin/git --git-dir="$HOME/.dotfiles/" --work-tree="$HOME"'
+alias ssh='kitty +kitten ssh'

.gitmodules

@@ -1,9 +1,12 @@
-[submodule ".ohmyzsh"]
+[submodule ".config/zsh_custom/themes/powerlevel10k"]
-	path = .ohmyzsh
+	path = .config/zsh_custom/themes/powerlevel10k
-	url = https://github.com/ohmyzsh/ohmyzsh.git
-[submodule "/home/amy/.config/zsh_custom/themes/powerlevel10k"]
-	path = /home/amy/.config/zsh_custom/themes/powerlevel10k
 	url = https://github.com/romkatv/powerlevel10k.git
 [submodule ".config/zsh_custom/plugins/zsh-syntax-highlighting"]
 	path = .config/zsh_custom/plugins/zsh-syntax-highlighting
 	url = https://github.com/zsh-users/zsh-syntax-highlighting
+[submodule ".config/zsh_custom/plugins/zsh-autosuggestions"]
+	path = .config/zsh_custom/plugins/zsh-autosuggestions
+	url = https://github.com/zsh-users/zsh-autosuggestions
+[submodule ".ohmyzsh"]
+	path = .ohmyzsh
+	url = https://github.com/ohmyzsh/ohmyzsh.git

.zshrc

@@ -0,0 +1,120 @@
+# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
+# Initialization code that may require console input (password prompts, [y/n]
+# confirmations, etc.) must go above this block; everything else may go below.
+if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
+  source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
+fi
+
+# If you come from bash you might have to change your $PATH.
+# export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH
+
+# Path to your Oh My Zsh installation.
+export ZSH="$HOME/.ohmyzsh"
+export ZSH_CUSTOM="$HOME/.config/zsh_custom"
+# Set name of the theme to load --- if set to "random", it will
+# load a random theme each time Oh My Zsh is loaded, in which case,
+# to know which specific one was loaded, run: echo $RANDOM_THEME
+# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
+ZSH_THEME="powerlevel10k/powerlevel10k"
+
+# Set list of themes to pick from when loading at random
+# Setting this variable when ZSH_THEME=random will cause zsh to load
+# a theme from this variable instead of looking in $ZSH/themes/
+# If set to an empty array, this variable will have no effect.
+# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )
+
+# Uncomment the following line to use case-sensitive completion.
+# CASE_SENSITIVE="true"
+
+# Uncomment the following line to use hyphen-insensitive completion.
+# Case-sensitive completion must be off. _ and - will be interchangeable.
+# HYPHEN_INSENSITIVE="true"
+
+# Uncomment one of the following lines to change the auto-update behavior
+zstyle ':omz:update' mode disabled  # disable automatic updates
+# zstyle ':omz:update' mode auto      # update automatically without asking
+# zstyle ':omz:update' mode reminder  # just remind me to update when it's time
+
+# Uncomment the following line to change how often to auto-update (in days).
+# zstyle ':omz:update' frequency 13
+
+# Uncomment the following line if pasting URLs and other text is messed up.
+# DISABLE_MAGIC_FUNCTIONS="true"
+
+# Uncomment the following line to disable colors in ls.
+# DISABLE_LS_COLORS="true"
+
+# Uncomment the following line to disable auto-setting terminal title.
+# DISABLE_AUTO_TITLE="true"
+
+# Uncomment the following line to enable command auto-correction.
+# ENABLE_CORRECTION="true"
+
+# Uncomment the following line to display red dots whilst waiting for completion.
+# You can also set it to another string to have that shown instead of the default red dots.
+# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
+# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765)
+# COMPLETION_WAITING_DOTS="true"
+
+# Uncomment the following line if you want to disable marking untracked files
+# under VCS as dirty. This makes repository status check for large repositories
+# much, much faster.
+# DISABLE_UNTRACKED_FILES_DIRTY="true"
+
+# Uncomment the following line if you want to change the command execution time
+# stamp shown in the history command output.
+# You can set one of the optional three formats:
+# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
+# or set a custom format using the strftime function format specifications,
+# see 'man strftime' for details.
+# HIST_STAMPS="mm/dd/yyyy"
+
+# Would you like to use another custom folder than $ZSH/custom?
+# ZSH_CUSTOM=/path/to/new-custom-folder
+
+# Which plugins would you like to load?
+# Standard plugins can be found in $ZSH/plugins/
+# Custom plugins may be added to $ZSH_CUSTOM/plugins/
+# Example format: plugins=(rails git textmate ruby lighthouse)
+# Add wisely, as too many plugins slow down shell startup.
+plugins=(
+    git
+    zsh-syntax-highlighting
+    zsh-autosuggestions
+)
+
+source $ZSH/oh-my-zsh.sh
+
+# User configuration
+
+# export MANPATH="/usr/local/man:$MANPATH"
+
+# You may need to manually set your language environment
+# export LANG=en_US.UTF-8
+
+# Preferred editor for local and remote sessions
+# if [[ -n $SSH_CONNECTION ]]; then
+#   export EDITOR='vim'
+# else
+#   export EDITOR='nvim'
+# fi
+
+# Compilation flags
+# export ARCHFLAGS="-arch $(uname -m)"
+
+# Set personal aliases, overriding those provided by Oh My Zsh libs,
+# plugins, and themes. Aliases can be placed here, though Oh My Zsh
+# users are encouraged to define aliases within a top-level file in
+# the $ZSH_CUSTOM folder, with .zsh extension. Examples:
+# - $ZSH_CUSTOM/aliases.zsh
+# - $ZSH_CUSTOM/macos.zsh
+# For a full list of active aliases, run `alias`.
+#
+# Example aliases
+# alias zshconfig="mate ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"
+
+# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
+
+# To customize prompt, run `p10k configure` or edit ~/.config/zsh_custom/10-p10k.zsh.
+[[ ! -f ~/.config/zsh_custom/10-p10k.zsh ]] || source ~/.config/zsh_custom/10-p10k.zsh