From 8495b844ad737cbe1e680f5fc562588901efaa3f Mon Sep 17 00:00:00 2001
From: Nicole <frega.nicole@gmail.com>
Date: Fri, 1 Aug 2025 21:01:20 +0200
Subject: [PATCH] Moved programs to dedicated module, added flatpak support

---
 etc/nixos/configuration.nix   | 129 +---------------------------------
 etc/nixos/flake.nix           |   4 +-
 etc/nixos/modules/desktop.nix |   8 ++-
 3 files changed, 12 insertions(+), 129 deletions(-)

diff --git a/etc/nixos/configuration.nix b/etc/nixos/configuration.nix
index 1532619..0fef7fe 100644
--- a/etc/nixos/configuration.nix
+++ b/etc/nixos/configuration.nix
@@ -24,6 +24,7 @@ in
       ./modules/nvidia.nix
       ./modules/desktop.nix
       ./modules/ld-fix.nix
+      ./modules/programs.nix
     ];
   
 
@@ -153,132 +154,6 @@ in
     #jack.enable = true;
   };
 
-
-
-#░█▀█░█▀█░█▀▀░█░█░█▀█░█▀▀░█▀▀░█▀▀
-#░█▀▀░█▀█░█░░░█▀▄░█▀█░█░█░█▀▀░▀▀█
-#░▀░░░▀░▀░▀▀▀░▀░▀░▀░▀░▀▀▀░▀▀▀░▀▀▀
-
-  environment.systemPackages = with pkgs; [
-    # TERM UTILS #
-    kitty
-    neovim
-    wget
-    git
-    fastfetch
-    htop
-    cowsay
-    starship
-    cava
-
-    # FILES #
-    gvfs
-    nautilus
-    nautilus-python
-    nautilus-open-any-terminal
-    sushi
-    pandoc
-    texliveFull
-    fsearch
-    filezilla
-    ffmpegthumbnailer
-    zenity
-    imagemagick
-
-    # SCREENSHOTS AND RECORDING #
-    grim
-    slurp
-    swappy 
-    wl-clipboard
-    obs-studio
-
-    # HYPRLAND RELATED #
-    hyprpaper
-    swaybg
-    pkgs-unstable.hyprlock
-    swaylock
-    hypridle
-    hyprpanel
-    hyprsunset
-    hyprpolkitagent
-    waybar
-    hyprpanel
-    wlogout
-    rofi-wayland
-    libnotify
-    
-    # OFFICE #
-    onlyoffice-desktopeditors
-    obsidian
-    nextcloud-client
-    xournalpp
-    gnome-text-editor
-    gnome-calculator
-    simple-scan
-    anydesk
-    gimp
-
-    # MEDIA #
-    ffmpeg
-    mpv
-    jellyfin-media-player
-    feishin
-    spotify
-
-    # INTERNET #    
-    floorp
-    brave
-    telegram-desktop
-    element-desktop
-    (discord.override {
-      withVencord = true;
-    })
-    mailspring
-    teams-for-linux
-    qbittorrent
-    
-    # DEV #
-    vscode-fhs
-    nixd
-    nil
-    zed-editor
-    gnumake
-    cmake
-    ninja
-    libgcc
-    gcc
-
-    # GAMING #
-    mangohud
-    lutris
-    protonup-qt
-    gdlauncher-carbon
-    adwsteamgtk
-
-    # OTHERS #
-    #home-manager
-    seahorse
-    playerctl
-    adw-gtk3
-    remmina
-    appimage-run
-    gnomeExtensions.appindicator
-
-    # UTILS #
-    monitorets
-    gnome-system-monitor
-    xdg-user-dirs
-    brightnessctl
-    
-    # CUDA #
-    cudaPackages.cudatoolkit
-    cudaPackages.cudnn
-    cudaPackages.cuda_cudart
-
-    # AUDIO #
-    helvum
-  ];
-  
   # ISO mounting utils #
   programs.cdemu.enable = true;
   
@@ -305,7 +180,7 @@ in
   # DEFAULTS #
   environment = {
     sessionVariables = {
-      EDITOR = "nvim";
+      EDITOR = "zed";
       BROWSER = "floorp";
       TERMINAL = "kitty";
       LIBVIRT_DEFAULT_URI = "qemu:///system";
diff --git a/etc/nixos/flake.nix b/etc/nixos/flake.nix
index 901f08a..a95f6ea 100644
--- a/etc/nixos/flake.nix
+++ b/etc/nixos/flake.nix
@@ -4,9 +4,10 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nix-flatpak.url = "github:gmodena/nix-flatpak";
   };
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, ... } @inputs:
+  outputs = { self, nixpkgs, nixpkgs-unstable, nix-flatpak, ... } @inputs:
 
  let
  system = "x86_64-linux";
@@ -31,6 +32,7 @@
         inherit pkgs-unstable;
       };
       modules = [
+        nix-flatpak.nixosModules.nix-flatpak
         ./configuration.nix
       ];
     };
diff --git a/etc/nixos/modules/desktop.nix b/etc/nixos/modules/desktop.nix
index 3d2291c..e89b3c2 100644
--- a/etc/nixos/modules/desktop.nix
+++ b/etc/nixos/modules/desktop.nix
@@ -4,12 +4,18 @@
 
 {config, pkgs, pkgs-unstable, lib, ... }:
 {
-
+  
   # Enable GDM
   #services.displayManager.gdm.enable = true;
   
   # Enable SDDM
   services.displayManager.sddm.enable = true;
+  environment.systemPackages = with pkgs; [
+     kdePackages.qtmultimedia 
+     libsForQt5.qt5.qtgraphicaleffects
+     sddm-astronaut
+   ];
+  services.displayManager.sddm.theme = "${pkgs.sddm-chili-theme}/share/sddm/themes/chili";
   services.displayManager.sddm.wayland.enable = true;
 
   # Gnome Keyring (for window managers)