diff options
| author | Caroline Larimore <caroline@larimo.re> | 2024-05-10 19:48:45 -0700 |
|---|---|---|
| committer | Caroline Larimore <caroline@larimo.re> | 2024-05-10 19:48:45 -0700 |
| commit | 6eda4acc251fed0afbf5f1a85a63e321d8234799 (patch) | |
| tree | 0be125628339545e8a11cd29a994271bc16f55b3 /util/modules | |
Initial Commit
Diffstat (limited to 'util/modules')
| -rw-r--r-- | util/modules/default.nix | 10 | ||||
| -rw-r--r-- | util/modules/fonts.nix | 22 | ||||
| -rw-r--r-- | util/modules/home/colors.nix | 31 | ||||
| -rw-r--r-- | util/modules/home/default.nix | 18 | ||||
| -rw-r--r-- | util/modules/home/discord.nix | 31 | ||||
| -rw-r--r-- | util/modules/home/flameshot.nix | 22 | ||||
| -rw-r--r-- | util/modules/home/i3.nix | 224 | ||||
| -rw-r--r-- | util/modules/home/kitty.nix | 39 | ||||
| -rw-r--r-- | util/modules/home/mpv.nix | 12 | ||||
| -rw-r--r-- | util/modules/home/picom.nix | 18 | ||||
| -rw-r--r-- | util/modules/home/polybar.nix | 232 | ||||
| -rw-r--r-- | util/modules/home/rofi.nix | 49 | ||||
| -rw-r--r-- | util/modules/home/theme.nix | 39 | ||||
| -rw-r--r-- | util/modules/home/vscode.nix | 22 | ||||
| -rw-r--r-- | util/modules/home/zsh.nix | 17 | ||||
| -rw-r--r-- | util/modules/networking.nix | 23 | ||||
| -rw-r--r-- | util/modules/pipewire.nix | 13 | ||||
| -rw-r--r-- | util/modules/wifi.nix | 3 | ||||
| -rw-r--r-- | util/modules/xserver.nix | 33 |
19 files changed, 858 insertions, 0 deletions
diff --git a/util/modules/default.nix b/util/modules/default.nix new file mode 100644 index 0000000..8a8b05b --- /dev/null +++ b/util/modules/default.nix @@ -0,0 +1,10 @@ +{ ... }: + +{ + imports = [ + ./fonts.nix + ./networking.nix + ./pipewire.nix + ./xserver.nix + ]; +} diff --git a/util/modules/fonts.nix b/util/modules/fonts.nix new file mode 100644 index 0000000..89ee17a --- /dev/null +++ b/util/modules/fonts.nix @@ -0,0 +1,22 @@ +{ pkgs, ... }: + +{ + fonts = { + packages = with pkgs; [ + nerdfonts + noto-fonts + noto-fonts-cjk + noto-fonts-cjk-sans + noto-fonts-cjk-serif + noto-fonts-emoji + ]; + + fontconfig = { + defaultFonts = { + monospace = [ "CaskaydiaMono Nerd Font" ]; + sansSerif = [ "DejaVu Sans" "Noto Sans CJK JP" "Noto Sans" ]; + serif = [ "DejaVu Serif" "Noto Serif CJK JP" "Noto Serif" ]; + }; + }; + }; +} diff --git a/util/modules/home/colors.nix b/util/modules/home/colors.nix new file mode 100644 index 0000000..ecafe62 --- /dev/null +++ b/util/modules/home/colors.nix @@ -0,0 +1,31 @@ +{ lib, ... }: + +with lib; + +{ + options.colors = + let + mkColorOption = name: { + inherit name; + value = mkOption { +# type = types.strMatching "[a-fA-F0-9]{6}"; + type = types.strMatching "[a-fA-F0-9]*"; + description = "Color ${name}."; + }; + }; + in listToAttrs (map mkColorOption [ + "primary" "secondary" + "foreground" "foregroundAlt" + "background" "backgroundAlt" + + "accent" + + "black" "red" "green" "yellow" "blue" "magenta" "cyan" "white" + "brightBlack" "brightRed" "brightGreen" "brightYellow" "brightBlue" "brightMagenta" "brightCyan" "brightWhite" + + "bg" "bg0" "bg1" "bg2" "bg3" "bg4" + "fg" "fg0" "fg1" "fg2" "fg3" "fg4" + + "orange" "brightOrange" + ]); +} diff --git a/util/modules/home/default.nix b/util/modules/home/default.nix new file mode 100644 index 0000000..d48f5bc --- /dev/null +++ b/util/modules/home/default.nix @@ -0,0 +1,18 @@ +{ ... }: + +{ + imports = [ + ./colors.nix + ./discord.nix + ./flameshot.nix + ./i3.nix + ./kitty.nix + ./mpv.nix + ./picom.nix + ./polybar.nix + ./rofi.nix + ./theme.nix + ./vscode.nix +# ./zsh.nix + ]; +} diff --git a/util/modules/home/discord.nix b/util/modules/home/discord.nix new file mode 100644 index 0000000..f303f1f --- /dev/null +++ b/util/modules/home/discord.nix @@ -0,0 +1,31 @@ +{ config, lib, ... }: + +let + conversion = import ../../util/color-conversion.nix { inherit lib; }; +in { + xdg.configFile."Vencord/themes/nix.theme.css".text = let c = config.theme.colors; in '' + @import url(https://mwittrien.github.io/BetterDiscordAddons/Themes/BasicBackground/BasicBackground.css); + + :root { + --transparencycolor: 0, 0, 0; + --transparencyalpha: 0.0; + --messagetransparency: 0.0; + --guildchanneltransparency: 0.15; + --chatinputtransparency: 0.0; + --memberlisttransparency: 0.15; + --settingsicons: 0; + --background: rgba(0, 0, 0, 0.8); + --backdrop: rgba(0, 0, 0, 0); + --version1_0_5: none; + + --accentcolor: ${conversion.hexToRGBString ", " c.accent}; + + --textbrightest: ${conversion.hexToRGBString ", " c.fg0}; + --textbrighter: ${conversion.hexToRGBString ", " c.fg1}; + --textbright: ${conversion.hexToRGBString ", " c.fg2}; + --textdark: ${conversion.hexToRGBString ", " c.fg3}; + --textdarker: ${conversion.hexToRGBString ", " c.fg4}; + --textdarkest: ${conversion.hexToRGBString ", " c.brightBlack}; + } + ''; +} diff --git a/util/modules/home/flameshot.nix b/util/modules/home/flameshot.nix new file mode 100644 index 0000000..d58dfe7 --- /dev/null +++ b/util/modules/home/flameshot.nix @@ -0,0 +1,22 @@ +{ config, ... }: + +{ + services.flameshot = { + enable = true; + + settings = let c = config.theme.colors; in { + General = { + savePath = "Pictures/Screenshots"; + + uiColor = "#${c.bg}"; + contrastUiColor = "#${c.accent}"; + + + filenamePattern = "%F_%T"; + + startupLaunch = false; + saveAfterCopy = true; + }; + }; + }; +} diff --git a/util/modules/home/i3.nix b/util/modules/home/i3.nix new file mode 100644 index 0000000..151bbaa --- /dev/null +++ b/util/modules/home/i3.nix @@ -0,0 +1,224 @@ +{ config, pkgs, ... }: + +{ + xsession.windowManager.i3 = { + enable = true; + + config = let + mod = "Mod1"; + + ws0 = "0:Main"; + ws1 = "1:Terminal"; + ws2 = "2:Browser"; + ws3 = "3:Chat"; + ws4 = "4:Steam"; + ws5 = "5"; + ws6 = "6"; + ws7 = "7"; + ws8 = "8:qBittorrent"; + ws9 = "9:Youtube"; + ws10 = "10:Misc"; + ws11 = "11:Empty"; + + output = { + primary = "primary"; + left = "DVI-D-0"; + right = "DisplayPort-1 HDMI-A-0"; + }; + in { + modifier = "${mod}"; + + fonts = { + names = [ "monospace" ]; + size = 8.0; + }; + + colors = let c = config.theme.colors; in { + focused = { + border = "#${c.fg2}"; + background = "#${c.fg2}"; + text = "#${c.bg}"; + indicator = "#${c.fg2}"; + childBorder = "#${c.fg2}"; + }; + + focusedInactive = { + border = "#${c.bg1}"; + background = "#${c.bg1}"; + text = "#${c.fg}"; + indicator = "#${c.bg1}"; + childBorder = "#${c.bg1}"; + }; + + unfocused = { + border = "#${c.bg}"; + background = "#${c.bg}"; + text = "#${c.fg}"; + indicator = "#${c.bg}"; + childBorder = "#${c.bg}"; + }; + }; + + gaps.inner = 8; + + workspaceOutputAssign = [ + { workspace = "${ws0}"; output = output.primary; } + { workspace = "${ws1}"; output = output.primary; } + + { workspace = "${ws2}"; output = output.left; } + { workspace = "${ws3}"; output = output.left; } + + { workspace = "${ws4}"; output = output.primary; } + + { workspace = "${ws5}"; output = output.primary; } + { workspace = "${ws6}"; output = output.primary; } + { workspace = "${ws7}"; output = output.primary; } + + { workspace = "${ws8}"; output = output.primary; } + { workspace = "${ws9}"; output = output.right; } + { workspace = "${ws10}"; output = output.primary; } + + { workspace = "${ws11}"; output = output.primary; } + ]; + + assigns = { + "${ws2}" = [ { class = "Firefox"; } ]; + "${ws3}" = [ { class = "discord"; } ]; + "${ws4}" = [ { class = "steam"; } ]; + + "${ws8}" = [ { class = "qBittorrent"; } ]; + }; + + startup = [ + { command = "polybar-msg cmd quit"; always = true; notification = false; } + { command = "polybar"; always = true; notification = false; } + { command = "systemctl --user restart picom"; always = true; notification = false; } + { command = "${pkgs.feh}/bin/feh --bg-fill ~/Pictures/bg/${config.theme.background}"; always = true; notification = false; } +# { command = "${pkgs.pywal}/bin/wal -ne -b 000000 -i ~/Pictures/bg/${config.theme.background}"; always = true; notification = false; } + ]; + + keybindings = { + "${mod}+Shift+c" = "reload"; + "${mod}+Shift+r" = "restart"; + "${mod}+Shift+e" = "exec \"i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'\""; + + "${mod}+q" = "kill"; + "${mod}+d" = "exec \"rofi -modi drun,run -show drun\""; + "${mod}+Return" = "exec kitty"; + + "${mod}+Num_Lock" = "exec --no-startup-id polybar-msg cmd toggle"; + + # Screenshots + #TODO: screen and full should be swapped, but currently screen is fucky :'( + "Shift+Print" = "exec ${pkgs.flameshot}/bin/flameshot screen -c"; + "Print" = "exec ${pkgs.flameshot}/bin/flameshot full -c"; + "${mod}+Shift+s" = "exec ${pkgs.flameshot}/bin/flameshot gui -c"; + "Mod4+Shift+s" = "exec ${pkgs.flameshot}/bin/flameshot gui -c"; + "${mod}+Ctrl+Shift+s" = "exec ${pkgs.flameshot}/bin/flameshot launcher -c"; + + # Media keys + "XF86AudioRaiseVolume" = "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ +2%"; + "XF86AudioLowerVolume" = "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ -2%"; + "XF86AudioMute" = "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-sink-mute @DEFAULT_SINK@ toggle"; + "XF86AudioMicMute" = "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-source-mute @DEFAULT_SOURCE@ toggle"; + + "XF86AudioPlay" = "exec playerctl play-pause"; + "XF86AudioPause" = "exec playerctl play-pause"; + "XF86AudioStop" = "exec playerctl stop"; + "XF86AudioNext" = "exec playerctl next"; + "XF86AudioPrev" = "exec playerctl previous"; + + # Workspaces + "${mod}+grave" = "workspace number ${ws0}"; + "${mod}+1" = "workspace number ${ws1}"; + "${mod}+2" = "workspace number ${ws2}"; + "${mod}+3" = "workspace number ${ws3}"; + "${mod}+4" = "workspace number ${ws4}"; + "${mod}+5" = "workspace number ${ws5}"; + "${mod}+6" = "workspace number ${ws6}"; + "${mod}+7" = "workspace number ${ws7}"; + "${mod}+8" = "workspace number ${ws8}"; + "${mod}+9" = "workspace number ${ws9}"; + "${mod}+0" = "workspace number ${ws10}"; + "${mod}+equal" = "workspace number ${ws11}"; + + # Move active workspace + "${mod}+comma" = "move workspace to output ${output.left}"; + "${mod}+period" = "move workspace to output ${output.primary}"; + "${mod}+slash" = "move workspace to output ${output.right}"; + + # Layout + "${mod}+z" = "layout stacking"; + "${mod}+x" = "layout tabbed"; + "${mod}+c" = "layout toggle split"; + + # Focus + "${mod}+h" = "focus left"; + "${mod}+j" = "focus down"; + "${mod}+k" = "focus up"; + "${mod}+l" = "focus right"; + + "${mod}+Left" = "focus left"; + "${mod}+Down" = "focus down"; + "${mod}+Up" = "focus up"; + "${mod}+Right" = "focus right"; + + "${mod}+space" = "focus mode_toggle"; + "${mod}+a" = "focus parent"; + + # Move focused container + "${mod}+Shift+h" = "move left"; + "${mod}+Shift+j" = "move down"; + "${mod}+Shift+k" = "move up"; + "${mod}+Shift+l" = "move right"; + + "${mod}+Shift+Left" = "move left"; + "${mod}+Shift+Down" = "move down"; + "${mod}+Shift+Up" = "move up"; + "${mod}+Shift+Right" = "move right"; + + # Misc container binds + "${mod}+Shift+space" = "floating toggle"; + "${mod}+f" = "fullscreen toggle"; + + "${mod}+w" = "split h"; + "${mod}+e" = "split v"; + + "${mod}+r" = "mode resize"; + + # Move focused container to workspace + "${mod}+Shift+grave" = "move container to workspace number ${ws0}"; + "${mod}+Shift+1" = "move container to workspace number ${ws1}"; + "${mod}+Shift+2" = "move container to workspace number ${ws2}"; + "${mod}+Shift+3" = "move container to workspace number ${ws3}"; + "${mod}+Shift+4" = "move container to workspace number ${ws4}"; + "${mod}+Shift+5" = "move container to workspace number ${ws5}"; + "${mod}+Shift+6" = "move container to workspace number ${ws6}"; + "${mod}+Shift+7" = "move container to workspace number ${ws7}"; + "${mod}+Shift+8" = "move container to workspace number ${ws8}"; + "${mod}+Shift+9" = "move container to workspace number ${ws9}"; + "${mod}+Shift+0" = "move container to workspace number ${ws10}"; + }; + + modes = { + resize = { + "h" = "resize shrink width 10 px or 10 ppt"; + "j" = "resize grow height 10 px or 10 ppt"; + "k" = "resize shrink height 10 px or 10 ppt"; + "l" = "resize grow width 10 px or 10 ppt"; + + "Left" = "resize shrink width 10 px or 10 ppt"; + "Down" = "resize grow height 10 px or 10 ppt"; + "Up" = "resize shrink height 10 px or 10 ppt"; + "Right" = "resize grow width 10 px or 10 ppt"; + + "Return" = "mode default"; + "Escape" = "mode default"; + "${mod}+r" = "mode default"; + }; + }; + + bars = []; + }; + }; +} diff --git a/util/modules/home/kitty.nix b/util/modules/home/kitty.nix new file mode 100644 index 0000000..852f554 --- /dev/null +++ b/util/modules/home/kitty.nix @@ -0,0 +1,39 @@ +{ config, ... }: + +{ + programs.kitty = { + enable = true; + + font = { name = "monospace"; size = 8.0; }; + + settings = let c = config.theme.colors; in { + color0 = "#${c.black}"; + color1 = "#${c.red}"; + color2 = "#${c.green}"; + color3 = "#${c.yellow}"; + color4 = "#${c.blue}"; + color5 = "#${c.magenta}"; + color6 = "#${c.cyan}"; + color7 = "#${c.white}"; + + color8 = "#${c.brightBlack}"; + color9 = "#${c.brightRed}"; + color10 = "#${c.brightGreen}"; + color11 = "#${c.brightYellow}"; + color12 = "#${c.brightBlue}"; + color13 = "#${c.brightMagenta}"; + color14 = "#${c.brightCyan}"; + color15 = "#${c.brightWhite}"; + }; + + shellIntegration = { + mode = "no-cursor"; + enableBashIntegration = true; + }; + + extraConfig = '' + background_opacity 0.8 + confirm_os_window_close 0 + ''; + }; +} diff --git a/util/modules/home/mpv.nix b/util/modules/home/mpv.nix new file mode 100644 index 0000000..5e1f013 --- /dev/null +++ b/util/modules/home/mpv.nix @@ -0,0 +1,12 @@ +{ ... }: + +{ + programs.mpv = { + enable = true; + + config = { + screenshot-format = "png"; + screenshot-template = "~/Pictures/Screenshots/mpv/%F/%P"; + }; + }; +} diff --git a/util/modules/home/picom.nix b/util/modules/home/picom.nix new file mode 100644 index 0000000..d625200 --- /dev/null +++ b/util/modules/home/picom.nix @@ -0,0 +1,18 @@ +{ ... }: + +{ + services.picom = { + enable = true; + + backend = "glx"; + vSync = true; + + settings = { + blur = { + method = "gaussian"; + size = 10; + deviation = 2; + }; + }; + }; +} diff --git a/util/modules/home/polybar.nix b/util/modules/home/polybar.nix new file mode 100644 index 0000000..073919d --- /dev/null +++ b/util/modules/home/polybar.nix @@ -0,0 +1,232 @@ +{ pkgs, config, ... }: + +{ + services.polybar = { + enable = true; + script = "polybar"; + + package = pkgs.polybar.override { + i3Support = true; + pulseSupport = true; + }; + + settings = let c = config.theme.colors; in { + "bar/main" = { + width = "100%"; + height = "24pt"; + radius = 0; + + background = "#${c.bg}"; + foreground = "#${c.fg}"; + + font = [ + "Symbols Nerd Font:size=16;2" + "monospace:size=11;2" + "Sauce Code Pro Nerd Font:size=11;2" + "Noto Sans CJK JP:size=11;1" + "sans-serif:size=11;1" + ]; + + border = { + top = "8px"; + left = "8px"; + right = "8px"; + + color = "#00000000"; + }; + + padding = { + left = 2; + right = 2; + }; + + cursor = { + click = "pointer"; + scroll = "ns-resize"; + }; + + enable-ipc = true; + + line.size = "3pt"; + + separator = { + text = "|"; + foreground = "#${c.bg3}"; + }; + + module.margin = 1; + modules = { + left = "cpu memory xwindow"; + center = "i3"; + right = "wlan eth filesystem xkeyboard pulseaudio date"; + }; + }; + + + "module/i3" = { + type = "internal/i3"; + + strip-wsnumbers = true; + index-sort = true; + + ws.icon = [ + "0:Main;" "1:Terminal;" "2:Browser;" "3:Chat;" "4:Steam;" + "5;" "6;" "7;" + "8:qBittorrent;" "9:Youtube;" "10:Misc;" + ]; + + label = { + focused = { + text = "%icon%"; + padding = 2; + + foreground = "#${c.fg0}"; + background = "#${c.bg1}"; + underline = "#${c.accent}"; + }; + + visible = { + text = "%icon%"; + padding = 2; + + underline = "#${c.fg4}"; + }; + + unfocused = { + text = "%icon%"; + padding = 2; + }; + + urgent = { + text = "%icon%"; + padding = 2; + + foreground = "#${c.bg}"; + background = "#${c.accent}"; + }; + }; + }; + + "module/xwindow" = { + type = "internal/xwindow"; + label = "%title:0:64:...%"; + }; + + + "module/pulseaudio" = { + type = "internal/pulseaudio"; + + format.volume = "<ramp-volume> <label-volume>"; + + label = { + volume = "%percentage%%"; + muted = { + text = " %percentage%%"; + foreground = "#${c.bg3}"; + }; + }; + + ramp.volume = { + text = [ "" "" "" ]; + foreground = "#${c.accent}"; + }; + }; + + "module/xkeyboard" = { + type = "internal/xkeyboard"; + blacklist = [ "num lock" ]; + + indicator.icon = [ "caps lock;;" ]; + + format = { + text = "<label-indicator> <label-layout>"; + + prefix = { + text = " "; + foreground = "#${c.accent}"; + }; + }; + + label = { + layout = "%layout%"; + indicator.on = "%icon%"; + }; + }; + + "module/cpu" = { + type = "internal/cpu"; + interval = 2; + + format.prefix = { + text = "CPU "; + foreground = "#${c.accent}"; + }; + + label = "%percentage%%"; + }; + + "module/memory" = { + type = "internal/memory"; + interval = 2; + + format.prefix = { + text = "MEM "; + foreground = "#${c.accent}"; + }; + + label = "%gb_used%"; + }; + + "module/filesystem" = { + type = "internal/fs"; + interval = 25; + + mount = [ "/nix" "/persist" ]; + + label = { + mounted = "%{F#${c.accent}}%{F-} %used%"; + unmounted = { + text = "%mountpoint%"; + foreground = "#${c.bg3}"; + }; + }; + }; + + "module/eth" = { + type = "internal/network"; + interface.type = "wired"; + interval = 2; + + format.connected = "<label-connected>"; + label.connected = "%{F#${c.accent}}%{F-} %downspeed% %upspeed%"; + }; + + "module/wlan" = { + type = "internal/network"; + interface.type = "wireless"; + interval = 2; + + format.connected = "<ramp-signal> <label-connected>"; + label.connected = " %downspeed% %upspeed%"; + + ramp-signal = { + text = [ "" "" "" "" "" ]; + foreground = "#${c.accent}"; + }; + }; + + "module/date" = { + type = "internal/date"; + interval = 1; + + date = "%H:%M"; + date-alt = "%Y-%m-%d %H:%M:%S"; + + format.prefix = { + text = " "; + foreground = "#${c.accent}"; + }; + }; + }; + }; +} diff --git a/util/modules/home/rofi.nix b/util/modules/home/rofi.nix new file mode 100644 index 0000000..d0ff642 --- /dev/null +++ b/util/modules/home/rofi.nix @@ -0,0 +1,49 @@ +{ config, ... }: + +{ + programs.rofi = { + enable = true; + + font = "monospace 12"; + + theme = let + inherit (config.lib.formats.rasi) mkLiteral; + c = config.theme.colors; + in { + "@import" = "default"; + + "*" = { + background = mkLiteral "#${c.bg}"; + foreground = mkLiteral "#${c.fg}"; + foreground-alt = mkLiteral "#${c.bg3}"; + + alternate-normal-background = mkLiteral "var(background)"; + + selected-normal-foreground = mkLiteral "var(background)"; + selected-normal-background = mkLiteral "#${c.accent}"; + + border-color = mkLiteral "var(background)"; + separatorcolor = mkLiteral "#${c.bg3}"; + }; + + inputbar = { + children = map mkLiteral [ "entry" "num-filtered-rows" "textbox-num-sep" "num-rows" ]; + }; + + element = { + children = map mkLiteral [ "element-icon" "element-text" ]; + }; + + entry.placeholder = ""; + + scrollbar.handle-color = mkLiteral "var(foreground-alt)"; + num-rows.text-color = mkLiteral "var(foreground-alt)"; + num-filtered-rows.text-color = mkLiteral "var(foreground-alt)"; + textbox-num-sep.text-color = mkLiteral "var(foreground-alt)"; + + message.border = mkLiteral "1px solid 0px 0px"; + listview.border = mkLiteral "1px solid 0px 0px"; + sidebar.border = mkLiteral "1px solid 0px 0px"; + }; + }; +} diff --git a/util/modules/home/theme.nix b/util/modules/home/theme.nix new file mode 100644 index 0000000..056c8ac --- /dev/null +++ b/util/modules/home/theme.nix @@ -0,0 +1,39 @@ +{ lib, ... }: + +with lib; + +{ + options.theme = { + background = mkOption { + type = types.str; + example = "mem.png"; + description = '' + Background image. Path starts in ~/Pictures/bg/ + ''; + }; + + colors = let + mkColorOption = name: { + inherit name; + value = mkOption { + type = types.strMatching "[a-fA-F0-9]{6}"; + default = "ff00ff"; + example = "23ce94"; + description = '' + Hex value for color "${name}". + ''; + }; + }; + in listToAttrs (map mkColorOption [ + "accent" + + "black" "red" "green" "yellow" "blue" "magenta" "cyan" "white" + "brightBlack" "brightRed" "brightGreen" "brightYellow" "brightBlue" "brightMagenta" "brightCyan" "brightWhite" + + "bg" "bg0" "bg1" "bg2" "bg3" "bg4" + "fg" "fg0" "fg1" "fg2" "fg3" "fg4" + + "orange" "brightOrange" + ]); + }; +} diff --git a/util/modules/home/vscode.nix b/util/modules/home/vscode.nix new file mode 100644 index 0000000..3047d33 --- /dev/null +++ b/util/modules/home/vscode.nix @@ -0,0 +1,22 @@ +{ pkgs, ... }: + +{ + programs.vscode = { + enable = true; + package = pkgs.vscodium; + + extensions = with pkgs.vscode-extensions; [ + jdinhlife.gruvbox + vscode-icons-team.vscode-icons + + jnoortheen.nix-ide + golang.go + ]; + + userSettings = { + "workbench.colorTheme" = "Gruvbox Dark Medium"; + "workbench.iconTheme" = "vscode-icons"; + "window.titleBarStyle" = "custom"; + }; + }; +} diff --git a/util/modules/home/zsh.nix b/util/modules/home/zsh.nix new file mode 100644 index 0000000..7d72dba --- /dev/null +++ b/util/modules/home/zsh.nix @@ -0,0 +1,17 @@ +{ pkgs, ... }: + +{ + programs.zsh = { + enable = true; + + shellAliases = { + lsa = "ls -lAsh"; + }; + + oh-my-zsh = { + enable = true; + plugins = [ "git" "systemd" ]; + #theme = "powerlevel10k"; + }; + }; +} diff --git a/util/modules/networking.nix b/util/modules/networking.nix new file mode 100644 index 0000000..13237a8 --- /dev/null +++ b/util/modules/networking.nix @@ -0,0 +1,23 @@ +{ ... }: + +{ + networking = { + hostName = "c-pc"; + hostId = "23ce94ff"; + + useDHCP = true; + + wireless = { + enable = true; + networks = import ./wifi.nix; + }; + + firewall = { + enable = false; + + allowedTCPPorts = [ 8096 50000 ]; + allowedUDPPorts = [ ]; + }; + }; +} + diff --git a/util/modules/pipewire.nix b/util/modules/pipewire.nix new file mode 100644 index 0000000..0dfb230 --- /dev/null +++ b/util/modules/pipewire.nix @@ -0,0 +1,13 @@ +{ ... }: + +{ + security.rtkit.enable = true; + services.pipewire = { + enable = true; + + pulse.enable = true; + alsa.enable = true; + alsa.support32Bit = true; + #jack.enable = true; + }; +} diff --git a/util/modules/wifi.nix b/util/modules/wifi.nix new file mode 100644 index 0000000..9e23e44 --- /dev/null +++ b/util/modules/wifi.nix @@ -0,0 +1,3 @@ +{ + "The Dwyers".psk = "86EC3E567E"; +} diff --git a/util/modules/xserver.nix b/util/modules/xserver.nix new file mode 100644 index 0000000..1530c44 --- /dev/null +++ b/util/modules/xserver.nix @@ -0,0 +1,33 @@ +{ pkgs, ... }: + +{ + services.xserver = { + enable = true; + + videoDrivers = [ "amdgpu" ]; + + displayManager = { + lightdm.enable = true; + defaultSession = "none+i3"; + + setupCommands = '' + if ${pkgs.xorg.xrandr}/bin/xrandr --query | grep 2560x1080; then + ${pkgs.xorg.xrandr}/bin/xrandr --output DVI-D-0 --mode 1920x1080 --rate 60 --pos 0x0 + ${pkgs.xorg.xrandr}/bin/xrandr --output DisplayPort-2 --mode 2560x1080 --rate 60 --pos 1920x0 --primary + ${pkgs.xorg.xrandr}/bin/xrandr --output HDMI-A-0 --mode 1920x1080 --rate 75 --pos 4480x0 + elif ${pkgs.xorg.xrandr}/bin/xrandr --query | grep 2560x1440; then + ${pkgs.xorg.xrandr}/bin/xrandr --output DVI-D-0 --mode 1920x1080 --rate 60 --pos 0x360 + ${pkgs.xorg.xrandr}/bin/xrandr --output DisplayPort-2 --mode 2560x1440 --rate 165 --pos 1920x0 --primary + ${pkgs.xorg.xrandr}/bin/xrandr --output DisplayPort-1 --mode 1920x1200 --rate 60 --pos 4480x0 + fi + ''; + }; + + windowManager.i3 = { + enable = true; + }; + + xkb.layout = "us"; +# xkb.options = "eurosign:e,caps:escape"; + }; +} |