diff --git a/software.nix b/software.nix
index a5d37d7..78c6c6b 100644
--- a/software.nix
+++ b/software.nix
@@ -1,8 +1,4 @@
-{ config, pkgs, lib, ... }:
-
-{
-  # Install firefox.
-  programs.firefox.enable = true;
+{ config, pkgs, lib, ... }: {
 
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
@@ -10,10 +6,12 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-    vim wget git
+    vim wget git ncdu btop
+    gcc cmake valgrind clang-tools
     vscodium
     gnome.nautilus
     libsForQt5.kalgebra
+    texliveFull
   ];
 
   services.flatpak.enable = true;
@@ -24,8 +22,13 @@
   services.flatpak.remotes = lib.mkOptionDefault [{
     name = "flathub"; location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
   }];
+  services.flatpak.update.auto = {
+    enable = true;
+    onCalendar = "weekly";
+  };
 
   services.flatpak.packages = [
+    "org.mozilla.firefox"
     "md.obsidian.Obsidian"
     "org.mozilla.Thunderbird"
     "com.discordapp.Discord"
@@ -35,6 +38,7 @@
     "com.github.tchx84.Flatseal"
     "com.yubico.yubioath"
     "org.filezillaproject.Filezilla"
+    "com.nextcloud.desktopclient.nextcloud"
     "org.gnome.moserial"
     "org.raspberrypi.rpi-imager"
     "org.sdrangel.SDRangel"
@@ -42,10 +46,105 @@
     "fr.handbrake.ghb"
     "com.valvesoftware.Steam"
     "com.mojang.Minecraft"
+    "org.gimp.GIMP"
     "org.inkscape.Inkscape"
+    "org.videolan.VLC"
     "org.gnome.Rhythmbox3"
+    "org.audacityteam.Audacity"
     "com.prusa3d.PrusaSlicer"
     "org.freecadweb.FreeCAD"
     "org.kicad.KiCad"
   ];
+  services.flatpak.overrides = {
+    global = {
+      # Force Wayland by default
+      Context.sockets = [
+        "wayland" "!x11" "!fallback-x11"
+      ];
+      filesystems = [
+        "!home"
+      ];
+      Environment = {
+        XCURSOR_PATH = "/run/host/user-share/icons:/run/host/share/icons"; # Fix un-themed cursor in some Wayland apps
+        GTK_THEME = "Adwaita:dark"; # Force correct theme for some GTK apps
+      };
+    };
+
+    "md.obsidian.Obsidian".Context = {
+      filesystems = [
+        "~/.ssh:ro"
+        "xdg-config/git:ro"
+        "~/git/kladjes:rw"
+        "!/run/media" "!/media" "!/mnt"
+      ];
+    };
+
+    "org.filezillaproject.Filezilla".Context = {
+      filesystems = [
+        "!host"
+        "xdg-documents:rw"
+        "xdg-downloads:rw"
+      ];
+    };
+
+    "com.nextcloud.desktopclient.nextcloud".Context = {
+      filesystems = [
+        "!host"
+        "~/datatjes:rw"
+      ];
+    };
+
+    "org.gimp.GIMP".Context = {
+      filesystems = [
+        "!host"
+        "xdg-documents:rw"
+        "xdg-downloads:rw"
+      ];
+    };
+
+    "org.inkscape.Inkscape".Context = {
+      filesystems = [
+        "!host"
+        "xdg-documents:rw"
+        "xdg-downloads:rw"
+      ];
+    };
+
+    "org.videolan.VLC".Context = {
+      filesystems = [
+        "!host"
+        "xdg-videos"
+      ];
+    };
+
+    "org.audacityteam.Audacity".Context = {
+      filesystems = [
+        "!host"
+        "xdg-documents:rw"
+        "xdg-downloads:rw"
+      ];
+    };
+
+    "com.prusa3d.PrusaSlicer".Context = {
+      filesystems = [
+        "xdg-documents:rw"
+        "xdg-downloads:rw"
+      ];
+    };
+
+    "org.freecadweb.FreeCAD".Context = {
+      filesystems = [
+        "!host"
+        "xdg-documents:rw"
+        "xdg-downloads:rw"
+      ];
+    };
+
+    "org.kicad.KiCad".Context = {
+      filesystems = [
+        "xdg-documents:rw"
+        "xdg-downloads:rw"
+      ];
+    };
+  };
 }