Some more cleanup ig

configuration.nix

@@ -12,10 +12,12 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ./modules/packages.nix
+    ./modules/flatpak.nix
-    ./modules/services.nix
     ./modules/gdm-monitors.nix
+    ./modules/gnome.nix
+    ./modules/packages.nix
     ./modules/programs.nix
+    ./modules/services.nix
   ];
 
   chaotic.mesa-git.enable = true;
@@ -41,7 +43,7 @@
         windows = {
           "w" = {
             title = "Windows";
-            efiDeviceHandle = "HD(1,GPT,ee23cd4d-b501-4b9d-9ca0-971fa6be44cf,0x800,0x32000)"; # ?????????
+            efiDeviceHandle = "HD3b";
           };
         };
       };
@@ -123,6 +125,20 @@
         "ventoy-gtk3-1.1.07"
       ];
     };
+    overlays = [
+      (final: prev: {
+        nautilus = prev.nautilus.overrideAttrs (nprev: {
+          buildInputs =
+            nprev.buildInputs
+            ++ (with pkgs.gst_all_1; [
+              gst-plugins-good
+              gst-plugins-bad
+              gst-plugins-ugly
+              gst-plugins-base
+            ]);
+        });
+      })
+    ];
   };
 
   environment = {
@@ -130,6 +146,11 @@
       NIXOS_OZONE_WL = "1";
       LIBVIRT_DEFAULT_URI = "qemu:///system";
     };
+    systemPackages = [
+      pkgs.libheif
+      pkgs.libheif.out
+    ];
+    pathsToLink = [ "share/thumbnailers" ];
   };
 
   hardware = {

flake.lock

@@ -9,11 +9,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1762525922,
+        "lastModified": 1762966292,
-        "narHash": "sha256-DX0/D0o/lUQRMCuoAoJiXkDqoISLSgkQAlsPqPS4i6M=",
+        "narHash": "sha256-WJtAHPDOJRd/ecQJBFyuyqBIbDG0ocdQuBGPBRRsgew=",
         "owner": "chaotic-cx",
         "repo": "nyx",
-        "rev": "863eed9a7967cb307ecdcdba0c7b87db6a314865",
+        "rev": "037d0bb4a6b51609e66fab2221d3bca2d3b5fa3b",
         "type": "github"
       },
       "original": {
@@ -45,11 +45,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762463325,
+        "lastModified": 1762787259,
-        "narHash": "sha256-33YUsWpPyeBZEWrKQ2a1gkRZ7i0XCC/2MYpU6BVeQSU=",
+        "narHash": "sha256-t2U/GLLXHa2+kJkwnFNRVc2fEJ/lUfyZXBE5iKzJdcs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0562fef070a1027325dd4ea10813d64d2c967b39",
+        "rev": "37a3d97f2873e0f68711117c34d04b7c7ead8f4e",
         "type": "github"
       },
       "original": {
@@ -67,11 +67,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762452596,
+        "lastModified": 1762856455,
-        "narHash": "sha256-Iaga+mkwWnWa6FxsAYknpHzeP344VCKGkdudX420LgA=",
+        "narHash": "sha256-x7zgteJWIlbVexL2ubOadUXKlHSjh0RAjLO1KfWdgpU=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "99919fd35e70c1b18ce948d5329928d751031312",
+        "rev": "29a671ae20223d182eaf54b963a735230497c2f9",
         "type": "github"
       },
       "original": {
@@ -120,11 +120,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1762363567,
+        "lastModified": 1762844143,
-        "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=",
+        "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4",
+        "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4",
         "type": "github"
       },
       "original": {
@@ -136,11 +136,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1762616480,
+        "lastModified": 1763101017,
-        "narHash": "sha256-vLjEPWbntbVNKIDbQW7fUj6y3bkIJaSCuy6sJ2cXeNI=",
+        "narHash": "sha256-Vr92WyDB5r7b5M8FtSevqoMi1jUbTplILUIWbWvQpYk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8ea611305a7db12c49446f9c40c609614419ec4b",
+        "rev": "534d5ee716a5f547efa4f3563d3592527e30329c",
         "type": "github"
       },
       "original": {
@@ -165,11 +165,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1762483116,
+        "lastModified": 1762915112,
-        "narHash": "sha256-Z8EVsTH10BjCdFyPxbUu5jBV+HGL39rh9+beQcnNRm0=",
+        "narHash": "sha256-d9j1g8nKmYDHy+/bIOPQTh9IwjRliqaTM0QLHMV92Ic=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "9de55b59b6aaadbd9dbf223765a835239b767ee5",
+        "rev": "aa1e85921cfa04de7b6914982a94621fbec5cc02",
         "type": "github"
       },
       "original": {

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