chore: refactor user modules

2025-07-27 22:50:25 +02:00
parent af1a606c1a
commit d200079cdb
94 changed files with 832 additions and 665 deletions
@@ -2,109 +2,90 @@
  pkgs,
  inputs,
  lib,
-  config,
  ...
 }:
-with lib; let
-  cfg = config.modules.packages;
-in {
-  options.modules.packages.emacsPackage = mkOption {
-    type = types.package;
-    default = pkgs.emacs;
-  };
-  config.home.packages = with pkgs; let
-    scripts = import ../scripts {
-      inherit pkgs;
-      config.emacsPkg = cfg.emacsPackage;
-    };
-  in
-    [
-      flatpak
+with lib; {
+  home.packages = with pkgs; [
+    # Terminal stuff
+    duf
+    ffmpeg
+    ripgrep-all
+    unzip

-      # LSP servers
-      bash-language-server
-      docker-language-server
-      kdePackages.qtdeclarative # For QML LSP
-      nil # Nix
-      python3 # for Emacs and LSP
-      yaml-language-server # Yaml (Docker, GitHub Actions, ...)
+    # Fonts
+    #nerdfonts
+    noto-fonts-cjk-sans
+    noto-fonts-cjk-serif
+    tibetan-machine

-      # Terminal stuff
-      duf
-      ffmpeg
-      ripgrep-all
-      unzip
+    # Browsers
+    amfora

-      # Fonts
-      #nerdfonts
-      noto-fonts-cjk-sans
-      noto-fonts-cjk-serif
-      tibetan-machine
+    # Media
+    ani-cli
+    audacity
+    plexamp
+    plex-desktop
+    spicetify-cli
+    spotify
+    pavucontrol # Volume control

-      # Browsers
-      amfora
+    # Social
+    vesktop # Discord alternative that works well with wayland
+    element-desktop
+    signal-desktop-bin

-      # Media
-      ani-cli
-      audacity
-      plexamp
-      plex-desktop
-      spicetify-cli
-      spotify
-      pavucontrol # Volume control
+    # Misc
+    bitwarden
+    gplates
+    libnotify
+    nextcloud-client
+    onlyoffice-bin
+    scrcpy
+    syncthing
+    watchmate
+    inputs.zen-browser.packages.${system}.default
+    inputs.pumo-system-info.packages.${system}.default
+    inputs.quickshell.packages.${system}.default

-      # Social
-      vesktop # Discord alternative that works well with wayland
-      element-desktop
-      signal-desktop-bin
+    # Games
+    atlauncher
+    heroic
+    modrinth-app
+    openmw
+    openttd-jgrpp
+    moonlight-qt

-      # Misc
-      bitwarden
-      gplates
-      libnotify
-      nextcloud-client
-      onlyoffice-bin
-      scrcpy
-      syncthing
-      watchmate
-      inputs.zen-browser.packages.${system}.default
-      inputs.pumo-system-info.packages.${system}.default
-      inputs.quickshell.packages.${system}.default
+    # Gnome stuff
+    gnome-tweaks
+    gnomeExtensions.docker
+    gnomeExtensions.syncthing-indicator
+    gnomeExtensions.tray-icons-reloaded
+    gthumb

-      # Games
-      atlauncher
-      heroic
-      modrinth-app
-      openmw
-      openttd-jgrpp
-      moonlight-qt
+    # Graphics
+    inkscape
+    gimp
+    gimpPlugins.fourier
+    gimpPlugins.farbfeld

-      # Emacs stuff
-      emacs-all-the-icons-fonts
+    # Dev
+    devenv
+    dive # A tool for exploring each layer in a docker image
+    grype # Vulnerability scanner for container images and filesystems
+    kicad # Working on my custom keyboard
+    podman-desktop
+    podman-compose
+    tectonic # better LaTeX engine
+    virt-manager
+    zeal

-      # Gnome stuff
-      gnome-tweaks
-      gnomeExtensions.docker
-      gnomeExtensions.syncthing-indicator
-      gnomeExtensions.tray-icons-reloaded
-      gthumb
-
-      # Graphics
-      inkscape
-      gimp
-      gimpPlugins.fourier
-      gimpPlugins.farbfeld
-
-      # Dev
-      devenv
-      dive # A tool for exploring each layer in a docker image
-      grype # Vulnerability scanner for container images and filesystems
-      kicad # Working on my custom keyboard
-      podman-desktop
-      podman-compose
-      tectonic # better LaTeX engine
-      virt-manager
-      zeal
-    ]
-    ++ scripts;
+    ## LSP servers
+    bash-language-server
+    docker-language-server
+    kdePackages.qtdeclarative # For QML LSP
+    nil # Nix
+    python3 # for Emacs and LSP
+    yaml-language-server # Yaml (Docker, GitHub Actions, ...)
+  ];
 }