Nixos: Fix remaining name qualifications after module update

Until I figure out how to theme this thing

.gitignore

@@ -8,3 +8,5 @@
 result
 
 config/neovim/store
+home/modules/ags/config/types
+home/modules/ags/config/tsconfig.json

config/rofi/colors/Foggy-Lake.rasi

@@ -1,7 +0,0 @@
-* {
-	bg-col-op: rgba(239, 241, 245, 100%);
-    bg-col: rgba(239, 241, 245, 60%);
-    fg-col: #4c4f69;
-    pink: #d20f39;
-	trans: rgba(255, 255, 255, 0);
-}

config/rofi/colors/Three-Bears.rasi

@@ -1,16 +0,0 @@
-* {
-    dark: #2A231C;
-    light: #EBEBE5;
-    accent-dark: #463A2E;
-    accent-light: #865E43;
-
-    pastel-a: #797D62;
-    pastel-b: #9B9B7A;
-    pastel-c: #D9AE94;
-    pastel-d: #E5C59E;
-    pastel-e: #F1DCA7;
-    pastel-f: #F8D488;
-    pastel-g: #E4B074;
-    pastel-h: #D08C60;
-    pastel-i: #997B66;
-}

config/rofi/rofi.rasi

@@ -1,100 +0,0 @@
-/*See https://github.com/davatorium/rofi/blob/1.7.3/doc/rofi-theme.5.markdown#basic-structure-1*/
-
-configuration{
-  modi: "run,drun,ssh,filebrowser";
-  font: "JetBrainsMono Nerd Font Mono 14";
-  show-icons: true;
-  icon-theme: "Papirus";
-  /*terminal: "alacritty -o font.size=12";*/
-  terminal: "kitty";
-  drun-display-format: "{icon} {name}";
-  disable-history: false;
-  hide-scrollbar: true;
-  display-drun: " apps ";
-  display-run: " run ";
-  display-filebrowser: " file ";
-  display-ssh: " ssh ";
-  sidebar-mode: false;
-}
-
-@theme "colors.rasi"
-
-element-text,
-element-icon,
-mode-switcher {
-  background-color: inherit;
-  text-color: inherit;
-}
-
-window {
-  height: 500px;
-  width: 700px;
-  border-radius: 0px;
-  background-color: @bg-col;
-}
-
-mainbox {
-  background-color: @trans;
-}
-
-message {
-  background-color: @trans;
-}
-
-error-message {
-  background-color: @trans;
-  margin: 0px 0px 20px 0px;
-}
-
-textbox {
-  background-color: @trans;
-  padding: 6px;
-  margin: 20px 20px 0px 20px;
-  border-radius: 3;
-}
-
-inputbar {
-  children: [prompt,entry];
-  background-color: @trans;
-}
-
-prompt {
-  background-color: @pink;
-  padding: 6px;
-  text-color: @bg-col-op;
-  border-radius: 3px;
-  margin: 20px 0px 0px 20px;
-}
-
-entry {
-  padding: 6px;
-  margin: 20px 20px 0px 10px;
-  text-color: @fg-col;
-  background-color: @trans;
-  border-radius: 3px;
-}
-
-listview {
-  border: 0px 0px 0px;
-  padding: 6px 0px 0px;
-  margin: 10px 0px 0px 20px;
-  columns: 1;
-  background-color: @trans;
-}
-
-element {
-  padding: 5px;
-  margin: 0px 20px 0px 0px;
-  background-color: @trans;
-  text-color: @pink;
-  border-radius: 3px;
-}
-
-element-icon {
-  size: 25px;
-}
-
-element selected {
-  background-color: @pink;
-  text-color: @bg-col-op;
-}

config/stablediffusion/launch.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-# NOTE: This script is used in conjunction with the rocm/python docker image
-
-# Install if necessary
-if [[ ! -f "/webui-data/stable-diffusion-webui/launch.py" ]]; then
-  cd /webui-data
-  git clone https://github.com/AUTOMATIC1111/stable-diffusion-webui
-  cd stable-diffusion-webui
-  python -m pip install --upgrade pip wheel
-fi
-
-cd /webui-data/stable-diffusion-webui
-REQS_FILE='requirements.txt' python launch.py --precision full --no-half

home/christoph/default.nix

@@ -33,6 +33,8 @@ rec {
 
   # Enable and configure my custom HM modules.
   modules = {
+    ags.enable = false; # TODO: Configure
+
     chromium = {
       enable = true;
       google = false;
@@ -68,12 +70,11 @@ rec {
           "$mainMod, T" = ["exec, kitty"];
           "$mainMod, E" = ["exec, kitty"];
           "$mainMod, N" = ["exec, neovide"];
-          # "$mainMod, T" = ["exec, alacritty -o font.size=12 -e tmux"];
-          # "$mainMod, E" = ["exec, alacritty -o font.size=12 -e tmux"];
 
-          "$mainMod, P" = ["exec, hyprpicker -a"];
+          "$mainMod, P" = ["exec, hyprpicker -autocopy -format=hex"];
           "$mainMod, S" = ["exec, grim -g \"$(slurp)\""];
           "$mainMod CTRL, S" = ["exec, grim -g \"$(slurp)\" - | wl-copy"];
+          "$mainMod SHIFT, S" = ["exec, grim -g \"$(slurp)\" - | wl-copy"];
 
           ", XF86AudioRaiseVolume" = ["exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+"];
           ", XF86AudioLowerVolume" = ["exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%-"];
@@ -170,10 +171,7 @@ rec {
       theme = "Foggy-Lake";
     };
 
-    waybar = {
-      enable = true;
-    };
-
+    waybar.enable = true;
     zathura.enable = true;
   };
 

home/christoph/nixinator/default.nix

@@ -48,7 +48,6 @@
         ];
       };
 
-      # TODO: Also set the dunst monitor
       waybar.monitor = "HDMI-A-1";
     };
 

home/modules/0_template/default.nix

@@ -5,12 +5,10 @@
   mylib,
   pkgs,
   ...
-}:
-with lib;
-with mylib.modules; let
-  cfg = config.modules.TEMPLATE;
+}: let
+  inherit (config.modules) TEMPLATE;
 in {
   options.modules.TEMPLATE = import ./options.nix {inherit lib mylib;};
 
-  config = mkIf cfg.enable {};
+  config = lib.mkIf TEMPLATE.enable {};
 }

home/modules/ags/config/config.js

