diff --git a/private_dot_config/DankMaterialShell/firefox.css b/private_dot_config/DankMaterialShell/firefox.css index 35c27c2..21152aa 100644 --- a/private_dot_config/DankMaterialShell/firefox.css +++ b/private_dot_config/DankMaterialShell/firefox.css @@ -53,8 +53,11 @@ --m3-radius: 12px; --m3-radius-sm: 10px; --m3-elev-0: none; - --m3-elev-1: 0 1px 2px rgba(0,0,0,.08), 0 1px 3px rgba(0,0,0,.06); - --m3-elev-2: 0 2px 6px rgba(0,0,0,.10), 0 1px 3px rgba(0,0,0,.06); + --m3-elev-1: 0 1px 2px color-mix(in srgb, var(--md-sys-color-shadow) 8%, transparent), 0 1px 3px color-mix(in srgb, var(--md-sys-color-shadow) 6%, transparent); + --m3-elev-2: 0 2px 6px color-mix(in srgb, var(--md-sys-color-shadow) 10%, transparent), 0 1px 3px color-mix(in srgb, var(--md-sys-color-shadow) 6%, transparent); + --m3-elev-3: 0 11px 7px color-mix(in srgb, var(--md-sys-color-shadow) 19%, transparent), 0 13px 25px color-mix(in srgb, var(--md-sys-color-shadow) 30%, transparent); + --m3-elev-4: 0 14px 12px color-mix(in srgb, var(--md-sys-color-shadow) 17%, transparent), 0 20px 40px color-mix(in srgb, var(--md-sys-color-shadow) 30%, transparent); + --m3-elev-5: 0 17px 17px color-mix(in srgb, var(--md-sys-color-shadow) 15%, transparent), 0 27px 55px color-mix(in srgb, var(--md-sys-color-shadow) 30%, transparent); --tab-height: 34px; --urlbar-height: 38px; @@ -118,8 +121,11 @@ --md-sys-color-surface-container-high: #2a2a2b; --md-sys-color-surface-container-highest: #343536; - --m3-elev-1: 0 1px 2px rgba(0,0,0,.50), 0 1px 3px rgba(0,0,0,.35); - --m3-elev-2: 0 4px 10px rgba(0,0,0,.55), 0 1px 3px rgba(0,0,0,.35); + --m3-elev-1: 0 1px 2px color-mix(in srgb, var(--md-sys-color-shadow) 50%, transparent), 0 1px 3px color-mix(in srgb, var(--md-sys-color-shadow) 35%, transparent); + --m3-elev-2: 0 4px 10px color-mix(in srgb, var(--md-sys-color-shadow) 55%, transparent), 0 1px 3px color-mix(in srgb, var(--md-sys-color-shadow) 35%, transparent); + --m3-elev-3: 0 11px 7px color-mix(in srgb, var(--md-sys-color-shadow) 45%, transparent), 0 13px 25px color-mix(in srgb, var(--md-sys-color-shadow) 55%, transparent); + --m3-elev-4: 0 14px 12px color-mix(in srgb, var(--md-sys-color-shadow) 42%, transparent), 0 20px 40px color-mix(in srgb, var(--md-sys-color-shadow) 55%, transparent); + --m3-elev-5: 0 17px 17px color-mix(in srgb, var(--md-sys-color-shadow) 40%, transparent), 0 27px 55px color-mix(in srgb, var(--md-sys-color-shadow) 55%, transparent); --state-hover: color-mix(in srgb, var(--md-sys-color-on-surface) 6%, transparent); --state-press: color-mix(in srgb, var(--md-sys-color-on-surface) 10%, transparent); diff --git a/private_dot_config/niri/binds.kdl b/private_dot_config/niri/binds.kdl index 650cbdb..523dd5c 100644 --- a/private_dot_config/niri/binds.kdl +++ b/private_dot_config/niri/binds.kdl @@ -58,8 +58,8 @@ binds { // Changing monitor focus. Mod+Alt+Left { focus-monitor-left; } - Mod+Alt+Down { focus-monitor-down; } - Mod+Alt+Up { focus-monitor-up; } + Mod+Alt+Down { move-workspace-down; } + Mod+Alt+Up { move-workspace-up; } Mod+Alt+Right { focus-monitor-right; } // Moving window to monitor. diff --git a/private_dot_config/niri/config.kdl b/private_dot_config/niri/config.kdl index 25da18a..395c72b 100644 --- a/private_dot_config/niri/config.kdl +++ b/private_dot_config/niri/config.kdl @@ -1,4 +1,5 @@ include "input.kdl" +include "workspaces.kdl" include "overview.kdl" include "animations.kdl" include "binds.kdl" diff --git a/private_dot_config/niri/startup.kdl b/private_dot_config/niri/startup.kdl index 4700b2e..bf951a0 100644 --- a/private_dot_config/niri/startup.kdl +++ b/private_dot_config/niri/startup.kdl @@ -1,6 +1,7 @@ hotkey-overlay { skip-at-startup; } // spawn-at-startup "~/.config/niri/overview-listener" -spawn-at-startup "dms" "run" +// DMS now managed via systemd: systemctl --user enable dms +// spawn-at-startup "dms" "run" spawn-sh-at-startup "wl-clip-persist --clipboard regular -all-mime-type-regex '^(?!x-kde-passwordManagerHint).+'" spawn-at-startup "bash" "-c" "wl-paste --watch cliphist store &" diff --git a/private_dot_config/nvim/lua/plugins/dankcolors.lua b/private_dot_config/nvim/lua/plugins/dankcolors.lua index cc3e830..702a96d 100644 --- a/private_dot_config/nvim/lua/plugins/dankcolors.lua +++ b/private_dot_config/nvim/lua/plugins/dankcolors.lua @@ -4,38 +4,38 @@ return { priority = 1000, config = function() require('base16-colorscheme').setup({ - base00 = '#131314', - base01 = '#131314', - base02 = '#7f8389', - base03 = '#7f8389', - base04 = '#d1d6de', - base05 = '#f8fbff', - base06 = '#f8fbff', - base07 = '#f8fbff', - base08 = '#ff9fbb', - base09 = '#ff9fbb', - base0A = '#d4dde9', - base0B = '#a5feb1', - base0C = '#f3f7ff', - base0D = '#d4dde9', - base0E = '#ecf4ff', - base0F = '#ecf4ff', + base00 = '#101418', + base01 = '#101418', + base02 = '#8d979f', + base03 = '#8d979f', + base04 = '#e8f4ff', + base05 = '#f5faff', + base06 = '#f5faff', + base07 = '#f5faff', + base08 = '#ff739e', + base09 = '#ff739e', + base0A = '#60b8ff', + base0B = '#7cff8d', + base0C = '#abd9ff', + base0D = '#60b8ff', + base0E = '#7cc4ff', + base0F = '#7cc4ff', }) vim.api.nvim_set_hl(0, 'Visual', { - bg = '#7f8389', - fg = '#f8fbff', + bg = '#8d979f', + fg = '#f5faff', bold = true }) vim.api.nvim_set_hl(0, 'Statusline', { - bg = '#d4dde9', - fg = '#131314', + bg = '#60b8ff', + fg = '#101418', }) - vim.api.nvim_set_hl(0, 'LineNr', { fg = '#7f8389' }) - vim.api.nvim_set_hl(0, 'CursorLineNr', { fg = '#f3f7ff', bold = true }) + vim.api.nvim_set_hl(0, 'LineNr', { fg = '#8d979f' }) + vim.api.nvim_set_hl(0, 'CursorLineNr', { fg = '#abd9ff', bold = true }) vim.api.nvim_set_hl(0, 'Statement', { - fg = '#ecf4ff', + fg = '#7cc4ff', bold = true }) vim.api.nvim_set_hl(0, 'Keyword', { link = 'Statement' }) @@ -43,34 +43,34 @@ return { vim.api.nvim_set_hl(0, 'Conditional', { link = 'Statement' }) vim.api.nvim_set_hl(0, 'Function', { - fg = '#d4dde9', + fg = '#60b8ff', bold = true }) vim.api.nvim_set_hl(0, 'Macro', { - fg = '#d4dde9', + fg = '#60b8ff', italic = true }) vim.api.nvim_set_hl(0, '@function.macro', { link = 'Macro' }) vim.api.nvim_set_hl(0, 'Type', { - fg = '#f3f7ff', + fg = '#abd9ff', bold = true, italic = true }) vim.api.nvim_set_hl(0, 'Structure', { link = 'Type' }) vim.api.nvim_set_hl(0, 'String', { - fg = '#a5feb1', + fg = '#7cff8d', italic = true }) - vim.api.nvim_set_hl(0, 'Operator', { fg = '#d1d6de' }) - vim.api.nvim_set_hl(0, 'Delimiter', { fg = '#d1d6de' }) + vim.api.nvim_set_hl(0, 'Operator', { fg = '#e8f4ff' }) + vim.api.nvim_set_hl(0, 'Delimiter', { fg = '#e8f4ff' }) vim.api.nvim_set_hl(0, '@punctuation.bracket', { link = 'Delimiter' }) vim.api.nvim_set_hl(0, '@punctuation.delimiter', { link = 'Delimiter' }) vim.api.nvim_set_hl(0, 'Comment', { - fg = '#7f8389', + fg = '#8d979f', italic = true })