diff options
| author | Rosa <rosaontheweb@proton.me> | 2026-03-17 16:21:33 -0400 |
|---|---|---|
| committer | Rosa <rosaontheweb@proton.me> | 2026-03-17 16:21:33 -0400 |
| commit | ce19b701046c064a1eb39098d8537b2c4964a86e (patch) | |
| tree | 8c42a1392d36132803a2ee4ecb4d2c9150f72296 /modules/user | |
| parent | 8848e53815fe12ffa3998c0a4bbcf2178d6b00e8 (diff) | |
start rewrite
Diffstat (limited to 'modules/user')
| -rw-r--r-- | modules/user/default.nix | 5 | ||||
| -rw-r--r-- | modules/user/desktop/components/default.nix | 6 | ||||
| -rw-r--r-- | modules/user/desktop/components/fuzzel.nix | 30 | ||||
| -rw-r--r-- | modules/user/desktop/components/waybar/default.nix | 141 | ||||
| -rw-r--r-- | modules/user/desktop/components/waybar/style-blue.css | 82 | ||||
| -rw-r--r-- | modules/user/desktop/components/waybar/style-pink.css | 82 | ||||
| -rw-r--r-- | modules/user/desktop/default.nix | 129 | ||||
| -rw-r--r-- | modules/user/desktop/wallpaper.png | bin | 13373186 -> 0 bytes | |||
| -rw-r--r-- | modules/user/desktop/window-managers/default.nix | 5 | ||||
| -rw-r--r-- | modules/user/desktop/window-managers/sway.nix | 268 |
10 files changed, 0 insertions, 748 deletions
diff --git a/modules/user/default.nix b/modules/user/default.nix deleted file mode 100644 index 5c8d960..0000000 --- a/modules/user/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - imports = [ - ./desktop - ]; -} diff --git a/modules/user/desktop/components/default.nix b/modules/user/desktop/components/default.nix deleted file mode 100644 index 8d96216..0000000 --- a/modules/user/desktop/components/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - imports = [ - ./fuzzel.nix - ./waybar - ]; -} diff --git a/modules/user/desktop/components/fuzzel.nix b/modules/user/desktop/components/fuzzel.nix deleted file mode 100644 index e4b6ef8..0000000 --- a/modules/user/desktop/components/fuzzel.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ config, ... }: -{ - programs.fuzzel.settings = { - border = { - radius = 0; - width = 2; - }; - - colors = { - background = "1e1e2eff"; - border = "89b4faff"; - input = "cdd6f4ff"; - match = "89b4faff"; - placeholder = "7f849cff"; - prompt = "bac2deff"; - selection = "585b70ff"; - selection-match = "89b4faff"; - selection-text = "cdd6f4ff"; - text = "cdd6f4ff"; - }; - - main = { - dpi-aware = true; - font = "Fira Code:size=6"; - tabs = 4; - terminal = "foot -a '{cmd}' -T '{cmd}' {cmd}"; - use-bold = true; - }; - }; -} diff --git a/modules/user/desktop/components/waybar/default.nix b/modules/user/desktop/components/waybar/default.nix deleted file mode 100644 index 0fa0f16..0000000 --- a/modules/user/desktop/components/waybar/default.nix +++ /dev/null @@ -1,141 +0,0 @@ -{ - config, - lib, - options, - ... -}: -{ - options.desktop.components.waybar.enable = lib.mkEnableOption "waybar"; - config.programs.waybar = { - enable = config.desktop.components.waybar.enable; - settings = { - main = { - modules-left = [ - "sway/workspaces" - "tray" - ]; - - modules-center = [ "clock" ]; - modules-right = [ - "backlight" - "battery" - "network" - "wireplumber" - ]; - - backlight = { - format = "{icon}"; - format-icons = [ - "" - "" - ]; - - tooltip-format = "{percent}%"; - }; - - battery = { - format = "{icon}"; - format-critical = "{icon} ({capacity}%)"; - format-icons = [ - "" - "" - "" - "" - ]; - - format-time = "{H}h{m}m"; - format-warning = "{icon} ({capacity}%)"; - states = { - critical = 15; - warning = 25; - }; - - tooltip-format = "{time} remaining, {health}% battery health"; - tooltip-format-critical = "plug yo shit in NOW!!"; - }; - - clock = { - format = "{:%A, %b %d %Y - %H:%M %Z}"; - # i am the time god. fear me. - timezones = [ - "America/Toronto" - "America/Vancouver" - "America/Edmonton" - "America/Regina" - "America/Toronto" # duplicated so it appears in the list too - "America/Halifax" - "America/St_Johns" - "America/Sao_Paulo" - "Etc/UTC" - "Australia/Perth" - ]; - - tooltip-format = "{tz_list}"; - }; - - network = { - format-disabled = ""; - format-disconnected = ""; - format-ethernet = " {ipaddr}/{cidr}"; - format-icons = [ - "" - "" - "" - "" - ]; - - format-wifi = "{icon}"; - interval = 1; - tooltip-format = "{ifname} tx: {bandwidthUpBytes} rx: {bandwidthDownBytes}"; - tooltip-format-wifi = '' - <b>Network:</b> {essid} - <b>{ifname}:</b> {ipaddr}/{cidr} - <b>tx:</b> {bandwidthUpBytes} - <b>rx:</b> {bandwidthDownBytes} - ''; - }; - - position = "bottom"; - "sway/workspaces" = { - all-outputs = true; - disable-scroll = true; - format = ""; - persistent-workspaces = { - "1" = [ - "DP-1" - "eDP-1" - ]; - - "2" = [ - "DP-2" - "eDP-1" - ]; - - "3" = [ ]; - "4" = [ ]; - "5" = [ ]; - "6" = [ ]; - "7" = [ ]; - "8" = [ ]; - "9" = [ ]; - }; - }; - - wireplumber = { - format = "{icon}"; - format-icons = [ - "" - "" - "" - ]; - - format-muted = ""; - on-click = "wpctl set-mute @DEFAULT_SINK@ toggle"; - tooltip-format = "{node_name} - {volume}%"; - }; - }; - }; - - style = builtins.readFile ./style-${config.desktop.accent}.css; - }; -} diff --git a/modules/user/desktop/components/waybar/style-blue.css b/modules/user/desktop/components/waybar/style-blue.css deleted file mode 100644 index 9df1136..0000000 --- a/modules/user/desktop/components/waybar/style-blue.css +++ /dev/null @@ -1,82 +0,0 @@ -* { - border: none; - border-radius: 0; - font-family: 'FiraCode Nerd Font Mono'; - min-height: 0; -} - -window#waybar { - background: #11111b; - color: #cdd6f4; -} - -tooltip { - background: #1e1e2e; - border: 2px solid #89b4fa; -} - -tooltip label { - color: #cdd6f4; -} - -#workspaces button { - background: none; - box-shadow: none; - color: #585b70; - padding: 0; -} - -#workspaces button.empty { - color: #313244; -} - -#workspaces button.visible { - color: #6c7086; -} - -#workspaces button.focused { - color: #89b4fa; -} - -#workspaces button.urgent { - color: #f38ba8; -} - -#workspaces button:hover { - color: #cdd6f4; - text-shadow: inherit; -} - -.module { - padding: 0 8px; - padding-top: 2px; -} - -.modules-left { - margin-left: 8px; - margin-right: 4px; -} - -.modules-right { - margin-left: 4px; - margin-right: 8px; -} - -@keyframes blink { - to { - color: #cdd6f4; - } -} - -#battery.charging { - color: #a6e3a1; -} - -#battery.critical:not(.charging) { - animation-direction: alternate; - animation-duration: 0.5s; - animation-iteration-count: infinite; - animation-name: blink; - animation-timing-function: steps(2); - color: #f38ba8; -} diff --git a/modules/user/desktop/components/waybar/style-pink.css b/modules/user/desktop/components/waybar/style-pink.css deleted file mode 100644 index 491279a..0000000 --- a/modules/user/desktop/components/waybar/style-pink.css +++ /dev/null @@ -1,82 +0,0 @@ -* { - border: none; - border-radius: 0; - font-family: 'FiraCode Nerd Font Mono'; - min-height: 0; -} - -window#waybar { - background: #11111b; - color: #cdd6f4; -} - -tooltip { - background: #1e1e2e; - border: 2px solid #f5c2e7; -} - -tooltip label { - color: #cdd6f4; -} - -#workspaces button { - background: none; - box-shadow: none; - color: #585b70; - padding: 0; -} - -#workspaces button.empty { - color: #313244; -} - -#workspaces button.visible { - color: #6c7086; -} - -#workspaces button.focused { - color: #f5c2e7; -} - -#workspaces button.urgent { - color: #f38ba8; -} - -#workspaces button:hover { - color: #cdd6f4; - text-shadow: inherit; -} - -.module { - padding: 0 8px; - padding-top: 2px; -} - -.modules-left { - margin-left: 8px; - margin-right: 4px; -} - -.modules-right { - margin-left: 4px; - margin-right: 8px; -} - -@keyframes blink { - to { - color: #cdd6f4; - } -} - -#battery.charging { - color: #a6e3a1; -} - -#battery.critical:not(.charging) { - animation-direction: alternate; - animation-duration: 0.5s; - animation-iteration-count: infinite; - animation-name: blink; - animation-timing-function: steps(2); - color: #f38ba8; -} diff --git a/modules/user/desktop/default.nix b/modules/user/desktop/default.nix deleted file mode 100644 index 7cd19ce..0000000 --- a/modules/user/desktop/default.nix +++ /dev/null @@ -1,129 +0,0 @@ -{ - config, - lib, - pkgs, - options, - ... -}: -{ - imports = [ - ./components - ./window-managers - ]; - - options.desktop.windowManager = lib.mkOption { - description = "Which window manager to use"; - default = null; - type = with lib.types; nullOr (enum [ ]); - }; - - config = { - fonts.fontconfig.enable = true; - gtk = { - enable = true; - colorScheme = "dark"; - cursorTheme = { - package = pkgs.catppuccin-cursors.mochaDark; - name = "catppuccin-mocha-dark-cursors"; - size = 24; - }; - - theme = { - package = ( - pkgs.catppuccin-gtk.override { - variant = "mocha"; - } - ); - - name = "catppuccin-mocha-blue-standard"; - }; - }; - - home = { - file."Pictures/wallpaper.png" = { - enable = (config.desktop.windowManager != null); - source = ./wallpaper.png; - }; - - packages = with pkgs; [ - brightnessctl - fira-code - keepassxc - nerd-fonts.fira-code - ]; - }; - - programs = { - foot = { - enable = lib.mkDefault (config.desktop.windowManager != null); - settings = { - bell = { - notify = true; - urgent = true; - }; - - colors = { - background = "1e1e2e"; - cursor = "11111b f5e0dc"; - foreground = "cdd6f4"; - regular0 = "45475a"; - regular1 = "f38ba8"; - regular2 = "a6e3a1"; - regular3 = "f9e2af"; - regular4 = "89b4fa"; - regular5 = "f5c2e7"; - regular6 = "94e2d5"; - regular7 = "bac2de"; - bright0 = "585b70"; - bright1 = "f38ba8"; - bright2 = "a6e3a1"; - bright3 = "f9e2af"; - bright4 = "89b4fa"; - bright5 = "f5c2e7"; - bright6 = "94e2d5"; - bright7 = "a6adc8"; - "16" = "fab387"; - "17" = "f5e0dc"; - jump-labels = "11111b fab387"; - search-box-match = "cdd6f4 313244"; - search-box-no-match = "11111b f38ba8"; - selection-background = "414356"; - selection-foreground = "cdd6f4"; - urls = "89b4fa"; - }; - - cursor.blink = true; - main = { - dpi-aware = lib.mkDefault true; - font = lib.mkDefault "FiraCode Nerd Font Mono:size=8"; - }; - - mouse.hide-when-typing = true; - }; - }; - - librewolf = { - enable = lib.mkDefault (config.desktop.windowManager != null); - profiles = { - # sidebar visibility keeps getting reset when launching the browser. - default.settings."sidebar.visibility" = "hide-sidebar"; - noRFP = { - id = 1; - settings = { - "privacy.resistFingerprinting" = false; - "sidebar.visibility" = "hide-sidebar"; - "webgl.disabled" = false; - }; - }; - }; - - settings = { - "browser.uidensity" = 1; - "sidebar.animation.enabled" = false; - "sidebar.new-sidebar.has-used" = true; - "sidebar.verticalTabs" = true; - }; - }; - }; - }; -} diff --git a/modules/user/desktop/wallpaper.png b/modules/user/desktop/wallpaper.png Binary files differdeleted file mode 100644 index 9b5f637..0000000 --- a/modules/user/desktop/wallpaper.png +++ /dev/null diff --git a/modules/user/desktop/window-managers/default.nix b/modules/user/desktop/window-managers/default.nix deleted file mode 100644 index 47a721a..0000000 --- a/modules/user/desktop/window-managers/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - imports = [ - ./sway.nix - ]; -} diff --git a/modules/user/desktop/window-managers/sway.nix b/modules/user/desktop/window-managers/sway.nix deleted file mode 100644 index c52b1cf..0000000 --- a/modules/user/desktop/window-managers/sway.nix +++ /dev/null @@ -1,268 +0,0 @@ -{ - config, - lib, - options, - pkgs, - ... -}: -{ - options.desktop.windowManager = lib.mkOption { type = with lib.types; nullOr (enum [ "sway" ]); }; - config = { - home.packages = with pkgs; [ - grim - slurp - ]; - - programs = { - fuzzel.enable = lib.mkDefault (config.desktop.windowManager == "sway"); - i3blocks = { - enable = lib.mkDefault (config.desktop.windowManager == "sway"); - bars.bottom = { - time = { - command = "date +'%F %R'"; - interval = 60; - }; - }; - }; - - swaylock = { - enable = lib.mkDefault (config.desktop.windowManager == "sway"); - settings = { - color = "000000"; - no-unlock-indicator = true; - }; - }; - }; - - wayland.windowManager.sway = - if (config.desktop.windowManager == "sway") then - { - enable = lib.mkForce true; - package = null; # use the nixos module - config = { - bars = [ - { - colors = { - activeWorkspace = { - background = "#11111b"; - border = "#11111b"; - text = "#cdd6f4"; - }; - - background = "#11111b"; - focusedBackground = "#11111b"; - focusedSeparator = "#313244"; - focusedStatusline = "#cdd6f4"; - focusedWorkspace = { - background = "#11111b"; - border = "#11111b"; - text = "#89b4fa"; - }; - - inactiveWorkspace = { - background = "#11111b"; - border = "#11111b"; - text = "#313244"; - }; - - separator = "#313244"; - statusline = "#cdd6f4"; - urgentWorkspace = { - background = "#11111b"; - border = "#11111b"; - text = "#f38ba8"; - }; - }; - - fonts = { - names = [ "Fira Code" ]; - size = 8.0; - }; - - statusCommand = "${pkgs.i3blocks}/bin/i3blocks -c ~/.config/i3blocks/bottom"; - } - ]; - - bindswitches = { - "lid:off" = { - action = "output eDP-1 power on"; - locked = true; - }; - - "lid:on" = { - action = "output eDP-1 power off"; - locked = true; - }; - }; - - colors = # catppuccin mocha - let - base = "#1e1e2e"; - blue = "#89b4fa"; - red = "#f38ba8"; - surface1 = "#45475a"; - teal = "#94e2d5"; - text = "#cdd6f4"; - in - { - focused = { - background = "${blue}"; - border = "${blue}"; - childBorder = "${blue}"; - indicator = "${teal}"; - text = "${base}"; - }; - - focusedInactive = { - background = "${surface1}"; - border = "${surface1}"; - childBorder = "${surface1}"; - indicator = "${surface1}"; - text = "${text}"; - }; - - unfocused = { - background = "${base}"; - border = "${base}"; - childBorder = "${base}"; - indicator = "${base}"; - text = "${text}"; - }; - - urgent = { - background = "${red}"; - border = "${red}"; - childBorder = "${red}"; - indicator = "${red}"; - text = "${base}"; - }; - }; - - floating.titlebar = false; - focus.followMouse = false; - fonts = { - names = [ "Fira Code" ]; - size = 8.0; - }; - - gaps = { - inner = 4; - outer = 8; - }; - - input = { - "*" = { - accel_profile = "flat"; - }; - - "type:touchpad" = { - drag = "enabled"; - dwt = "enabled"; - natural_scroll = "enabled"; - tap = "enabled"; - }; - }; - - keybindings = - let - mod = config.wayland.windowManager.sway.config.modifier; - in - { - "${mod}+Return" = "exec foot"; - "${mod}+Q" = "kill"; - "${mod}+Alt+Q" = "exit"; - "${mod}+V" = "splitt"; - "${mod}+H" = "focus left"; - "${mod}+J" = "focus down"; - "${mod}+K" = "focus up"; - "${mod}+L" = "focus right"; - "${mod}+Shift+H" = "move left"; - "${mod}+Shift+J" = "move down"; - "${mod}+Shift+K" = "move up"; - "${mod}+Shift+L" = "move right"; - "${mod}+Minus" = "resize shrink width 5"; - "${mod}+Shift+Equal" = "resize grow height 5"; - "${mod}+Shift+Minus" = "resize shrink height 5"; - "${mod}+Equal" = "resize grow width 5"; - "${mod}+1" = "workspace 1"; - "${mod}+2" = "workspace 2"; - "${mod}+3" = "workspace 3"; - "${mod}+4" = "workspace 4"; - "${mod}+5" = "workspace 5"; - "${mod}+6" = "workspace 6"; - "${mod}+7" = "workspace 7"; - "${mod}+8" = "workspace 8"; - "${mod}+9" = "workspace 9"; - "${mod}+Shift+1" = "move workspace 1"; - "${mod}+Shift+2" = "move workspace 2"; - "${mod}+Shift+3" = "move workspace 3"; - "${mod}+Shift+4" = "move workspace 4"; - "${mod}+Shift+5" = "move workspace 5"; - "${mod}+Shift+6" = "move workspace 6"; - "${mod}+Shift+7" = "move workspace 7"; - "${mod}+Shift+8" = "move workspace 8"; - "${mod}+Shift+9" = "move workspace 9"; - "${mod}+F" = "floating toggle"; - "${mod}+G" = "layout toggle split tabbed"; - "${mod}+R" = "exec fuzzel"; - "${mod}+Shift+S" = "exec grim -g \"$(slurp)\" ~/Pictures/screenshot.png"; - "${mod}+Alt+L" = "exec swaylock"; - "XF86AudioRaiseVolume" = "exec wpctl set-volume @DEFAULT_SINK@ 5%+ -l 1"; - "XF86AudioLowerVolume" = "exec wpctl set-volume @DEFAULT_SINK@ 5%- -l 1"; - "XF86AudioMute" = "exec wpctl set-mute @DEFAULT_SINK@ toggle"; - "XF86MonBrightnessUp" = "exec brightnessctl --class=backlight s +10%"; - "XF86MonBrightnessDown" = "exec brightnessctl --class=backlight s 10%-"; - "Shift+XF86MonBrightnessUp" = "exec brightnessctl --device=chromeos::kbd_backlight s +10%"; - "Shift+XF86MonBrightnessDown" = "exec brightnessctl --device=chromeos::kbd_backlight s 10%-"; - "XF86RFKill" = "exec rfkill toggle 1"; - }; - - modes = { }; - modifier = "Mod4"; - output = { - "eDP-1" = { - background = "~/Pictures/wallpaper.png fill"; - mode = "2256x1504@60Hz"; - position = "0 0"; - scale = "1.5"; - }; - - "DP-1" = { - background = "~/Pictures/wallpaper.png fill"; - mode = "1920x1080@165Hz"; - position = "0 0"; - }; - - "DP-2" = { - background = "~/Pictures/wallpaper.png fill"; - mode = "1920x1080@75Hz"; - position = "1920 0"; - }; - }; - - seat.seat0.xcursor_theme = "catppuccin-mocha-dark-cursors"; - window.titlebar = false; - workspaceOutputAssign = [ - { - output = [ - "DP-1" - "eDP-1" - ]; - - workspace = "1"; - } - { - output = "DP-2"; - workspace = "2"; - } - ]; - }; - - extraConfig = '' - exec waybar - ''; - } - else - { }; - }; -} |