@@ -0,0 +1,204 @@
+const hyprland = await Service.import("hyprland");
+const notifications = await Service.import("notifications");
+const mpris = await Service.import("mpris");
+const audio = await Service.import("audio");
+const battery = await Service.import("battery");
+const systemtray = await Service.import("systemtray");
+
+const date = Variable("", {
+  poll: [1000, 'date "+%H:%M:%S %b %e."'],
+});
+
+// widgets can be only assigned as a child in one container
+// so to make a reuseable widget, make it a function
+// then you can simply instantiate one by calling it
+
+function Workspaces() {
+  const activeId = hyprland.active.workspace.bind("id");
+  const workspaces = hyprland.bind("workspaces").as((ws) =>
+    ws.map(({ id }) =>
+      Widget.Button({
+        on_clicked: () => hyprland.messageAsync(`dispatch workspace ${id}`),
+        child: Widget.Label(`${id}`),
+        class_name: activeId.as((i) => `${i === id ? "focused" : ""}`),
+      }),
+    ),
+  );
+
+  return Widget.Box({
+    class_name: "workspaces",
+    children: workspaces,
+  });
+}
+
+function ClientTitle() {
+  return Widget.Label({
+    class_name: "client-title",
+    label: hyprland.active.client.bind("title"),
+  });
+}
+
+function Clock() {
+  return Widget.Label({
+    class_name: "clock",
+    label: date.bind(),
+  });
+}
+
+// we don't need dunst or any other notification daemon
+// because the Notifications module is a notification daemon itself
+function Notification() {
+  const popups = notifications.bind("popups");
+  return Widget.Box({
+    class_name: "notification",
+    visible: popups.as((p) => p.length > 0),
+    children: [
+      Widget.Icon({
+        icon: "preferences-system-notifications-symbolic",
+      }),
+      Widget.Label({
+        label: popups.as((p) => p[0]?.summary || ""),
+      }),
+    ],
+  });
+}
+
+function Media() {
+  const label = Utils.watch("", mpris, "player-changed", () => {
+    if (mpris.players[0]) {
+      const { track_artists, track_title } = mpris.players[0];
+      return `${track_artists.join(", ")} - ${track_title}`;
+    } else {
+      return "Nothing is playing";
+    }
+  });
+
+  return Widget.Button({
+    class_name: "media",
+    on_primary_click: () => mpris.getPlayer("")?.playPause(),
+    on_scroll_up: () => mpris.getPlayer("")?.next(),
+    on_scroll_down: () => mpris.getPlayer("")?.previous(),
+    child: Widget.Label({ label }),
+  });
+}
+
+function Volume() {
+  const icons = {
+    101: "overamplified",
+    67: "high",
+    34: "medium",
+    1: "low",
+    0: "muted",
+  };
+
+  function getIcon() {
+    const icon = audio.speaker.is_muted
+      ? 0
+      : [101, 67, 34, 1, 0].find(
+          (threshold) => threshold <= audio.speaker.volume * 100,
+        );
+
+    return `audio-volume-${icons[icon]}-symbolic`;
+  }
+
+  const icon = Widget.Icon({
+    icon: Utils.watch(getIcon(), audio.speaker, getIcon),
+  });
+
+  const slider = Widget.Slider({
+    hexpand: true,
+    draw_value: false,
+    on_change: ({ value }) => (audio.speaker.volume = value),
+    setup: (self) =>
+      self.hook(audio.speaker, () => {
+        self.value = audio.speaker.volume || 0;
+      }),
+  });
+
+  return Widget.Box({
+    class_name: "volume",
+    css: "min-width: 180px",
+    children: [icon, slider],
+  });
+}
+
+function BatteryLabel() {
+  const value = battery.bind("percent").as((p) => (p > 0 ? p / 100 : 0));
+  const icon = battery
+    .bind("percent")
+    .as((p) => `battery-level-${Math.floor(p / 10) * 10}-symbolic`);
+
+  return Widget.Box({
+    class_name: "battery",
+    visible: battery.bind("available"),
+    children: [
+      Widget.Icon({ icon }),
+      Widget.LevelBar({
+        widthRequest: 140,
+        vpack: "center",
+        value,
+      }),
+    ],
+  });
+}
+
+function SysTray() {
+  const items = systemtray.bind("items").as((items) =>
+    items.map((item) =>
+      Widget.Button({
+        child: Widget.Icon({ icon: item.bind("icon") }),
+        on_primary_click: (_, event) => item.activate(event),
+        on_secondary_click: (_, event) => item.openMenu(event),
+        tooltip_markup: item.bind("tooltip_markup"),
+      }),
+    ),
+  );
+
+  return Widget.Box({
+    children: items,
+  });
+}
+
+function Left() {
+  return Widget.Box({
+    spacing: 8,
+    children: [Workspaces(), ClientTitle()],
+  });
+}
+
+function Center() {
+  return Widget.Box({
+    spacing: 8,
+    children: [Media(), Notification()],
+  });
+}
+
+function Right() {
+  return Widget.Box({
+    hpack: "end",
+    spacing: 8,
+    children: [Volume(), Clock(), SysTray()],
+  });
+}
+
+function Bar(monitor = 0) {
+  return Widget.Window({
+    name: `bar-${monitor}`,
+    class_name: "ags_bar",
+    monitor,
+    anchor: ["top", "left", "right"],
+    exclusivity: "exclusive",
+    child: Widget.CenterBox({
+      start_widget: Left(),
+      center_widget: Center(),
+      end_widget: Right(),
+    }),
+  });
+}
+
+App.config({
+  style: "/home/christoph/.config/ags/style.css",
+  windows: [Bar(0)],
+});
+
+export {};

home/modules/ags/config/style.css

@@ -0,0 +1,40 @@
+window.bar {
+  background-color: @theme_bg_color;
+  color: @theme_fg_color;
+}
+
+button {
+  min-width: 0;
+  padding-top: 0;
+  padding-bottom: 0;
+  background-color: transparent;
+}
+
+button:active {
+  background-color: @theme_selected_bg_color;
+}
+
+button:hover {
+  border-bottom: 3px solid @theme_fg_color;
+}
+
+label {
+  font-weight: bold;
+}
+
+.workspaces button.focused {
+  border-bottom: 3px solid @theme_selected_bg_color;
+}
+
+.client-title {
+  color: @theme_selected_bg_color;
+}
+
+.notification {
+  color: yellow;
+}
+
+levelbar block,
+highlight {
+  min-height: 10px;
+}

home/modules/ags/default.nix

@@ -2,15 +2,27 @@
   config,
   lib,
   mylib,
+  pkgs,
   ...
