From 7d5a2940ef2bbacd7eacf06c30cffb0d35ee5460 Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Thu, 7 Mar 2024 13:09:05 +0100 Subject: [PATCH] Updated config --- .config/environment.d/10-xdg.conf | 4 +++ .config/environment.d/20-dirs.conf | 9 ++++++ .config/environment.d/30-general.conf | 2 ++ .config/environment.d/40-apps.conf | 3 ++ .config/fish/config.fish | 4 +-- .config/fish/fish_variables | 2 +- .config/hypr/autostart.conf | 3 +- .config/hypr/environment.conf | 34 -------------------- .config/hypr/general.conf | 10 +++--- .config/hypr/keys.conf | 6 ++-- .config/nvim/lazy-lock.json | 13 +++----- .config/nvim/lua/plugins/telescope.lua | 2 ++ .config/nvim/lua/usercmds.lua | 5 ++- .config/waybar/config.jsonc | 20 +++++++----- .config/waybar/modules.jsonc | 24 +++++++------- .config/waybar/style.css | 43 ++++++++++++++++++++------ .gitignore | 1 + 17 files changed, 100 insertions(+), 85 deletions(-) create mode 100644 .config/environment.d/10-xdg.conf create mode 100644 .config/environment.d/20-dirs.conf create mode 100644 .config/environment.d/30-general.conf create mode 100644 .config/environment.d/40-apps.conf diff --git a/.config/environment.d/10-xdg.conf b/.config/environment.d/10-xdg.conf new file mode 100644 index 0000000..143bc02 --- /dev/null +++ b/.config/environment.d/10-xdg.conf @@ -0,0 +1,4 @@ +XDG_CACHE_HOME=$HOME/.cache +XDG_CONFIG_HOME=$HOME/.config +XDG_DATA_HOME=$HOME/.local/share +XDG_STATE_HOME=$HOME/.local/state diff --git a/.config/environment.d/20-dirs.conf b/.config/environment.d/20-dirs.conf new file mode 100644 index 0000000..fbdfc6b --- /dev/null +++ b/.config/environment.d/20-dirs.conf @@ -0,0 +1,9 @@ +CARGO_HOME=$XDG_DATA_HOME/cargo +CUDA_CACHE_PATH=$XDG_CACHE_HOME/nv +DOTNET_CLI_HOME=$XDG_DATA_HOME/dotnet +GOPATH=$XDG_DATA_HOME/go +GTK2_RC_FILES=$XDG_CONFIG_HOME/gtk-2.0/gtkrc +HISTFILE=$XDG_STATE_HOME/bash/history +NUGET_PACKAGES=$XDG_CACHE_HOME/nuget +RUSTUP_HOME=$XDG_DATA_HOME/rustup +W3M_DIR=$XDG_DATA_HOME/w3m diff --git a/.config/environment.d/30-general.conf b/.config/environment.d/30-general.conf new file mode 100644 index 0000000..1b266aa --- /dev/null +++ b/.config/environment.d/30-general.conf @@ -0,0 +1,2 @@ +LANG=en_US.UTF-8 +SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/gcr/ssh diff --git a/.config/environment.d/40-apps.conf b/.config/environment.d/40-apps.conf new file mode 100644 index 0000000..85db7c5 --- /dev/null +++ b/.config/environment.d/40-apps.conf @@ -0,0 +1,3 @@ +BROWSER=firefox +EDITOR=nvim +TERMINAL=alacritty diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 56fb2e5..09866d3 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -3,9 +3,7 @@ if status is-interactive set -x LS_COLORS di=0:ln=0:so=0:pi=0:ex=0:bd=0:cd=0:su=0:sg=0:tw=0:ow=0 end -set -x GOPATH $HOME/.go -set -x EDITOR nvim set -x LANG en_US.UTF-8 fish_add_path $GOPATH/bin -fish_add_path $HOME/.bin \ No newline at end of file +fish_add_path $HOME/.local/bin diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index 78ad882..b10e29e 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -42,4 +42,4 @@ SETUVAR fish_pager_color_selected_completion:\x1d SETUVAR fish_pager_color_selected_description:\x1d SETUVAR fish_pager_color_selected_prefix:\x1d SETUVAR fish_prompt_pwd_dir_length:0 -SETUVAR fish_user_paths:/home/eduard/\x2ego/bin\x1e/home/eduard/\x2ebin +SETUVAR fish_user_paths:/home/eduard/\x2elocal/share/go/bin\x1e/home/eduard/\x2elocal/bin diff --git a/.config/hypr/autostart.conf b/.config/hypr/autostart.conf index 33c5c22..5dcc83f 100644 --- a/.config/hypr/autostart.conf +++ b/.config/hypr/autostart.conf @@ -1,4 +1,3 @@ -exec-once = $statusbar -exec-once = waypaper --restore exec-once = dunst +exec-once = waypaper --restore exec-once = wl-paste --watch cliphist store diff --git a/.config/hypr/environment.conf b/.config/hypr/environment.conf index ddf81bc..746117f 100644 --- a/.config/hypr/environment.conf +++ b/.config/hypr/environment.conf @@ -1,24 +1,11 @@ - # Firefox env = MOZ_ENABLE_WAYLAND,1 -# Nvidia -env = LIBVA_DRIVER_NAME,nvidia -env = GBM_BACKEND,nvidia-drm -env = __GLX_VENDOR_LIBRARY_NAME,nvidia - -# Programs -env = EDITOR,$editor -env = TERMINAL,$terminal - # Qt env = QT_QPA_PLATFORM,wayland env = QT_QPA_PLATFORMTHEME,qt6ct env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1 -# SSH -env = SSH_AUTH_SOCK,$XDG_RUNTIME_DIR/gcr/ssh - # Wayland env = XDG_SESSION_TYPE,wayland env = GDK_BACKEND,wayland @@ -27,26 +14,5 @@ env = GDK_BACKEND,wayland env = WLR_NO_HARDWARE_CURSORS,1 env = WLR_RENDERER,vulkan -# https://github.com/hyprwm/Hyprland/issues/2591 -$XDG_DATA_HOME=$HOME/.local/share -$XDG_CONFIG_HOME=$HOME/.config -$XDG_STATE_HOME=$HOME/.local/state -$XDG_CACHE_HOME=$HOME/.cache - -env = XDG_DATA_HOME,$XDG_DATA_HOME -env = XDG_CONFIG_HOME,$XDG_CONFIG_HOME -env = XDG_STATE_HOME,$XDG_STATE_HOME -env = XDG_CACHE_HOME,$XDG_CACHE_HOME - -# Config directories -env = HISTFILE,$XDG_STATE_HOME/bash/history -env = CARGO_HOME,$XDG_DATA_HOME/cargo -env = CUDA_CACHE_PATH,$XDG_CACHE_HOME/nv -env = DOTNET_CLI_HOME,$XDG_DATA_HOME/dotnet -env = GTK2_RC_FILES,$XDG_CONFIG_HOME/gtk-2.0/gtkrc -env = NUGET_PACKAGES,$XDG_CACHE_HOME/nuget -env = RUSTUP_HOME,$XDG_DATA_HOME/rustup -env = W3M_DIR,$XDG_DATA_HOME/w3m - # X11 env = XCURSOR_SIZE,24 diff --git a/.config/hypr/general.conf b/.config/hypr/general.conf index 54b0803..a6bd71c 100644 --- a/.config/hypr/general.conf +++ b/.config/hypr/general.conf @@ -1,6 +1,6 @@ general { gaps_in = 4 - gaps_out = 6 + gaps_out = 8 border_size = 0 @@ -30,7 +30,7 @@ input { } decoration { - rounding = 10 + rounding = 6 blur { enabled = true @@ -41,13 +41,13 @@ decoration { xray = false } - drop_shadow = yes + drop_shadow = no shadow_range = 4 shadow_render_power = 3 col.shadow = rgba(1a1a1aee) - #active_opacity = 1.0 - #inactive_opacity = 0.75 + active_opacity = 0.9 + inactive_opacity = 0.9 } dwindle { diff --git a/.config/hypr/keys.conf b/.config/hypr/keys.conf index e132ce6..747572b 100644 --- a/.config/hypr/keys.conf +++ b/.config/hypr/keys.conf @@ -8,16 +8,18 @@ bind = $leader, E, exec, $files bind = $leader, D, exec, $terminal -e $editor bind = $leader, L, exec, $lockscreen bind = $leader, Space, exec, $menu -bind = $leader, F12, exec, $logout bind = , Print, exec, $screenshot +# Session management +bind = $leader, F11, exit, +bind = $leader, F12, exec, $logout + # Window management bind = $leader, C, killactive, bind = $leader, F, fullscreen, bind = $leader, V, togglefloating, bind = $leader, P, pseudo, bind = $leader, J, togglesplit, -bind = $leader, M, exit, # Move focus with leader + arrow keys bind = $leader, left, movefocus, l diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 848fd95..6fe65fe 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,23 +1,20 @@ { "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, - "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, - "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, + "mini.completion": { "branch": "main", "commit": "0cf6c4e257b5e8189ac6b3ffa2064a319c4eb8a8" }, "mini.surround": { "branch": "main", "commit": "a1b590cc3b676512de507328d6bbab5e43794720" }, "monokai.nvim": { "branch": "master", "commit": "b8bd44d5796503173627d7a1fc51f77ec3a08a63" }, "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" }, - "nui.nvim": { "branch": "main", "commit": "fbb139c6f14896b434d0229099e1acd863ae6bec" }, + "nui.nvim": { "branch": "main", "commit": "756c59f46057cd2d43619cd3a6d4e01b2aa60295" }, "nvim-autopairs": { "branch": "master", "commit": "c6139ca0d5ad7af129ea6c89cb4c56093f2c034a" }, - "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, - "nvim-lspconfig": { "branch": "master", "commit": "7f5cf1121f772850a30bdaf83fb448e88846aa58" }, + "nvim-lspconfig": { "branch": "master", "commit": "e5e600232188ed9fb960f5df6bb06084ae8bf3ec" }, "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, "nvim-tree.lua": { "branch": "master", "commit": "efafd73efa9bc8c26282aed563ba0f01c7465b06" }, - "nvim-treesitter": { "branch": "master", "commit": "212b7a504cf56f85d1acc5be237261b42d7560c5" }, + "nvim-treesitter": { "branch": "master", "commit": "9775d5d7c724f81acdd441e7e9edefc4514e990b" }, "nvim-web-devicons": { "branch": "master", "commit": "4adea17610d140a99c313e3f79a9dc01825d59ae" }, - "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, + "plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" }, "telescope-project.nvim": { "branch": "master", "commit": "1aaf16580a614601a7f7077d9639aeb457dc5559" }, "telescope.nvim": { "branch": "master", "commit": "dc1ea28cc2a02cd1cebb9d80e967807d668f78f8" } } \ No newline at end of file diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua index 98da775..3a080cd 100644 --- a/.config/nvim/lua/plugins/telescope.lua +++ b/.config/nvim/lua/plugins/telescope.lua @@ -1,5 +1,6 @@ return { "nvim-telescope/telescope.nvim", + event = "VeryLazy", dependencies = { "nvim-lua/plenary.nvim", "nvim-telescope/telescope-project.nvim", @@ -42,6 +43,7 @@ return { }) require("telescope").load_extension("project") + require("telescope").load_extension("notify") -- require("telescope").load_extension("ui-select") end, } diff --git a/.config/nvim/lua/usercmds.lua b/.config/nvim/lua/usercmds.lua index e966e9c..a277f4b 100644 --- a/.config/nvim/lua/usercmds.lua +++ b/.config/nvim/lua/usercmds.lua @@ -1,9 +1,12 @@ -- ToggleWord vim.api.nvim_create_user_command("ToggleWord", function() local inverse = { + ["horizontal"] = "vertical", + ["on"] = "off", ["true"] = "false", ["True"] = "False", ["TRUE"] = "FALSE", + ["yes"] = "no", ["Yes"] = "No", ["YES"] = "NO", ["1"] = "0", @@ -15,7 +18,7 @@ vim.api.nvim_create_user_command("ToggleWord", function() ['""'] = "''", ["+"] = "-", ["==="] = "!==", - ["=="] = "!=" + ["=="] = "!=", } vim.tbl_add_reverse_lookup(inverse) diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc index 93085e0..2e1ef24 100644 --- a/.config/waybar/config.jsonc +++ b/.config/waybar/config.jsonc @@ -1,21 +1,25 @@ { "layer": "top", - "position": "bottom", + "position": "top", "modules-left": [ "hyprland/workspaces", - "hyprland/window", ], "modules-center": [], "modules-right": [ "custom/updates", - "cpu", - "custom/gpu", - "memory", - "disk", - "network#up", - "network#down", "wireplumber", "clock", ], + "group/hardware": { + "orientation": "horizontal", + "modules": [ + "cpu", + "custom/gpu", + "memory", + "disk", + "network#up", + "network#down", + ], + }, "include": "~/.config/waybar/modules.jsonc", } diff --git a/.config/waybar/modules.jsonc b/.config/waybar/modules.jsonc index 5003834..f1ef65e 100644 --- a/.config/waybar/modules.jsonc +++ b/.config/waybar/modules.jsonc @@ -1,21 +1,21 @@ { "clock": { "interval": 60, - "format": " {:%H : %M}", + "format": " {:%H : %M}", "tooltip-format": "{:%A, %Y-%m-%d}", "on-click": "gnome-clocks", "on-click-right": "date -u +'%Y-%m-%dT%H:%M:%SZ' | wl-copy", }, "cpu": { "interval": 2, - "format": "{icon} {usage}%", + "format": "{icon} {usage}%", "format-icons": ["󰾆", "󰾅", "󰓅"], "max-length": 10, "on-click": "$TERMINAL -e btop", }, "custom/updates": { "interval": 300, - "format": "󰏖 {}", + "format": "󰏖 {}", "exec": "~/.bin/updates", "return-type": "json", "on-click": "$TERMINAL -e yay", @@ -23,41 +23,41 @@ "custom/gpu": { "interval": 2, "exec": "nvidia-smi --query-gpu=utilization.gpu --format=csv,noheader,nounits", - "format": " {}%", + "format": " {}%", "return-type": "", "on-click": "$TERMINAL -e nvtop", "max-length": 10, }, "memory": { "interval": 2, - "format": "{used} GiB", + "format": "{used} GiB", "max-length": 10, "on-click": "$TERMINAL -e btop", }, "network#up": { "interval": 2, - "format": "{bandwidthUpBits}", + "format": "{bandwidthUpBits}", "tooltip-format": " {ifname} upload", "max-length": 10, "on-click": "$TERMINAL -e nethogs", }, "network#down": { "interval": 2, - "format": "{bandwidthDownBits}", + "format": "{bandwidthDownBits}", "tooltip-format": " {ifname} download", "max-length": 10, "on-click": "$TERMINAL -e nethogs", }, "disk": { "interval": 30, - "format": "󰋊 {used}", + "format": "󰋊 {used}", "path": "/", "max-length": 10, "on-click": "$TERMINAL -e dua i", }, "mpris": { - "format": "{player_icon} {title}", - "format-paused": "{status_icon} {title}", + "format": "{player_icon} {title}", + "format-paused": "{status_icon} {title}", "player-icons": { "default": "󰝚", "mpv": "󰝚" @@ -68,7 +68,7 @@ "title-len": 30, }, "wireplumber": { - "format": "{icon} {volume}%", + "format": "{icon} {volume}%", "format-muted": "", "scroll-step": 5, "format-icons": ["", "", ""], @@ -76,7 +76,7 @@ "on-click": "helvum", }, "hyprland/window": { - "format": "󰘔 {initialTitle}", + "format": "󰘔 {initialTitle}", "separate-outputs": true }, "hyprland/workspaces": { diff --git a/.config/waybar/style.css b/.config/waybar/style.css index e4d57b9..296ab89 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -1,13 +1,14 @@ * { border: none; font-family: "Ubuntu Nerd Font"; - font-size: 12px; + font-size: 14px; padding: 0; margin: 0; } #waybar { - background: transparent; + background: rgba(255, 255, 255, 0.9); + color: rgba(38, 41, 44, 0.9); } #waybar.hidden { @@ -35,11 +36,34 @@ #custom-os, #custom-gpu, #custom-updates { - background: rgb(38, 41, 44); - border-radius: 10px; - padding: 4px 8px; - margin: 0px 4px; - margin-bottom: 4px; + /* background: rgb(38, 41, 44); */ + border-radius: 12px; + padding: 2px 10px; + margin: 4px; +} + +#cpu { + background: rgb(50.15%, 92.07%, 99.48%); +} + +#custom-gpu { + background: rgb(67.06%, 91.37%, 70.2%); +} + +#memory { + background: rgb(100%, 81.7%, 68.38%); +} + +#disk { + background: rgb(100%, 80.74%, 81.04%); +} + +#network { + background: rgb(92.54%, 81.78%, 100%); +} + +#wireplumber { + /* background: rgb(90.34%, 85.77%, 59.65%); */ } #custom-updates.disabled { @@ -47,8 +71,9 @@ } #workspaces button { + color: rgba(38, 41, 44, 0.9); padding: 0px 5px; - opacity: 0.8; + opacity: 0.2; background: transparent; text-shadow: none; border-radius: 0; @@ -59,7 +84,7 @@ } #workspaces button.active { - opacity: 1.0; + opacity: 0.9; } #workspaces button.visible {} diff --git a/.gitignore b/.gitignore index c90b82a..b7c001a 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ /.config/* !/.config/alacritty !/.config/dunst +!/.config/environment.d !/.config/fish !/.config/fuzzel !/.config/htop