diff --git a/assets/wallpapers/gay_arch_linux.png b/assets/wallpapers/gay_arch_linux.png new file mode 100644 index 0000000..40168c0 Binary files /dev/null and b/assets/wallpapers/gay_arch_linux.png differ diff --git a/hosts/vali/hermit/configuration.nix b/hosts/vali/hermit/configuration.nix index 8a0dc9b..1531e93 100644 --- a/hosts/vali/hermit/configuration.nix +++ b/hosts/vali/hermit/configuration.nix @@ -78,6 +78,7 @@ spicetify.enable = true; schizofox.enable = true; anyrun.enable = true; + zathura.enable = true; ags.enable = true; foot = { enable = true; @@ -115,7 +116,7 @@ }; image = ../../../assets/wallpapers/tiredgod.png; }; - gtk = {enable = true;}; + gtk = {enable = false;}; qt = { enable = true; package = pkgs.kde-gruvbox; diff --git a/hosts/vali/hermit/profile.nix b/hosts/vali/hermit/profile.nix index c843f8e..895d6ad 100644 --- a/hosts/vali/hermit/profile.nix +++ b/hosts/vali/hermit/profile.nix @@ -4,6 +4,7 @@ _: { ../../../options/common/bluetooth.nix ../../../options/desktop/fonts.nix ../../../options/common/networking.nix + ../../../options/common/docs.nix ../../../options/common/gpu/nvidia.nix ../../../options/desktop/monitors.nix ../../../overlay.nix diff --git a/hosts/vali/hermit/programs.nix b/hosts/vali/hermit/programs.nix index e8c0b12..2fa6e78 100644 --- a/hosts/vali/hermit/programs.nix +++ b/hosts/vali/hermit/programs.nix @@ -21,6 +21,7 @@ in { calc calcure calibre + cbonsai cmake cmus difftastic @@ -112,7 +113,6 @@ in { xournalpp yt-dlp zapzap - zathura zip zoxide ]; diff --git a/modules/gui/anyrun/anyrun.nix b/modules/gui/anyrun/anyrun.nix index ff20bf7..bafb125 100644 --- a/modules/gui/anyrun/anyrun.nix +++ b/modules/gui/anyrun/anyrun.nix @@ -20,10 +20,10 @@ in { plugins = with inputs.anyrun.packages.${pkgs.system}; [ applications dictionary - rink + #rink shell # symbols - translate + #translate websearch ]; hideIcons = false; @@ -41,7 +41,6 @@ in { extraConfigFiles = { "applications.ron".text = '' Config( - desktop_actions: true, max_entries: 10, terminal: Some("foot"), ) diff --git a/modules/gui/schizofox.nix b/modules/gui/schizofox.nix index d715629..3aa9994 100644 --- a/modules/gui/schizofox.nix +++ b/modules/gui/schizofox.nix @@ -92,7 +92,7 @@ in { { Name = "noogle"; Descriptiom = "Noogle Search"; - Alias = "!no"; + Alias = "!ng"; Method = "GET"; URLTemplate = "https://noogle.dev/"; } diff --git a/modules/gui/waybar.nix b/modules/gui/waybar.nix index cc3555f..26c525d 100644 --- a/modules/gui/waybar.nix +++ b/modules/gui/waybar.nix @@ -16,14 +16,15 @@ in { settings.mainBar = { gtk-layer-shell = true; layer = "top"; - modules-left = ["tray" "hyprland/window"]; + modules-left = ["tray" "mpd" "hyprland/window"]; modules-center = ["hyprland/workspaces"]; modules-right = [ - "mpd" "cpu" "memory" "pulseaudio" "clock" + "backlight" + "battery" ]; pulseaudio = { @@ -34,6 +35,7 @@ in { format-icons = {default = ["󰕿" "󰖀" "󰕾"];}; on-click = "${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; }; + "hyprland/workspaces" = { sort-by-name = true; sort-by-coordinates = false; @@ -74,10 +76,12 @@ in { "30" = "10"; }; }; + tray = { icon-size = 12; spacing = 5; }; + # 󰃰 clock = { interval = 1; @@ -105,27 +109,39 @@ in { }; }; }; + + battery = { + interval = 10; + states = { + good = 75; + warning = 20; + critical = 10; + }; + format = "{icon}{capacity}%"; + format-charging = "󰚥{icon}{capacity}%"; + format-discharging = "{icon}{capacity}%"; + format-icons = ["󰂎" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"]; + format-charging-icons = ["󰢟" "󰢜" "󰂆" "󰂇" "󰂈" "󰢝" "󰂉" "󰢞" "󰂊" "󰂋" "󰂅"]; + }; + cpu = { interval = 1; format = "󰻠 {}%"; max-length = 10; }; + memory = { interval = 1; format = "󰍛 {}%"; max-length = 10; }; - "custom/launcher" = { - format = " "; - on-click = "anyrun"; - on-click-right = "pkill anyrun"; - }; "hyprland/window" = { format = "{}"; separate-outputs = true; }; + mpd = { - format = "󰝚 {artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S})"; + format = "󰝚 {artist} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S})"; format-disconnected = "󰝚 Disconnected"; format-stopped = "󰝚 Stopped"; interval = 1; @@ -134,6 +150,7 @@ in { on-click = "mpc toggle"; }; }; + style = '' @define-color base #1e1e2e; @define-color mantle #181825; diff --git a/modules/gui/zathura.nix b/modules/gui/zathura.nix index 0bb5af9..17e61de 100644 --- a/modules/gui/zathura.nix +++ b/modules/gui/zathura.nix @@ -6,7 +6,7 @@ }: with lib; let cfg = config.modules.programs.zathura; - username = config.modules.other.system.username; + inherit (config.modules.other.system) username; catppuccin = pkgs.fetchFromGitHub { owner = "catppuccin"; repo = "zathura"; @@ -24,7 +24,16 @@ in { extraConfig = '' include catppuccin-mocha ''; - options = {selection-clipboard = "clipboard";}; + options = { + selection-clipboard = "clipboard"; + adjust-open = "best-fit"; + pages-per-row = "1"; + scroll-page-aware = "true"; + scroll-full-overlap = "0.01"; + scroll-step = "100"; + zoom-min = "10"; + guioptions = "none"; + }; }; }; }; diff --git a/modules/other/system.nix b/modules/other/system.nix index 60040d8..1df6219 100644 --- a/modules/other/system.nix +++ b/modules/other/system.nix @@ -30,5 +30,9 @@ in { isNormalUser = true; extraGroups = ["wheel"]; }; + users.users.test = { + isNormalUser = true; + extraGroups = ["wheel"]; + }; }; } diff --git a/modules/services/default.nix b/modules/services/default.nix index 35ca86a..d82560f 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -1 +1 @@ -_: {imports = [./pipewire.nix ./ssh.nix ./greetd.nix ./dunst.nix ./mpd.nix];} +_: {imports = [./pipewire.nix ./ssh.nix ./greetd.nix ./dunst.nix ./mpd.nix ./firewall.nix];} diff --git a/modules/services/firewall.nix b/modules/services/firewall.nix new file mode 100644 index 0000000..94d3b25 --- /dev/null +++ b/modules/services/firewall.nix @@ -0,0 +1,3 @@ +_: { + networking.nftables.enable = true; +} diff --git a/modules/services/mpd.nix b/modules/services/mpd.nix index b4955c9..665dfc0 100644 --- a/modules/services/mpd.nix +++ b/modules/services/mpd.nix @@ -1,6 +1,7 @@ { config, lib, + pkgs, ... }: let cfg = config.modules.services.mpd; @@ -18,6 +19,7 @@ in { }; config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [mpc-cli]; systemd.services.mpd.environment = { # https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/609 XDG_RUNTIME_DIR = "/run/user/1000"; diff --git a/modules/styling/stylix.nix b/modules/styling/stylix.nix index 5d07ef2..00ffff1 100644 --- a/modules/styling/stylix.nix +++ b/modules/styling/stylix.nix @@ -32,7 +32,7 @@ in { }; name = lib.mkOption { description = "Cursor Name"; - type = lib.type.str; + type = lib.types.str; }; }; fontsizes = { diff --git a/options/common/docs.nix b/options/common/docs.nix new file mode 100644 index 0000000..c90b445 --- /dev/null +++ b/options/common/docs.nix @@ -0,0 +1,22 @@ +{pkgs, ...}: { + documentation = { + enable = true; + dev.enable = true; + doc.enable = false; + info.enable = false; + man = { + enable = true; + generateCaches = false; + man-db.enable = false; + mandoc.enable = true; + }; + nixos = { + includeAllModules = false; + }; + }; + + environment.systemPackages = with pkgs; [ + man-pages + man-pages-posix + ]; +}