Restructure system-modules and bump flake.lock

- Consolidate enable flags into a `packages` attribute in all host system-modules.nix files. - Rename package option paths to `config.packages.<name>.enable` in modules/core/packages/packages.nix. - Update locked revisions (lastModified, narHash, rev) for firefox‑addons and stylix in flake.lock.
Add Jan UI and selective Flatpak options
2025-11-30 14:05:19 +01:00 · 2025-11-30 13:26:51 +01:00
11 changed files with 277 additions and 333 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -143,11 +143,11 @@
      },
      "locked": {
        "dir": "pkgs/firefox-addons",
-        "lastModified": 1764389080,
-        "narHash": "sha256-BEn1Z9Uv20u2DS6wzLKdzx5kAzynM3wMQ9JnGf3VJvI=",
+        "lastModified": 1764475519,
+        "narHash": "sha256-12TAT2CD+L+wdIHszQnPyu8zGSBxcazoVZmP6UQjk6s=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "897437c09bf22ce59efb3370f0783d0c662dba31",
+        "rev": "1172c39fb0e847a7f036e480d94f629edcf2cf46",
        "type": "gitlab"
      },
      "original": {
@@ -523,11 +523,11 @@
        "tinted-zed": "tinted-zed"
      },
      "locked": {
-        "lastModified": 1764254063,
-        "narHash": "sha256-V22JzkaTLF/GAL2LgqvOsJhAr8JbJsKaD8hnHjGwXfE=",
+        "lastModified": 1764451865,
+        "narHash": "sha256-d4tfTm3ccp4rx7W1WW1BzSkTgEeMd4cZvhAJ7lP145M=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "a1451bc40413870f0c7b576b751c1ca92055e323",
+        "rev": "8a096ccec828c68bfb870295d186ad994ea0ae2c",
        "type": "github"
      },
      "original": {
--- a/hosts/Garand-Desktop/home-modules.nix
+++ b/hosts/Garand-Desktop/home-modules.nix
@@ -2,65 +2,55 @@ _: {
  /*
  Development editors and IDEs
  */
-  # VSCodium: a free and open-source "demicrosofted" VSCode
-  vscodium.enable = false;
-  # Zed Editor: a modern, high‑performance code editor
+  vscodium.enable = false; # VSCodium: a free and open-source "demicrosofted" VSCode
+
  zed-editor = {
-    # Enable Zed Editor
-    enable = true;
-    # Remote Server: enable remote editing capabilities
-    remote-server = true;
+    enable = true; # Zed Editor: a modern, high‑performance code editor
+    remote-server = true; # Remote Server: enable remote editing capabilities
  };

  /*
  Web browsers
  */
-  # Librewolf: a privacy-focused Firefox fork
-  librewolf.enable = true;
-  # Ungoogled Chromium: a privacy-focused Chromium fork
-  ungoogled-chromium.enable = true;
+  librewolf.enable = true; # Librewolf: a privacy-focused Firefox fork
+
+  ungoogled-chromium.enable = true; # Ungoogled Chromium: a privacy-focused Chromium fork

  /*
  System utilities
  */
-  # Btop: a resource monitor for the terminal
-  btop.enable = true;
-  # Cava: terminal audio visualizer
-  cava.enable = false;
-  # Fastfetch: a fast system information tool
-  fastfetch.enable = true;
+  btop.enable = true; # Btop: a resource monitor for the terminal
+
+  cava.enable = false; # Cava: terminal audio visualizer
+
+  fastfetch.enable = true; # Fastfetch: a fast system information tool

  /*
  Communication and synchronization
  */
-  # KDE Connect: integrate your phone and desktop
-  kdeconnect.enable = false;
-  # Nextcloud Client: sync files with a Nextcloud server
-  nextcloud-client.enable = true;
-  # Vesktop: a community‑driven Discord client
-  vesktop.enable = true;
+  kdeconnect.enable = false; # KDE Connect: integrate your phone and desktop
+
+  nextcloud-client.enable = true; # Nextcloud Client: sync files with a Nextcloud server
+
+  vesktop.enable = true; # Vesktop: a community‑driven Discord client

  /*
  Gaming
  */
-  # Lutris: an open gaming platform
-  lutris.enable = false;
+  lutris.enable = false; # Lutris: an open gaming platform

  /*
  Media recording and streaming
  */
-  # OBS Studio: streaming and recording software
-  obs-studio.enable = false;
+  obs-studio.enable = false; # OBS Studio: streaming and recording software

  /*
  Office suite
  */
-  # OnlyOffice: an office suite compatible with Microsoft formats
-  onlyoffice.enable = true;
+  onlyoffice.enable = true; # OnlyOffice: an office suite compatible with Microsoft formats

  /*
  Learning tools
  */
-  # Anki: spaced‑repetition flashcard program
-  anki.enable = true;
+  anki.enable = true; # Anki: spaced‑repetition flashcard program
 }
--- a/hosts/Garand-Desktop/system-modules.nix
+++ b/hosts/Garand-Desktop/system-modules.nix
@@ -2,86 +2,75 @@ _: {
  /*
  Container & Packaging
  */
-  # Docker: container runtime and management
-  docker.enable = true;
-  # Distrobox: containerized development environments
-  distrobox.enable = false;
-  # Flatpak: universal packaging system for Linux
-  flatpak.enable = true;
-  # Lazydocker: simple TUI for Docker
-  lazydocker.enable = false;
+  docker.enable = true; # Docker: container runtime and management
+  flatpak = {
+    enable = true; # Flatpak: universal packaging system for Linux
+    packages = {
+      sober = false; # Roblox client
+      warehouse = true; # Flatpak manager
+      flatseal = true; # Flatpak permissions manager
+    };
+  };

  /*
  Gaming
  */
-  # GameMode: optimizes system performance for gaming
-  gamemode.enable = true;
-  # Gamescope: micro-compositor for games
-  gamescope.enable = false;
-  # Prism Launcher: Minecraft modded launcher
-  prismlauncher.enable = false;
-  # Steam: platform for buying and playing games
-  steam.enable = true;
-  # SpaceCadet Pinball: classic pinball game
-  spaceCadetPinball.enable = true;
-  # TTY Solitaire: terminal based solitaire game
-  ttySolitaire.enable = true;
+  gamemode.enable = true; # GameMode: optimizes system performance for gaming
+  gamescope.enable = false; # Gamescope: micro‑compositor for games
+  steam.enable = true; # Steam: platform for buying and playing games
+
+  packages = {
+    /*
+    Container & Packaging
+    */
+    distrobox.enable = false; # Distrobox: containerized development environments
+    lazydocker.enable = false; # Lazydocker: simple TUI for Docker
+
+    /*
+    Gaming
+    */
+    prismlauncher.enable = false; # Prism Launcher: Minecraft modded launcher
+    spaceCadetPinball.enable = true; # SpaceCadet Pinball: classic pinball game
+    ttySolitaire.enable = true; # TTY Solitaire: terminal‑based solitaire game

    /*
    Development Tools
    */
-  # Exercism: coding practice platform
-  exercism.enable = true;
-  # Gedit: GNOME text editor
-  gedit.enable = false;
-  # Lazygit: simple TUI for git
-  lazygit.enable = false;
-  # OpenCode: tools for coding and development
-  opencode.enable = true;
+    exercism.enable = true; # Exercism: coding practice platform
+    lazygit.enable = false; # Lazygit: simple TUI for Git
+    opencode.enable = true; # OpenCode: tools for coding and development
+    jan.enable = true; # Jan: AI chat UI

    /*
    Communication & Collaboration
    */
-  # Mattermost: open-source Slack alternative
-  mattermost.enable = true;
-  # Slack: team communication and collaboration tool
-  slack.enable = true;
-  # Tutanota: secure email client
-  tutanota.enable = true;
+    mattermost.enable = true; # Mattermost: open‑source Slack alternative
+    slack.enable = true; # Slack: team communication and collaboration tool
+    tutanota.enable = true; # Tutanota: secure email client

    /*
    Productivity / Knowledge Management
    */
-  # Bitwarden: password manager (desktop)
-  bitwarden.enable = false;
-  # Iotas: lightweight notes manager
-  iotas.enable = true;
-  # Logseq: knowledge base and outliner
-  logseq.enable = false;
+    bitwarden.enable = false; # Bitwarden: password manager (desktop)
+    iotas.enable = true; # Iotas: lightweight notes manager
+    logseq.enable = false; # Logseq: knowledge base and outliner

    /*
    Media & Graphics
    */
-  # Affinity: professional graphics suite
-  affinity.enable = false;
-  # Eye of GNOME: image viewer
-  eyeOfGnome.enable = true;
-  # FreeTube: privacy‑friendly YouTube client
-  freetube.enable = false;
-  # GIMP: gnu image manipulation program
-  gimp.enable = false;
-  # Kdenlive: video editing software
-  kdenlive.enable = false;
-  # Plex: media player and server client
-  plex.enable = true;
+    affinity.enable = false; # Affinity: professional graphics suite
+    eyeOfGnome.enable = true; # Eye of GNOME: image viewer
+    freetube.enable = false; # FreeTube: privacy‑friendly YouTube client
+    gimp.enable = false; # GIMP: GNU Image Manipulation Program
+    kdenlive.enable = false; # Kdenlive: video editing software
+    plex.enable = true; # Plex: media player and server client

    /*
    Utilities / Misc
    */
-  # Eddie AirVPN: VPN client
-  eddieAirVPN.enable = true;
-  # Galculator: simple calculator
-  galculator.enable = true;
-  # Winboat: Windows remote desktop via RDP
-  winboat.enable = false;
+    eddieAirVPN.enable = true; # Eddie AirVPN: VPN client
+    galculator.enable = true; # Galculator: simple calculator
+    gedit.enable = false; # Gedit: GNOME text editor
+    winboat.enable = false; # Winboat: Windows remote desktop via RDP
+  };
 }
--- a/hosts/Garand-Laptop/home-modules.nix
+++ b/hosts/Garand-Laptop/home-modules.nix
@@ -2,65 +2,55 @@ _: {
  /*
  Development editors and IDEs
  */
-  # VSCodium: a free and open-source "demicrosofted" VSCode
-  vscodium.enable = false;
-  # Zed Editor: a modern, high‑performance code editor
+  vscodium.enable = false; # VSCodium: a free and open-source "demicrosofted" VSCode
+
  zed-editor = {
-    # Enable Zed Editor
-    enable = true;
-    # Remote Server: enable remote editing capabilities
-    remote-server = true;
+    enable = true; # Zed Editor: a modern, high‑performance code editor
+    remote-server = true; # Remote Server: enable remote editing capabilities
  };

  /*
  Web browsers
  */
-  # Librewolf: a privacy-focused Firefox fork
-  librewolf.enable = true;
-  # Ungoogled Chromium: a privacy-focused Chromium fork
-  ungoogled-chromium.enable = true;
+  librewolf.enable = true; # Librewolf: a privacy-focused Firefox fork
+
+  ungoogled-chromium.enable = true; # Ungoogled Chromium: a privacy-focused Chromium fork

  /*
  System utilities
  */
-  # Btop: a resource monitor for the terminal
-  btop.enable = true;
-  # Cava: terminal audio visualizer
-  cava.enable = false;
-  # Fastfetch: a fast system information tool
-  fastfetch.enable = true;
+  btop.enable = true; # Btop: a resource monitor for the terminal
+
+  cava.enable = false; # Cava: terminal audio visualizer
+
+  fastfetch.enable = true; # Fastfetch: a fast system information tool

  /*
  Communication and synchronization
  */
-  # KDE Connect: integrate your phone and desktop
-  kdeconnect.enable = false;
-  # Nextcloud Client: sync files with a Nextcloud server
-  nextcloud-client.enable = true;
-  # Vesktop: a community‑driven Discord client
-  vesktop.enable = true;
+  kdeconnect.enable = false; # KDE Connect: integrate your phone and desktop
+
+  nextcloud-client.enable = true; # Nextcloud Client: sync files with a Nextcloud server
+
+  vesktop.enable = true; # Vesktop: a community‑driven Discord client

  /*
  Gaming
  */
-  # Lutris: an open gaming platform
-  lutris.enable = false;
+  lutris.enable = false; # Lutris: an open gaming platform

  /*
  Media recording and streaming
  */
-  # OBS Studio: streaming and recording software
-  obs-studio.enable = false;
+  obs-studio.enable = false; # OBS Studio: streaming and recording software

  /*
  Office suite
  */
-  # OnlyOffice: an office suite compatible with Microsoft formats
-  onlyoffice.enable = true;
+  onlyoffice.enable = true; # OnlyOffice: an office suite compatible with Microsoft formats

  /*
  Learning tools
  */
-  # Anki: spaced‑repetition flashcard program
-  anki.enable = true;
+  anki.enable = true; # Anki: spaced‑repetition flashcard program
 }
--- a/hosts/Garand-Laptop/system-modules.nix
+++ b/hosts/Garand-Laptop/system-modules.nix
@@ -2,86 +2,75 @@ _: {
  /*
  Container & Packaging
  */
-  # Docker: container runtime and management
-  docker.enable = true;
-  # Distrobox: containerized development environments
-  distrobox.enable = false;
-  # Flatpak: universal packaging system for Linux
-  flatpak.enable = true;
-  # Lazydocker: simple TUI for Docker
-  lazydocker.enable = false;
+  docker.enable = true; # Docker: container runtime and management
+  flatpak = {
+    enable = true; # Flatpak: universal packaging system for Linux
+    packages = {
+      sober = false; # Roblox client
+      warehouse = true; # Flatpak manager
+      flatseal = true; # Flatpak permissions manager
+    };
+  };

  /*
  Gaming
  */
-  # GameMode: optimizes system performance for gaming
-  gamemode.enable = true;
-  # Gamescope: micro-compositor for games
-  gamescope.enable = false;
-  # Prism Launcher: Minecraft modded launcher
-  prismlauncher.enable = false;
-  # Steam: platform for buying and playing games
-  steam.enable = true;
-  # SpaceCadet Pinball: classic pinball game
-  spaceCadetPinball.enable = true;
-  # TTY Solitaire: terminal based solitaire game
-  ttySolitaire.enable = true;
+  gamemode.enable = true; # GameMode: optimizes system performance for gaming
+  gamescope.enable = false; # Gamescope: micro‑compositor for games
+  steam.enable = true; # Steam: platform for buying and playing games
+
+  packages = {
+    /*
+    Container & Packaging
+    */
+    distrobox.enable = false; # Distrobox: containerized development environments
+    lazydocker.enable = false; # Lazydocker: simple TUI for Docker
+
+    /*
+    Gaming
+    */
+    prismlauncher.enable = false; # Prism Launcher: Minecraft modded launcher
+    spaceCadetPinball.enable = true; # SpaceCadet Pinball: classic pinball game
+    ttySolitaire.enable = true; # TTY Solitaire: terminal‑based solitaire game

    /*
    Development Tools
    */
-  # Exercism: coding practice platform
-  exercism.enable = true;
-  # Gedit: GNOME text editor
-  gedit.enable = false;
-  # Lazygit: simple TUI for git
-  lazygit.enable = false;
-  # OpenCode: tools for coding and development
-  opencode.enable = true;
+    exercism.enable = true; # Exercism: coding practice platform
+    lazygit.enable = false; # Lazygit: simple TUI for Git
+    opencode.enable = true; # OpenCode: tools for coding and development
+    jan.enable = true; # Jan: AI chat UI

    /*
    Communication & Collaboration
    */
-  # Mattermost: open-source Slack alternative
-  mattermost.enable = true;
-  # Slack: team communication and collaboration tool
-  slack.enable = true;
-  # Tutanota: secure email client
-  tutanota.enable = true;
+    mattermost.enable = true; # Mattermost: open‑source Slack alternative
+    slack.enable = true; # Slack: team communication and collaboration tool
+    tutanota.enable = true; # Tutanota: secure email client

    /*
    Productivity / Knowledge Management
    */
-  # Bitwarden: password manager (desktop)
-  bitwarden.enable = false;
-  # Iotas: lightweight notes manager
-  iotas.enable = true;
-  # Logseq: knowledge base and outliner
-  logseq.enable = false;
+    bitwarden.enable = false; # Bitwarden: password manager (desktop)
+    iotas.enable = true; # Iotas: lightweight notes manager
+    logseq.enable = false; # Logseq: knowledge base and outliner

    /*
    Media & Graphics
    */
-  # Affinity: professional graphics suite
-  affinity.enable = false;
-  # Eye of GNOME: image viewer
-  eyeOfGnome.enable = true;
-  # FreeTube: privacy‑friendly YouTube client
-  freetube.enable = false;
-  # GIMP: gnu image manipulation program
-  gimp.enable = false;
-  # Kdenlive: video editing software
-  kdenlive.enable = false;
-  # Plex: media player and server client
-  plex.enable = true;
+    affinity.enable = false; # Affinity: professional graphics suite
+    eyeOfGnome.enable = true; # Eye of GNOME: image viewer
+    freetube.enable = false; # FreeTube: privacy‑friendly YouTube client
+    gimp.enable = false; # GIMP: GNU Image Manipulation Program
+    kdenlive.enable = false; # Kdenlive: video editing software
+    plex.enable = true; # Plex: media player and server client

    /*
    Utilities / Misc
    */
-  # Eddie AirVPN: VPN client
-  eddieAirVPN.enable = true;
-  # Galculator: simple calculator
-  galculator.enable = true;
-  # Winboat: Windows remote desktop via RDP
-  winboat.enable = false;
+    eddieAirVPN.enable = true; # Eddie AirVPN: VPN client
+    galculator.enable = true; # Galculator: simple calculator
+    gedit.enable = false; # Gedit: GNOME text editor
+    winboat.enable = false; # Winboat: Windows remote desktop via RDP
+  };
 }
--- a/hosts/default/home-modules.nix
+++ b/hosts/default/home-modules.nix
@@ -2,65 +2,55 @@ _: {
  /*
  Development editors and IDEs
  */
-  # VSCodium: a free and open-source "demicrosofted" VSCode
-  vscodium.enable = false;
-  # Zed Editor: a modern, high‑performance code editor
+  vscodium.enable = false; # VSCodium: a free and open-source "demicrosofted" VSCode
+
  zed-editor = {
-    # Enable Zed Editor
-    enable = true;
-    # Remote Server: enable remote editing capabilities
-    remote-server = true;
+    enable = true; # Zed Editor: a modern, high‑performance code editor
+    remote-server = true; # Remote Server: enable remote editing capabilities
  };

  /*
  Web browsers
  */
-  # Librewolf: a privacy-focused Firefox fork
-  librewolf.enable = true;
-  # Ungoogled Chromium: a privacy-focused Chromium fork
-  ungoogled-chromium.enable = true;
+  librewolf.enable = true; # Librewolf: a privacy-focused Firefox fork
+
+  ungoogled-chromium.enable = true; # Ungoogled Chromium: a privacy-focused Chromium fork

  /*
  System utilities
  */
-  # Btop: a resource monitor for the terminal
-  btop.enable = true;
-  # Cava: terminal audio visualizer
-  cava.enable = false;
-  # Fastfetch: a fast system information tool
-  fastfetch.enable = true;
+  btop.enable = true; # Btop: a resource monitor for the terminal
+
+  cava.enable = false; # Cava: terminal audio visualizer
+
+  fastfetch.enable = true; # Fastfetch: a fast system information tool

  /*
  Communication and synchronization
  */
-  # KDE Connect: integrate your phone and desktop
-  kdeconnect.enable = false;
-  # Nextcloud Client: sync files with a Nextcloud server
-  nextcloud-client.enable = true;
-  # Vesktop: a community‑driven Discord client
-  vesktop.enable = true;
+  kdeconnect.enable = false; # KDE Connect: integrate your phone and desktop
+
+  nextcloud-client.enable = true; # Nextcloud Client: sync files with a Nextcloud server
+
+  vesktop.enable = true; # Vesktop: a community‑driven Discord client

  /*
  Gaming
  */
-  # Lutris: an open gaming platform
-  lutris.enable = false;
+  lutris.enable = false; # Lutris: an open gaming platform

  /*
  Media recording and streaming
  */
-  # OBS Studio: streaming and recording software
-  obs-studio.enable = false;
+  obs-studio.enable = false; # OBS Studio: streaming and recording software

  /*
  Office suite
  */
-  # OnlyOffice: an office suite compatible with Microsoft formats
-  onlyoffice.enable = true;
+  onlyoffice.enable = true; # OnlyOffice: an office suite compatible with Microsoft formats

  /*
  Learning tools
  */
-  # Anki: spaced‑repetition flashcard program
-  anki.enable = true;
+  anki.enable = true; # Anki: spaced‑repetition flashcard program
 }
--- a/hosts/default/system-modules.nix
+++ b/hosts/default/system-modules.nix
@@ -2,86 +2,75 @@ _: {
  /*
  Container & Packaging
  */
-  # Docker: container runtime and management
-  docker.enable = true;
-  # Distrobox: containerized development environments
-  distrobox.enable = false;
-  # Flatpak: universal packaging system for Linux
-  flatpak.enable = true;
-  # Lazydocker: simple TUI for Docker
-  lazydocker.enable = false;
+  docker.enable = true; # Docker: container runtime and management
+  flatpak = {
+    enable = true; # Flatpak: universal packaging system for Linux
+    packages = {
+      sober = false; # Roblox client
+      warehouse = true; # Flatpak manager
+      flatseal = true; # Flatpak permissions manager
+    };
+  };

  /*
  Gaming
  */
-  # GameMode: optimizes system performance for gaming
-  gamemode.enable = true;
-  # Gamescope: micro-compositor for games
-  gamescope.enable = false;
-  # Prism Launcher: Minecraft modded launcher
-  prismlauncher.enable = false;
-  # Steam: platform for buying and playing games
-  steam.enable = true;
-  # SpaceCadet Pinball: classic pinball game
-  spaceCadetPinball.enable = true;
-  # TTY Solitaire: terminal based solitaire game
-  ttySolitaire.enable = true;
+  gamemode.enable = true; # GameMode: optimizes system performance for gaming
+  gamescope.enable = false; # Gamescope: micro‑compositor for games
+  steam.enable = true; # Steam: platform for buying and playing games
+
+  packages = {
+    /*
+    Container & Packaging
+    */
+    distrobox.enable = false; # Distrobox: containerized development environments
+    lazydocker.enable = false; # Lazydocker: simple TUI for Docker
+
+    /*
+    Gaming
+    */
+    prismlauncher.enable = false; # Prism Launcher: Minecraft modded launcher
+    spaceCadetPinball.enable = true; # SpaceCadet Pinball: classic pinball game
+    ttySolitaire.enable = true; # TTY Solitaire: terminal‑based solitaire game

    /*
    Development Tools
    */
-  # Exercism: coding practice platform
-  exercism.enable = true;
-  # Gedit: GNOME text editor
-  gedit.enable = false;
-  # Lazygit: simple TUI for git
-  lazygit.enable = false;
-  # OpenCode: tools for coding and development
-  opencode.enable = true;
+    exercism.enable = true; # Exercism: coding practice platform
+    lazygit.enable = false; # Lazygit: simple TUI for Git
+    opencode.enable = true; # OpenCode: tools for coding and development
+    jan.enable = true; # Jan: AI chat UI

    /*
    Communication & Collaboration
    */
-  # Mattermost: open-source Slack alternative
-  mattermost.enable = true;
-  # Slack: team communication and collaboration tool
-  slack.enable = true;
-  # Tutanota: secure email client
-  tutanota.enable = true;
+    mattermost.enable = true; # Mattermost: open‑source Slack alternative
+    slack.enable = true; # Slack: team communication and collaboration tool
+    tutanota.enable = true; # Tutanota: secure email client

    /*
    Productivity / Knowledge Management
    */
-  # Bitwarden: password manager (desktop)
-  bitwarden.enable = false;
-  # Iotas: lightweight notes manager
-  iotas.enable = true;
-  # Logseq: knowledge base and outliner
-  logseq.enable = false;
+    bitwarden.enable = false; # Bitwarden: password manager (desktop)
+    iotas.enable = true; # Iotas: lightweight notes manager
+    logseq.enable = false; # Logseq: knowledge base and outliner

    /*
    Media & Graphics
    */
-  # Affinity: professional graphics suite
-  affinity.enable = false;
-  # Eye of GNOME: image viewer
-  eyeOfGnome.enable = true;
-  # FreeTube: privacy‑friendly YouTube client
-  freetube.enable = false;
-  # GIMP: gnu image manipulation program
-  gimp.enable = false;
-  # Kdenlive: video editing software
-  kdenlive.enable = false;
-  # Plex: media player and server client
-  plex.enable = true;
+    affinity.enable = false; # Affinity: professional graphics suite
+    eyeOfGnome.enable = true; # Eye of GNOME: image viewer
+    freetube.enable = false; # FreeTube: privacy‑friendly YouTube client
+    gimp.enable = false; # GIMP: GNU Image Manipulation Program
+    kdenlive.enable = false; # Kdenlive: video editing software
+    plex.enable = true; # Plex: media player and server client

    /*
    Utilities / Misc
    */
-  # Eddie AirVPN: VPN client
-  eddieAirVPN.enable = true;
-  # Galculator: simple calculator
-  galculator.enable = true;
-  # Winboat: Windows remote desktop via RDP
-  winboat.enable = false;
+    eddieAirVPN.enable = true; # Eddie AirVPN: VPN client
+    galculator.enable = true; # Galculator: simple calculator
+    gedit.enable = false; # Gedit: GNOME text editor
+    winboat.enable = false; # Winboat: Windows remote desktop via RDP
+  };
 }
--- a/modules/core/flatpak.nix
+++ b/modules/core/flatpak.nix
@@ -2,16 +2,27 @@
  lib,
  config,
  ...
-}: {
+}: let
+  mkFlatpakPackage = name: pkgId: {
+    options.flatpak.packages.${name} = lib.mkEnableOption "Flatpak: ${name}";
+
+    config.services.flatpak.packages =
+      lib.mkIf config.flatpak.packages.${name} [pkgId];
+  };
+
+  flatpakPackages = {
+    sober = "org.vinegarhq.Sober";
+    warehouse = "io.github.flattool.Warehouse";
+    flatseal = "com.github.tchx84.Flatseal";
+  };
+in {
  options.flatpak.enable = lib.mkEnableOption "Flatpak";

  config.services.flatpak = lib.mkIf config.flatpak.enable {
    enable = true;
    update.onActivation = true;
-    packages = [
-      # "org.vinegarhq.Sober"
-      "io.github.flattool.Warehouse"
-      "com.github.tchx84.Flatseal"
-    ];
+    packages = [];
  };
+
+  imports = builtins.attrValues (builtins.mapAttrs mkFlatpakPackage flatpakPackages);
 }
