diff --git a/dotfiles/hypr/%hyprlock.conf b/dotfiles/hypr/%hyprlock.conf
deleted file mode 100644
index 294ff02..0000000
--- a/dotfiles/hypr/%hyprlock.conf
+++ /dev/null
@@ -1,72 +0,0 @@
-source = ~/.config/hypr/variables.conf
-
-# BACKGROUND
-background {
- monitor =
- color = #000000
- blur_passes = 0
- contrast = 1
- brightness = 0.5
- vibrancy = 0.2
- vibrancy_darkness = 0.2
-}
-
-# GENERAL
-general {
- no_fade_in = true
- no_fade_out = true
- hide_cursor = false
- grace = 0
- disable_loading_bar = true
-}
-
-# INPUT FIELD
-input-field {
- monitor =
- size = 250, 60
- outline_thickness = 2
- dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8
- dots_spacing = 0.35 # Scale of dots' absolute size, 0.0 - 1.0
- dots_center = true
- outer_color = rgba(1, 1, 1, 0)
- inner_color = rgba(1, 1, 1, 0.2)
- font_color = #000000
- fade_on_empty = false
- rounding = -1
- check_color = rgb(204, 136, 34)
- placeholder_text = Input Password...
- hide_input = false
- position = 0, -200
- halign = center
- valign = center
-}
-
-# DATE
-label {
- monitor =
- text = cmd[update:1000] echo "$(date +"%A, %B %d")"
- color = rgba(255,255,255, 0.75)
- font_size = 22
- font_family = Luciole
- position = 0, 100
- halign = center
- valign = center
-}
-
-# TIME
-label {
- monitor =
- text = cmd[update:1000] echo "$(date +"%-I:%M")"
- color = rgba(255,255,255, 0.75)
- font_size = 95
- font_family = Luciole
- position = 0, 200
- halign = center
- valign = center
-}
-
-
-auth {
- fingerprint:enabled=true
-}
-
diff --git a/dotfiles/hypr/%hyprtoolkit.conf b/dotfiles/hypr/%hyprtoolkit.conf
deleted file mode 100644
index d872f15..0000000
--- a/dotfiles/hypr/%hyprtoolkit.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-background = rgba(1a1b26ff)
-base = rgba(1a1b26ff)
-text = rgba(c0caf5ff)
-alternate_base = rgba(24283bff)
-bright_text = rgba(16161eff)
-accent = rgba(7aa2f7ff)
-accent_secondary = rgba(bb9af7ff)
\ No newline at end of file
diff --git a/dotfiles/hypr/conf/binding.lua b/dotfiles/hypr/conf/binding.lua
index 185618a..b02f0d0 100644
--- a/dotfiles/hypr/conf/binding.lua
+++ b/dotfiles/hypr/conf/binding.lua
@@ -27,10 +27,13 @@ hl.bind("CTRL + SUPER + H", hl.dsp.window.move({ direction = "left" }))
hl.bind("CTRL + SUPER + K", hl.dsp.window.move({ direction = "up" }))
hl.bind("CTRL + SUPER + J", hl.dsp.window.move({ direction = "down" }))
-- move to monitor
-hl.bind("SUPER + A", hl.dsp.focus({ monitor = monitorA }))
-hl.bind("SUPER + B", hl.dsp.focus({ monitor = monitorB }))
+hl.bind("ALT + A", hl.dsp.focus({ monitor = monitorA }))
+hl.bind("ALT + B", hl.dsp.focus({ monitor = monitorB }))
+hl.bind("ALT + B", hl.dsp.focus({ monitor = monitorC }))
hl.bind("CTRL + SUPER + A", hl.dsp.window.move({ monitor = monitorA }))
hl.bind("CTRL + SUPER + B", hl.dsp.window.move({ monitor = monitorB }))
+hl.bind("CTRL + SUPER + B", hl.dsp.window.move({ monitor = monitorC }))
+
-- change workspace
hl.bind("SUPER + L", hl.dsp.focus({ workspace = "r+1" }))
hl.bind("SUPER + H", hl.dsp.focus({ workspace = "r-1" }))
diff --git a/dotfiles/hypr/conf/env.lua b/dotfiles/hypr/conf/env.lua
index d295628..dae2a8b 100644
--- a/dotfiles/hypr/conf/env.lua
+++ b/dotfiles/hypr/conf/env.lua
@@ -7,3 +7,7 @@ hl.env("NVD_BACKEND", "direct")
hl.env("ELECTRON_OZONE_PLATFORM_HINT", "auto")
hl.env("SCREENSHOT_DIR", "$home/Screenshots")
hl.env("GDK_SCALE", 1)
+hl.env("XCURSOR_THEME", "Bibata-Modern-Ice")
+hl.env("XCURSOR_SIZE", 24)
+hl.env("HYPRCURSOR_THEME", "Bibata-Modern-Ice")
+hl.env("HYPRCURSOR_SIZE", 24)
diff --git a/dotfiles/hypr/conf/others.lua b/dotfiles/hypr/conf/others.lua
index 1aea91e..541c83d 100644
--- a/dotfiles/hypr/conf/others.lua
+++ b/dotfiles/hypr/conf/others.lua
@@ -1,6 +1,14 @@
-hl.misc({
- force_default_wallpaper = 0,
- disable_hyprland_logo = true,
- disable_splash_rendering = true,
- vrr = 1,
+hl.config({
+ misc = {
+ force_default_wallpaper = 0,
+ disable_hyprland_logo = true,
+ disable_splash_rendering = true,
+ vrr = 1,
+ },
+})
+hl.config({
+ cursor = {
+ enable_hyprcursor = false,
+ no_hardware_cursors = true,
+ },
})
diff --git a/dotfiles/hypr/conf/startup.lua b/dotfiles/hypr/conf/startup.lua
index 3898cb5..7f7bbb3 100644
--- a/dotfiles/hypr/conf/startup.lua
+++ b/dotfiles/hypr/conf/startup.lua
@@ -4,7 +4,6 @@ hl.on("hyprland.start", function()
hl.exec_cmd("wl-paste --type image --watch cliphist store")
hl.exec_cmd("systemctl --user start hyprpolkitagent")
hl.exec_cmd("hyprctl setcursor Bibata-Modern-Ice 24")
- hl.exec_cmd("./~/nixos-config/dotfiles/hypr/unlockbridge.sh")
-- hl.exec_cmd("noctalia-shell")
-- hl.exec_cmd("hyprpanel")
-- hl.exec_cmd("hyprsunset")
diff --git a/dotfiles/hypr/conf/style.lua b/dotfiles/hypr/conf/style.lua
index 1220ce1..168fa3b 100644
--- a/dotfiles/hypr/conf/style.lua
+++ b/dotfiles/hypr/conf/style.lua
@@ -49,7 +49,7 @@ hl.config({
master = {
new_status = "slave",
orientation = "left",
- mfact = "0.7",
+ mfact = "0.6",
},
scrolling = {
fullscreen_on_one_column = true,
diff --git a/dotfiles/hypr/hyprland.lua b/dotfiles/hypr/hyprland.lua
index 59d9010..6d5bfe3 100644
--- a/dotfiles/hypr/hyprland.lua
+++ b/dotfiles/hypr/hyprland.lua
@@ -1,7 +1,8 @@
require("conf.variables")
-require("conf.env")
require("conf.binding")
+require("conf.env")
require("conf.input")
+require("conf.others")
require("conf.monitor")
require("conf.startup")
require("conf.style")
diff --git a/dotfiles/hypr/hyprlock.conf b/dotfiles/hypr/hyprlock.conf
new file mode 100644
index 0000000..1ae4a01
--- /dev/null
+++ b/dotfiles/hypr/hyprlock.conf
@@ -0,0 +1,118 @@
+source = ~/.config/hypr/variables.conf
+
+# BACKGROUND
+background {
+ monitor =
+ path = ~/nixos-config/dotfiles/hypr/wallpaper/nix-wallpaper.png
+ blur_passes = 2
+ contrast = 0.8916
+ brightness = 0.8172
+zsh:1: command not found: q
+ vibrancy_darkness = 0.3
+}
+
+# GENERAL
+general {
+ no_fade_in = false
+ grace = 0
+ disable_loading_bar = false
+}
+
+# DATE
+label {
+ monitor =
+ text = cmd[update:1000] echo "$(date +"%A, %B %d")"
+ color = rgba(255,255,255, 0.75)
+ font_size = 22
+ font_family = Luciole
+ position = 0, 100
+ halign = center
+ valign = center
+}
+
+# TIME
+label {
+ monitor =
+ text = cmd[update:1000] echo -e "$(LC_TIME=en_US.UTF-8 date +"%A, %B %d")"
+ color = rgba(216, 222, 233, 0.90)
+ font_size = 25
+ font_family = SF Pro Display Semibold
+ position = 0, 350
+ halign = center
+ valign = center
+}
+label {
+ monitor =
+ text = cmd[update:1000] echo "$(date +"%I:%M")"
+ color = rgba(216, 222, 233, 0.90)
+ font_size = 120
+ font_family = SF Pro Display Bold
+ position = 0, 230
+ halign = center
+ valign = center
+}
+
+# User info
+label {
+ monitor =
+ text = $USER
+ color = rgba(216, 222, 233, 0.80)
+ outline_thickness = 2
+ dots_size = 0.2
+ dots_spacing = 0.2
+ dots_center = true
+ font_size = 18
+ font_family = SF Pro Display Bold
+ position = 0, -130
+ halign = center
+ valign = center
+}
+shape {
+ monitor =
+ size = 280, 55
+ color = rgba(255, 255, 255, .1)
+ rounding = -1
+ border_size = 0
+ border_color = rgba(253, 198, 135, 0)
+ rotate = 0
+ xray = false
+ position = 0, -130
+ halign = center
+ valign = center
+}
+
+# INPUT FIELD
+input-field {
+ monitor =
+ size = 280, 55
+ outline_thickness = 2
+ dots_size = 0.2 # Password dot size (0.2-0.8)
+ dots_spacing = 0.2 # Spacing between dots (0.0-1.0)
+ dots_center = true # Center dots in field
+ outer_color = rgba(0, 0, 0, 0)
+ inner_color = rgba(255, 255, 255, 0.1)
+ font_color = rgb(200, 200, 200)
+ fade_on_empty = false
+ font_family = SF Pro Display Bold
+ placeholder_text = Enter Pass
+ hide_input = false # Show/hide password dots
+ position = 0, -210
+ halign = center
+ valign = center
+}
+
+label {
+ monitor =
+ text = cmd[update:30000] echo "🔋 $(cat /sys/class/power_supply/BAT0/capacity)%"
+ color = rgba(255, 255, 255, 0.8)
+ font_size = 14
+ position = -50, 50
+ halign = right
+ valign = bottom
+}
+
+
+auth {
+ fingerprint:enabled=true
+}
+
diff --git a/dotfiles/hypr/unlockbridge.sh b/dotfiles/hypr/unlockbridge.sh
deleted file mode 100755
index 15723c4..0000000
--- a/dotfiles/hypr/unlockbridge.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-protonmail-bridge --cli
diff --git a/dotfiles/hypr/wallpaper/avatar.jpg b/dotfiles/hypr/wallpaper/avatar.jpg
deleted file mode 100644
index e2f2dbe..0000000
Binary files a/dotfiles/hypr/wallpaper/avatar.jpg and /dev/null differ
diff --git a/dotfiles/inkscape/dialogs-state-ex.ini b/dotfiles/inkscape/dialogs-state-ex.ini
index 81dc38f..cf714da 100644
--- a/dotfiles/inkscape/dialogs-state-ex.ini
+++ b/dotfiles/inkscape/dialogs-state-ex.ini
@@ -5,7 +5,7 @@ Count=1
Notebook0Dialogs=ObjectProperties;FillStroke;Export;AlignDistribute;Text;
Notebook0Height=921
Notebook0ActiveTab=2
-ColumnWidth=633
+ColumnWidth=560
NotebookCount=1
BeforeCanvas=false
diff --git a/dotfiles/inkscape/fontcollections/recently_used_fonts.log b/dotfiles/inkscape/fontcollections/recently_used_fonts.log
index 2ce61b4..c289371 100644
--- a/dotfiles/inkscape/fontcollections/recently_used_fonts.log
+++ b/dotfiles/inkscape/fontcollections/recently_used_fonts.log
@@ -1,4 +1,3 @@
Comic Sans MS
-Sans
Trebuchet MS
-sans-serif
+Sans
diff --git a/dotfiles/inkscape/preferences.xml b/dotfiles/inkscape/preferences.xml
index 3ed87e1..a549546 100644
--- a/dotfiles/inkscape/preferences.xml
+++ b/dotfiles/inkscape/preferences.xml
@@ -317,7 +317,7 @@
id="lpetool"
mode="drag"
style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;"
- unit="mm" />
+ unit="px" />
+ scaleLineHeightFromFontSIze="2" />
+ style="text-orientation:auto;-inkscape-font-specification:'Sans, Normal';font-family:Sans;stroke-linejoin:bevel;stroke-width:0.62740157;font-size:16px;fill:#000000">