Update 2025-10-29

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1744940522,
+        "lastModified": 1760701190,
-        "narHash": "sha256-TNoetfICvd29DhxRPpmyKItQBDlqSvKcV+wGNkn14jk=",
+        "narHash": "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "51d33bbb7f1e74ba5f9d9a77357735149da99081",
+        "rev": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5",
         "type": "github"
       },
       "original": {
@@ -20,37 +20,18 @@
         "type": "github"
       }
     },
-    "flatpaks": {
-      "inputs": {
-        "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_2",
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1733581530,
-        "narHash": "sha256-W+orHmF+XpZosrBFAFRs7sS1iVKYveg9SutkzSXMVsI=",
-        "owner": "GermanBread",
-        "repo": "declarative-flatpak",
-        "rev": "b88bd5b65f8e7c35eec0a90cfd6e096b2e7f79c0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "GermanBread",
-        "ref": "stable-v3",
-        "repo": "declarative-flatpak",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1733572789,
+        "lastModified": 1747688870,
-        "narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=",
+        "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c7ffc9727d115e433fd884a62dc164b587ff651d",
+        "rev": "d5f1f641b289553927b3801580598d200a501863",
         "type": "github"
       },
       "original": {
@@ -67,11 +48,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745033012,
+        "lastModified": 1761666354,
-        "narHash": "sha256-KjBMsjCzIOWgDqTZMYIriPFmHiQcCb2RhuDh5JF0VVc=",
+        "narHash": "sha256-fHr+tIYBJccNF8QWqgowfRmEAtAMSt1deZIRNKL8A7c=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ae84885d9b6b62dc58ccd300e9ab321a3fd9f9c7",
+        "rev": "ca2ab1d877a24d5a437dad62f56b8b2c02e964e9",
         "type": "github"
       },
       "original": {
@@ -81,38 +62,33 @@
         "type": "github"
       }
     },
-    "home-manager_2": {
+    "nix-flatpak": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
       "locked": {
-        "lastModified": 1744743431,
+        "lastModified": 1739444422,
-        "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=",
+        "narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=",
-        "owner": "nix-community",
+        "owner": "gmodena",
-        "repo": "home-manager",
+        "repo": "nix-flatpak",
-        "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387",
+        "rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177",
         "type": "github"
       },
       "original": {
-        "owner": "nix-community",
+        "owner": "gmodena",
-        "ref": "release-24.11",
+        "ref": "latest",
-        "repo": "home-manager",
+        "repo": "nix-flatpak",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1731755305,
+        "lastModified": 1751274312,
-        "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=",
+        "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4",
+        "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
         "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
@@ -120,11 +96,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1744932701,
+        "lastModified": 1761373498,
-        "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
+        "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
+        "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce",
         "type": "github"
       },
       "original": {
@@ -134,62 +110,15 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1733412085,
-        "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1744440957,
-        "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "disko": "disko",
-        "flatpaks": "flatpaks",
+        "home-manager": "home-manager",
-        "home-manager": "home-manager_2",
         "home-manager-unstable": "home-manager-unstable",
-        "nixpkgs": "nixpkgs_3",
+        "nix-flatpak": "nix-flatpak",
+        "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable"
       }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -20,11 +20,11 @@
       url = "github:nix-community/home-manager/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    flatpaks.url = "github:GermanBread/declarative-flatpak/stable-v3";
+    nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest";
   };
 
   # Flake outputs, NixOS and Home Configurations.
-  outputs = inputs@{ self, flatpaks, ... }:
+  outputs = inputs@{ self, nix-flatpak, ... }:
   let
     # Load settings.nix or the default if not exists.
     settings = (if (builtins.pathExists ./settings.nix)
@@ -78,7 +78,7 @@
       modules = [
         inputs.disko.nixosModules.disko
         home-manager.nixosModules.default
-        flatpaks.nixosModules.default
+        nix-flatpak.nixosModules.nix-flatpak
         config
       ];
     };
@@ -91,7 +91,7 @@
         inherit settings;
       };
       modules = [
-        flatpaks.homeManagerModules.default
+        nix-flatpak.homeManagerModules.nix-flatpak
         config
       ];
     };

modules/home/flatpaks.nix

@@ -2,7 +2,6 @@
 
 {
   # Setup flatpaks.
-  services.flatpak.enableModule = true;
   services.flatpak.remotes = {
     "flathub" = "https://dl.flathub.org/repo/flathub.flatpakrepo";
   };

modules/home/zsh.nix

@@ -21,7 +21,7 @@
       export VIDEO="mpv"
       export OPENER="xdg-open"
     '';
-    initExtra = ''
+    initContent = ''
       # Set emacs key binding.
       bindkey -e
 

modules/nixos/common.nix

@@ -111,7 +111,7 @@
     };
     gc = {
       automatic = true;
-      dates = "weekly";
+      dates = "Mon 3:40";
       options = "--delete-oder-than 7d";
     };
   };

modules/nixos/users.nix

@@ -33,7 +33,7 @@
   };
 
   environment.systemPackages = with pkgs; [
-    nodejs_23
+    nodejs
     pure-prompt
     fastfetch
     home-manager
@@ -47,7 +47,6 @@
     users = {
       ${settings.user.name} = {
         imports = [
-          inputs.flatpaks.homeManagerModules.default
           ../../users/main-user.nix
         ];
       };

modules/nixos/virtualization.nix

@@ -30,13 +30,6 @@
       package = pkgs.qemu_full;
       runAsRoot = true;
       swtpm.enable = true;
-      ovmf = {
-        enable = true;
-        packages = [(pkgs.OVMF.override {
-          secureBoot = true;
-          tpmSupport = true;
-        }).fd];
-      };
     };
   };
 

users/main-user.nix

@@ -4,7 +4,6 @@
   imports = [
     ../modules/home/git.nix
     ../modules/home/zsh.nix
-    ../modules/home/flatpaks.nix
   ] ++ (if (builtins.pathExists ../modules/home/profiles/${settings.profile}.nix)
             then
               [ ../modules/home/profiles/${settings.profile}.nix ]