diff options
Diffstat (limited to 'modules')
37 files changed, 127 insertions, 1085 deletions
diff --git a/modules/core.nix b/modules/core.nix deleted file mode 100644 index fd4517b..0000000 --- a/modules/core.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -{ - boot = { - loader = { - efi.canTouchEfiVariables = true; - systemd-boot = { - enable = true; - editor = false; - memtest86.enable = true; - }; - - timeout = 1; - }; - - tmp.cleanOnBoot = true; - }; - - documentation.dev.enable = true; - environment.systemPackages = with pkgs; [ - kakoune - # useful reference manuals - man-pages - man-pages-posix - ]; - - hardware.enableRedistributableFirmware = true; - nix.settings.experimental-features = [ - "flakes" - "nix-command" - ]; - - programs = { - git = { - enable = true; - package = pkgs.gitMinimal; - }; - - nano.enable = false; - zsh = { - enable = true; - setOptions = [ "HIST_IGNORE_ALL_DUPS" ]; - shellInit = '' - PS1="%n@%m %~ %# " - ''; - }; - }; - - users = { - defaultUserShell = pkgs.zsh; - users.rosa = { - enable = lib.mkDefault false; - description = "Rosa"; - extraGroups = [ - "input" - "wheel" - ]; - isNormalUser = true; - openssh.authorizedKeys.keyFiles = [ ../.ssh/id_rosa.pub ]; - }; - }; -} diff --git a/modules/default.nix b/modules/default.nix index 6c71dbb..a74d08f 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,15 +1,5 @@ { - config, - lib, - options, - ... -}: -{ imports = [ - ./desktop.nix - ./doas.nix - ./networks - ./nonfree.nix - ./steam.nix + ./profiles ]; } diff --git a/modules/desktop.nix b/modules/desktop.nix deleted file mode 100644 index 0ad8321..0000000 --- a/modules/desktop.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ - config, - lib, - options, - ... -}: -{ - config = lib.mkIf config.system.enableDesktopDefaults { - i18n.defaultLocale = lib.mkDefault "en_CA.UTF-8"; - services.pipewire = { - enable = true; - alsa = { - enable = true; - support32Bit = true; - }; - - pulse.enable = true; - }; - - time.timeZone = lib.mkDefault "Canada/Eastern"; - }; - - options.system.enableDesktopDefaults = lib.mkEnableOption "core desktop services such as pipewire"; -} diff --git a/modules/doas.nix b/modules/doas.nix deleted file mode 100644 index 5a99756..0000000 --- a/modules/doas.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - config, - lib, - options, - pkgs, - ... -}: -{ - security = { - doas.extraRules = [ - { - groups = [ "wheel" ]; - } - { - cmd = "mount"; - groups = [ "wheel" ]; - noPass = true; - } - ]; - - sudo.enable = lib.mkDefault (!config.security.doas.enable); - }; -} diff --git a/modules/networks/default.nix b/modules/networks/default.nix deleted file mode 100644 index dfff6a4..0000000 --- a/modules/networks/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - imports = [ ./evilvpn.nix ]; -} diff --git a/modules/networks/evilvpn.nix b/modules/networks/evilvpn.nix deleted file mode 100644 index 5bf1ebc..0000000 --- a/modules/networks/evilvpn.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ config, lib, ... }: -{ - systemd.network = { - netdevs."90-evilvpn" = { - enable = lib.mkDefault false; - netdevConfig = { - Kind = "wireguard"; - Name = "wg0"; - }; - - wireguardConfig = { - PrivateKeyFile = "/etc/wireguard/${config.networking.hostName}.key"; - RouteTable = "main"; - }; - - wireguardPeers = [ - { - AllowedIPs = [ "10.6.6.0/24" ]; - Endpoint = "www.eviltransgenders.club:51820"; - PersistentKeepalive = 25; - PublicKey = "ChnzJG0HJcgk3OhgTzoPZ9EOyhuCH1EAknaQ9VF7N0I="; - } - ]; - }; - - networks."90-evilvpn" = { - dns = [ "10.6.6.2" ]; - domains = [ "rosa.labs.eviltransgenders.club" ]; - matchConfig.Name = "wg0"; - }; - }; -} diff --git a/modules/nonfree.nix b/modules/nonfree.nix deleted file mode 100644 index ebd332c..0000000 --- a/modules/nonfree.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ config, lib, ... }: -{ - nixpkgs.config.allowUnfreePredicate = - pkg: - builtins.elem (lib.getName pkg) [ - "steam" - "steam-run" - "steam-unwrapped" - ]; -} diff --git a/modules/profiles/core.nix b/modules/profiles/core.nix new file mode 100644 index 0000000..a79505a --- /dev/null +++ b/modules/profiles/core.nix @@ -0,0 +1,61 @@ +{ + config, + lib, + options, + pkgs, + ... +}: +{ + config = { + boot = { + loader = { + efi.canTouchEfiVariables = lib.mkDefault true; + limine = { + enable = lib.mkDefault config.system.profile.core.enable; + extraConfig = lib.mkDefault "quiet"; + maxGenerations = lib.mkDefault 10; + # TODO: secureBoot + }; + + timeout = 1; + }; + + tmp.cleanOnBoot = lib.mkDefault true; + }; + + environment = { + systemPackages = with pkgs; [ kakoune ]; + variables = { + EDITOR = "kak"; + VISUAL = "kak"; + }; + }; + + hardware.enableRedistributableFirmware = lib.mkDefault config.system.profile.core.enable; + i18n = { + defaultLocale = lib.mkDefault "en_CA.UTF-8"; + extraLocales = [ + "en_US.UTF-8/UTF-8" + ]; + }; + + networking = { + dhcpcd.enable = lib.mkDefault !config.system.profile.core.enable; + nftables.enable = lib.mkDefault config.system.profile.core.enable; + }; + + nix = { + gc = { + automatic = lib.mkDefault config.system.profile.core.enable; + dates = "weekly"; + options = "--delete-older-than 15d"; + }; + + settings.experimental-features = [ "flakes" "nix-command" ]; + }; + + programs.nano.enable = lib.mkDefault !config.system.profile.core.enable; + }; + + options.system.profile.core.enable = lib.mkEnableOption "the core system profile"; +} diff --git a/modules/profiles/default.nix b/modules/profiles/default.nix new file mode 100644 index 0000000..ec3fa03 --- /dev/null +++ b/modules/profiles/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./core.nix + ./desktop.nix + ]; +} diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix new file mode 100644 index 0000000..9de629c --- /dev/null +++ b/modules/profiles/desktop.nix @@ -0,0 +1,59 @@ +{ + config, + lib, + options, + pkgs, + ... +}: +{ + config = { + boot = { + loader.limine.style = { + backdrop = lib.mkDefault "333333"; + graphicalTerminal = { + background = lib.mkDefault "33000000"; + brightBackground = lib.mkDefault "000000"; + brightForeground = lib.mkDefault config.boot.loader.limine.style.graphicalTerminal.foreground; + brightPalette = lib.mkDefault "585b70;f38ba8;a6e3a1;f9e2af;89b4fa;f5c2e7;94e2d5;bac2de"; + foreground = lib.mkDefault "cdd6f4"; + palette = lib.mkDefault "45475a;f38ba8;a6e3a1;f9e2af;89b4fa;f5c2e7;94e2d5;a6adc8"; + }; + }; + + plymouth = { + enable = lib.mkDefault config.system.profile.desktop.enable; + #font = lib.mkDefault "${pkgs.fira-code}/..."; + }; + }; + + console = { + colors = lib.mkIf config.system.profile.desktop.enable [ + "000000" + "f38ba8" + "a6e3a1" + "f9e2af" + "89b4fa" + "f5c2e7" + "94e2d5" + "cdd6f4" + "585b70" + "f38ba8" + "a6e3a1" + "f9e2af" + "89b4fa" + "f5c2e7" + "94e2d5" + "cdd6f4" + ]; + + earlySetup = lib.mkDefault config.system.profile.desktop.enable; + }; + + documentation.dev.enable = lib.mkDefault config.system.profile.desktop.enable; + fonts.enableDefaultPackages = lib.mkDefault config.system.profile.desktop.enable; + + system.profile.core.enable = lib.mkIf config.system.profile.desktop.enable true; + }; + + options.system.profile.desktop.enable = lib.mkEnableOption "the desktop system profile"; +} diff --git a/modules/steam.nix b/modules/steam.nix deleted file mode 100644 index 7d16052..0000000 --- a/modules/steam.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -{ - programs.steam = { - extraCompatPackages = with pkgs; [ proton-ge-bin ]; - protontricks.enable = lib.mkDefault config.programs.steam.enable; - }; -} diff --git a/modules/user/default.nix b/modules/user/default.nix deleted file mode 100644 index 7c0d274..0000000 --- a/modules/user/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -{ - imports = [ - ./desktop - ./editors - ./git.nix - ./ssh.nix - ./zsh - ]; - - fonts.fontconfig.enable = true; - home.packages = with pkgs; [ - brightnessctl - keepassxc - ]; - - services.ssh-agent.enable = lib.mkDefault true; -} diff --git a/modules/user/desktop/apps/default.nix b/modules/user/desktop/apps/default.nix deleted file mode 100644 index 280f44d..0000000 --- a/modules/user/desktop/apps/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - imports = [ - ./foot.nix - ./fuzzel.nix - ./iamb.nix - ./librewolf.nix - ./mako.nix - ./waybar - ]; -} diff --git a/modules/user/desktop/apps/foot.nix b/modules/user/desktop/apps/foot.nix deleted file mode 100644 index 8673032..0000000 --- a/modules/user/desktop/apps/foot.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ config, ... }: -{ - programs.foot.settings = { - bell.urgent = true; - cursor = { - blink = true; - unfocused-style = "hollow"; - }; - - colors-dark = { - 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"; - }; - - main = { - font = - let - fontSize = (builtins.toString config.desktop.defaultFontSize); - in - "Fira Code:size=${fontSize}, FiraCode Nerd Font Mono:size=${fontSize}"; - selection-target = "none"; - }; - - mouse.hide-when-typing = true; - scrollback.multiplier = 1.0; - }; -} diff --git a/modules/user/desktop/apps/fuzzel.nix b/modules/user/desktop/apps/fuzzel.nix deleted file mode 100644 index 4d0bdf3..0000000 --- a/modules/user/desktop/apps/fuzzel.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ config, pkgs, ... }: -{ - programs.fuzzel.settings = { - border = { - radius = 0; - width = 2; - }; - - colors = { - background = "1e1e2eff"; - border = "cba6f7ff"; - counter = "7f849cff"; - input = "cdd6f4ff"; - match = "cba6f7ff"; - message = "a6adc8ff"; - placeholder = "7f849cff"; - prompt = "bac2deff"; - selection = "585b70ff"; - selection-match = "cba6f7ff"; - selection-text = "cdd6f4ff"; - text = "cdd6f4ff"; - }; - - main = { - font = "Fira Code:size=${(builtins.toString config.desktop.defaultFontSize)}"; - minimal-lines = true; - sort-result = false; - terminal = "${pkgs.foot}/bin/foot -a '{cmd}' -T '{cmd}' {cmd}"; - use-bold = true; - }; - }; -} diff --git a/modules/user/desktop/apps/iamb.nix b/modules/user/desktop/apps/iamb.nix deleted file mode 100644 index 6e340fe..0000000 --- a/modules/user/desktop/apps/iamb.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ config, ... }: -{ - programs.iamb.settings = { - default_profile = "personal"; - macros.normal = { - "<C-h>" = "gT"; - "<C-l>" = "gt"; - }; - - profiles.personal.user_id = "@rosa:girlonthe.net"; - settings = { - image_preview.protocol.type = "sixel"; - notifications = { - enabled = true; - via = "bell"; - }; - - sort.rooms = [ - "favorite" - "unread" - "recent" - "name" - ]; - - username_display = "displayname"; - }; - }; -} diff --git a/modules/user/desktop/apps/librewolf.nix b/modules/user/desktop/apps/librewolf.nix deleted file mode 100644 index 2b55dc9..0000000 --- a/modules/user/desktop/apps/librewolf.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -{ - nixpkgs.config.permittedInsecurePackages = [ - "librewolf-151.0.2-1" - "librewolf-unwrapped-151.0.2-1" - ]; - - programs.librewolf = { - profiles = - let - searchSettings = { - default = "ecosia"; - engines.ecosia = { - name = "Ecosia"; - urls = [ - { - template = "https://www.ecosia.org/search"; - params = [ - { - name = "q"; - value = "{searchTerms}"; - } - ]; - } - ]; - }; - }; - in - { - default.settings."sidebar.visibility" = "hide-sidebar"; - noRFP = { - id = 1; - settings = { - "privacy.resistFingerprinting" = false; - "sidebar.visibility" = "hide-sidebar"; - "webgl.disabled" = false; - }; - }; - }; - - settings = { - "browser.search.separatePrivateDefault" = false; - "browser.uidensity" = 1; - "sidebar.animation.enabled" = false; - "sidebar.new-sidebar.has-used" = true; - "sidebar.verticalTabs" = true; - "sidebar.verticalTabs.dragToPinPromo.dismissed" = true; - }; - }; -} diff --git a/modules/user/desktop/apps/mako.nix b/modules/user/desktop/apps/mako.nix deleted file mode 100644 index ef0d703..0000000 --- a/modules/user/desktop/apps/mako.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ config, ... }: -{ - services.mako.settings = { - background-color = "#11111b"; - border-color = "#cba6f7"; - default-timeout = 5000; - font = "FiraCode Nerd Font 10"; - margin = 6; # AAAAAAAAAAA - padding = 4; - progress-color = "#a6e3a1"; - }; -} diff --git a/modules/user/desktop/apps/vencord.nix b/modules/user/desktop/apps/vencord.nix deleted file mode 100644 index 95fb614..0000000 --- a/modules/user/desktop/apps/vencord.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ config, ... }: -{ - programs.vesktop.vencord.settings = { - plugins = { - AlwaysExpandRoles.enabled = true; - MessageLogger.enabled = true; - }; - }; -} diff --git a/modules/user/desktop/apps/waybar/default.nix b/modules/user/desktop/apps/waybar/default.nix deleted file mode 100644 index 2c68fd5..0000000 --- a/modules/user/desktop/apps/waybar/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ config, ... }: -{ - programs.waybar = { - settings.main = { - layer = "bottom"; - position = "bottom"; - modules-left = [ "sway/workspaces" ]; - modules-center = [ "clock" ]; - modules-right = [ - "wireplumber" - "battery" - "backlight" - "sway/language" - "tray" - ]; - - backlight = { - format = "{icon}"; - format-icons = [ - "" - "" - ]; - tooltip-format = "{percent}%"; - }; - - battery = { - format = "{icon}"; - format-critical = "{icon} {capacity}%"; - format-icons = { - good = [ "" ]; - okay = [ "" ]; - mediocre = [ "" ]; - low = [ "" ]; - critical = [ "" ]; - }; - - format-low = "{icon} {capacity}%"; - format-time = "{H}h{m}m"; - states = { - good = 85; - okay = 75; - mediocre = 50; - low = 25; - critical = 10; - }; - - tooltip-format = "{timeTo} ({power}W)"; - tooltip-format-critical = "please. charge me."; - }; - - clock = { - format = "{:%A, %b %d %Y | %H:%M}"; - }; - - "sway/language" = { - on-click = "swaymsg input type:keyboard xkb_switch_layout next"; - tooltip-format = "{long}"; - }; - - "sway/workspaces" = { - all-outputs = true; - disable-auto-back-and-forth = true; - format = "{icon}"; - format-icons = { - "1" = "I"; - "2" = "II"; - "3" = "III"; - "4" = "IV"; - "5" = "V"; - "6" = "VI"; - "7" = "VII"; - "8" = "VIII"; - "9" = "IX"; - }; - }; - - wireplumber = { - format = "{icon}"; - format-icons = [ - "" - "" - "" - ]; - format-muted = ""; - tooltip-format = "{node_name} ({volume}%)"; - }; - }; - - style = builtins.readFile ./style.css; - }; -} diff --git a/modules/user/desktop/apps/waybar/style.css b/modules/user/desktop/apps/waybar/style.css deleted file mode 100644 index 86e5737..0000000 --- a/modules/user/desktop/apps/waybar/style.css +++ /dev/null @@ -1,68 +0,0 @@ -* { - border: none; - border-radius: 0; - font-family: 'FiraCode Nerd Font', monospace; - font-size: 10pt; - min-height: 0; -} - -window#waybar { - background: transparent; - color: #cdd6f4; -} - -tooltip { - background: #181825; - border: 2px solid #cba6f7; -} - -tooltip label { - color: #cdd6f4; -} - -.modules-left, .modules-center, .modules-right { - margin: 0 6px; /* don't ask. the outer gaps are set to 4px but they're actually 6px */ -} - - -#workspaces button { - background: none; - box-shadow: none; - color: #6c7086; - min-width: 0px; - padding: 0; - padding-right: 1em; -} - -#workspaces button.visible { - color: #a6adc8; -} - -#workspaces button.focused { - color: #cba6f7; -} - -#workspaces button.urgent { - color: #f38ba8; -} - -#workspaces button:hover { - color: #cdd6f4; - text-shadow: inherit; -} - -#backlight, #battery, #language, #tray, #wireplumber { - padding-left: 1em; -} - -#backlight, #battery, #language, #wireplumber { - min-width: 1.5em; /* font weirdness */ -} - -#battery.critical { - color: #f38ba8; -} - -#battery.charging { - color: #a6e3a1; -} diff --git a/modules/user/desktop/default.nix b/modules/user/desktop/default.nix deleted file mode 100644 index 05b0cc9..0000000 --- a/modules/user/desktop/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - config, - lib, - options, - pkgs, - ... -}: -{ - imports = [ - ./apps - ./sessions - ]; - - config = { - gtk = { - colorScheme = "dark"; - cursorTheme = { - package = pkgs.catppuccin-cursors.mochaDark; - name = "catppuccin-mocha-dark"; - size = 24; - }; - - gtk4.theme = config.gtk.theme; - theme = { - package = pkgs.catppuccin-gtk.override { - accents = [ "mauve" ]; - variant = "mocha"; - }; - - name = "catppuccin-mocha-mauve-standard"; - }; - }; - - fonts.fontconfig.enable = true; - home.packages = with pkgs; [ - fira-code # monospace - ipaexfont # JP - nerd-fonts.fira-code # nerdfonts icons - ]; - - xdg.dataFile."wallpaper.png" = { - enable = lib.mkDefault false; - source = ./freeen.jpg; - }; - }; - - options.desktop.defaultFontSize = lib.mkOption { - default = 11.0; - description = "The default font size used by some apps"; - type = lib.types.float; - }; -} diff --git a/modules/user/desktop/freeen.jpg b/modules/user/desktop/freeen.jpg Binary files differdeleted file mode 100644 index acaea6c..0000000 --- a/modules/user/desktop/freeen.jpg +++ /dev/null diff --git a/modules/user/desktop/scripts/screenshot.sh b/modules/user/desktop/scripts/screenshot.sh deleted file mode 100644 index 8250f9e..0000000 --- a/modules/user/desktop/scripts/screenshot.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash -# Bash screenshot script. Requires grim, slurp, sway, fuzzel, libnotify and jq. -[[ -d "~/Pictures/Screenshots" ]] || mkdir -p ~/Pictures/Screenshots -IFS=$'\n' -screenshot_targets=$(swaymsg -rt get_outputs | jq -r '.[].name' | sort) -screenshot_targets+=($'\nSpecific region') # i LOVE bash -selected_target="$(printf '%s' "${screenshot_targets[@]}" | fuzzel --hide-prompt --mesg='What would you like to screenshot?' --mesg-mode=expand --minimal-lines --dmenu)" -outfile="$HOME/Pictures/Screenshots/$(date +'%F_%H.%M.%S.png')" - -send_notification() { - notify-send "Screenshot taken" "Screenshot saved to <b>$1</b>." -} - -case $selected_target in - 'Specific region') grim -g "$(slurp)" "$outfile" && send_notification "$outfile";; - *) grim -o "$selected_target" "$outfile" && send_notification "$outfile" ;; -esac diff --git a/modules/user/desktop/scripts/switchkbdlayout.sh b/modules/user/desktop/scripts/switchkbdlayout.sh deleted file mode 100644 index 964ee8e..0000000 --- a/modules/user/desktop/scripts/switchkbdlayout.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash -# Just sends a notification when switching keyboard layout. -swaymsg input 'type:keyboard' xkb_switch_layout next && notify-send -eu low -t 3000 "Switched keyboard layout" "$(swaymsg -rt get_inputs | jq -r '.[] | select(.type == "keyboard").xkb_active_layout_name' | head -n1)" diff --git a/modules/user/desktop/sessions/default.nix b/modules/user/desktop/sessions/default.nix deleted file mode 100644 index 47a721a..0000000 --- a/modules/user/desktop/sessions/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - imports = [ - ./sway.nix - ]; -} diff --git a/modules/user/desktop/sessions/sway.nix b/modules/user/desktop/sessions/sway.nix deleted file mode 100644 index 80a99d5..0000000 --- a/modules/user/desktop/sessions/sway.nix +++ /dev/null @@ -1,285 +0,0 @@ -{ - config, - lib, - options, - pkgs, - ... -}: -{ - config = { - gtk.enable = lib.mkDefault config.desktop.sessions.sway.enable; - home.packages = lib.mkIf config.desktop.sessions.sway.enable [ - # needed for various scripts - pkgs.grim - pkgs.jq - pkgs.libnotify - pkgs.slurp - ]; - - programs = { - foot.enable = lib.mkDefault config.desktop.sessions.sway.enable; - fuzzel.enable = lib.mkDefault config.desktop.sessions.sway.enable; - librewolf.enable = lib.mkDefault config.desktop.sessions.sway.enable; - swaylock = { - enable = lib.mkDefault config.desktop.sessions.sway.enable; - settings = { - bs-hl-color = "f38ba8"; - caps-lock-bs-hl-color = "f38ba8"; - color = "000000"; - font = "Fira Code"; - font-size = config.desktop.defaultFontSize; - image = "~/.local/share/wallpaper.png"; - indicator-caps-lock = true; - inside-clear-color = "b4befe"; - inside-color = "1e1e2e"; - inside-ver-color = "f9e2af"; - inside-wrong-color = "f38ba8"; - key-hl-color = "585b70"; - line-caps-lock-color = "00000000"; - line-clear-color = "00000000"; - line-color = "00000000"; - line-ver-color = "00000000"; - line-wrong-color = "00000000"; - ring-clear-color = "b4befe"; - ring-color = "313244"; - ring-ver-color = "f9e2af"; - ring-wrong-color = "f38ba8"; - scaling = "fill"; - separator-color = "00000000"; - text-caps-lock-color = "cdd6f4"; - text-clear-color = "1e1e2e"; - text-color = "cdd6f4"; - text-ver-color = "1e1e2e"; - text-wrong-color = "1e1e2e"; - }; - }; - - waybar.enable = lib.mkDefault config.desktop.sessions.sway.enable; - }; - - services.mako.enable = true; - wayland.windowManager.sway = { - enable = lib.mkDefault config.desktop.sessions.sway.enable; - config = { - bars = [ ]; - bindswitches = - let - display = "eDP-1"; - in - { - "lid:on" = { - action = "output ${display} disable"; - locked = true; - reload = true; - }; - - "lid:off" = { - action = "output ${display} enable"; - locked = true; - reload = true; - }; - }; - - colors = { - focused = { - background = "#cba6f7"; - border = "#cba6f7"; - childBorder = "#cba6f7"; - indicator = "#f5c2e7"; - text = "#1e1e2e"; - }; - - focusedInactive = { - background = "#585b70"; - border = "#585b70"; - childBorder = "#585b70"; - indicator = "#585b70"; - text = "#cdd6f4"; - }; - - unfocused = { - background = "#313244"; - border = "#313244"; - childBorder = "#313244"; - indicator = "#313244"; - text = "#a6adc8"; - }; - - urgent = { - background = "#f38ba8"; - border = "#f38ba8"; - childBorder = "#f38ba8"; - indicator = "#f38ba8"; - text = "#1e1e2e"; - }; - }; - - defaultWorkspace = "workspace number 1"; - floating = { - criteria = [ - # TODO - ]; - - titlebar = false; - }; - - focus.followMouse = false; - fonts = { - names = [ "Fira Code" ]; - size = 8.0; - }; - - gaps = { - inner = 2; - outer = 4; - }; - - input = { - "*" = { - accel_profile = "flat"; - }; - - "type:keyboard" = { - xkb_layout = "us,ca"; - xkb_options = "compose:rctrl"; - }; - - "type:touchpad" = { - drag = "enabled"; - dwt = "enabled"; - natural_scroll = "enabled"; - tap = "enabled"; - }; - }; - - keybindings = - let - grim = "${pkgs.grim}/bin/grim"; - launcher = "${pkgs.fuzzel}/bin/fuzzel"; - mod = config.wayland.windowManager.sway.config.modifier; - scripts = { - screenshot = pkgs.writeShellScript "screenshot" (builtins.readFile ../scripts/screenshot.sh); - switchkbdlayout = pkgs.writeShellScript "switchkbdlayout" ( - builtins.readFile ../scripts/switchkbdlayout.sh - ); - }; - terminal = "${pkgs.foot}/bin/foot"; - in - { - "${mod}+Return" = "exec ${terminal}"; - "${mod}+R" = "exec ${launcher}"; - "${mod}+B" = "exec ${pkgs.librewolf}/bin/librewolf"; - "${mod}+Shift+S" = "exec ${scripts.screenshot}"; - "${mod}+Alt+L" = "exec ${pkgs.swaylock}/bin/swaylock"; - "${mod}+Alt+K" = "exec ${scripts.switchkbdlayout}"; - "${mod}+Alt+Q" = "exit"; - "${mod}+Q" = "kill"; - "${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}+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}+Equal" = "resize grow width"; - "${mod}+Minus" = "resize shrink width"; - "${mod}+Shift+Equal" = "resize grow height"; - "${mod}+Shift+Minus" = "resize shrink height"; - "${mod}+P" = "focus parent"; - "${mod}+Shift+F" = "fullscreen"; - "${mod}+V" = "splitt"; - "${mod}+G" = "layout toggle tabbed split"; - "${mod}+S" = "sticky toggle"; - "XF86AudioMute" = "exec wpctl set-mute @DEFAULT_SINK@ toggle"; - "XF86AudioLowerVolume" = "exec wpctl set-volume @DEFAULT_SINK@ 5%- -l 1"; - "XF86AudioRaiseVolume" = "exec wpctl set-volume @DEFAULT_SINK@ 5%+ -l 1"; - "XF86MonBrightnessDown" = "exec brightnessctl --class=backlight s 5%-"; - "XF86MonBrightnessUp" = "exec brightnessctl --class=backlight s +5%"; - }; - - modifier = "Mod4"; - output = { - "eDP-1" = { - bg = "#11111b solid_color"; - scale = "1.5"; - }; - - "DP-1" = { - bg = "#11111b solid_color"; - mode = "1920x1080@165Hz"; - pos = "0 0"; - }; - - "DP-2" = { - bg = "#11111b solid_color"; - mode = "1920x1080@75Hz"; - pos = "1920 0"; - }; - }; - - seat."seat0".xcursor_theme = "catppuccin-mocha-dark-cursors 24"; - window = { - commands = [ - { - command = "floating enable"; - criteria = { - class = "^Minecraft"; - }; - } - ]; - titlebar = false; - }; - - workspaceOutputAssign = [ - { - output = "eDP-1"; - workspace = "1"; - } - { - output = "DP-1"; - workspace = "1"; - } - { - output = "DP-2"; - workspace = "2"; - } - ]; - }; - - extraConfig = '' - exec waybar - ''; - }; - - xdg.dataFile."wallpaper.png".enable = config.desktop.sessions.sway.enable; - xdg.portal = { - enable = true; - config.common.default = "*"; - extraPortals = with pkgs; [ - xdg-desktop-portal-gtk - ]; - }; - }; - - options.desktop.sessions.sway.enable = lib.mkEnableOption "the sway window manager"; -} diff --git a/modules/user/direnv.nix b/modules/user/direnv.nix deleted file mode 100644 index 3d44531..0000000 --- a/modules/user/direnv.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ config, ... }: -{ - programs.direnv.nix-direnv.enable = true; -} diff --git a/modules/user/editors/default.nix b/modules/user/editors/default.nix deleted file mode 100644 index fa1b4ff..0000000 --- a/modules/user/editors/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - imports = [ ./kakoune ]; -} diff --git a/modules/user/editors/kakoune/default.nix b/modules/user/editors/kakoune/default.nix deleted file mode 100644 index 5c7188d..0000000 --- a/modules/user/editors/kakoune/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ - config, - lib, - options, - pkgs, - ... -}: -{ - config.programs.kakoune = lib.mkIf config.editors.kakoune.enable { - enable = true; - colorSchemePackage = pkgs.kakounePlugins.kakoune-catppuccin; - config = { - alignWithTabs = true; - colorScheme = "catppuccin_mocha"; - hooks = [ - { - commands = "set window tabstop 2"; - group = "set-indentwidth"; - name = "WinSetOption"; - option = "filetype=(nix)"; - } - { - commands = "lsp-enable-window"; - name = "WinSetOption"; - option = "filetype=(c|css|html|java|zig)"; - } - { - commands = "set buffer filetype json"; - name = "BufCreate"; - option = ".*\.mcmeta"; - } - ]; - - indentWidth = 0; - keyMappings = [ - { - docstring = "Open a new window"; - effect = ":new<ret>"; - key = "<c-w>"; - mode = "normal"; - } - { - docstring = "Open a new file"; - effect = ":e %sh{${pkgs.fd}/bin/fd -tf | fuzzel --prompt=\"open: \" --dmenu --minimal-lines --width=60}<ret>"; - key = "<c-o>"; - mode = "normal"; - } - { - docstring = "Comment the selected line(s)"; - effect = ":comment-line<ret>"; - key = "<c-a-c>"; - mode = "normal"; - } - { - docstring = "Rename the symbol below the cursor"; - effect = ":lsp-rename-prompt<ret>"; - key = "<a-r>"; - mode = "normal"; - } - { - docstring = "Create a new file"; - effect = ":e %sh{${(pkgs.writeShellScript "newfile" (builtins.readFile ./newfile.sh))}}<ret>"; - key = "<c-a-n>"; - mode = "normal"; - } - ]; - - numberLines = { - enable = true; - highlightCursor = true; - relative = true; - }; - - tabStop = 4; - ui.assistant = "cat"; - }; - - defaultEditor = true; - extraConfig = builtins.readFile ./kakrc; - plugins = with pkgs.kakounePlugins; [ - auto-pairs-kak - kakoune-extra-filetypes - kakoune-lsp - ]; - }; - - options.editors.kakoune.enable = lib.mkEnableOption "rosa's kakoune setup"; -} diff --git a/modules/user/editors/kakoune/kakrc b/modules/user/editors/kakoune/kakrc deleted file mode 100644 index 27a3f1d..0000000 --- a/modules/user/editors/kakoune/kakrc +++ /dev/null @@ -1,2 +0,0 @@ -eval %sh{kak-lsp} -enable-auto-pairs diff --git a/modules/user/editors/kakoune/newfile.sh b/modules/user/editors/kakoune/newfile.sh deleted file mode 100644 index 2c2cfee..0000000 --- a/modules/user/editors/kakoune/newfile.sh +++ /dev/null @@ -1,5 +0,0 @@ -newfile="$(fuzzel --prompt-only='create: ' --dmenu)" -if [ ! -z "$newfile" ]; then - mkdir -p "${newfile%/*}" - printf '%s' "$newfile" -fi diff --git a/modules/user/git.nix b/modules/user/git.nix deleted file mode 100644 index 531f7d2..0000000 --- a/modules/user/git.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - config, - lib, - options, - ... -}: -{ - programs.git = { - enable = lib.mkDefault true; - settings = lib.mkDefault { - init.defaultBranch = "main"; - user.email = "rosaontheweb@proton.me"; - user.name = "Rosa"; - }; - }; -} diff --git a/modules/user/ssh.nix b/modules/user/ssh.nix deleted file mode 100644 index 9904879..0000000 --- a/modules/user/ssh.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ config, ... }: -{ - programs.ssh = { - enable = true; - extraConfig = '' - SendEnv COLORTERM - ''; - }; -} diff --git a/modules/user/zsh/default.nix b/modules/user/zsh/default.nix deleted file mode 100644 index 3d52279..0000000 --- a/modules/user/zsh/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - config, - lib, - options, - ... -}: -{ - config.programs = { - direnv.enable = lib.mkDefault config.programs.zsh.enable; - zsh = { - enable = lib.mkDefault true; # default user shell - autocd = true; - autosuggestion = { - enable = lib.mkDefault true; - strategy = [ - "history" - "completion" - ]; - }; - - history.ignoreAllDups = true; - initContent = builtins.readFile ./zshrc.zsh; - loginExtra = builtins.readFile ./zlogin.zsh; - setOptions = [ "extendedglob" ]; - shellAliases = { - k = "kak"; - }; - - syntaxHighlighting.enable = true; - }; - }; -} diff --git a/modules/user/zsh/zlogin.zsh b/modules/user/zsh/zlogin.zsh deleted file mode 100644 index 6919fd3..0000000 --- a/modules/user/zsh/zlogin.zsh +++ /dev/null @@ -1 +0,0 @@ -[[ -x $(which sway) ]] && exec sway diff --git a/modules/user/zsh/zshrc.zsh b/modules/user/zsh/zshrc.zsh deleted file mode 100644 index 9b2083a..0000000 --- a/modules/user/zsh/zshrc.zsh +++ /dev/null @@ -1 +0,0 @@ -PS1='%F{8}%(?..(%F{1}%?%F{8}%)-)[%F{1}%n@%M%F{8}]:%F{1}%5~%F{8}%# %f' |
