Some more cleanup ig

modules/flatpak.nix

@@ -0,0 +1,48 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+{
+  services.flatpak = {
+    enable = true;
+    remotes = [
+      {
+        name = "flathub";
+        location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
+      }
+    ];
+    packages = [
+      {
+        appId = "com.mattjakeman.ExtensionManager";
+        origin = "flathub";
+      }
+      {
+        appId = "com.prusa3d.PrusaSlicer";
+        origin = "flathub";
+      }
+      {
+        appId = "com.github.tchx84.Flatseal";
+        origin = "flathub";
+      }
+      {
+        appId = "org.gtk.Gtk3theme.Adwaita-dark";
+        origin = "flathub";
+      }
+      {
+        appId = "org.gtk.Gtk3theme.Flat-Remix-GTK-Red-Darkest";
+        origin = "flathub";
+      }
+      {
+        appId = "com.github.iwalton3.jellyfin-media-player";
+        origin = "flathub";
+      }
+      {
+        appId = "org.freecad.FreeCAD";
+        origin = "flathub";
+      }
+    ];
+  };
+}

modules/gnome.nix

@@ -0,0 +1,43 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+{
+  environment = {
+    gnome.excludePackages = with pkgs; [
+      decibels
+      epiphany
+      geary
+      gnome-connections
+      gnome-contacts
+      gnome-logs
+      gnome-maps
+      gnome-music
+      gnome-software
+      gnome-system-monitor
+      snapshot
+      totem
+      yelp
+    ];
+
+    systemPackages = with pkgs.gnomeExtensions; [
+      # thanatophobia
+      alphabetical-app-grid
+      appindicator
+      blur-my-shell
+      control-monitor-brightness-and-volume-with-ddcutil
+      bubblemail
+      color-picker
+      dash-to-dock
+      # Not for G49 yet
+      # favorites-to-applications-grid
+      middle-click-to-close-in-overview
+      undecorate
+      user-themes
+      window-is-ready-remover
+    ];
+  };
+}

modules/packages.nix

