1757626796

modules/packages.nix

@@ -1,72 +1,57 @@
 { config, pkgs, ... }:
 
-let
-  unstablePkgs = import (builtins.fetchTarball "https://github.com/NixOS/nixpkgs/archive/nixos-unstable.tar.gz") {
-    config = {
-      allowUnfree = true;
-    };
-  };
-
-in
 {
-  # Allow unfree packages for the default (stable) nixpkgs.
+  # Allow unfree packages from the stable channel
   nixpkgs.config.allowUnfree = true;
 
-  # System packages
+  environment.systemPackages = with pkgs; [
-  environment.systemPackages =
+    # Browsers and comms
-    # Packages from the stable channel (pkgs)
+    ungoogled-chromium
-    with pkgs; [
+    discord
-      # Browsers and comms
+    signal-desktop-bin
-      ungoogled-chromium
-      discord
-      signal-desktop-bin
-      
-      # Development tools
-      git
-      go
-      cargo
-      rustc
-      rust-analyzer
-      rustfmt
-      nodejs_24
-      python3Full
-      openssh
-      nodePackages."pnpm"
-      openssl
-      ffmpeg
-      vscodium
-      usbutils
-      qmk-udev-rules
-      qmk
-      
-      # Desktop applications
-      bitwarden-desktop
-      vlc
-      streamrip
-      supersonic
-      nextcloud-client
-      zotero
-      prismlauncher
-      lrcget
-      slack
-      impression
-      ardour
-      krita
-      inkscape
-      streamcontroller
-      easyeffects
 
-      # Gaming
+    # Development tools
-      luanti
+    git
-      duckstation
+    go
-      dolphin-emu
+    cargo
-      ryubing
+    rustc
+    rust-analyzer
+    rustfmt
+    nodejs_24
+    python3Full
+    openssh
+    nodePackages."pnpm"
+    openssl
+    ffmpeg
+    vscodium
+    usbutils
+    qmk-udev-rules
+    qmk
 
-      # GNOME extensions
+    # Desktop applications
-      gnomeExtensions.appindicator
+    bitwarden-desktop
-    ]
+    vlc
-    # Unstable packages
+    streamrip
-    ++ (with unstablePkgs; [
+    supersonic
-       onlyoffice-desktopeditors
+    nextcloud-client
-    ]);
+    zotero
-}
+    prismlauncher
+    lrcget
+    slack
+    impression
+    ardour
+    krita
+    inkscape
+    streamcontroller
+    easyeffects
+
+    # Gaming
+    luanti
+    duckstation
+    dolphin-emu
+    ryubing
+
+    # GNOME extensions
+    gnomeExtensions.appindicator
+  ];
+}