-}:
-with lib;
-with mylib.modules; let
-  cfg = config.modules.ags;
+}: let
+  inherit (config.modules) ags;
 in {
   options.modules.ags = import ./options.nix {inherit lib mylib;};
 
-  config =
-    mkIf cfg.enable {
+  config = lib.mkIf ags.enable {
+    programs.ags = {
+      enable = true;
+      systemd.enable = true;
+
+      # configDir = ./config;
+    };
+
+    home.file = {
+      # NOTE: Keep this symlinked as long as I'm configuring
+      ".config/ags".source = config.lib.file.mkOutOfStoreSymlink "/home/christoph/NixFlake/home/modules/ags/config";
+
+      # LSP typechecking support (use ags --init)
+      # ".config/ags/types".source = config.lib.file.mkOutOfStoreSymlink "${pkgs.ags}/share/com.github.Aylur.ags/types";
+    };
   };
 }

home/modules/chromium/default.nix

@@ -1,22 +1,18 @@
-# TODO: Expose some settings
 {
   config,
-  nixosConfig,
   lib,
   mylib,
   pkgs,
   ...
-}:
-with lib;
-with mylib.modules; let
-  cfg = config.modules.chromium;
+}: let
+  inherit (config.modules) chromium;
 in {
   options.modules.chromium = import ./options.nix {inherit lib mylib;};
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf chromium.enable {
     home.packages = with pkgs;
       builtins.concatLists [
-        (optionals cfg.google [
+        (lib.optionals chromium.google [
           google-chrome # Trash, but required for decker pdf export
 
           # Required for some flatpak compatibility

home/modules/color/default.nix

@@ -3,10 +3,8 @@
   lib,
   mylib,
   ...
-}:
-with lib;
-with mylib.modules; let
-  cfg = config.modules.color;
+}: let
+  inherit (config.modules) color;
 
   # Options and assignments will be generated from those keys
   colorKeys = [
@@ -44,13 +42,13 @@ in {
   options.modules.color = import ./options.nix {inherit lib mylib colorKeys;};
 
   config = let
-    lightDefs = import ./${cfg.lightScheme}.nix;
-    darkDefs = import ./${cfg.darkScheme}.nix;
+    lightDefs = import ./schemes/${color.lightScheme}.nix;
+    darkDefs = import ./schemes/${color.darkScheme}.nix;
 
     mkLightColorAssignment = key: {${key} = lightDefs.${key};};
     mkDarkColorAssignment = key: {${key} = darkDefs.${key};};
   in
-    mkIf cfg.enable {
+    lib.mkIf color.enable {
       # This module sets its own options
       # to the values specified in a colorscheme file.
       modules.color.light = lib.pipe colorKeys [

home/modules/default.nix

@@ -3,6 +3,7 @@
     # Obsolete modules are kept in "1_deprecated" for reference.
 
     # My own HM modules
+    ./ags
     ./chromium
     ./color
     ./firefox

home/modules/firefox/default.nix

@@ -6,39 +6,37 @@
   pkgs,
   hostname,
   ...
-}:
-with lib;
-with mylib.modules; let
-  cfg = config.modules.firefox;
+}: let
+  inherit (config.modules) firefox;
 in {
   options.modules.firefox = import ./options.nix {inherit lib mylib;};
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf firefox.enable {
     home.packages = with pkgs;
       builtins.concatLists [
         # TODO: I don't think vaapi works yet
-        (optionals cfg.vaapi [
+        (lib.optionals firefox.vaapi [
           # NOTE: I put these into hardware.opengl.extrapackages, don't know if they belong there...
           # libva
           # libvdpau
         ])
 
         # TODO: Derivation borked on standalone HM
-        # (optionals cfg.gnomeTheme [firefox-gnome-theme])
+        # (lib.optionals firefox.gnomeTheme [firefox-gnome-theme])
       ];
 
-    home.sessionVariables = mkMerge [
+    home.sessionVariables = lib.mkMerge [
       {
         MOZ_USE_XINPUT2 = 1;
       }
 
-      (optionalAttrs cfg.wayland {
+      (lib.optionalAttrs firefox.wayland {
         MOZ_ENABLE_WAYLAND = 1;
         EGL_PLATFORM = "wayland";
         # XDG_CURRENT_DESKTOP = "Hyprland"; # TODO: Or "sway"? # Already set by hyprland
       })
 
-      (optionalAttrs cfg.vaapi {
+      (lib.optionalAttrs firefox.vaapi {
         # LIBVA_DRIVER_NAME = "radeonsi"; # "nvidia" for Nvidia card
         # LIBVA_DRIVER_NAME = "nvidia"; # Specified in hardware-configuration
         MOZ_DISABLE_RDD_SANDBOX = 1;
@@ -72,7 +70,7 @@ in {
         #       not strictly necessary
         extraPolicies = {
           # TODO: Make library function to allow easy bookmark creation and add my default bookmarks/folders
-          Bookmarks = optionalAttrs cfg.defaultBookmarks {};
+          Bookmarks = lib.optionalAttrs firefox.defaultBookmarks {};
           CaptivePortal = false;
           DisableFirefoxAccounts = true;
           DisableFirefoxStudies = true;
@@ -98,13 +96,13 @@ in {
         default = {
           id = 0; # 0 is default profile
 
-          userChrome = concatStringsSep "\n" [
+          userChrome = lib.concatStringsSep "\n" [
             # TODO: Borked after standalone HM
             # (optionalString cfg.gnomeTheme ''
             #   @import "${pkgs.firefox-gnome-theme}/share/firefox-gnome-theme/gnome-theme.css";
             # '')
 
-            (optionalString cfg.disableTabBar ''
+            (lib.optionalString firefox.disableTabBar ''
               #TabsToolbar { display: none; }
             '')
           ];
@@ -153,8 +151,8 @@ in {
             youtube-shorts-block
           ];
 
-          settings = mkMerge [
-            (optionalAttrs cfg.vaapi {
+          settings = lib.mkMerge [
+            (lib.optionalAttrs firefox.vaapi {
               # Firefox wayland hardware video acceleration
               # https://github.com/elFarto/nvidia-vaapi-driver/#firefox=
               # TODO: Disable and check if it works by default
@@ -255,7 +253,6 @@ in {
 
               "identity.fxaccounts.account.device.name" = hostname;
 
-
               "media.hardwaremediakeys.enabled" = false; # Do not interfere with spotify
               "media.videocontrols.picture-in-picture.video-toggle.enabled" = true;
 
@@ -278,7 +275,7 @@ in {
 
               "toolkit.coverage.opt-out" = true;
               "toolkit.coverage.endpoint.base" = "";
-              "toolkit.legacyUserProfileCustomizations.stylesheets" = cfg.gnomeTheme || cfg.disableTabBar;
+              "toolkit.legacyUserProfileCustomizations.stylesheets" = firefox.gnomeTheme || firefox.disableTabBar;
               "toolkit.telemetry.unified" = false;
               "toolkit.telemetry.enabled" = false;
               "toolkit.telemetry.server" = "data:,";

home/modules/fish/default.nix

@@ -4,14 +4,12 @@
   mylib,
   pkgs,
   ...
-}:
-with lib;
-with mylib.modules; let
-  cfg = config.modules.fish;
+}: let
+  inherit (config.modules) fish;
 in {
   options.modules.fish = import ./options.nix {inherit lib mylib;};
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf fish.enable {
     home.file.".config/fish/themes/catppuccin-latte.theme".text = ''
       # name: 'Catppuccin Latte'
       # url: 'https://github.com/catppuccin/fish'
@@ -109,19 +107,19 @@ in {
 
       shellAbbrs = let
         # Only add " | bat" if bat is installed
-        batify = command: command + (optionalString config.programs.bat.enable " | bat");
+        batify = command: command + (lib.optionalString config.programs.bat.enable " | bat");
 
         # Same as above but with args for bat
-        batifyWithArgs = command: args: command + (optionalString config.programs.bat.enable (" | bat " + args));
+        batifyWithArgs = command: args: command + (lib.optionalString config.programs.bat.enable (" | bat " + args));
 
         # These can be used for my config.modules and for HM config.programs,
         # as both of these add the package to home.packages
-        hasHomePackage = package: (contains config.home.packages package);
+        hasHomePackage = package: (mylib.modules.contains config.home.packages package);
 
         # Only add fish abbr if package is installed
-        abbrify = package: abbr: (optionalAttrs (hasHomePackage package) abbr);
+        abbrify = package: abbr: (lib.optionalAttrs (hasHomePackage package) abbr);
       in
-        mkMerge [
+        lib.mkMerge [
           # Abbrs that are always available are defined here.
           {
             # Shell basics

home/modules/hyprland/default.nix

@@ -10,8 +10,7 @@
   nixosConfig,
   ...
 }: let
-  cfg = config.modules.hyprland;
-  color = config.modules.color;
+  inherit (config.modules) hyprland color;
 
   # This function is mapped to the "cfg.monitors" attrSet.
   # For each key-value entry in "cfg.monitors",
@@ -29,22 +28,22 @@
     + (lib.optionalString (builtins.hasAttr "class" attrs) ", class:^(${attrs.class})$")
     + (lib.optionalString (builtins.hasAttr "title" attrs) ", title:^(${attrs.title})$");
 
-  mkTranslucentRule = class: "opacity ${cfg.transparent-opacity} ${cfg.transparent-opacity}, class:^(${class})$";
+  mkTranslucentRule = class: "opacity ${hyprland.transparent-opacity} ${hyprland.transparent-opacity}, class:^(${class})$";
 
   mkBind = key: action: "${key}, ${action}";
   mkBinds = key: actions: builtins.map (mkBind key) actions;
 
   # These functions are used to generate the keybindings.info file for Rofi
   fixupNoMod = key: ''${builtins.replaceStrings ["<-"] ["<"] key}'';
-  mkBindHelpKey = key: ''${builtins.replaceStrings ["$mainMod" " " ","] ["${cfg.keybindings.main-mod}" "-" ""] key}'';
+  mkBindHelpKey = key: ''${builtins.replaceStrings ["$mainMod" " " ","] ["${hyprland.keybindings.main-mod}" "-" ""] key}'';
   mkBindHelpAction = action: ''${builtins.replaceStrings [","] [""] action}'';
   mkBindHelp = key: action: "<${mkBindHelpKey key}>: ${mkBindHelpAction action}";
   mkBindsHelp = key: actions: builtins.map fixupNoMod (builtins.map (mkBindHelp key) actions);
 
-  mkWallpaper = monitor: "${monitor}, ${config.home.homeDirectory}/NixFlake/wallpapers/${cfg.theme}.png";
+  mkWallpaper = monitor: "${monitor}, ${config.home.homeDirectory}/NixFlake/wallpapers/${hyprland.theme}.png";
 
   mkDelayedStart = str: "hyprctl dispatch exec \"sleep 5s && ${str}\"";
-  delayed-exec = builtins.map mkDelayedStart cfg.autostart.delayed;
+  delayed-exec = builtins.map mkDelayedStart hyprland.autostart.delayed;
   mkExec = prog: "${prog}";
 
   always-bind = {
@@ -55,6 +54,7 @@
     "$mainMod, F" = ["fullscreen"];
     "$mainMod, C" = ["exec, clipman pick --tool=rofi"];
     "$mainMod, G" = ["togglegroup"];
+    "$mainMod, L" = ["exec, loginctl lock-session"];
     "ALT, tab" = ["changegroupactive"];
     "$mainMod, tab" = ["workspace, previous"];
 
@@ -70,13 +70,7 @@
     "$mainMod CTRL, k" = ["movewindow, u"];
     "$mainMod CTRL, d" = ["movewindow, d"];
 
-    # Rofi
-    "$mainMod, D" = ["exec, ~/NixFlake/config/rofi/menus/systemd-podman.fish"];
-    "$mainMod, O" = ["exec, ~/NixFlake/config/rofi/menus/lectures.fish"];
-    "$mainMod, M" = ["exec, ~/NixFlake/config/rofi/menus/keybinds.fish"];
-    "$mainMod, U" = ["exec, ~/NixFlake/config/rofi/menus/vpn.fish"];
-
-    # TODO: Somehow write this more compact?
+    # TODO: Somehow write this more compact? Try to use workspace 0 instead of 10...
     "$mainMod, 1" = ["workspace, 1"];
     "$mainMod, 2" = ["workspace, 2"];
     "$mainMod, 3" = ["workspace, 3"];
@@ -131,7 +125,7 @@
 in {
   options.modules.hyprland = import ./options.nix {inherit lib mylib;};
 
-  config = lib.mkIf cfg.enable {
+  config = lib.mkIf hyprland.enable {
     # Some assertion is not possible if HM is used standalone,
     # because nixosConfig won't be available.
     assertions = [
@@ -179,7 +173,7 @@ in {
       ];
 
       file = {
-        ".config/hypr/keybindings.info".text = lib.pipe (cfg.keybindings.bindings
+        ".config/hypr/keybindings.info".text = lib.pipe (hyprland.keybindings.bindings
           // always-bind) [
           (builtins.mapAttrs mkBindsHelp)
           builtins.attrValues
@@ -218,7 +212,7 @@ in {
 
           background = [
             {
-              path = "~/NixFlake/wallpapers/${cfg.theme}.png";
+              path = "~/NixFlake/wallpapers/${hyprland.theme}.png";
               blur_passes = 3;
               blur_size = 10;
               monitor = "";
@@ -284,8 +278,8 @@ in {
           splash = false;
           splash_offset = 2.0;
 
-          preload = "~/NixFlake/wallpapers/${cfg.theme}.png";
-          wallpaper = lib.pipe cfg.monitors [
+          preload = "~/NixFlake/wallpapers/${hyprland.theme}.png";
+          wallpaper = lib.pipe hyprland.monitors [
             builtins.attrNames
             (builtins.map mkWallpaper)
           ];
@@ -318,6 +312,7 @@ in {
       };
 
       # Notification service
+      # TODO: Allow setting the dunst monitor
       dunst = {
         enable = true;
 
@@ -341,7 +336,7 @@ in {
           };
 
           urgency_normal = {
-            frame_color = "#${color.light.yellow}";
+            frame_color = "#${color.light.green}";
           };
 
           urgency_critical = {
@@ -357,7 +352,7 @@ in {
       xwayland.enable = true;
 
       settings = {
-        "$mainMod" = "${cfg.keybindings.main-mod}";
+        "$mainMod" = "${hyprland.keybindings.main-mod}";
 
         general = {
           gaps_in = 5;
@@ -370,9 +365,13 @@ in {
 
         group = {
           groupbar = {
+            enabled = true;
             render_titles = false;
             font_size = 10;
             gradients = false;
+
+            "col.active" = "rgb(${color.dark.lavender})";
+            "col.inactive" = "rgba(${color.dark.base}AA)";
           };
 
           "col.border_active" = "rgb(${color.dark.lavender})";
@@ -380,8 +379,8 @@ in {
         };
 
         input = {
-          kb_layout = "${cfg.kb-layout}";
-          kb_variant = "${cfg.kb-variant}";
+          kb_layout = "${hyprland.kb-layout}";
+          kb_variant = "${hyprland.kb-variant}";
           kb_model = "pc104";
           kb_options = "";
           kb_rules = "";
@@ -395,18 +394,18 @@ in {
           sensitivity = 0; # -1.0 - 1.0, 0 means no modification.
         };
 
-        monitor = lib.pipe cfg.monitors [
+        monitor = lib.pipe hyprland.monitors [
           (builtins.mapAttrs mkMonitor)
           builtins.attrValues
         ];
 
-        workspace = lib.pipe cfg.workspaces [
+        workspace = lib.pipe hyprland.workspaces [
           (builtins.mapAttrs mkWorkspaces)
           builtins.attrValues
           builtins.concatLists
         ];
 
-        bind = lib.pipe (cfg.keybindings.bindings
+        bind = lib.pipe (hyprland.keybindings.bindings
           // always-bind) [
           (builtins.mapAttrs mkBinds)
           builtins.attrValues
@@ -419,20 +418,20 @@ in {
           builtins.concatLists
         ];
 
-        exec-once = lib.pipe (always-exec ++ cfg.autostart.immediate ++ delayed-exec) [
+        exec-once = lib.pipe (always-exec ++ hyprland.autostart.immediate ++ delayed-exec) [
           (builtins.map mkExec)
         ];
 
         windowrulev2 =
-          lib.pipe cfg.workspacerules [
+          lib.pipe hyprland.workspacerules [
             (builtins.mapAttrs mkWorkspaceRules)
             builtins.attrValues
             builtins.concatLists
           ]
-          ++ lib.pipe cfg.floating [
+          ++ lib.pipe hyprland.floating [
             (builtins.map mkFloatingRule)
           ]
-          ++ lib.pipe cfg.transparent [
+          ++ lib.pipe hyprland.transparent [
             (builtins.map mkTranslucentRule)
           ];
 
@@ -451,13 +450,20 @@ in {
 
         misc = {
           # Say no to the anime girl
+          disable_hyprland_logo = true;
           force_default_wallpaper = 0;
+
+          disable_splash_rendering = true;
+          font_family = "${color.font}";
         };
 
         # Because those are not windows, but layouts,
         # we have to blur them explicitly
         layerrule = [
           "blur,rofi"
+          "ignorealpha 0.001,rofi"
+          # "dimaround,rofi"
+
           "blur,waybar"
         ];
 

home/modules/kitty/default.nix

@@ -4,16 +4,12 @@
   lib,
   mylib,
   ...
-}:
-with lib;
-with mylib.modules; let
-  cfg = config.modules.kitty;
-  color = config.modules.color;
-  # cfgnv = config.modules.neovim;
+}: let
+  inherit (config.modules) kitty color;
 in {
   options.modules.kitty = import ./options.nix {inherit lib mylib;};
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf kitty.enable {
     programs.kitty = {
       enable = true;
       shellIntegration.enableFishIntegration = true;
@@ -72,11 +68,11 @@ in {
         macos_titlebar_color = "system";
 
         # Tab bar colors
-        active_tab_foreground = "#${color.light.base}";
-        active_tab_background = "#${color.light.mauve}";
-        inactive_tab_foreground = "#${color.light.text}";
-        inactive_tab_background = "#${color.light.overlay0}";
-        tab_bar_background = "#${color.light.surface1}";
+        active_tab_foreground = "#${color.dark.base}";
+        active_tab_background = "#${color.dark.lavender}";
+        inactive_tab_foreground = "#${color.dark.text}";
+        inactive_tab_background = "#${color.dark.crust}";
+        tab_bar_background = "#${color.light.base}";
 
         # Color for marks (marked text in the terminal)
         mark1_foreground = "#${color.light.base}";

home/modules/latex/default.nix

@@ -4,14 +4,12 @@
   mylib,
   pkgs,
   ...
-}:
-with lib;
-with mylib.modules; let
-  cfg = config.modules.latex;
+}: let
+  inherit (config.modules) latex;
 in {
   options.modules.latex = import ./options.nix {inherit lib mylib;};
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf latex.enable {
     home = {
       packages = with pkgs; [
         texliveFull

home/modules/neovim/default.nix

@@ -6,14 +6,12 @@
   mylib,
   pkgs,
   ...
-}:
-with lib;
-with mylib.modules; let
-  cfg = config.modules.neovim;
+}: let
+  inherit (config.modules) neovim color;
 in {
   options.modules.neovim = import ./options.nix {inherit lib mylib;};
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf neovim.enable {
     home = {
       file.".config/neovide/config.toml".source = ./neovide_config.ini;
       file.".config/vale/.vale.ini".source = ./vale_config.ini;
@@ -25,7 +23,7 @@ in {
 
       packages = with pkgs;
         builtins.concatLists [
-          (optionals cfg.neovide [neovide])
+          (lib.optionals neovim.neovide [neovide])
 
           [
             (pkgs.ripgrep.override {withPCRE2 = true;})
@@ -35,19 +33,21 @@ in {
             lua51Packages.xml2lua # For rest
             lua51Packages.mimetypes # For rest
             lua51Packages.jsregexp # For tree-sitter
+            nodejs
 
             # Language servers
             clang-tools_18
             clojure-lsp
             cmake-language-server
             haskell-language-server
+            ltex-ls
             lua-language-server
             nil
             nixd
             pyright
             rust-analyzer
             texlab
-            ltex-ls
+            typescript
 
             # Linters
             checkstyle # java
@@ -77,24 +77,25 @@ in {
       defaultEditor = true;
       enableMan = false; # Nixvim man pages
       luaLoader.enable = true; # NOTE: Experimental
-      viAlias = cfg.alias;
-      vimAlias = cfg.alias;
+      viAlias = neovim.alias;
+      vimAlias = neovim.alias;
 
-      colorschemes.catppuccin = {
-        enable = true;
-        settings = {
-          flavour = "mocha"; # latte, frappe, macchiato, mocha
-          background = {
-            light = "latte";
-            dark = "mocha";
-          };
-        };
-      };
+      # Configured using plugin
+      # colorschemes.catppuccin = {
+      #   enable = true;
+      #   settings = {
+      #     flavour = "mocha"; # latte, frappe, macchiato, mocha
+      #     background = {
+      #       light = "latte";
+      #       dark = "mocha";
+      #     };
+      #   };
+      # };
 
       performance.byteCompileLua = {
         enable = true;
         configs = true;
-        initLua = false; # When debugging init.lua turn this off
+        initLua = true; # When debugging init.lua turn this off
         nvimRuntime = true;
         plugins = true;
       };
@@ -263,6 +264,52 @@ in {
                 light = "latte";
                 dark = "mocha";
               };
+              default_integrations = false;
+              integrations = {
+                cmp = true;
+                dashboard = true;
+                diffview = true;
+                flash = true;
+                gitsigns = true;
+                mini.enabled = true;
+                neotree = true;
+                noice = true;
+                native_lsp = {
+                  enabled = true;
+                  virtual_text = {
+                    errors = ["italic"];
+                    hints = ["italic"];
+                    warnings = ["italic"];
+                    information = ["italic"];
+                    ok = ["italic"];
+                  };
+                  underlines = {
+                    errors = ["underline"];
+                    hints = ["underline"];
+                    warnings = ["underline"];
+                    information = ["underline"];
+                    ok = ["underline"];
+                  };
+                  inlay_hints = {
+                    background = true;
+                  };
+                };
+                navic = {
+                  enabled = true;
+                  # custom_bg = "crust";
+                };
+                notify = true;
+                treesitter = true;
+                ufo = true;
+                rainbow_delimiters = true;
+                telescope.enabled = true;
+                lsp_trouble = true;
+                illuminate = {
+                  enabled = true;
+                  lsp = true;
+                };
+                which_key = true;
+              };
             };
           };
 
@@ -1051,37 +1098,50 @@ in {
             '';
             opts = let
               bubbles = ''
-                (function()
-                  -- Wrap this in an immediately invoked function and require catppuccin
-                  -- because we need "colors" in the scope.
-                  -- For this, the catppuccin plugin must be installed,
-                  -- just setting the neovim colorscheme isn't enough.
-                  local colors = require("catppuccin.palettes").get_palette("mocha")
-
-                  -- Use :lua print(vim.inspect(require("catppuccin.palettes").get_palette("mocha"))) to list colors
-                  return {
+                {
                   normal = {
-                      a = { fg = colors.base, bg = colors.lavender },
-                      b = { fg = colors.text, bg = colors.crust },
-                      c = { fg = colors.text },
+                    a = { fg = "#${color.dark.base}", bg = "#${color.dark.lavender}", gui = "bold" },
+                    b = { fg = "#${color.dark.text}", bg = "#${color.dark.crust}" },
+                    c = { fg = "#${color.dark.text}", bg = "NONE" },
                   },
 
-                    insert = { a = { fg = colors.base, bg = colors.blue } },
-                    visual = { a = { fg = colors.base, bg = colors.teal } },
-                    replace = { a = { fg = colors.base, bg = colors.red } },
+                  insert = {
+                    a = { fg = "#${color.dark.base}", bg = "#${color.dark.green}", gui = "bold" },
+                    b = { fg = "#${color.dark.green}", bg = "#${color.dark.crust}" },
+                  },
+
+                  visual = {
+                    a = { fg = "#${color.dark.base}", bg = "#${color.dark.mauve}", gui = "bold" },
+                    b = { fg = "#${color.dark.mauve}", bg = "#${color.dark.crust}" },
+                  },
+
+                  replace = {
+                    a = { fg = "#${color.dark.base}", bg = "#${color.dark.red}", gui = "bold" },
+                    b = { fg = "#${color.dark.red}", bg = "#${color.dark.crust}" },
+                  },
+
+                  -- terminal = {
+                  --   a = { fg = "#${color.dark.base}", bg = "#${color.dark.green}", gui = "bold" },
+                  --   b = { fg = "#${color.dark.green}", bg = "#${color.dark.crust}" },
+                  -- },
+
+                  command = {
+                    a = { fg = "#${color.dark.base}", bg = "#${color.dark.peach}", gui = "bold" },
+                    b = { fg = "#${color.dark.peach}", bg = "#${color.dark.crust}" },
+                  },
 
                   inactive = {
-                      a = { fg = colors.text, bg = colors.base },
-                      b = { fg = colors.text, bg = colors.base },
-                      c = { fg = colors.text },
+                    a = { fg = "#${color.dark.text}", bg = "#${color.dark.base}" },
+                    b = { fg = "#${color.dark.text}", bg = "#${color.dark.base}" },
+                    c = { fg = "#${color.dark.text}", bg = "NONE" },
                   },
                 }
-                end)()
               '';
             in {
               extensions = ["fzf" "lazy" "neo-tree" "oil" "quickfix" "toggleterm" "trouble"];
 
               options = {
+                # theme = "catppuccin";
                 theme.__raw = bubbles;
                 always_divide_middle = true;
                 globalstatus = true;
@@ -1505,19 +1565,17 @@ in {
             opts = {
               line.__raw = ''
                 function(line)
-                  local colors = require("catppuccin.palettes").get_palette("mocha")
-
-                  local base = { fg = colors.base, bg = colors.base }
-                  local crust = { fg = colors.crust, bg = colors.crust }
-                  local text = { fg = colors.text, bg = colors.crust }
-                  local lavender = { fg = colors.lavender, bg = colors.lavender }
+                  local base = { fg = "#${color.dark.base}", bg = "#${color.dark.base}" }
+                  local crust = { fg = "#${color.dark.crust}", bg = "#${color.dark.crust}" }
+                  local text = { fg = "#${color.dark.text}", bg = "#${color.dark.crust}" }
+                  local lavender = { fg = "#${color.dark.lavender}", bg = "#${color.dark.lavender}" }
 
                   local numtabs = vim.call("tabpagenr", "$")
 
                   return {
                     -- Head
                     {
-                        { " NEOVIM ", hl = { fg = colors.base, bg = colors.lavender } },
+                        { " NEOVIM ", hl = { fg = "#${color.dark.base}", bg = "#${color.dark.lavender}", style = "bold" } },
 
                         -- The separator gets a foreground and background fill (each have fg + bg).
                         -- line.sep("", lavender, lavender),
@@ -1526,7 +1584,7 @@ in {
                     -- Tabs
                     line.tabs().foreach(function(tab)
                       -- Switch out the start separator instead of the ending one because the last separator is different
-                      local hl = tab.is_current() and { fg = colors.lavender, bg = colors.crust, style = "bold" } or text
+                      local hl = tab.is_current() and { fg = "#${color.dark.lavender}", bg = "#${color.dark.crust}", style = "bold" } or text
                       local sep_start = tab.number() == 1 and "" or ""
                       local sep_end = tab.number() == numtabs and "" or ""
 
@@ -1858,6 +1916,15 @@ in {
             config = mkDefaultConfig name;
           };
 
+          typescript-tools = rec {
+            name = "typescript-tools";
+            pkg = pkgs.vimPlugins.typescript-tools-nvim;
+            lazy = true;
+            ft = ["javascript" "typescript"];
+            dependencies = [_plenary lspconfig];
+            config = mkDefaultConfig name;
+          };
+
           _promise = {
             name = "promise";
             pkg = pkgs.vimPlugins.promise-async;
@@ -2020,6 +2087,7 @@ in {
           treesitter # AST based syntax highlighting + indentation
           trim # Trim whitespace
           trouble # Diagnostics window
+          typescript-tools # Typescript tsserver LSP
           ufo # Code folding
           vimtex # LaTeX support
           wakatime # Time tracking

home/modules/nnn/default.nix

@@ -1,19 +1,16 @@
 # TODO: Expose some settings
 {
   config,
-  nixosConfig,
   lib,
   mylib,
   pkgs,
   ...
-}:
-with lib;
-with mylib.modules; let
-  cfg = config.modules.nnn;
+}: let
+  inherit (config.modules) nnn;
 in {
   options.modules.nnn = import ./options.nix {inherit lib mylib;};
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf nnn.enable {
     home.sessionVariables = {
       # NNN_TERMINAL = "alacritty";
       # NNN_FIFO = "/tmp/nnn.fifo"; # For nnn preview

home/modules/rofi/default.nix

@@ -7,14 +7,133 @@
   pkgs,
   ...
 }: let
-  cfg = config.modules.rofi;
+  inherit (config.modules) rofi color;
 in {
   options.modules.rofi = import ./options.nix {inherit lib mylib;};
 
-  config = lib.mkIf cfg.enable {
-    home.packages = with pkgs; [
-      rofi-wayland
-    ];
+  config = lib.mkIf rofi.enable {
+    programs.rofi = {
+      enable = true;
+      package = pkgs.rofi-wayland;
+      terminal = "kitty";
+      font = "${color.font} 14";
+      location = "center";
+      cycle = true;
+
+      extraConfig = {
+        modi = "run,drun,ssh,filebrowser";
+        show-icons = true;
+        icon-theme = "Papirus";
+        drun-display-format = "{icon} {name}";
+        disable-history = false;
+        hide-scrollbar = true;
+        display-drun = " apps ";
+        display-run = " run ";
+        display-filebrowser = " file ";
+        display-ssh = " ssh ";
+        sidebar-mode = false;
+      };
+
+      # bg-col: rgba(239, 241, 245, 60%);
+      theme = let
+        inherit (config.lib.formats.rasi) mkLiteral;
+
+        mkColor = color: mkLiteral "#{color}";
+      in {
+        "*" = {
+          bg = mkLiteral "rgba(239, 241, 245, 0.3)";
+          hl = mkLiteral "#${color.dark.lavender}";
+          text = mkLiteral "#${color.dark.base}";
+          trans = mkLiteral "rgba(255, 255, 255, 0)";
+        };
+
+        "element-text,element-icon,mode-switcher" = {
+          background-color = mkLiteral "inherit";
+          text-color = mkLiteral "inherit";
+        };
+
+        "window" = {
+          height = 480;
+          width = 700;
+          # border-style = mkLiteral "solid";
+          border = mkLiteral "2 solid 2 solid 2 solid 2 solid";
+          border-radius = 6;
+          border-color = mkLiteral "@hl";
+          background-color = mkLiteral "@bg";
+        };
+
+        "mainbox" = {
+          background-color = mkLiteral "@trans";
+        };
+
+        "message" = {
+          background-color = mkLiteral "@trans";
+        };
+
+        "error-message" = {
+          background-color = mkLiteral "@trans";
+          margin = mkLiteral "0px 0px 20px 0px";
+        };
+
+        "textbox" = {
+          background-color = mkLiteral "@trans";
+          padding = 6;
+          margin = mkLiteral "20px 20px 0px 20px";
+          border-radius = 3;
+        };
+
+        "inputbar" = {
+          children = builtins.map mkLiteral ["prompt" "entry"];
+          background-color = mkLiteral "@trans";
+        };
+
+        "prompt" = {
+          background-color = mkLiteral "@hl";
+          padding = 6;
+          text-color = mkLiteral "@text";
+          border-radius = 3;
+          margin = mkLiteral "20px 0px 0px 20px";
+        };
+
+        "entry" = {
+          padding = 6;
+          margin = mkLiteral "20px 20px 0px 10px";
+          text-color = mkLiteral "@text";
+          background-color = mkLiteral "@trans";
+          border = mkLiteral "2 solid 2 solid 2 solid 2 solid";
+          border-radius = 3;
+          border-color = mkLiteral "@hl";
+        };
+
+        "listview" = {
+          # border = mkLiteral "0px 0px 0px";
+          padding = 0;
+          margin = mkLiteral "10px 20px 20px 20px";
+          columns = 1;
+          background-color = mkLiteral "@trans";
+          border = mkLiteral "2 solid 2 solid 2 solid 2 solid";
+          border-radius = 3;
+          border-color = mkLiteral "@hl";
+        };
+
+        "element" = {
+          padding = 5;
+          margin = 0;
+          background-color = mkLiteral "@trans";
+          text-color = mkLiteral "@text";
+          border-radius = 3;
+        };
+
+        "element-icon" = {
+          size = 25;
+        };
+
+        "element selected" = {
+          background-color = mkLiteral "@hl";
+          text-color = mkLiteral "@text";
+        };
+      };
+    };
 
     modules.hyprland.keybindings = let
       power-menu =
@@ -23,18 +142,23 @@ in {
         {
           "Poweroff" = "poweroff";
           "Reboot" = "reboot";
+          "Lock" = "loginctl lock-session";
           "Reload Hyprland" = "hyprctl reload";
           "Exit Hyprland" = "hyprctl dispatch exit";
         };
+
+      vpn-menu = pkgs.writeScript "rofi-menu-vpn" (builtins.readFile ./menus/vpn.fish);
+      keybinds-menu = pkgs.writeScript "rofi-menu-keybinds" (builtins.readFile ./menus/keybinds.fish);
+
+      # TODO: Expand on that
+      lectures-menu = pkgs.writeScript "rofi-menu-lectures" (builtins.readFile ./menus/lectures.fish);
     in {
       bindings = {
         "$mainMod, escape" = ["exec, \"${power-menu}\""];
+        "$mainMod, O" = ["exec, \"${lectures-menu}\""];
+        "$mainMod, M" = ["exec, \"${keybinds-menu}\""];
+        "$mainMod, U" = ["exec, \"${vpn-menu}\""];
       };
     };
-
-    home.file = {
-      ".config/rofi/config.rasi".source = ../../../config/rofi/rofi.rasi;
-      ".config/rofi/colors.rasi".source = ../../../config/rofi/colors/${cfg.theme}.rasi;
-    };
   };
 }

home/modules/rofi/menus/lectures.fish

@@ -12,4 +12,6 @@ if test -z $DECK
     exit
 end
 
+# TODO: $LECTURE and $DECK seem fine, but nothing opens:
+#       error: Could not determine file type.
 xdg-open ~/Notes/TU/$LECTURE/Lecture/$DECK

home/modules/waybar/default.nix

@@ -2,18 +2,13 @@
   config,
   lib,
   mylib,
-  pkgs,
   ...
-}:
-with lib;
-with mylib.modules; let
-  cfg = config.modules.waybar;
-  color = config.modules.color;
-  hyprcfg = config.modules.hyprland;
+}: let
+  inherit (config.modules) color waybar;
 in {
   options.modules.waybar = import ./options.nix {inherit lib mylib;};
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf waybar.enable {
     programs.waybar = {
       enable = true;
       systemd.enable = true;
@@ -22,16 +17,18 @@ in {
         mainBar = {
           layer = "top";
           position = "top";
-          height = 40;
-          spacing = 4;
-          output = ["${cfg.monitor}"];
+          height = 36;
+          spacing = 0;
+          margin = "10px 10px 0px 10px";
+          fixed-center = true;
+          output = ["${waybar.monitor}"];
 
           modules-left = ["custom/launcher" "user" "hyprland/window"];
           modules-center = ["hyprland/workspaces"];
           modules-right = ["pulseaudio" "network" "cpu" "memory" "temperature" "clock" "tray"];
 
           "custom/launcher" = {
-            format = "<span font='${color.font}'></span> ";
+            format = "<span></span>";
             interval = "once";
             on-click = "rofi -drun-show-actions -show drun";
           };
@@ -46,33 +43,33 @@ in {
           };
 
           "pulseaudio" = {
-            format = "<span font='${color.font}'></span> {volume}%";
-            format-muted = "<span font='${color.font}'></span> ";
+            format = "<span></span> {volume}%";
+            format-muted = "<span></span> ";
             on-click = "kitty ncpamixer -t o";
           };
 
           "network" = {
-            format = "<span font='${color.font}'></span> {ipaddr}";
-            format-disconnected = "<span font='${color.font}'></span> ";
+            format = "<span></span> {ipaddr}";
+            format-disconnected = "<span></span> ";
             interface = "enp8s0";
             tooltip-format = "{ifname} via {gwaddr}";
           };
 
           cpu = {
-            format = "<span font='${color.font}'></span> {load}%";
+            format = "<span></span> {load}%";
           };
 
           memory = {
-            format = "<span font='${color.font}'></span> {percentage}%";
+            format = "<span></span> {percentage}%";
           };
 
           temperature = {
-            format = "<span font='${color.font}'></span> {temperatureC}°C";
+            format = "<span></span> {temperatureC}°C";
             thermal-zone = 3;
           };
 
           clock = {
-            format = "<span font='${color.font}'></span> {:%H:%M}";
+            format = "<span></span> {:%H:%M}";
             timezone = "Europe/Berlin";
             tooltip-format = "<tt><small>{calendar}</small></tt>";
           };
@@ -87,35 +84,44 @@ in {
 
       style = ''
         /*Order is Top-Right-Bottom-Left for combined properties*/
-        window#waybar {
+        * {
+          color: #${color.dark.base};
           font-family: ${color.font};
           font-weight: bold;
-          color: #${color.light.base};
-
-          /*Can't use color.light.base here because waybar doesn't support rrggbbaa*/
-          background-color: rgba(239, 241, 245, 0.5);
         }
 
+        window#waybar {
+          border-style: solid;
+          border-width: 2px;
+          border-radius: 6px;
+          border-color: #${color.dark.lavender};
+
+          /*Can't use color.light.base here because waybar doesn't support rrggbbaa :(*/
+          background-color: rgba(239, 241, 245, 0.3);
+        }
+
+        /*Colors*/
+        #custom-launcher   {background-color: #${color.dark.lavender};}
+        #user              {background-color: #${color.dark.pink};}
+        #window            {background-color: #${color.dark.mauve};}
+        #workspaces button {background-color: #${color.dark.lavender};}
+        #pulseaudio        {background-color: #${color.dark.maroon};}
+        #network           {background-color: #${color.dark.peach};}
+        #cpu               {background-color: #${color.dark.yellow};}
+        #memory            {background-color: #${color.dark.green};}
+        #temperature       {background-color: #${color.dark.teal};}
+        #clock             {background-color: #${color.dark.sky};}
+        #tray              {background-color: #${color.dark.lavender};}
+
         /*Square Widgets*/
         #custom-launcher,
         #workspaces button,
         #tray {
           padding: 0px 10px 0px 10px;
-          margin: 5px 5px 5px 5px;
           border-radius: 6px;
           color: #${color.light.base};
         }
 
-        #workspaces button:hover {
-          color: #${color.light.pink};
-        }
-
-        /*Tux Icon*/
-        #custom-launcher {
-          font-size: 18px;
-          padding-right: 0px;
-        }
-
         /*Rectangle Widgets*/
         #user,
         #window,
@@ -130,39 +136,29 @@ in {
           border-radius: 6px;
         }
 
-        /*Colors*/
+        /*make window module transparent when no windows present*/
+        window#waybar.empty #window {
+            background-color: transparent;
+        }
+
+        /*Tux Icon*/
         #custom-launcher {
-          background-color: #${color.light.flamingo};
-        }
-        #user {
-          background-color: #${color.light.pink};
-        }
-        #window {
-          background-color: #${color.light.mauve};
+          font-size: 26px;
+          padding-right: 10px;
+          margin: 0px 5px 0px 0px;
+          color: #${color.light.text};
         }
+
         #workspaces button {
-          background-color: #${color.light.red};
+          margin: 0px 5px 0px 5px;
         }
-        #pulseaudio {
-          background-color: #${color.light.maroon};
-        }
-        #network {
-          background-color: #${color.light.peach};
-        }
-        #cpu {
-          background-color: #${color.light.yellow};
-        }
-        #memory {
-          background-color: #${color.light.green};
-        }
-        #temperature {
-          background-color: #${color.light.teal};
-        }
-        #clock {
-          background-color: #${color.light.sky};
+
+        #workspaces button:hover {
+          color: #${color.light.pink};
         }
+
         #tray {
-          background-color: #${color.light.sapphire};
+          margin: 0px 0px 0px 5px;
         }
       '';
     };

home/modules/zathura/default.nix

@@ -3,17 +3,17 @@
   lib,
   mylib,
   ...
-}:
-with lib;
-with mylib.modules; let
-  cfg = config.modules.zathura;
+}: let
+  inherit (config.modules) zathura;
 in {
   options.modules.zathura = import ./options.nix {inherit lib mylib;};
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf zathura.enable {
     programs.zathura = {
       enable = true;
 
+      # TODO: Set database backend
+      # TODO: Use color module
       options = {
         # Catppuccin Latte
         default-fg = "#4C4F69";

system/default.nix

@@ -46,15 +46,6 @@ with mylib.networking; {
     };
   };
 
-  # NOTE: This should be handled by my local DNS
-  # networking.hosts = {
-  #   "192.168.86.50" = ["nixinator"];
-  #   "192.168.86.4" = ["proxmox"];
-  #   "192.168.86.20" = ["truenas"];
-  #   "192.168.86.5" = ["opnsense"];
-  #   "192.168.86.25" = ["servenix"];
-  # };
-
   # Enable flakes
   nix = {
     package = pkgs.nixVersions.stable;
@@ -64,18 +55,12 @@ with mylib.networking; {
 
     settings.trusted-users = ["root" "christoph"];
 
-    # Keep nix-shell from garbage collection for direnv (keep-outputs + keep-derivations)
-    # NOTE: nix-direnv use nix or use flake should do this automatically
-    # keep-outputs = true
-    # keep-derivations = true
-
     # Auto garbage-collect and optimize store
     # gc.automatic = true; # NOTE: Disabled for "nh clean"
     gc.options = "--delete-older-than 5d";
     settings.auto-optimise-store = true;
     optimise.automatic = true;
 
-    # TODO: I do not understand this
     # This will add your inputs as registries, making operations with them (such
     # as nix shell nixpkgs#name) consistent with your flake inputs.
     # (Registry contains flakes)
@@ -88,9 +73,7 @@ with mylib.networking; {
   # Bootloader/Kernel stuff
   boot = {
     kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
-    # kernelPackages = pkgs.linuxPackages_zen; # NOTE: Only set for nixinator
-    # kernelPackages = pkgs.linuxPackages_latest; # The package set that includes the kernel and modules
-    kernelParams = ["mitigations=off"]; # I don't care about security regarding spectre/meltdown
+    kernelParams = ["mitigations=off"]; # I don't care
 
     # plymouth.enable = true;
     loader = {
@@ -118,23 +101,13 @@ with mylib.networking; {
       hyprlock = {};
     };
 
-    # TODO: Replace with polkit
     sudo.enable = true;
     sudo.extraRules = [
       {
         users = ["christoph"];
         commands = [
-          # Launch gamemode without password because it is annoying
-          # {
-          #   command = "/etc/profiles/per-user/christoph/bin/gamemoderun";
-          #   options = [ "SETENV" "NOPASSWD" ];
-          # }
-          # {
-          #   command = "${pkgs.gamemode}/libexec/cpugovctl";
-          #   options = [ "SETENV" "NOPASSWD" ];
-          # }
-
-          # We allow running flatpak without password so flatpaks can be installed from the hm config (needs sudo)
+          # We allow running flatpak without password
+          # so flatpaks can be installed from the hm config
           {
             command = "/run/current-system/sw/bin/flatpak";
             options = ["SETENV" "NOPASSWD"];
@@ -198,7 +171,7 @@ with mylib.networking; {
       textEditor = "neovide.desktop"; # Helix.desktop
       videoPlayer = "mpv.desktop";
       imageViewer = "imv.desktop";
-      audioPlayer = "vlc.desktop"; # mov.desktop
+      audioPlayer = "mpv.desktop"; # mov.desktop
     in {
       "inode/directory" = "nnn.desktop";
 
@@ -245,8 +218,9 @@ with mylib.networking; {
     enableDefaultPackages = true; # Some default fonts for unicode coverage
     fontDir.enable = true; # Puts fonts to /run/current-system/sw/share/X11/fonts
 
-    # Font packages go here
-    # NOTE: Don't do this with HomeManager as I need the fonts in the fontdir for flatpak apps
+    # Font packages go here.
+    # They are installed system-wide so they land in fontdir,
+    # this is required for flatpak to find them.
     packages = with pkgs; [
       # Monospace fonts
       (nerdfonts.override {
@@ -262,8 +236,6 @@ with mylib.networking; {
       lxgw-wenkai
     ];
 
-    # TODO: Check if this works
-    # TODO: Conflicts with kde?
     fontconfig = {
       enable = true;
       antialias = true;
@@ -296,7 +268,8 @@ with mylib.networking; {
       "lp"
       "libvirtd"
     ];
-    shell = pkgs.fish; # TODO: Is this needed if programs.fish.enable = true?
+    shell = pkgs.fish;
+
     # We do this with HomeManager
     # packages = with pkgs; [];
   };
@@ -335,25 +308,12 @@ with mylib.networking; {
     # egl-wayland
   ];
 
-  # NOTE: Gnome
-  # TODO: Identify all the crap
-  # Remove these packages that come by default with GNOME
-  # environment.gnome.excludePackages = with pkgs.gnome; [
-  #   # epiphany # gnome webbrowser, could be good with new version
-  #   gnome-maps
-  #   gnome-contacts
-  # ];
-
-  # NOTE: Plasma
-  # TODO: Identify all the crap
-  # environment.plasma5.excludePackages = with pkgs.libsForQt5; [
-  # ];
-
-  # It is preferred to use the module (if it exists) over environment.systemPackages, as some extra configs are applied.
-  # I would prefer to use HomeManager for some of these but the modules don't exist (yet)
+  # It is preferred to use the module (if it exists) over environment.systemPackages,
+  # as some extra configs are applied.
+  # I would prefer to use HomeManager for some of these but the modules don't exist (yet).
   programs = {
     adb.enable = true;
-    dconf.enable = true; # NOTE: Also needed for Plasma Wayland (GTK theming)
+    dconf.enable = true;
     fish.enable = true;
     firejail.enable = true; # Use to run app in network namespace (e.g. through vpn)
     git.enable = true;
@@ -376,7 +336,6 @@ with mylib.networking; {
     # ausweisapp.openFirewall = true; # Directly set port in firewall
   };
 
-  # sound.enable = false; # Alsa, seems to conflict with PipeWire # NOTE: Deprecated
   hardware.pulseaudio.enable = false; # Get off my lawn
 
   # List services that you want to enable:
@@ -388,9 +347,7 @@ with mylib.networking; {
       alsa.support32Bit = true;
       pulse.enable = true;
       jack.enable = false;
-
-      wireplumber.enable = true; # Probably the default
-      # media-session.enable = false; # NOTE: Deprecated
+      wireplumber.enable = true;
     };
 
     # Enable the X11 windowing system.
@@ -416,6 +373,7 @@ with mylib.networking; {
         dell-b1160w # TODO: Broken
       ];
     };
+
     avahi = {
       enable = false; # Network printers
       nssmdns4 = true;
@@ -441,13 +399,6 @@ with mylib.networking; {
       enable = true;
       package = lib.mkForce pkgs.gnome3.gvfs;
     };
-    # packagekit.enable = true; # KDE Discover/Gnome Software
-
-    # samba = {
-    #   package = pkgs.samba4Full;
-    #   enable = true;
-    #   openFirewall = true;
-    # };
 
     udev = {
       packages = with pkgs; [
@@ -455,10 +406,7 @@ with mylib.networking; {
       ];
     };
 
-    gnome.gnome-keyring.enable = true; # TODO: Is probably also needed for Plasma (some apps require it)
-    # gnome.sushi.enable = true;
-    # gnome.gnome-settings-daemon.enable = true;
-    # gnome.gnome-online-accounts.enable = true; # Probably Gnome enables this
+    gnome.gnome-keyring.enable = true; # Some apps require this
   };
 
   virtualisation = {
@@ -484,13 +432,9 @@ with mylib.networking; {
 
     oci-containers.backend = "podman"; # "docker" or "podman"
     libvirtd.enable = true;
-
-    # Follow steps from https://nixos.wiki/wiki/WayDroid
-    # waydroid.enable = true;
-    # lxd.enable = true;
   };
 
-  # NOTE: Current system was installed on 22.05, do not change
+  # The current system was installed on 22.05, do not change.
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave