diff --git a/dot_config/hypr/config/autostart.lua b/dot_config/hypr/config/autostart.lua
index 6523deb..7ef5a5e 100644
--- a/dot_config/hypr/config/autostart.lua
+++ b/dot_config/hypr/config/autostart.lua
@@ -7,4 +7,5 @@ hl.on("hyprland.start", function()
hl.exec_cmd("/usr/libexec/hyprpolkitagent")
hl.exec_cmd("dunst")
hl.exec_cmd("killall -q waybar; sleep .5 && env LC_TIME=de_DE.UTF-8 waybar")
+ hl.exec_cmd("hypridle")
end)
diff --git a/dot_config/hypr/config/general.lua b/dot_config/hypr/config/general.lua
index 8942d49..4543663 100644
--- a/dot_config/hypr/config/general.lua
+++ b/dot_config/hypr/config/general.lua
@@ -60,7 +60,9 @@ hl.config({
},
cursor = {
- no_hardware_cursors = 1
+ no_hardware_cursors = 1,
+ no_warps = true,
+ hide_on_key_press = true
}
})
@@ -114,9 +116,11 @@ hl.config({
input = {
kb_layout = "de",
kb_variant = "nodeadkeys",
+
follow_mouse = 1,
- sensitivity = 0.2,
- force_no_accel = 1,
+ sensitivity = 0,
+ -- force_no_accel = 1,
+ accel_profile = "flat",
}
})
diff --git a/dot_config/hypr/config/rules.lua b/dot_config/hypr/config/rules.lua
index 23fe9ba..971ba32 100644
--- a/dot_config/hypr/config/rules.lua
+++ b/dot_config/hypr/config/rules.lua
@@ -43,17 +43,19 @@ hl.window_rule({
title = "^(notificationtoasts_.*)$"
},
no_focus = true,
- no_initial_focus = true
+ no_initial_focus = true,
+ focus_on_activate = false,
+ suppress_event = "activate activatefocus"
})
hl.window_rule({
name = "discord",
match = {
- class = "discord"
+ class = "[dD]iscord"
},
monitor = SECONDARY_DISPLAY,
workspace = "6 silent",
no_initial_focus = true,
focus_on_activate = false,
- suppress_event = "activatefocus"
+ suppress_event = "active activatefocus"
})
diff --git a/dot_config/hypr/executable_fix-hypr-lock.sh b/dot_config/hypr/executable_fix-hypr-lock.sh
deleted file mode 100644
index e32b22c..0000000
--- a/dot_config/hypr/executable_fix-hypr-lock.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-IS_LOCKED=$(ps -e | grep hyprlock)
-
-if [ -z "$IS_LOCKED" ]
-then
- hyprlock
-fi
diff --git a/dot_config/hypr/hyprlock.conf b/dot_config/hypr/hyprlock.conf
index f6559a2..94c14a7 100644
--- a/dot_config/hypr/hyprlock.conf
+++ b/dot_config/hypr/hyprlock.conf
@@ -1,90 +1,117 @@
-# source = ~/.cache/wal/colors-hyprland.conf
+$font = Noto Sans
-# BACKGROUND
-background {
- monitor = DP-4
- path = /home/zam/.config/wallpapers/wall0.png
- blur_passes = 3
- contrast = 0.8916
- brightness = 0.8172
- vibrancy = 0.1696
- vibrancy_darkness = 0.0
-}
-
-background {
- monitor = DP-3
- path = /home/zam/.config/wallpapers/wall1.png
- blur_passes = 3
- contrast = 0.8916
- brightness = 0.8172
- vibrancy = 0.1696
- vibrancy_darkness = 0.0
-}
-
-# GENERAL
general {
- no_fade_in = false
- grace = 0
- disable_loading_bar = true
- hide_cursor = true
+ hide_cursor = true
}
-# INPUT FIELD
-input-field {
- monitor = DP-4
- size = 250, 60
- outline_thickness = 2
- dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8
- dots_spacing = 0.2 # Scale of dots' absolute size, 0.0 - 1.0
- dots_center = true
- outer_color = rgba(0, 0, 0, 0)
- inner_color = rgba(0, 0, 0, 0.5)
- font_color = rgb(200, 200, 200)
- fade_on_empty = false
- # font_family = JetBrains Mono Nerd Font Mono
- placeholder_text = Input Password...
- hide_input = false
- position = 0, -120
- halign = center
- valign = center
+animations {
+ enabled = true
+ bezier = ease, 0.25, 0.1, 0.25, 1.0
+ animation = fadeIn, 1, 4, ease
+ animation = fadeOut, 1, 4, ease
+ animation = inputFieldDots, 1, 2, ease
}
-# TIME
+background {
+ monitor = DP-7
+ path = screenshot
+ blur_passes = 4
+ contrast = 0.95
+ brightness = 0.55
+ vibrancy = 0.18
+ vibrancy_darkness = 0.2
+}
+
+background {
+ monitor = DP-6
+ path = screenshot
+ blur_passes = 4
+ contrast = 0.95
+ brightness = 0.50
+ vibrancy = 0.16
+ vibrancy_darkness = 0.25
+}
+
+# Main monitor: DP-7
label {
- monitor = DP-4
- text = cmd[update:1000] date +"%-I:%M%p"
- # color = $foreground
- color = rgba(255, 255, 255, 0.6)
- font_size = 120
- font_family = JetBrains Mono Nerd Font Mono ExtraBold
- position = 0, -300
+ monitor = DP-7
+ text = $TIME
+ color = rgba(245, 247, 250, 0.92)
+ font_size = 96
+ font_family = $font
+ position = 0, -130
halign = center
valign = top
}
-# USER
label {
- monitor = DP-4
- text = Hi there, Zam
- # color = $foreground
- color = rgba(255, 255, 255, 0.6)
- font_size = 25
- font_family = JetBrains Mono Nerd Font Mono
- position = 0, -40
+ monitor = DP-7
+ text = cmd[update:60000] date +"%A, %d %B"
+ color = rgba(220, 225, 232, 0.78)
+ font_size = 24
+ font_family = $font
+ position = 0, -295
+ halign = center
+ valign = top
+}
+
+input-field {
+ monitor = DP-7
+ size = 420, 58
+ outline_thickness = 2
+ rounding = 14
+
+ outer_color = rgba(33ccffee) rgba(00ff99ee) 45deg
+ check_color = rgba(00ff99ee) rgba(33ccffee) 45deg
+ fail_color = rgba(ff6633ee) rgba(ff0066ee) 45deg
+
+ inner_color = rgba(12, 14, 18, 0.58)
+ font_color = rgba(245, 247, 250, 0.90)
+ font_family = $font
+
+ dots_size = 0.22
+ dots_spacing = 0.24
+ dots_center = true
+
+ fade_on_empty = false
+ placeholder_text = Password
+ fail_text = $PAMFAIL
+
+ position = 0, -95
halign = center
valign = center
}
-# CURRENT SONG
-# label {
-# monitor = DP-3
-# text = cmd[update:1000] echo "$(~/Documents/Scripts/whatsong.sh)"
-# color = $foreground
-# #color = rgba(255, 255, 255, 0.6)
-# font_size = 18
-# font_family = JetBrainsMono, Font Awesome 6 Free Solid
-# position = 0, -50
-# halign = center
-# valign = bottom
-# }
-#
+label {
+ monitor = DP-7
+ text = $LAYOUT
+ color = rgba(220, 225, 232, 0.55)
+ font_size = 16
+ font_family = $font
+ position = -32, 28
+ halign = right
+ valign = bottom
+}
+
+# Secondary rotated monitor: DP-6
+label {
+ monitor = DP-6
+ text = $TIME
+ color = rgba(245, 247, 250, 0.74)
+ font_size = 58
+ font_family = $font
+ position = 0, -80
+ halign = center
+ valign = center
+}
+
+label {
+ monitor = DP-6
+ text = cmd[update:60000] date +"%d %b"
+ color = rgba(220, 225, 232, 0.58)
+ font_size = 22
+ font_family = $font
+ position = 0, -145
+ halign = center
+ valign = center
+}
diff --git a/dot_config/hypr/hyprpaper.conf b/dot_config/hypr/hyprpaper.conf
deleted file mode 100644
index e13cb50..0000000
--- a/dot_config/hypr/hyprpaper.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-preload = ~/.config/wallpapers/wall0.jpg
-preload = ~/.config/wallpapers/wall1.jpg
-
-wallpaper {
- monitor = DP-4
- path = ~/.config/wallpapers/wall0.jpg
-}
-
-wallpaper {
- monitor = DP-3
- path = ~/.config/wallpapers/wall1.jpg
-}
diff --git a/dot_config/nvim/init.lua.tmpl b/dot_config/nvim/init.lua.tmpl
index 2f6aa79..b395c97 100644
--- a/dot_config/nvim/init.lua.tmpl
+++ b/dot_config/nvim/init.lua.tmpl
@@ -59,10 +59,10 @@ local function smart_move(direction, vim_cmd)
end
end
-vim.keymap.set('n', '', smart_move("left", "h"), { noremap = true, silent = false, desc = "Move to left windows" });
-vim.keymap.set('n', '', smart_move("right", "l"), { noremap = true, silent = false, desc = "Move to right windows" });
-vim.keymap.set('n', '', smart_move("down", "j"), { noremap = true, silent = false, desc = "Move to down window" });
-vim.keymap.set('n', '', smart_move("up", "k"), { noremap = true, silent = false, desc = "Move to up window" });
+vim.keymap.set({ 'n', 'i', 'v' }, '', smart_move("left", "h"), { noremap = true, silent = false, desc = "Move to left windows" });
+vim.keymap.set({ 'n', 'i', 'v' }, '', smart_move("right", "l"), { noremap = true, silent = false, desc = "Move to right windows" });
+vim.keymap.set({ 'n', 'i', 'v' }, '', smart_move("down", "j"), { noremap = true, silent = false, desc = "Move to down window" });
+vim.keymap.set({ 'n', 'i', 'v' }, '', smart_move("up", "k"), { noremap = true, silent = false, desc = "Move to up window" });
{{ end }}
diff --git a/dot_config/nvim/lua/plugins/catppuccin.lua b/dot_config/nvim/lua/plugins/catppuccin.lua
index b60a0e4..86af49a 100644
--- a/dot_config/nvim/lua/plugins/catppuccin.lua
+++ b/dot_config/nvim/lua/plugins/catppuccin.lua
@@ -6,7 +6,21 @@ return
lazy = false,
config = function()
require("catppuccin").setup({
- transparent_background = true,
+ transparent_background = false,
+
+ custom_highlights = function(colors)
+ return {
+ Normal = { bg = colors.base },
+ NormalNC = { bg = colors.mantle },
+
+ WinSeparator = { fg = colors.surface1, bg = colors.mantle },
+
+ StatusLine = { fg = colors.text, bg = colors.surface0 },
+ StatusLineNC = { fg = colors.overlay0, bg = colors.mantle },
+
+ CursorLine = { bg = colors.surface0 },
+ }
+ end
})
vim.cmd.colorscheme "catppuccin"
diff --git a/dot_config/nvim/lua/plugins/lualine.lua b/dot_config/nvim/lua/plugins/lualine.lua
index 71522da..588b264 100644
--- a/dot_config/nvim/lua/plugins/lualine.lua
+++ b/dot_config/nvim/lua/plugins/lualine.lua
@@ -3,9 +3,9 @@ return {
dependencies = { 'nvim-tree/nvim-web-devicons' },
config = function()
require('lualine').setup({
- -- options = {
- -- theme = 'catppuccin'
- -- },
+ options = {
+ theme = 'catppuccin-mocha'
+ },
})
end
}
diff --git a/dot_config/nvim/lua/vim-options.lua b/dot_config/nvim/lua/vim-options.lua
index 60bc802..5b6e097 100644
--- a/dot_config/nvim/lua/vim-options.lua
+++ b/dot_config/nvim/lua/vim-options.lua
@@ -7,10 +7,10 @@ vim.opt.expandtab = true
vim.opt.clipboard:append("unnamedplus")
-vim.cmd("highlight Normal guibg=none")
-vim.cmd("highlight NonText guibg=none")
-vim.cmd("highlight Normal ctermbg=none")
-vim.cmd("highlight NonText ctermbg=none")
+-- vim.cmd("highlight Normal guibg=none")
+-- vim.cmd("highlight NonText guibg=none")
+-- vim.cmd("highlight Normal ctermbg=none")
+-- vim.cmd("highlight NonText ctermbg=none")
vim.o.winborder = 'rounded'