From 30c02876e803906212fa1980c0eeecdf5fa2d430 Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Sat, 2 Mar 2024 17:06:30 +0100 Subject: [PATCH] Updated config --- .config/fuzzel/fuzzel.ini | 13 +++++ .config/hypr/autostart.conf | 4 +- .config/hypr/general.conf | 20 ++++---- .config/hypr/hyprlock.conf | 43 ---------------- .config/hypr/keys.conf | 7 ++- .config/hypr/programs.conf | 6 ++- .config/nvim/lazy-lock.json | 6 +-- .config/nvim/lua/config/keys.lua | 15 +++++- .config/nvim/lua/config/settings.lua | 28 +++++------ .config/swaylock/config | 38 ++++++++++++++ .config/waybar/config | 27 +++++----- .config/waybar/style.css | 74 ++++++---------------------- .config/wlogout/layout | 18 +++++++ .config/wlogout/style.css | 46 +++++++++++++++++ .gitignore | 3 ++ 15 files changed, 193 insertions(+), 155 deletions(-) create mode 100644 .config/fuzzel/fuzzel.ini delete mode 100644 .config/hypr/hyprlock.conf create mode 100644 .config/swaylock/config create mode 100644 .config/wlogout/layout create mode 100644 .config/wlogout/style.css diff --git a/.config/fuzzel/fuzzel.ini b/.config/fuzzel/fuzzel.ini new file mode 100644 index 0000000..6baa86a --- /dev/null +++ b/.config/fuzzel/fuzzel.ini @@ -0,0 +1,13 @@ +font=Ubuntu Nerd Font:size=18 +prompt="" +lines=5 +width=20 +horizontal-pad=16 +vertical-pad=8 +inner-pad=8 +line-height=32 +fields=filename,name,generic,exec + +[border] +width=0 +radius=8 diff --git a/.config/hypr/autostart.conf b/.config/hypr/autostart.conf index 332e3a6..84b282c 100644 --- a/.config/hypr/autostart.conf +++ b/.config/hypr/autostart.conf @@ -1,12 +1,10 @@ exec-once = dunst -exec-once = ~/.bin/launch-waybar +exec-once = $statusbar exec-once = waypaper --restore exec-once = wl-paste --watch cliphist store exec-once = dbus-update-activation-environment --all exec-once = gnome-keyring-daemon --start --components=pkcs11,secrets,ssh -exec-once = [workspace 1 silent] godot -exec-once = [workspace 2 silent] $editor exec-once = [workspace 3 silent] $browser exec-once = [workspace 4 silent] $terminal exec-once = [workspace 5 silent] $terminal diff --git a/.config/hypr/general.conf b/.config/hypr/general.conf index bb1c46a..adb7485 100644 --- a/.config/hypr/general.conf +++ b/.config/hypr/general.conf @@ -1,6 +1,6 @@ general { gaps_in = 5 - gaps_out = 20 + gaps_out = 10 border_size = 2 col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg col.inactive_border = rgba(595959aa) @@ -27,7 +27,7 @@ input { } decoration { - rounding = 8 + rounding = 10 blur { enabled = true @@ -46,17 +46,17 @@ animations { bezier = myBezier, 0.05, 0.9, 0.1, 1.05 - animation = windows, 1, 7, myBezier - animation = windowsOut, 1, 7, default, popin 80% - animation = border, 1, 10, default - animation = borderangle, 1, 8, default - animation = fade, 1, 7, default + animation = windows, 1, 6, myBezier + animation = windowsOut, 1, 6, default, popin 80% + animation = border, 1, 9, default + animation = borderangle, 1, 7, default + animation = fade, 1, 6, default animation = workspaces, 1, 1, default } dwindle { - pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below - preserve_split = yes # you probably want this + pseudotile = yes + preserve_split = yes } master { @@ -68,5 +68,5 @@ gestures { } misc { - force_default_wallpaper = 0 # Set to 0 or 1 to disable the anime mascot wallpapers + force_default_wallpaper = 0 } diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf deleted file mode 100644 index 88e2f85..0000000 --- a/.config/hypr/hyprlock.conf +++ /dev/null @@ -1,43 +0,0 @@ -background { - monitor = - path = $HOME/pictures/wallpapers/lockscreen.png - color = rgba(25, 20, 20, 1.0) - - blur_passes = 4 - blur_size = 2 - noise = 0.0117 - contrast = 0.8916 - brightness = 0.8172 - vibrancy = 0.1696 - vibrancy_darkness = 0.0 -} - -input-field { - monitor = - size = 200, 50 - outline_thickness = 1 - dots_size = 0.2 # 0.2 - 0.8 - dots_spacing = 0.15 # 0.0 - 1.0 - dots_center = true - outer_color = rgb(000000) - inner_color = rgb(200, 200, 200) - font_color = rgb(10, 10, 10) - fade_on_empty = true - placeholder_text = Input Password... - hide_input = false - position = 0, -20 - halign = center - valign = center -} - -label { - monitor = - text = Enter your password to unlock - color = rgba(200, 200, 200, 1.0) - font_size = 24 - font_family = Ubuntu Nerd Font - - position = 0, 200 - halign = center - valign = center -} diff --git a/.config/hypr/keys.conf b/.config/hypr/keys.conf index a77c53a..fde7719 100644 --- a/.config/hypr/keys.conf +++ b/.config/hypr/keys.conf @@ -6,10 +6,9 @@ bind = $leader, T, exec, $terminal bind = $leader, B, exec, $browser bind = $leader, E, exec, $files bind = $leader, Super_L, exec, $menu -bind = $leader, L, exec, hyprlock - -# Screenshot -bind = , Print, exec, grim -g "$(slurp -d)" - | wl-copy +bind = $leader, L, exec, $lockscreen +bind = $leader, F12, exec, $logout +bind = , Print, exec, $screenshot # Window management bind = $leader, C, killactive, diff --git a/.config/hypr/programs.conf b/.config/hypr/programs.conf index 4a1fc2d..dc34b76 100644 --- a/.config/hypr/programs.conf +++ b/.config/hypr/programs.conf @@ -1,6 +1,10 @@ $browser = firefox -$editor = code +$editor = nvim $email = geary $files = nautilus +$logout = wlogout +$lockscreen = swaylock $menu = ~/.bin/toggle-fuzzel +$screenshot = grim -g "$(slurp -d)" - | wl-copy +$statusbar = ~/.bin/launch-waybar $terminal = alacritty diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 16f144c..5fbdb48 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -6,12 +6,12 @@ "mini.completion": { "branch": "main", "commit": "0cf6c4e257b5e8189ac6b3ffa2064a319c4eb8a8" }, "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" }, "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, - "nui.nvim": { "branch": "main", "commit": "c3c7fd618dcb5a89e443a2e1033e7d11fdb0596b" }, + "nui.nvim": { "branch": "main", "commit": "b81333d12f824dbed5eb231c8a4409a290fdd848" }, "nvim-lspconfig": { "branch": "master", "commit": "9553725789be682ecd945a527ec552e489ea8534" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, "nvim-tree.lua": { "branch": "master", "commit": "d52fdeb0a300ac42b9cfa65ae0600a299f8e8677" }, - "nvim-treesitter": { "branch": "master", "commit": "c2a265156d5799adbd9f9e7d5385735fa5d21776" }, - "nvim-web-devicons": { "branch": "master", "commit": "0bb67ef952ea3eb7b1bac9c011281471d99a27bc" }, + "nvim-treesitter": { "branch": "master", "commit": "e3e5ff4ebddcbfa8f5798253ebd1f9b449e8ee69" }, + "nvim-web-devicons": { "branch": "master", "commit": "4adea17610d140a99c313e3f79a9dc01825d59ae" }, "onedark.nvim": { "branch": "master", "commit": "1230aaf2a427b2c5b73aba6e4a9a5881d3e69429" }, "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, "telescope-project.nvim": { "branch": "master", "commit": "1aaf16580a614601a7f7077d9639aeb457dc5559" }, diff --git a/.config/nvim/lua/config/keys.lua b/.config/nvim/lua/config/keys.lua index 06a14a0..94461cb 100644 --- a/.config/nvim/lua/config/keys.lua +++ b/.config/nvim/lua/config/keys.lua @@ -4,17 +4,28 @@ end -- Basics map("n", ";", ":", "Command mode") -map("n", "qq", "qa!", "Quit all") map("n", "U", "redo", "Redo") map({ "i", "n" }, "", "noh", "Clear search") map({ "i", "n", "s", "v" }, "", "w", "Save file") map("n", "", "^Da", "Rewrite line") map("i", "", "^Da", "Rewrite line") map("n", "", "ggVG", "Select all") -map("n", "", ":%s///g", "Replace word under cursor") map({ "n", "v" }, "", "^", "Beginning of line") map("i", "", "^i", "Beginning of line") map({ "i", "n", "v" }, "", "", "End of line") +map("n", "qq", "qa!", "Quit all") + +-- Editing multiple instances +map("n", "", "*#", "Search word under cursor") +map("n", "", "*#:%s//", "Replace word under cursor") +map("v", "", "y/\"N", "Search selection") +map("v", "", "y/\"N:%s//\"", "Replace selection") + +-- Increasing and decreasing numbers +map("n", "+", "", "Increase number") +map("n", "-", "", "Decrease number") +map("n", "", "", "Increase number") +map("n", "", "", "Decrease number") -- Buffer management map("n", "", "enew", "New file") diff --git a/.config/nvim/lua/config/settings.lua b/.config/nvim/lua/config/settings.lua index eb1c1ed..2740f2e 100644 --- a/.config/nvim/lua/config/settings.lua +++ b/.config/nvim/lua/config/settings.lua @@ -8,50 +8,46 @@ end -- Options local opt = vim.opt -opt.autoindent = true opt.autowrite = false opt.clipboard = "unnamedplus" opt.completeopt = "menu,menuone,noinsert" opt.conceallevel = 0 opt.cursorline = true opt.cursorlineopt = "number" -opt.expandtab = false opt.grepformat = "%f:%l:%c:%m" opt.grepprg = "rg --grep" opt.ignorecase = false opt.mouse = "a" opt.ruler = false opt.sessionoptions = { "buffers", "curdir", "tabpages", "winsize" } -opt.shiftwidth = 4 opt.shortmess:append "scCFI" opt.showmode = false -opt.showtabline = 0 -opt.smartindent = true -opt.softtabstop = 4 opt.spell = false opt.splitbelow = true opt.splitright = true -opt.tabstop = 4 opt.termguicolors = true -opt.undofile = true -opt.undolevels = 10000 opt.updatetime = 250 opt.virtualedit = "onemore" opt.wildmode = "longest:full,full" opt.wrap = false +-- Indentation +opt.autoindent = true +opt.expandtab = false +opt.shiftwidth = 4 +opt.smartindent = true +opt.softtabstop = 4 +opt.tabstop = 4 + -- UI opt.fillchars = { eob = " ", vert = " " } opt.laststatus = 0 opt.number = true opt.relativenumber = false +opt.showtabline = 0 opt.signcolumn = "yes" opt.statusline = "%{repeat('─',winwidth('.'))}" --- Neovide -if g.neovide then - opt.linespace = 3 - g.neovide_fullscreen = true - g.neovide_transparency = 0.92 - vim.o.guifont = "UbuntuMono Nerd Font:h20:#h-none" -end +-- Undo +opt.undofile = true +opt.undolevels = 10000 diff --git a/.config/swaylock/config b/.config/swaylock/config new file mode 100644 index 0000000..28a9383 --- /dev/null +++ b/.config/swaylock/config @@ -0,0 +1,38 @@ +daemonize +show-failed-attempts +clock +screenshot +effect-blur=9x5 +effect-vignette=0.5:0.5 +color=1f1d2e80 +font=Ubuntu Nerd Font +indicator +indicator-radius=200 +indicator-thickness=20 +line-color=1f1d2e +ring-color=33CCFE +inside-color=1f1d2e +key-hl-color=EC4899 +separator-color=00000000 +text-color=e0def4 +text-caps-lock-color= +line-ver-color=eb6f92 +ring-ver-color=eb6f92 +inside-ver-color=1f1d2e +text-ver-color=e0def4 +ring-wrong-color=31748f +text-wrong-color=31748f +inside-wrong-color=1f1d2e +inside-clear-color=1f1d2e +text-clear-color=e0def4 +ring-clear-color=9ccfd8 +line-clear-color=1f1d2e +line-wrong-color=1f1d2e +bs-hl-color=31748f +grace=2 +grace-no-mouse +grace-no-touch +datestr= +timestr=%H : %M +fade-in=0.2 +ignore-empty-password diff --git a/.config/waybar/config b/.config/waybar/config index 80d8f06..525064f 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -1,33 +1,34 @@ { "layer": "top", - "modules-left": ["custom/launcher","hyprland/workspaces"], + "modules-left": ["custom/os","hyprland/workspaces"], "modules-center": ["clock"], - "modules-right": ["mpris","wireplumber","cpu","memory","network","disk"], + "modules-right": ["cpu","memory","disk","network","custom/power"], "clock": { "interval": 60, - "format": "{:%a %H:%M}", + "format": "{:%a %H : %M}", "tooltip-format": "{:%Y-%m-%d}" }, "cpu": { "interval": 2, - "format": " {usage}%", + "format": "{icon} {usage}%", + "format-icons": ["󰾆", "󰾅", "󰓅"], "max-length": 10 }, "memory": { "interval": 2, - "format": "󰍜 {used} GiB", + "format": " {used} GiB", "max-length": 10 }, "network": { "interval": 2, - "format": "{ifname}", + "format": " {ifname}", "format-wifi": " {essid}", - "format-ethernet": "󰛳 {bandwidthTotalBytes}", + "format-ethernet": " {bandwidthUpBits}  {bandwidthDownBits}", "format-disconnected": "", "tooltip-format": "{ifname} via {gwaddr}", "tooltip-format-wifi": " {essid} ({signalStrength}%)", "tooltip-format-ethernet": " {ifname}", - "tooltip-format-disconnected": "Disconnected", + "tooltip-format-disconnected": "", "max-length": 50 }, "disk": { @@ -63,13 +64,13 @@ "format-icons": { "urgent": "", "active": "", - "default": "" + "default": "" }, "sort-by-number": true }, - "custom/launcher":{ - "format": " ", - "on-click": "fuzzel", - "on-click-right": "killall fuzzel" + "custom/os":{ + "format": "", + "tooltip": false, + "on-click": "alacritty --hold -e neofetch", } } diff --git a/.config/waybar/style.css b/.config/waybar/style.css index 620a194..2b7fd05 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -1,8 +1,9 @@ * { border: none; - border-radius: 8px; font-family: "Ubuntu Nerd Font"; - font-size: 16px; + font-size: 14px; + padding: 0; + margin: 0; } window#waybar { @@ -13,15 +14,6 @@ window#waybar.hidden { opacity: 0.2; } -#window { - margin-top: 6px; - padding-left: 10px; - padding-right: 10px; - transition: none; - color: transparent; - background: transparent; -} - #clock, #cpu, #disk, @@ -29,62 +21,24 @@ window#waybar.hidden { #mpris, #network, #wireplumber, -#workspaces { - margin-top: 6px; - margin-left: 8px; - padding-left: 10px; - padding-right: 10px; - margin-bottom: 0px; +#workspaces, +#custom-os { + color: @fg; + background: @bg; + margin: 0 4px; transition: none; } -#clock { - color: #161320; - background: #ABE9B3; +#workspaces button { + padding: 0px 5px; + color: rgba(255, 255, 255, 0.5); } -#cpu { - color: #161320; - background: #96CDFB; +#workspaces button.active { + color: rgba(255, 255, 255, 1.0); } -#disk { - color: #161320; - background: #E8A2AF; -} - -#memory { - color: #161320; - background: #DDB6F2; -} - -#mpris { - color: #1A1826; - background: #FAE3B0; -} - -#network { - color: #161320; - background: #bd93f9; -} - -#wireplumber { - color: #1A1826; - background: #FAE3B0; -} - -#workspaces { - color: white; - background: transparent; -} - -#custom-launcher { +#custom-os { font-size: 24px; - margin-top: 6px; - margin-left: 8px; - padding-left: 10px; - padding-right: 5px; - transition: none; color: #89DCEB; - background: transparent; } diff --git a/.config/wlogout/layout b/.config/wlogout/layout new file mode 100644 index 0000000..0abb65a --- /dev/null +++ b/.config/wlogout/layout @@ -0,0 +1,18 @@ +{ + "label" : "logout", + "action" : "loginctl terminate-user $USER", + "text" : "Logout", + "keybind" : "e" +} +{ + "label" : "shutdown", + "action" : "systemctl poweroff", + "text" : "Shutdown", + "keybind" : "s" +} +{ + "label" : "reboot", + "action" : "systemctl reboot", + "text" : "Reboot", + "keybind" : "r" +} diff --git a/.config/wlogout/style.css b/.config/wlogout/style.css new file mode 100644 index 0000000..b9d7cc1 --- /dev/null +++ b/.config/wlogout/style.css @@ -0,0 +1,46 @@ +* { + background-image: none; +} + +window { + background-color: rgba(0, 0, 0, 0.5); +} + +button { + color: #ffffff; + background-color: rgba(0, 0, 0, 1); + border-style: solid; + border-color: #33ccfe; + border-width: 2px; + border-radius: 10px; + background-repeat: no-repeat; + background-position: center; + background-size: 25%; + margin: 50px; +} + +button:focus, button:active, button:hover { + background-color: #353c4a; + outline-style: none; +} + +#logout { + background-image: image( + url("/usr/share/wlogout/icons/logout.png"), + url("/usr/local/share/wlogout/icons/logout.png") + ); +} + +#shutdown { + background-image: image( + url("/usr/share/wlogout/icons/shutdown.png"), + url("/usr/local/share/wlogout/icons/shutdown.png") + ); +} + +#reboot { + background-image: image( + url("/usr/share/wlogout/icons/reboot.png"), + url("/usr/local/share/wlogout/icons/reboot.png") + ); +} diff --git a/.gitignore b/.gitignore index c178dbe..f009b0f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,10 +9,13 @@ /.config/* !/.config/alacritty !/.config/fish +!/.config/fuzzel !/.config/htop !/.config/hypr !/.config/nushell !/.config/nvim +!/.config/swaylock !/.config/tmux !/.config/vscode !/.config/waybar +!/.config/wlogout