--- a/modules/core/packages/packages.nix
+++ b/modules/core/packages/packages.nix
@@ -7,9 +7,9 @@
  ...
 }: let
  mkPackage = name: pkgsOrList: {
-    options.${name}.enable = lib.mkEnableOption name;
+    options.packages.${name}.enable = lib.mkEnableOption name;
    config.environment.systemPackages =
-      lib.mkIf config.${name}.enable
+      lib.mkIf config.packages.${name}.enable
      (lib.toList pkgsOrList);
  };

@@ -25,6 +25,7 @@
    tutanota = tutanota-desktop;
    exercism = exercism;
    opencode = opencode;
+    jan = jan;
    lazygit = lazygit;
    prismlauncher = inputs.prismlauncher-cracked.packages.${system}.default;
    spaceCadetPinball = space-cadet-pinball;
--- a/modules/home/hyprland/binds.nix
+++ b/modules/home/hyprland/binds.nix
@@ -17,6 +17,7 @@ in {
      "$modifier, D, exec, vesktop"
      "$modifier, G, exec, affinity-v3"
      "$modifier, I, exec, iotas"
+      "$modifier, J, exec, Jan"
      "$modifier, L, exec, logseq"
      "$modifier, M, exec, plexamp"
      "$modifier, N, exec, dex ${desktopEntriesPath}/garandcloud.desktop"
--- a/modules/home/librewolf/profiles/search.nix
+++ b/modules/home/librewolf/profiles/search.nix
@@ -75,13 +75,7 @@
        icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
        urls = [
          {
-            template = "https://search.nixos.org/options";
-            params = [
-              {
-                name = "query";
-                value = "{searchTerms}";
-              }
-            ];
+            template = "https://search.nixos.org/options?channel=unstable&query={searchTerms}";
          }
        ];
      };