@@ -6,155 +6,131 @@
 }:
 
 {
-  environment.gnome.excludePackages = with pkgs; [
-    decibels
-    epiphany
-    geary
-    gnome-connections
-    gnome-contacts
-    gnome-logs
-    gnome-maps
-    gnome-music
-    gnome-software
-    gnome-system-monitor
-    snapshot
-    totem
-    yelp
-  ];
-
-  environment.systemPackages = lib.flatten [
-    (with pkgs.gnomeExtensions; [
-      # thanatophobia
-      alphabetical-app-grid
-      appindicator
-      blur-my-shell
-      control-monitor-brightness-and-volume-with-ddcutil
-      bubblemail
-      color-picker
-      dash-to-dock
-      favorites-to-applications-grid
-      middle-click-to-close-in-overview
-      undecorate
-      user-themes
-    ])
-    (with pkgs; [
-      abootimg
-      amdgpu_top
-      android-tools
-      appstream
-      arch-install-scripts
-      bibata-cursors
-      binwalk
-      brscan4
-      brscan5
-      btrfs-progs
-      bubblemail
-      bzip2
-      ccache
-      curl
-      czkawka
-      ddcutil
-      discord-krisp
-      distrobox
-      docker-compose
-      dog
-      eza
-      ffmpeg
-      ffmpegthumbnailer
-      file
-      flat-remix-gnome
-      flat-remix-gtk
-      flatpak-xdg-utils
-      freerdp
-      fuse
-      fuse3
-      fwupd
-      gimp
-      gnome-tweaks
-      gnome.gvfs
-      gotop
-      gparted
-      gvfs
-      gzip
-      htop
-      i2c-tools
-      iftop
-      inkscape
-      iotop
-      jq
-      killall
-      kooha
-      krita
-      lact
-      libnotify
-      libreoffice
-      linux-firmware
-      lm_sensors
-      lrzip
-      lsof
-      lz4
-      lzip
-      lzop
-      mangohud
-      mesa-demos
-      mission-center
-      ncdu
-      nil
-      nixfmt-rfc-style
-      noisetorch
-      ntfs3g
-      nvtopPackages.amd
-      openrgb-with-all-plugins
-      papirus-icon-theme
-      pbzip2
-      pigz
-      plymouth
-      poppler-utils
-      prismlauncher-unwrapped
-      protonup-qt
-      radeontop
-      rquickshare
-      scrcpy
-      screen
-      seafile-client
-      smartmontools
-      starship
-      sushi
-      swtpm
-      telegram-desktop
-      testdisk
-      thunderbird
-      tidal-hifi
-      tldr
-      tree
-      unrar
-      unzip
-      ventoy-full-gtk
-      vesktop
-      vkbasalt
-      vlc
-      vscode-fhs
-      wev
-      weylus
-      wget
-      which
-      wine
-      wireshark
-      xfce.tumbler
-      xz
-      yt-dlp
-      zenmonitor
-      zip
-      zram-generator
-      zsh-autosuggestions
-      zsh-completions
-      zsh-history-substring-search
-      zsh-syntax-highlighting
-      zstd
-      zulu8
-      zulu17
-      zulu23
-    ])
+  environment.systemPackages = with pkgs; [
+    abootimg
+    amdgpu_top
+    android-tools
+    appstream
+    arch-install-scripts
+    bibata-cursors
+    binwalk
+    brscan4
+    brscan5
+    btrfs-progs
+    bubblemail
+    bzip2
+    ccache
+    curl
+    czkawka
+    ddcutil
+    discord-krisp
+    distrobox
+    docker-buildx
+    docker-compose
+    dog
+    eza
+    ffmpeg
+    ffmpegthumbnailer
+    file
+    flat-remix-gnome
+    flat-remix-gtk
+    flatpak-xdg-utils
+    freerdp
+    fuse
+    fuse3
+    fwupd
+    gimp
+    gnome-tweaks
+    gnome.gvfs
+    gotop
+    gparted
+    gst_all_1.gstreamer
+    gst_all_1.gst-vaapi
+    gst_all_1.gst-libav
+    gst_all_1.gst-plugins-bad
+    gst_all_1.gst-plugins-good
+    gst_all_1.gst-plugins-ugly
+    gst_all_1.gst-plugins-base
+    gvfs
+    gzip
+    htop
+    i2c-tools
+    iftop
+    inkscape
+    iotop
+    jq
+    killall
+    kooha
+    krita
+    lact
+    libnotify
+    libreoffice
+    linux-firmware
+    lm_sensors
+    lrzip
+    lsof
+    lz4
+    lzip
+    lzop
+    mangohud
+    mesa-demos
+    mission-center
+    ncdu
+    nil
+    nixfmt-rfc-style
+    noisetorch
+    ntfs3g
+    nvtopPackages.amd
+    openrgb-with-all-plugins
+    papirus-icon-theme
+    pbzip2
+    pigz
+    plymouth
+    poppler-utils
+    prismlauncher-unwrapped
+    protonup-qt
+    radeontop
+    rquickshare
+    scrcpy
+    screen
+    seafile-client
+    smartmontools
+    starship
+    sushi
+    swtpm
+    telegram-desktop
+    testdisk
+    thunderbird
+    tidal-hifi
+    tldr
+    tree
+    unrar
+    unzip
+    ventoy-full-gtk
+    vesktop
+    vkbasalt
+    vlc
+    vscode-fhs
+    wev
+    weylus
+    wget
+    which
+    wine
+    wireshark
+    xfce.tumbler
+    xz
+    yt-dlp
+    zenmonitor
+    zip
+    zram-generator
+    zsh-autosuggestions
+    zsh-completions
+    zsh-history-substring-search
+    zsh-syntax-highlighting
+    zstd
+    zulu8
+    zulu17
+    zulu23
   ];
 
   fonts = {

modules/programs.nix

@@ -83,44 +83,4 @@
     };
     virt-manager.enable = true;
   };
-
-  services.flatpak = {
-    enable = true;
-    remotes = [
-      {
-        name = "flathub";
-        location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
-      }
-    ];
-    packages = [
-      {
-        appId = "com.mattjakeman.ExtensionManager";
-        origin = "flathub";
-      }
-      {
-        appId = "com.prusa3d.PrusaSlicer";
-        origin = "flathub";
-      }
-      {
-        appId = "com.github.tchx84.Flatseal";
-        origin = "flathub";
-      }
-      {
-        appId = "org.gtk.Gtk3theme.Adwaita-dark";
-        origin = "flathub";
-      }
-      {
-        appId = "org.gtk.Gtk3theme.Flat-Remix-GTK-Red-Darkest";
-        origin = "flathub";
-      }
-      {
-        appId = "com.github.iwalton3.jellyfin-media-player";
-        origin = "flathub";
-      }
-      {
-        appId = "org.freecad.FreeCAD";
-        origin = "flathub";
-      }
-    ];
-  };
 }

modules/services.nix

@@ -86,26 +86,4 @@
       interval = "weekly";
     };
   };
-
-  systemd = {
-    services."nix-prune-generations" = {
-      description = "Keep only 5 system generations and run nix-collect-garbage";
-      serviceConfig = {
-        Type = "oneshot";
-        ExecStart = ''
-          ${pkgs.nix}/bin/nix-env -p /nix/var/nix/profiles/system --delete-generations +5 || true
-          ${pkgs.nix}/bin/nix-collect-garbage -d || true
-        '';
-        Nice = "10";
-      };
-    };
-
-    timers."nix-prune-generations" = {
-      wantedBy = [ "timers.target" ];
-      timerConfig = {
-        OnCalendar = "weekly";
-        Persistent = true;
-      };
-    };
-  };
 }