diff --git a/flake.nix b/flake.nix
new file mode 100644
index 0000000..f8caed5
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,15 @@
+{
+  inputs = {
+    nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=0.4.1";
+  };
+
+  outputs = { nix-flatpak, ... }: {
+    nixosConfigurations.frdesktop = nixpkgs.lib.nixosSystem {
+      modules = [
+        nix-flatpak.nixosModules.nix-flatpak
+
+        ./configuration.nix
+      ];
+    };
+  };
+}
\ No newline at end of file
diff --git a/software.nix b/software.nix
index 41e6e82..a4fc6ee 100644
--- a/software.nix
+++ b/software.nix
@@ -12,9 +12,45 @@
   environment.systemPackages = with pkgs; [
     vim wget git
     vscodium
+    gnome.nautilus
+    libsForQt5.kalgebra
   ];
 
   services.flatpak.enable = true;
-  xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
-  xdg.portal.config.common.default = "gtk";
+  xdg.portal = {
+    enable = true;
+    config.common.default = [ "gtk" ];
+    extraPortals = with pkgs; [
+      # xdg-desktop-portal-wlr
+      # xdg-desktop-portal-kde
+      xdg-desktop-portal-gtk
+    ];
+  };
+  services.flatpak.remotes = lib.mkOptionDefault [{
+    name = "flathub"; location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
+  }];
+
+  services.flatpak.packages = [
+    "md.obsidian.Obsidian"
+    "org.mozilla.Thunderbird"
+    "com.discordapp.Discord"
+    "com.github.IsmaelMartinez.teams_for_linux"
+    "org.signal.Signal"
+    "org.telegram.desktop"
+    "com.github.tchx84.Flatseal"
+    "com.yubico.yubioath"
+    "org.filezillaproject.Filezilla"
+    "org.gnome.moserial"
+    "org.raspberrypi.rpi-imager"
+    "org.sdrangel.SDRangel"
+    "com.makemkv.MakeMKV"
+    "fr.handbrake.ghb"
+    "com.valvesoftware.Steam"
+    "com.mojang.Minecraft"
+    "org.inkscape.Inkscape"
+    "org.gnome.Rhythmbox3"
+    "com.prusa3d.PrusaSlicer"
+    "org.freecadweb.FreeCAD"
+    "org.kicad.KiCad"
+  ];
 }