From 2f907293f0af3b8344595c7b84fa2c9cc17427dc Mon Sep 17 00:00:00 2001 From: twoneis Date: Wed, 20 Mar 2024 13:55:10 +0100 Subject: [PATCH] removed unnecessary files and started working on global color config --- colors.nix | 7 + modules/system/niri/config.bak.kdl | 277 ----------------------------- modules/system/niri/config.kdl | 140 --------------- 3 files changed, 7 insertions(+), 417 deletions(-) create mode 100644 colors.nix delete mode 100644 modules/system/niri/config.bak.kdl delete mode 100644 modules/system/niri/config.kdl diff --git a/colors.nix b/colors.nix new file mode 100644 index 0000000..407339a --- /dev/null +++ b/colors.nix @@ -0,0 +1,7 @@ +{ + colors = { + base = { + hex = "#191724"; + }; + }; +} diff --git a/modules/system/niri/config.bak.kdl b/modules/system/niri/config.bak.kdl deleted file mode 100644 index 39897ef..0000000 --- a/modules/system/niri/config.bak.kdl +++ /dev/null @@ -1,277 +0,0 @@ - -// This config is in the KDL format: https://kdl.dev -// "/-" comments out the following node. - -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" - } - - // You can set the keyboard repeat parameters. The defaults match wlroots and sway. - // Delay is in milliseconds before the repeat starts. Rate is in characters per second. - // repeat-delay 600 - // repeat-rate 25 - - // Niri can remember the keyboard layout globally (the default) or per-window. - // - "global" - layout change is global for all windows. - // - "window" - layout is tracked for each window individually. - // track-layout "global" - } - - // Next sections include libinput settings. - // Omitting settings disables them, or leaves them at their default values. - touchpad { - tap - // dwt - natural-scroll - // accel-speed 0.2 - // accel-profile "flat" - // tap-button-map "left-middle-right" - } - - mouse { - // natural-scroll - // accel-speed 0.2 - // accel-profile "flat" - } - - tablet { - // Set the name of the output (see below) which the tablet will map to. - // If this is unset or the output doesn't exist, the tablet maps to one of the - // existing outputs. - map-to-output "DP-1" - } - - // By default, niri will take over the power button to make it sleep - // instead of power off. - // Uncomment this if you would like to configure the power button elsewhere - // (i.e. logind.conf). - // disable-power-key-handling -} - -// You can configure outputs by their name, which you can find with wayland-info(1). -// The built-in laptop monitor is usually called "eDP-1". -// Remember to uncommend the node by removing "/-"! -output "DP-3" { - // Uncomment this line to disable this output. - // off - - // Scale is a floating-point number, but at the moment only integer values work. - scale 1.0 - - // 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. - // All valid modes are listed in niri's debug output when an output is connected. - mode "5120x2160@59.940" - - // 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 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. - // It the position is unset or results in an overlap, the output is instead placed - // automatically. -} - -layout { - // 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 4 - - // Color of the ring on the active monitor: red, green, blue, alpha. - active-color 127 200 255 255 - - // Color of the ring on inactive monitors: red, green, blue, alpha. - inactive-color 80 80 80 255 - } - - // 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 4 - active-color 255 200 127 255 - inactive-color 80 80 80 255 - } - - // 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.25 - proportion 0.5 - proportion 0.75 - - // Fixed sets the width in logical pixels exactly. - // fixed 1920 - } - - // 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 {} - - // Set gaps around windows in logical pixels. - gaps 4 - - // 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 - } - - // 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. - // - "on-overflow", focusing a column will center it if it doesn't fit - // together with the previously focused column. - // - "always", the focused column will always be centered. - center-focused-column "never" -} - -// 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. -// spawn-at-startup "alacritty" "-e" "fish" - -cursor { - // Change the theme and size of the cursor as well as set the - // `XCURSOR_THEME` and `XCURSOR_SIZE` env variables. - // xcursor-theme "default" - // xcursor-size 24 -} - -// 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 rounded corners. -// 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 "~/Pictures/Screenshots/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 - -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. - - // Suggested binds for running programs: terminal, app launcher, screen locker. - Mod+T { spawn "alacritty"; } - Mod+B { spawn "firefox"; } - - Mod+Backspace { close-window; } - - Mod+Comma { focus-column-left; } - Mod+Period { focus-column-right; } - Mod+Left { focus-column-left; } - Mod+Down { focus-window-down; } - Mod+Up { focus-window-up; } - Mod+Right { focus-column-right; } - - Mod+Shift+Comma { move-column-left; } - Mod+Shift+Period { move-column-right; } - Mod+Ctrl+Left { move-column-left; } - Mod+Ctrl+Down { move-window-down; } - Mod+Ctrl+Up { move-window-up; } - Mod+Ctrl+Right { 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+F { maximize-column; } - Mod+K { center-column; } - Mod+Z { switch-preset-column-width; } - - // 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%"; } - - // 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"; } - - Print { screenshot; } - Ctrl+Print { screenshot-screen; } - Alt+Print { screenshot-window; } - - Mod+Shift+E { quit; } - - Mod+Shift+Ctrl+T { toggle-debug-tint; } -} - -// Settings for debugging. Not meant for normal use. -// These can change or stop working at any point with little notice. -debug { - // Make niri take over its DBus services even if it's not running as a session. - // Useful for testing screen recording changes without having to relogin. - // The main niri instance will *not* currently take back the services; so you will - // need to relogin in the end. - // dbus-interfaces-in-non-session-instances - - // Wait until every frame is done rendering before handing it over to DRM. - // wait-for-frame-completion-before-queueing - - // Enable direct scanout into overlay planes. - // May cause frame drops during some animations on some hardware. - // enable-overlay-planes - - // Disable the use of the cursor plane. - // The cursor will be rendered together with the rest of the frame. - // disable-cursor-plane - - // Slow down animations by this factor. - // animation-slowdown 3.0 - - // Override the DRM device that niri will use for all rendering. - // render-drm-device "/dev/dri/renderD129" -} diff --git a/modules/system/niri/config.kdl b/modules/system/niri/config.kdl deleted file mode 100644 index 0920eb2..0000000 --- a/modules/system/niri/config.kdl +++ /dev/null @@ -1,140 +0,0 @@ -// This config is in the KDL format: https://kdl.dev -// "/-" comments out the following node. - -input { - // If this section is omitted, holding down a key won't work anymore - keyboard { - xkb { } - } - touchpad { - tap - natural-scroll - } - tablet { - map-to-output "DP-3" - } - touch { - map-to-output "eDP-1" - } - disable-power-key-handling -} - -// `niri msg outputs` to list available outputs with options -output "eDP-1" { - scale 1.0 - - mode "1920x1080@60" - - position x=1280 y=0 -} - -output "DP-1" { - scale 1.0 - - mode "5120x2160@59.940" - - position x=1280 y=0 -} - -layout { - focus-ring { - width 4 - - active-gradient from="#31748f" to="#9ccfd8" angle=135 - inactive-color "#c4a7e7" - } - - preset-column-widths { - proportion 0.25 - proportion 0.5 - proportion 0.75 - } - - default-column-width { proportion 0.25; } - - gaps 4 -} - -environment { -} - -prefer-no-csd - -screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png" - -hotkey-overlay { - skip-at-startup -} - -spawn-at-startup "waybar" - -binds { - Mod+T { spawn "alacritty"; } - Mod+B { spawn "firefox"; } - - Mod+S { spawn "fuzzel" "-I"; } - - - XF86AudioRaiseVolume { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1+"; } - XF86AudioLowerVolume { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1-"; } - - Mod+Backspace { close-window; } - - Mod+Left { focus-column-left; } - Mod+Down { focus-window-down; } - Mod+Up { focus-window-up; } - Mod+Right { focus-column-right; } - Mod+Comma { focus-column-left; } - Mod+Period{ focus-column-right; } - Mod+O { focus-window-down; } - Mod+E { focus-window-up; } - - Mod+Shift+Left { move-column-left; } - Mod+Shift+Down { move-window-down; } - Mod+Shift+Up { move-window-up; } - Mod+Shift+Right { move-column-right; } - Mod+Shift+Comma { move-column-left; } - Mod+Shift+Period{ move-column-right; } - Mod+Shift+O { move-window-down; } - Mod+Shift+E { move-window-up; } - - Mod+Ctrl+Left { focus-monitor-left; } - Mod+Ctrl+Down { focus-monitor-down; } - Mod+Ctrl+Up { focus-monitor-up; } - Mod+Ctrl+Right { focus-monitor-right; } - Mod+Ctrl+Comma { focus-monitor-left; } - Mod+Ctrl+Period{ focus-monitor-right; } - Mod+Ctrl+O { focus-monitor-down; } - Mod+Ctrl+E { focus-monitor-up; } - - Mod+Shift+Ctrl+Left { move-column-to-monitor-left; } - Mod+Shift+Ctrl+Down { move-column-to-monitor-down; } - Mod+Shift+Ctrl+Up { move-column-to-monitor-up; } - Mod+Shift+Ctrl+Right { move-column-to-monitor-right; } - Mod+Shift+Ctrl+Comma { move-column-to-monitor-left; } - Mod+Shift+Ctrl+Period{ move-column-to-monitor-right; } - Mod+Shift+Ctrl+O { move-column-to-monitor-down; } - Mod+Shift+Ctrl+E { move-column-to-monitor-up; } - - - Mod+P { consume-window-into-column; } - Mod+Shift+P { expel-window-from-column; } - - Mod+Z { switch-preset-column-width; } - Mod+F { maximize-column; } - Mod+Shift+F { fullscreen-window; } - Mod+K { center-column; } - - Mod+Minus { set-column-width "-10%"; } - Mod+Equal { set-column-width "+10%"; } - - Mod+Shift+Minus { set-window-height "-10%"; } - Mod+Shift+Equal { set-window-height "+10%"; } - - Mod+Shift+S { screenshot; } - Print { screenshot-screen; } - Mod+Shift+Ctrl+S { screenshot-window; } - - Mod+Shift+L { spawn "swaylock"; } - Mod+Shift+Q { quit; } -}