diff --git a/.config/hypr/animations.conf b/.config/hypr/animations.conf new file mode 100644 index 0000000..efd9ded --- /dev/null +++ b/.config/hypr/animations.conf @@ -0,0 +1,35 @@ +################## +### ANIMATIONS ### +################## + +# https://wiki.hyprland.org/Configuring/Variables/#animations + +animations { + enabled = yes, please :) + + # Default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more + + bezier = easeOutQuint,0.23,1,0.32,1 + bezier = easeInOutCubic,0.65,0.05,0.36,1 + bezier = linear,0,0,1,1 + bezier = almostLinear,0.5,0.5,0.75,1.0 + bezier = quick,0.15,0,0.1,1 + + animation = global, 1, 10, default + animation = border, 1, 5.39, easeOutQuint + animation = windows, 1, 4.79, easeOutQuint + animation = windowsIn, 1, 4.1, easeOutQuint, popin 87% + animation = windowsOut, 1, 1.49, linear, popin 87% + animation = fadeIn, 1, 1.73, almostLinear + animation = fadeOut, 1, 1.46, almostLinear + animation = fade, 1, 3.03, quick + animation = layers, 1, 3.81, easeOutQuint + animation = layersIn, 1, 4, easeOutQuint, fade + animation = layersOut, 1, 1.5, linear, fade + animation = fadeLayersIn, 1, 1.79, almostLinear + animation = fadeLayersOut, 1, 1.39, almostLinear + animation = workspaces, 1, 1.94, almostLinear, fade + animation = workspacesIn, 1, 1.21, almostLinear, fade + animation = workspacesOut, 1, 1.94, almostLinear, fade +} + diff --git a/.config/hypr/appearance.conf b/.config/hypr/appearance.conf new file mode 100644 index 0000000..d2759f5 --- /dev/null +++ b/.config/hypr/appearance.conf @@ -0,0 +1,66 @@ +############### +### GENERAL ### +############### + +# https://wiki.hyprland.org/Configuring/Variables/#general + +general { + gaps_in = 5 + gaps_out = 15 + + border_size = 3 + + # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors + col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg + col.inactive_border = rgba(595959aa) + + # Set to true enable resizing windows by clicking and dragging on borders and gaps + resize_on_border = false + + # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on + allow_tearing = false + +} + +################## +### DECORATION ### +################## + +# https://wiki.hyprland.org/Configuring/Variables/#decoration + +decoration { + rounding = 10 + rounding_power = 5 + + # Change transparency of focused and unfocused windows + active_opacity = 1.0 + inactive_opacity = 0.95 + + shadow { + enabled = true + range = 4 + render_power = 3 + color = rgba(1a1a1aee) + } + + # https://wiki.hyprland.org/Configuring/Variables/#blur + blur { + enabled = true + size = 3 + passes = 1 + + vibrancy = 0.1696 + } +} + +############ +### MISC ### +############ + +# https://wiki.hyprland.org/Configuring/Variables/#misc + +misc { + force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers + disable_hyprland_logo = false # If true disables the random hyprland logo / anime girl background. :( +} + diff --git a/.config/hypr/autostart.conf b/.config/hypr/autostart.conf new file mode 100644 index 0000000..3c128e4 --- /dev/null +++ b/.config/hypr/autostart.conf @@ -0,0 +1,8 @@ +################# +### AUTOSTART ### +################# + +# Autostart necessary processes (like notifications daemons, status bars, etc.) + +exec-once = waybar + diff --git a/.config/hypr/env.conf b/.config/hypr/env.conf new file mode 100644 index 0000000..8f1918f --- /dev/null +++ b/.config/hypr/env.conf @@ -0,0 +1,9 @@ +############################# +### ENVIRONMENT VARIABLES ### +############################# + +# See https://wiki.hyprland.org/Configuring/Environment-variables/ + +env = XCURSOR_SIZE,24 +env = HYPRCURSOR_SIZE,24 + diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf new file mode 100644 index 0000000..f5b2bd9 --- /dev/null +++ b/.config/hypr/hyprland.conf @@ -0,0 +1,14 @@ +$hypr_config_dir = ~/.config/hypr +source = $hypr_config_dir/monitors.conf +source = $hypr_config_dir/programs.conf +source = $hypr_config_dir/autostart.conf +source = $hypr_config_dir/env.conf +source = $hypr_config_dir/appearance.conf +source = $hypr_config_dir/layout.conf +source = $hypr_config_dir/animations.conf +source = $hypr_config_dir/input.conf +source = $hypr_config_dir/keybindings.conf +source = $hypr_config_dir/rules.conf + +# Wiki +# https://wiki.hyprland.org/Configuring/ diff --git a/.config/hypr/input.conf b/.config/hypr/input.conf new file mode 100644 index 0000000..a13d6f4 --- /dev/null +++ b/.config/hypr/input.conf @@ -0,0 +1,33 @@ +############# +### INPUT ### +############# + +# https://wiki.hyprland.org/Configuring/Variables/#input +input { + kb_layout = us + kb_variant = + kb_model = + kb_options = + kb_rules = + + follow_mouse = 1 + + sensitivity = 0 # -1.0 - 1.0, 0 means no modification. + + touchpad { + natural_scroll = false + } +} + +# https://wiki.hyprland.org/Configuring/Variables/#gestures +gestures { + workspace_swipe = false +} + +# Example per-device config +# See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more +device { + name = epic-mouse-v1 + sensitivity = -0.5 +} + diff --git a/.config/hypr/keybindings.conf b/.config/hypr/keybindings.conf new file mode 100644 index 0000000..d8fb4a7 --- /dev/null +++ b/.config/hypr/keybindings.conf @@ -0,0 +1,74 @@ +################### +### KEYBINDINGS ### +################### + +# See https://wiki.hyprland.org/Configuring/Keywords/ +$mainMod = SUPER # Sets "Windows" key as main modifier + +# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more +bind = $mainMod, Q, exec, $terminal +bind = $mainMod, C, killactive, +bind = $mainMod, M, exit, +bind = $mainMod, E, exec, $fileManager +bind = $mainMod, V, togglefloating, +bind = $mainMod, R, exec, $menu +bind = $mainMod, P, pseudo, # dwindle +bind = $mainMod, J, togglesplit, # dwindle + +# Move focus with mainMod + arrow keys +bind = $mainMod, left, movefocus, l +bind = $mainMod, right, movefocus, r +bind = $mainMod, up, movefocus, u +bind = $mainMod, down, movefocus, d + +# Switch workspaces with mainMod + [0-9] +bind = $mainMod, 1, workspace, 1 +bind = $mainMod, 2, workspace, 2 +bind = $mainMod, 3, workspace, 3 +bind = $mainMod, 4, workspace, 4 +bind = $mainMod, 5, workspace, 5 +bind = $mainMod, 6, workspace, 6 +bind = $mainMod, 7, workspace, 7 +bind = $mainMod, 8, workspace, 8 +bind = $mainMod, 9, workspace, 9 +bind = $mainMod, 0, workspace, 10 + +# Move active window to a workspace with mainMod + SHIFT + [0-9] +bind = $mainMod SHIFT, 1, movetoworkspace, 1 +bind = $mainMod SHIFT, 2, movetoworkspace, 2 +bind = $mainMod SHIFT, 3, movetoworkspace, 3 +bind = $mainMod SHIFT, 4, movetoworkspace, 4 +bind = $mainMod SHIFT, 5, movetoworkspace, 5 +bind = $mainMod SHIFT, 6, movetoworkspace, 6 +bind = $mainMod SHIFT, 7, movetoworkspace, 7 +bind = $mainMod SHIFT, 8, movetoworkspace, 8 +bind = $mainMod SHIFT, 9, movetoworkspace, 9 +bind = $mainMod SHIFT, 0, movetoworkspace, 10 + +# Example special workspace (scratchpad) +bind = $mainMod, S, togglespecialworkspace, magic +bind = $mainMod SHIFT, S, movetoworkspace, special:magic + +# Scroll through existing workspaces with mainMod + scroll +bind = $mainMod, mouse_down, workspace, e+1 +bind = $mainMod, mouse_up, workspace, e-1 + +# Move/resize windows with mainMod + LMB/RMB and dragging +bindm = $mainMod, mouse:272, movewindow +bindm = $mainMod, mouse:273, resizewindow + +# Laptop multimedia keys for volume and LCD brightness +bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+ +bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- +bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle +bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle +bindel = ,XF86MonBrightnessUp, exec, brightnessctl s 10%+ +bindel = ,XF86MonBrightnessDown, exec, brightnessctl s 10%- + +# Requires playerctl +bindl = , XF86AudioNext, exec, playerctl next +bindl = , XF86AudioPause, exec, playerctl play-pause +bindl = , XF86AudioPlay, exec, playerctl play-pause +bindl = , XF86AudioPrev, exec, playerctl previous + +bind = $mainMod, F, fullscreen diff --git a/.config/hypr/layout.conf b/.config/hypr/layout.conf new file mode 100644 index 0000000..398ca6c --- /dev/null +++ b/.config/hypr/layout.conf @@ -0,0 +1,19 @@ +############## +### LAYOUT ### +############## + +general { + layout = dwindle +} + +# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more +dwindle { + pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below + preserve_split = true # You probably want this +} + +# See https://wiki.hyprland.org/Configuring/Master-Layout/ for more +master { + new_status = master +} + diff --git a/.config/hypr/monitors.conf b/.config/hypr/monitors.conf new file mode 100644 index 0000000..8e5c7ae --- /dev/null +++ b/.config/hypr/monitors.conf @@ -0,0 +1,8 @@ +################ +### MONITORS ### +################ + +# See https://wiki.hyprland.org/Configuring/Monitors/ + +monitor=,preferred,auto,auto + diff --git a/.config/hypr/programs.conf b/.config/hypr/programs.conf new file mode 100644 index 0000000..d44d535 --- /dev/null +++ b/.config/hypr/programs.conf @@ -0,0 +1,12 @@ +################### +### MY PROGRAMS ### +################### + +# See https://wiki.hyprland.org/Configuring/Keywords/ + +$terminal = kitty +$fileManager = yazi +$menu = wofi --show drun +$browser = firefox +$email = thunderbird + diff --git a/.config/hypr/rules.conf b/.config/hypr/rules.conf new file mode 100644 index 0000000..797ce71 --- /dev/null +++ b/.config/hypr/rules.conf @@ -0,0 +1,14 @@ + +############################## +### WINDOWS AND WORKSPACES ### +############################## + +# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more +# See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules + +# Ignore maximize requests from apps. You'll probably like this. +windowrule = suppressevent maximize, class:.* + +# Fix some dragging issues with XWayland +windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0 + diff --git a/.config/nvim/lua/plugins/conform.lua b/.config/nvim/lua/plugins/conform.lua index e780164..d2795e7 100644 --- a/.config/nvim/lua/plugins/conform.lua +++ b/.config/nvim/lua/plugins/conform.lua @@ -1,16 +1,58 @@ return { - { - "stevearc/conform.nvim", - config = function() - require("conform").setup({ - formatters_by_ft = { - lua = { "stylua" }, - }, - format_on_save = { - -- Enable or disable auto-formatting on save - lua = true, - }, - }) - end, - }, + { + "stevearc/conform.nvim", + config = function() + local conform = require("conform") + + conform.setup({ + formatters_by_ft = { + lua = { "stylua" }, + nginx = { "nginxfmt" }, + yaml = { "yamlfix" }, + -- Use the "*" filetype to run formatters on all filetypes. + -- ["*"] = { "codespell" }, + }, + format_on_save = { + -- Enable or disable auto-formatting on save + lua = true, + nginx = true, + yaml = true, + }, + + -- Set this to change the default values when calling conform.format() + -- This will also affect the default values for format_on_save/format_after_save + default_format_opts = { + lsp_format = "fallback", + }, + -- If this is set, Conform will run the formatter on save. + -- It will pass the table to conform.format(). + -- This can also be a function that returns the table. + format_on_save = { + -- I recommend these options. See :help conform.format for details. + lsp_format = "fallback", + timeout_ms = 500, + }, + -- If this is set, Conform will run the formatter asynchronously after save. + -- It will pass the table to conform.format(). + -- This can also be a function that returns the table. + format_after_save = { + lsp_format = "fallback", + }, + -- Set the log level. Use `:ConformInfo` to see the location of the log file. + log_level = vim.log.levels.ERROR, + -- Conform will notify you when a formatter errors + notify_on_error = true, + -- Conform will notify you when no formatters are available for the buffer + notify_no_formatters = true, + }) + + vim.keymap.set({ "n", "v" }, "mp", function() + conform.format({ + lsp_fallback = true, + async = false, + timeout_ms = 500, + }) + end, { desc = "Format file or range (in visual mode)" }) + end, + }, } diff --git a/.config/nvim/lua/plugins/mason.lua b/.config/nvim/lua/plugins/mason.lua index 22def00..9420f5f 100644 --- a/.config/nvim/lua/plugins/mason.lua +++ b/.config/nvim/lua/plugins/mason.lua @@ -4,11 +4,13 @@ return { dependencies = { "williamboman/mason-lspconfig.nvim", "WhoIsSethDaniel/mason-tool-installer.nvim", + "jose-elias-alvarez/null-ls.nvim", }, config = function() local mason = require("mason") local mason_lspconfig = require("mason-lspconfig") local mason_tool_installer = require("mason-tool-installer") + local null_ls = require("null-ls") -- Enable mason and configure icons mason.setup({ @@ -21,7 +23,6 @@ return { }, }) - -- Combine the setup for mason-lspconfig and mason-tool-installer mason_lspconfig.setup({ ensure_installed = { "cssls", @@ -36,7 +37,11 @@ return { mason_tool_installer.setup({ ensure_installed = { + "codespell", + "nginx-config-formatter", "stylua", + "yamlfix", + "yamllint", }, }) end, diff --git a/.config/nvim/lua/plugins/vim-suda.lua b/.config/nvim/lua/plugins/vim-suda.lua new file mode 100644 index 0000000..f255b6f --- /dev/null +++ b/.config/nvim/lua/plugins/vim-suda.lua @@ -0,0 +1,3 @@ +return { + "lambdalisue/vim-suda", +} diff --git a/.config/nvim/lua/settings.lua b/.config/nvim/lua/settings.lua index dadb085..578d90c 100644 --- a/.config/nvim/lua/settings.lua +++ b/.config/nvim/lua/settings.lua @@ -5,3 +5,9 @@ vim.o.tabstop = 4 -- Number of spaces tabs count for vim.o.shiftwidth = 4 -- Number of spaces to use for each step of (auto)indent vim.o.expandtab = true -- Convert tabs to spaces vim.o.smartindent = true -- Insert indents automatically + +vim.filetype.add({ + pattern = { + [".*/etc/nginx/.*/.*%.conf"] = "nginx", + }, +})