From cca75b5138879082e84fcd8cb712dc73759cf6e2 Mon Sep 17 00:00:00 2001
From: Sneexy <sneexy@disroot.org>
Date: Thu, 18 Apr 2024 21:01:19 -0500
Subject: [PATCH] chore: ordering of modules importing, comment mpd config,
 more flatpak edits

---
 flake.nix            |  10 +++--
 nixos.nix            |  21 +++++++++
 users/ruben/home.nix | 100 ++++++++++++++++++++-----------------------
 3 files changed, 73 insertions(+), 58 deletions(-)

diff --git a/flake.nix b/flake.nix
index 2581a7d..09fb435 100644
--- a/flake.nix
+++ b/flake.nix
@@ -103,12 +103,13 @@
           pkgs-master = nixpkgs-master.legacyPackages.${system};
         };
         modules = with self.nixosModules; [
-          ./machines/thunkpad
-          declarativeHome ./users/ruben
           # flatpaks
           nix-flatpak.nixosModules.nix-flatpak
           # nyx repo
           chaotic.nixosModules.default
+          # system and user config
+          ./machines/thunkpad
+          declarativeHome ./users/ruben
         ];
       };
       # my secondary laptop, a thinkpad yoga 14...?
@@ -120,12 +121,13 @@
           pkgs-master = nixpkgs-master.legacyPackages.${system};
         };
         modules = with self.nixosModules; [
-          ./machines/thonkpad
-          declarativeHome ./users/ruben
           # flatpaks
           nix-flatpak.nixosModules.nix-flatpak
           # nyx repo
           chaotic.nixosModules.default
+          # system and user config
+          ./machines/thonkpad
+          declarativeHome ./users/ruben
         ];
       };
     };
diff --git a/nixos.nix b/nixos.nix
index af19d65..2732e16 100644
--- a/nixos.nix
+++ b/nixos.nix
@@ -197,6 +197,27 @@
     wireplumber.enable = true;
   };
 
+  # flatpaks
+  # TODO: unsure if i should even bother using flatpaks in a configuration/distro like this...
+  # maybe i can fully embrace flatpaks once i've figured out how to remove default packages
+  services.flatpak.remotes = lib.mkOptionDefault [{
+    name = "flathub-system";
+    location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
+  }];
+
+  services.flatpak.update.auto.enable = true;
+  services.flatpak.uninstallUnmanaged = true;
+  # flatpak system packages
+  services.flatpak.packages = [
+    "org.mozilla.firefox"
+    "org.mozilla.Thunderbird"
+    "com.ulduzsoft.Birdtray"
+    "org.libreoffice.LibreOffice"
+    "org.gimp.GIMP"
+    "org.inkscape.Inkscape"
+    "org.qbittorrent.qBittorrent"
+  ];
+
   environment.systemPackages = with pkgs; [
     git
     wget fzf
diff --git a/users/ruben/home.nix b/users/ruben/home.nix
index 838d958..d908fd9 100644
--- a/users/ruben/home.nix
+++ b/users/ruben/home.nix
@@ -46,6 +46,45 @@
     homeDirectory = "/home/ruben";
   };
 
+  # flatpaks
+  # TODO: unsure if i should even bother using flatpaks in a configuration/distro like this...
+  # maybe i can fully embrace flatpaks once i've figured out how to remove default packages
+  services.flatpak.remotes = lib.mkOptionDefault [{
+    name = "flathub-user";
+    location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
+  }];
+
+  services.flatpak.update.auto.enable = true;
+  services.flatpak.uninstallUnmanaged = true;
+  # flatpak user packages
+  services.flatpak.packages = [
+    "org.kde.kdenlive"
+    "org.kde.krita"
+    "org.nicotine_plus.Nicotine"
+    "org.kde.okteta"
+    "md.obsidian.Obsidian"
+    "io.github.martinrotter.rssguardlite"
+    "com.dec05eba.gpu_screen_recorder"
+    "org.gajim.Gajim"
+    "in.cinny.Cinny"
+    "chat.revolt.RevoltDesktop"
+    "dev.vencord.Vesktop"
+    "org.signal.Signal"
+    "page.kramo.Cartridges"
+    "org.prismlauncher.PrismLauncher"
+    "org.libretro.RetroArch"
+    "net.pcsx2.PCSX2"
+    "org.duckstation.DuckStation"
+    "net.kuribo64.melonDS"
+    "org.DolphinEmu.dolphin-emu"
+    "org.ppsspp.PPSSPP"
+    "io.github.dosbox-staging"
+    "com.usebottles.bottles"
+    "net.davidotek.pupgui2"
+    "com.github.Matoking.protontricks"
+    "io.gitlab.azymohliad.WatchMate"
+  ];
+
   # Add stuff for your user as you see fit:
   programs.neovim.enable = true;
   home.packages = with pkgs; [
@@ -67,39 +106,9 @@
     imagemagick
     yt-dlp
 
-    firefox
-    thunderbird
-    birdtray
-    libreoffice
-    inkscape gimp
-    kdenlive krita
-    nicotine-plus
-    okteta
-    obsidian
-    rssguard
-    obs-studio
-    gpu-screen-recorder-gtk
-
-    gajim
-    cinny-desktop
-    revolt-desktop
-    vesktop
-    signal-desktop
-
-    cartridges
-    prismlauncher
-    retroarchFull
-    pcsx2
-    dolphin-emu
-    dosbox-staging
-    bottles
-    protonup-qt
-    protontricks
-
     mpv
-    qbittorrent
-    watchmate
     nextcloud-client
+    obs-studio
     ventoy-full
   ];
 
@@ -161,32 +170,15 @@
     EDITOR = "nvim";
   };
 
-  # flatpaks
-  # TODO: unsure if i should even bother using flatpaks in a configuration/distro like this...
-  # maybe i can fully embrace flatpaks once i've figured out how to remove default packages
-  #services.flatpak.remotes = lib.mkOptionDefault [{
-  #  name = "flathub";
-  #  location = "https://dl.flathub.org/repo/#flathub.flatpakrepo";
-  #}];
-  #
-  #services.flatpak.update.auto.enable = true;
-  #services.flatpak.uninstallUnmanaged = true;
-  # flatpak user packages
-  #services.flatpak.packages = [
-    #{ appId = "com.brave.Browser"; origin = "flathub"; }
-    #"com.obsproject.Studio"
-    #"im.riot.Riot"
-  #];
-
   # music!!
   services.mpd = {
     enable = true;
-    extraConfig = ''
-      ''audio_output {
-        type "pipewire"
-        name "PipeWire"
-      }''
-    '';
+    #extraConfig = ''
+    #  ''audio_output {
+    #    type "pipewire"
+    #    name "PipeWire"
+    #  }''
+    #'';
   };
 
   xdg.userDirs.enable = true;