From 3c3f332f835162ae9b38664e0b62c3a2c920804f Mon Sep 17 00:00:00 2001 From: coast Date: Sun, 2 Nov 2025 13:53:18 +0330 Subject: [PATCH] remove some things from the Nvim config, change up the waybar config, switch to Niri WM and update my Niri config, change up some stuff in nixos configuration --- config/niri/config.kdl | 462 +++------------------ config/nvim/lua/plugins/lsp/init.lua | 2 - config/waybar/config.jsonc | 31 +- config/waybar/style.css | 35 +- nixos/configuration/configuration.nix | 6 +- nixos/home-configuration/apps/sway.nix | 8 +- nixos/home-configuration/apps/zsh.nix | 1 + nixos/home-configuration/configuration.nix | 4 +- 8 files changed, 106 insertions(+), 443 deletions(-) diff --git a/config/niri/config.kdl b/config/niri/config.kdl index a6e072d..f0dff86 100644 --- a/config/niri/config.kdl +++ b/config/niri/config.kdl @@ -1,373 +1,128 @@ -spawn-at-startup "waybar"; -spawn-at-startup "xwayland-satellite"; -//spawn-at-startup "eval $(dbus-launch --sh-syntax)"; - -// This config is in the KDL format: https://kdl.dev -// "/-" comments out the following node. -// Check the wiki for a full description of the configuration: -// https://github.com/YaLTeR/niri/wiki/Configuration:-Introduction - -// Input device configuration. -// Find the full list of options on the wiki: -// https://github.com/YaLTeR/niri/wiki/Configuration:-Input input { keyboard { xkb { - // You can set rules, model, layout, variant and options. - // For more information, see xkeyboard-config(7). - - // For example: - // layout "us,ru" - // options "grp:win_space_toggle,compose:ralt,ctrl:nocaps" } - - // Enable numlock on startup, omitting this setting disables it. numlock } - // Next sections include libinput settings. - // Omitting settings disables them, or leaves them at their default values. touchpad { - // off tap - // dwt - // dwtp - // drag false - // drag-lock natural-scroll - // accel-speed 0.2 - // accel-profile "flat" - // scroll-method "two-finger" - // disabled-on-external-mouse } mouse { - // off - // natural-scroll - // accel-speed 0.2 - // accel-profile "flat" - // scroll-method "no-scroll" } trackpoint { - // off - // natural-scroll - // accel-speed 0.2 - // accel-profile "flat" - // scroll-method "on-button-down" - // scroll-button 273 - // middle-emulation } +} - // Uncomment this to make the mouse warp to the center of newly focused windows. - // warp-mouse-to-focus +cursor { + xcursor-theme "Adwaita" + xcursor-size 24 +} - // Focus windows and outputs automatically when moving the mouse into them. - // Setting max-scroll-amount="0%" makes it work only on windows already fully on screen. - focus-follows-mouse +output "HDMI-A-1" { + mode "1920x1080@75" + scale 1 + transform "normal" } -// You can configure outputs by their name, which you can find -// by running `niri msg outputs` while inside a niri instance. -// The built-in laptop monitor is usually called "eDP-1". -// Find more information on the wiki: -// https://github.com/YaLTeR/niri/wiki/Configuration:-Outputs -// Remember to uncomment the node by removing "/-"! -/-output "eDP-1" { - // Uncomment this line to disable this output. - // off - - // Resolution and, optionally, refresh rate of the output. - // The format is "x" or "x@". - // If the refresh rate is omitted, niri will pick the highest refresh rate - // for the resolution. - // If the mode is omitted altogether or is invalid, niri will pick one automatically. - // Run `niri msg outputs` while inside a niri instance to list all outputs and their modes. - mode "1920x1080@120.030" - - // You can use integer or fractional scale, for example use 1.5 for 150% scale. +output "eDP-1" { + off scale 2 - - // Transform allows to rotate the output counter-clockwise, valid values are: - // normal, 90, 180, 270, flipped, flipped-90, flipped-180 and flipped-270. transform "normal" - - // Position of the output in the global coordinate space. - // This affects directional monitor actions like "focus-monitor-left", and cursor movement. - // The cursor can only move between directly adjacent outputs. - // Output scale and rotation has to be taken into account for positioning: - // outputs are sized in logical, or scaled, pixels. - // For example, a 3840×2160 output with scale 2.0 will have a logical size of 1920×1080, - // so to put another output directly adjacent to it on the right, set its x to 1920. - // If the position is unset or results in an overlap, the output is instead placed - // automatically. position x=1280 y=0 } -// Settings that influence how windows are positioned and sized. -// Find more information on the wiki: -// https://github.com/YaLTeR/niri/wiki/Configuration:-Layout layout { - // Set gaps around windows in logical pixels. gaps 16 - - // When to center a column when changing focus, options are: - // - "never", default behavior, focusing an off-screen column will keep at the left - // or right edge of the screen. - // - "always", the focused column will always be centered. - // - "on-overflow", focusing a column will center it if it doesn't fit - // together with the previously focused column. center-focused-column "never" - // You can customize the widths that "switch-preset-column-width" (Mod+R) toggles between. preset-column-widths { - // Proportion sets the width as a fraction of the output width, taking gaps into account. - // For example, you can perfectly fit four windows sized "proportion 0.25" on an output. - // The default preset widths are 1/3, 1/2 and 2/3 of the output. proportion 0.33333 proportion 0.5 proportion 0.66667 - - // Fixed sets the width in logical pixels exactly. - // fixed 1920 } - // You can also customize the heights that "switch-preset-window-height" (Mod+Shift+R) toggles between. - // preset-window-heights { } - - // You can change the default width of the new windows. default-column-width { proportion 0.5; } - // If you leave the brackets empty, the windows themselves will decide their initial width. - // default-column-width {} - - // By default focus ring and border are rendered as a solid background rectangle - // behind windows. That is, they will show up through semitransparent windows. - // This is because windows using client-side decorations can have an arbitrary shape. - // - // If you don't like that, you should uncomment `prefer-no-csd` below. - // Niri will draw focus ring and border *around* windows that agree to omit their - // client-side decorations. - // - // Alternatively, you can override it with a window rule called - // `draw-border-with-background`. - - // You can change how the focus ring looks. - focus-ring { - // Uncomment this line to disable the focus ring. - // off - - // How many logical pixels the ring extends out from the windows. - width 3 - // Colors can be set in a variety of ways: - // - CSS named colors: "red" - // - RGB hex: "#rgb", "#rgba", "#rrggbb", "#rrggbbaa" - // - CSS-like notation: "rgb(255, 127, 0)", rgba(), hsl() and a few others. - - // Color of the ring on the active monitor. - active-color "#7fc8ff" - - // Color of the ring on inactive monitors. + focus-ring { + width 4 + active-color "#313244" inactive-color "#505050" - - // You can also use gradients. They take precedence over solid colors. - // Gradients are rendered the same as CSS linear-gradient(angle, from, to). - // The angle is the same as in linear-gradient, and is optional, - // defaulting to 180 (top-to-bottom gradient). - // You can use any CSS linear-gradient tool on the web to set these up. - // Changing the color space is also supported, check the wiki for more info. - // - active-gradient from="#80c8ff" to="#bbddff" angle=45 - - // You can also color the gradient relative to the entire view - // of the workspace, rather than relative to just the window itself. - // To do that, set relative-to="workspace-view". - // - // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view" } - // You can also add a border. It's similar to the focus ring, but always visible. border { - // The settings are the same as for the focus ring. - // If you enable the border, you probably want to disable the focus ring. off - - width 2 + width 4 active-color "#ffc87f" inactive-color "#505050" - - // Color of the border around windows that request your attention. urgent-color "#9b0000" - - // active-gradient from="#ffbb66" to="#ffc880" angle=45 relative-to="workspace-view" - // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view" } - // You can enable drop shadows for windows. shadow { - // Uncomment the next line to enable shadows. - // on - - // By default, the shadow draws only around its window, and not behind it. - // Uncomment this setting to make the shadow draw behind its window. - // - // Note that niri has no way of knowing about the CSD window corner - // radius. It has to assume that windows have square corners, leading to - // shadow artifacts inside the CSD rounded corners. This setting fixes - // those artifacts. - // - // However, instead you may want to set prefer-no-csd and/or - // geometry-corner-radius. Then, niri will know the corner radius and - // draw the shadow correctly, without having to draw it behind the - // window. These will also remove client-side shadows if the window - // draws any. - // - // draw-behind-window true - - // You can change how shadows look. The values below are in logical - // pixels and match the CSS box-shadow properties. - - // Softness controls the shadow blur radius. softness 30 - - // Spread expands the shadow. spread 5 - - // Offset moves the shadow relative to the window. offset x=0 y=5 - - // You can also change the shadow color and opacity. color "#0007" } - // Struts shrink the area occupied by windows, similarly to layer-shell panels. - // You can think of them as a kind of outer gaps. They are set in logical pixels. - // Left and right struts will cause the next window to the side to always be visible. - // Top and bottom struts will simply add outer gaps in addition to the area occupied by - // layer-shell panels and regular gaps. struts { - // left 64 - // right 64 - // top 64 - // bottom 64 } } -// Add lines like this to spawn processes at startup. -// Note that running niri as a session supports xdg-desktop-autostart, -// which may be more convenient to use. -// See the binds section below for more spawn examples. - -// Uncomment this line to ask the clients to omit their client-side decorations if possible. -// If the client will specifically ask for CSD, the request will be honored. -// Additionally, clients will be informed that they are tiled, removing some client-side rounded corners. -// This option will also fix border/focus ring drawing behind some semitransparent windows. -// After enabling or disabling this, you need to restart the apps for this to take effect. prefer-no-csd -// You can change the path where screenshots are saved. -// A ~ at the front will be expanded to the home directory. -// The path is formatted with strftime(3) to give you the screenshot date and time. -screenshot-path "~/files/pics/screenies/Screenshot from %Y-%m-%d %H-%M-%S.png" - -// You can also set this to null to disable saving screenshots to disk. -// screenshot-path null +screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png" -// Animation settings. -// The wiki explains how to configure individual animations: -// https://github.com/YaLTeR/niri/wiki/Configuration:-Animations animations { - // Uncomment to turn off all animations. - // off - - // Slow down all animations by this factor. Values below 1 speed them up instead. - // slowdown 3.0 } -// Window rules let you adjust behavior for individual windows. -// Find more information on the wiki: -// https://github.com/YaLTeR/niri/wiki/Configuration:-Window-Rules +spawn-at-startup "waybar" +spawn-at-startup "swaybg -i /home/coast/Downloads/wall1.png/ -m fill" -// Work around WezTerm's initial configure bug -// by setting an empty default-column-width. window-rule { - // This regular expression is intentionally made as specific as possible, - // since this is the default config, and we want no false positives. - // You can get away with just app-id="wezterm" if you want. match app-id=r#"^org\.wezfurlong\.wezterm$"# default-column-width {} } -// Open the Firefox picture-in-picture player as floating by default. window-rule { - // This app-id regular expression will work for both: - // - host Firefox (app-id is "firefox") - // - Flatpak Firefox (app-id is "org.mozilla.firefox") match app-id=r#"firefox$"# title="^Picture-in-Picture$" open-floating true } -// Example: block out two password managers from screen capture. -// (This example rule is commented out with a "/-" in front.) -/-window-rule { - match app-id=r#"^org\.keepassxc\.KeePassXC$"# - match app-id=r#"^org\.gnome\.World\.Secrets$"# - - block-out-from "screen-capture" - - // Use this instead if you want them visible on third-party screenshot tools. - // block-out-from "screencast" -} - -// Example: enable rounded corners for all windows. -// (This example rule is commented out with a "/-" in front.) -/-window-rule { - geometry-corner-radius 12 +window-rule { + geometry-corner-radius 7 clip-to-geometry true } binds { - // Keys consist of modifiers separated by + signs, followed by an XKB key name - // in the end. To find an XKB name for a particular key, you may use a program - // like wev. - // - // "Mod" is a special modifier equal to Super when running on a TTY, and to Alt - // when running as a winit window. - // - // Most actions that you can bind here can also be invoked programmatically with - // `niri msg action do-something`. - - // Mod-Shift-/, which is usually the same as Mod-?, - // shows a list of important hotkeys. Mod+Shift+Slash { show-hotkey-overlay; } - - // Suggested binds for running programs: terminal, app launcher, screen locker. - Mod+Return hotkey-overlay-title="Open a Terminal: kitty" { spawn "kitty"; } - Mod+D hotkey-overlay-title="Run an Application: fuzzel" { spawn "fuzzel"; } + Mod+Return hotkey-overlay-title="Open a Terminal: wezterm" { spawn "wezterm"; } + Mod+R hotkey-overlay-title="Run an Application: rofi" { spawn-sh "rofi -show drun"; } Super+Alt+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn "swaylock"; } + Super+Alt+S allow-when-locked=true hotkey-overlay-title=null { spawn-sh "pkill orca || exec orca"; } - // You can also use a shell. Do this if you need pipes, multiple commands, etc. - // Note: the entire command goes as a single argument in the end. - // Mod+T { spawn "bash" "-c" "notify-send hello && exec kitty"; } + XF86AudioRaiseVolume allow-when-locked=true { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1+"; } + XF86AudioLowerVolume allow-when-locked=true { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1-"; } + XF86AudioMute allow-when-locked=true { spawn-sh "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; } + XF86AudioMicMute allow-when-locked=true { spawn-sh "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"; } - // Example volume keys mappings for PipeWire & WirePlumber. - // The allow-when-locked=true property makes them work even when the session is locked. - XF86AudioRaiseVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1+"; } - XF86AudioLowerVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1-"; } - XF86AudioMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; } - XF86AudioMicMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; } + XF86MonBrightnessUp allow-when-locked=true { spawn "brightnessctl" "--class=backlight" "set" "+10%"; } + XF86MonBrightnessDown allow-when-locked=true { spawn "brightnessctl" "--class=backlight" "set" "10%-"; } - // Open/close the Overview: a zoomed-out view of workspaces and windows. - // You can also move the mouse into the top-left hot corner, - // or do a four-finger swipe up on a touchpad. Mod+O repeat=false { toggle-overview; } + Mod+S repeat=false { close-window; } - Mod+S { close-window; } - - Mod+J { focus-column-left; } - Mod+H { focus-window-down; } - Mod+L { focus-window-up; } - Mod+K { focus-column-right; } + Mod+Left { focus-column-left; } + Mod+Down { focus-window-down; } + Mod+Up { focus-window-up; } + Mod+Right { focus-column-right; } + Mod+H { focus-column-left; } + Mod+J { focus-window-down; } + Mod+K { focus-window-up; } + Mod+L { focus-column-right; } Mod+Ctrl+Left { move-column-left; } Mod+Ctrl+Down { move-window-down; } @@ -378,13 +133,6 @@ binds { Mod+Ctrl+K { move-window-up; } Mod+Ctrl+L { move-column-right; } - // Alternative commands that move across workspaces when reaching - // the first or last window in a column. - // Mod+J { focus-window-or-workspace-down; } - // Mod+K { focus-window-or-workspace-up; } - // Mod+Ctrl+J { move-window-down-or-to-workspace-down; } - // Mod+Ctrl+K { move-window-up-or-to-workspace-up; } - Mod+Home { focus-column-first; } Mod+End { focus-column-last; } Mod+Ctrl+Home { move-column-to-first; } @@ -408,14 +156,6 @@ binds { Mod+Shift+Ctrl+K { move-column-to-monitor-up; } Mod+Shift+Ctrl+L { move-column-to-monitor-right; } - // Alternatively, there are commands to move just a single window: - // Mod+Shift+Ctrl+Left { move-window-to-monitor-left; } - // ... - - // And you can also move a whole workspace to another monitor: - // Mod+Shift+Ctrl+Left { move-workspace-to-monitor-left; } - // ... - Mod+Page_Down { focus-workspace-down; } Mod+Page_Up { focus-workspace-up; } Mod+U { focus-workspace-down; } @@ -425,55 +165,11 @@ binds { Mod+Ctrl+U { move-column-to-workspace-down; } Mod+Ctrl+I { move-column-to-workspace-up; } - // Alternatively, there are commands to move just a single window: - // Mod+Ctrl+Page_Down { move-window-to-workspace-down; } - // ... - Mod+Shift+Page_Down { move-workspace-down; } Mod+Shift+Page_Up { move-workspace-up; } Mod+Shift+U { move-workspace-down; } Mod+Shift+I { move-workspace-up; } - // You can bind mouse wheel scroll ticks using the following syntax. - // These binds will change direction based on the natural-scroll setting. - // - // To avoid scrolling through workspaces really fast, you can use - // the cooldown-ms property. The bind will be rate-limited to this value. - // You can set a cooldown on any bind, but it's most useful for the wheel. - Mod+WheelScrollDown cooldown-ms=150 { focus-workspace-down; } - Mod+WheelScrollUp cooldown-ms=150 { focus-workspace-up; } - Mod+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; } - Mod+Ctrl+WheelScrollUp cooldown-ms=150 { move-column-to-workspace-up; } - - Mod+WheelScrollRight { focus-column-right; } - Mod+WheelScrollLeft { focus-column-left; } - Mod+Ctrl+WheelScrollRight { move-column-right; } - Mod+Ctrl+WheelScrollLeft { move-column-left; } - - // Usually scrolling up and down with Shift in applications results in - // horizontal scrolling; these binds replicate that. - Mod+Shift+WheelScrollDown { focus-column-right; } - Mod+Shift+WheelScrollUp { focus-column-left; } - Mod+Ctrl+Shift+WheelScrollDown { move-column-right; } - Mod+Ctrl+Shift+WheelScrollUp { move-column-left; } - - // Similarly, you can bind touchpad scroll "ticks". - // Touchpad scrolling is continuous, so for these binds it is split into - // discrete intervals. - // These binds are also affected by touchpad's natural-scroll, so these - // example binds are "inverted", since we have natural-scroll enabled for - // touchpads by default. - // Mod+TouchpadScrollDown { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02+"; } - // Mod+TouchpadScrollUp { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02-"; } - - // You can refer to workspaces by index. However, keep in mind that - // niri is a dynamic workspace system, so these commands are kind of - // "best effort". Trying to refer to a workspace index bigger than - // the current workspace count will instead refer to the bottommost - // (empty) workspace. - // - // For example, with 2 workspaces + 1 empty, indices 3, 4, 5 and so on - // will all refer to the 3rd workspace. Mod+1 { focus-workspace 1; } Mod+2 { focus-workspace 2; } Mod+3 { focus-workspace 3; } @@ -493,101 +189,63 @@ binds { Mod+Ctrl+8 { move-column-to-workspace 8; } Mod+Ctrl+9 { move-column-to-workspace 9; } - // Alternatively, there are commands to move just a single window: - // Mod+Ctrl+1 { move-window-to-workspace 1; } - - // Switches focus between the current and the previous workspace. - // Mod+Tab { focus-workspace-previous; } - - // The following binds move the focused window in and out of a column. - // If the window is alone, they will consume it into the nearby column to the side. - // If the window is already in a column, they will expel it out. Mod+BracketLeft { consume-or-expel-window-left; } Mod+BracketRight { consume-or-expel-window-right; } - // Consume one window from the right to the bottom of the focused column. Mod+Comma { consume-window-into-column; } - // Expel the bottom window from the focused column to the right. Mod+Period { expel-window-from-column; } - //wofi - Mod+R { spawn "wofi" "--show" "drun"; } - - Mod+Shift+Control+R { switch-preset-column-width; } + Mod+D { switch-preset-column-width; } Mod+Shift+R { switch-preset-window-height; } Mod+Ctrl+R { reset-window-height; } Mod+W { maximize-column; } - Mod+Shift+W { fullscreen-window; } + Mod+Q { fullscreen-window; } - // Expand the focused column to space not taken up by other fully visible columns. - // Makes the column "fill the rest of the space". Mod+Ctrl+F { expand-column-to-available-width; } - Mod+C { center-column; } - - // Center all fully visible columns on screen. Mod+Ctrl+C { center-visible-columns; } - // Finer width adjustments. - // This command can also: - // * set width in pixels: "1000" - // * adjust width in pixels: "-5" or "+5" - // * set width as a percentage of screen width: "25%" - // * adjust width as a percentage of screen width: "-10%" or "+10%" - // Pixel sizes use logical, or scaled, pixels. I.e. on an output with scale 2.0, - // set-column-width "100" will make the column occupy 200 physical screen pixels. Mod+Minus { set-column-width "-10%"; } Mod+Equal { set-column-width "+10%"; } - // Finer height adjustments when in column with other windows. Mod+Shift+Minus { set-window-height "-10%"; } Mod+Shift+Equal { set-window-height "+10%"; } - // Move the focused window between the floating and the tiling layout. Mod+V { toggle-window-floating; } Mod+Shift+V { switch-focus-between-floating-and-tiling; } - // Toggle tabbed column display mode. - // Windows in this column will appear as vertical tabs, - // rather than stacked on top of each other. - Mod+Shift+Z { toggle-column-tabbed-display; } - - // Actions to switch layouts. - // Note: if you uncomment these, make sure you do NOT have - // a matching layout switch hotkey configured in xkb options above. - // Having both at once on the same hotkey will break the switching, - // since it will switch twice upon pressing the hotkey (once by xkb, once by niri). - // Mod+Space { switch-layout "next"; } - // Mod+Shift+Space { switch-layout "prev"; } + Mod+Shift+F { toggle-column-tabbed-display; } + Mod+F { spawn "caja"; } Print { screenshot; } Ctrl+Print { screenshot-screen; } Alt+Print { screenshot-window; } - // Applications such as remote-desktop clients and software KVM switches may - // request that niri stops processing the keyboard shortcuts defined here - // so they may, for example, forward the key presses as-is to a remote machine. - // It's a good idea to bind an escape hatch to toggle the inhibitor, - // so a buggy application can't hold your session hostage. - // - // The allow-inhibiting=false property can be applied to other binds as well, - // which ensures niri always processes them, even when an inhibitor is active. Mod+Escape allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; } - // The quit action will show a confirmation dialog to avoid accidental exits. Mod+Shift+E { quit; } Ctrl+Alt+Delete { quit; } - // Powers off the monitors. To turn them back on, do any input like - // moving the mouse or pressing any other key. Mod+Shift+P { power-off-monitors; } -} + Mod+WheelScrollDown cooldown-ms=150 { focus-workspace-down; } + Mod+WheelScrollUp cooldown-ms=150 { focus-workspace-up; } + Mod+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; } + Mod+Ctrl+WheelScrollUp cooldown-ms=150 { move-column-to-workspace-up; } -cursor { - xcursor-theme "Adwaita" - xcursor-size 24 - // hide-when-typing - // hide-after-inactive-ms 1000 + Mod+WheelScrollRight { focus-column-right; } + Mod+WheelScrollLeft { focus-column-left; } + Mod+Ctrl+WheelScrollRight { move-column-right; } + Mod+Ctrl+WheelScrollLeft { move-column-left; } + + Mod+Shift+WheelScrollDown { focus-column-right; } + Mod+Shift+WheelScrollUp { focus-column-left; } + Mod+Ctrl+Shift+WheelScrollDown { move-column-right; } + Mod+Ctrl+Shift+WheelScrollUp { move-column-left; } } +gestures { + hot-corners { + off + } +} diff --git a/config/nvim/lua/plugins/lsp/init.lua b/config/nvim/lua/plugins/lsp/init.lua index bd9f5cb..6c158c8 100644 --- a/config/nvim/lua/plugins/lsp/init.lua +++ b/config/nvim/lua/plugins/lsp/init.lua @@ -6,7 +6,6 @@ require("nvim-autopairs").setup({}) require("lsp_signature").setup({ hint_enable = false, }) --- Formatters local augroup = vim.api.nvim_create_augroup("LspFormatting", {}) fmt.setup({ sources = { @@ -15,7 +14,6 @@ fmt.setup({ fmt.builtins.formatting.stylua, fmt.builtins.formatting.gofmt, }, - -- Format on save on_attach = function(client, bufnr) if client.supports_method("textDocument/formatting") then vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr }) diff --git a/config/waybar/config.jsonc b/config/waybar/config.jsonc index c3fba09..79767e9 100644 --- a/config/waybar/config.jsonc +++ b/config/waybar/config.jsonc @@ -2,15 +2,15 @@ "position": "top", "layer": "top", "modules-left": [ - "sway/workspaces", - "sway/mode", + "niri/workspaces", + "niri/mode", ], "modules-center": [ ], "modules-right": [ "clock", - "pulseaudio" -// "network" + "pulseaudio", + "network" ], "pulseaudio": { "tooltip": false, @@ -60,19 +60,30 @@ "tooltip": true, "tooltip-format": "{:%a, %b %d, :%I:%M:%S %p}" }, - "sway/workspaces": { - "format": "{name}" + "niri/workspaces": { + "format": "●", + "persistent-workspaces": { + "1": 1, + "2": 2, + "3": 3, + "4": 4, + "5": 5, + "6": 6, + "7": 7, + "8": 8, + "9": 9 + }, }, - "sway/window": { + "niri/window": { "icon": false, "icon-size": 20 }, - "sway/mode": { + "niri/mode": { "format": "{}" }, "network": { -// "interface": "eno1", - "interface": "wlo1", + "interface": "eno1", +// "interface": "wlo1", "format-wifi": "WLAN {essid}", "format-ethernet": "ETH {ipaddr}/{cidr}", "format-disconnected": "disconnected", diff --git a/config/waybar/style.css b/config/waybar/style.css index a4f4431..661765c 100644 --- a/config/waybar/style.css +++ b/config/waybar/style.css @@ -16,17 +16,14 @@ * { border: none; - font-family: "MapleMono"; - font-size: 14px; - min-height: 8px; - margin-bottom: 1px; + font-family: "JetBrainsMono Nerd Font"; + font-size: 15px; + min-height: 10px; } window#waybar { background: @background; border-bottom: 2px solid @surface0; - padding: 2px 0; - margin-bottom: 2px; } #disk, @@ -34,7 +31,6 @@ window#waybar { #window, #clock, #network, -#mode, #battery, #privacy, #memory, @@ -43,18 +39,17 @@ window#waybar { #tray, #bluetooth, #tray menu { - padding: 3px 6px; - margin: 4px 0 4px 6px; + padding: 5px 10px; + margin: 8px 0 8px 10px; background: @surface0; - color: @lavender; + color: @text; transition: 0.3s; border: 1.5px solid @border; - border-radius: 0px; + border-radius: 8px; } #window { transition: none; - margin-bottom: 2px; } window#waybar.empty #window { @@ -63,20 +58,19 @@ window#waybar.empty #window { border: none; } -#clock { - margin: 4px 0 4px 8px; +#network { + margin: 8px 12px 8px 12px; color: @lavender; } -#pulseaudio { - margin-right: 10px; - color: @lavender; +#pulseaudio, +#clock { + color: @lavender; } #workspaces { - padding: 0; - color: @lavender; - margin-left: 10px; + margin-left: 12px; + color: @lavender; } #workspaces button { @@ -102,4 +96,3 @@ window#waybar.empty #window { background: @overlay0; color: @text; } - diff --git a/nixos/configuration/configuration.nix b/nixos/configuration/configuration.nix index 9a47cbe..50d1e15 100644 --- a/nixos/configuration/configuration.nix +++ b/nixos/configuration/configuration.nix @@ -11,7 +11,6 @@ in enable = true; videoDrivers = ["modesetting" "nvidia"]; }; - displayManager.ly.enable = true; blueman.enable = false; printing.enable = false; @@ -93,6 +92,7 @@ in unstable.qbittorrent unstable.zathura unstable.rofi + unstable.wezterm ]; nixpkgs.config.allowUnfree = true; @@ -106,11 +106,11 @@ in programs = { zsh.enable = true; zsh.syntaxHighlighting.enable = true; - foot.enable = true; + foot.enable = false; nano.enable = false; nekoray.enable = true; nekoray.tunMode.enable = true; - sway.enable = true; + niri.enable = true; }; fonts.packages = with pkgs; [ diff --git a/nixos/home-configuration/apps/sway.nix b/nixos/home-configuration/apps/sway.nix index f7cc230..c5a2868 100644 --- a/nixos/home-configuration/apps/sway.nix +++ b/nixos/home-configuration/apps/sway.nix @@ -13,7 +13,7 @@ in { wayland.windowManager.sway = { - enable = true; + enable = false; wrapperFeatures.gtk = true; extraConfig = '' exec swaymsg workspace 1 @@ -33,11 +33,11 @@ in config = { modifier = "Mod4"; gaps = { - inner = 5; - outer = 5; + inner = 8; + outer = 10; }; bars = []; -# output.eDP-1.disable = ""; + output.eDP-1.disable = ""; keybindings = { "${modifier}+Return" = "exec ${terminal}"; "${modifier}+Shift+Return" = "exec ${menu} -l 10"; diff --git a/nixos/home-configuration/apps/zsh.nix b/nixos/home-configuration/apps/zsh.nix index d54d3df..c6c4a48 100644 --- a/nixos/home-configuration/apps/zsh.nix +++ b/nixos/home-configuration/apps/zsh.nix @@ -50,6 +50,7 @@ export PATH="/usr/bin:$PATH" export PATH="$HOME/.local/bin:$PATH" EDITOR=vim + bindkey -e PS1="[%n in %m %~] " ''; }; diff --git a/nixos/home-configuration/configuration.nix b/nixos/home-configuration/configuration.nix index 04c913b..972ca98 100644 --- a/nixos/home-configuration/configuration.nix +++ b/nixos/home-configuration/configuration.nix @@ -13,6 +13,7 @@ nvim = "nvim"; eww = "eww"; waybar = "waybar"; + niri = "niri"; }; in { xdg.configFile = builtins.mapAttrs (name: subpath: { @@ -27,13 +28,14 @@ in { packages = with pkgs; [ alsa-utils nix-search-cli - hyfetch + fastfetch dysk autotiling tree stylua gopls lua-language-server + serve-d wl-clipboard appimage-run libnotify