ollama via unstable channel

flake.lock

@@ -21,21 +21,6 @@
         "type": "github"
       }
     },
-    "nix-flatpak": {
-      "locked": {
-        "lastModified": 1776625032,
-        "narHash": "sha256-edvwHiFhgOiwywt6/Iwe+sSn6ybhU3WZGnIoiGcKjfQ=",
-        "owner": "gmodena",
-        "repo": "nix-flatpak",
-        "rev": "479e19f1decb390aa5b75cae13ddf87d763c74cc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "gmodena",
-        "repo": "nix-flatpak",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1776734388,
@@ -54,11 +39,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1776949667,
+        "lastModified": 1776329215,
-        "narHash": "sha256-GMSVw35Q+294GlrTUKlx087E31z7KurReQ1YHSKp5iw=",
+        "narHash": "sha256-a8BYi3mzoJ/AcJP8UldOx8emoPRLeWqALZWu4ZvjPXw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "01fbdeef22b76df85ea168fbfe1bfd9e63681b30",
+        "rev": "b86751bc4085f48661017fa226dee99fab6c651b",
         "type": "github"
       },
       "original": {
@@ -71,7 +56,6 @@
     "root": {
       "inputs": {
         "home-manager": "home-manager",
-        "nix-flatpak": "nix-flatpak",
         "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable"
       }

flake.nix

@@ -14,11 +14,6 @@
       url = "github:nix-community/home-manager/release-25.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
-    nix-flatpak = {
-      url = "github:gmodena/nix-flatpak";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
   # This strange syntax is a workaround for the intentional limitations of `flake.nix` files.

outputs.nix

@@ -1,4 +1,4 @@
-{ nixpkgs, nixpkgs-unstable, home-manager, nix-flatpak, ... }:
+{ nixpkgs, nixpkgs-unstable, home-manager, ... }:
 
 let
   mkPkgsUnstable = system: import nixpkgs-unstable {
@@ -13,10 +13,8 @@ in
       system = "x86_64-linux";
       specialArgs = {
         pkgsUnstable = mkPkgsUnstable "x86_64-linux";
-        nixFlatpak = nix-flatpak;
       };
       modules = [
-        nix-flatpak.nixosModules.nix-flatpak
         home-manager.nixosModules.home-manager
         ./systems/gandalf
       ];
@@ -25,10 +23,8 @@ in
       system = "x86_64-linux";
       specialArgs = {
         pkgsUnstable = mkPkgsUnstable "x86_64-linux";
-        nixFlatpak = nix-flatpak;
       };
       modules = [
-        nix-flatpak.nixosModules.nix-flatpak
         home-manager.nixosModules.home-manager
         ./systems/frodo
       ];
@@ -37,10 +33,8 @@ in
       system = "x86_64-linux";
       specialArgs = {
         pkgsUnstable = mkPkgsUnstable "x86_64-linux";
-        nixFlatpak = nix-flatpak;
       };
       modules = [
-        nix-flatpak.nixosModules.nix-flatpak
         home-manager.nixosModules.home-manager
         ./systems/legolas
       ];
@@ -49,10 +43,8 @@ in
       system = "x86_64-linux";
       specialArgs = {
         pkgsUnstable = mkPkgsUnstable "x86_64-linux";
-        nixFlatpak = nix-flatpak;
       };
       modules = [
-        nix-flatpak.nixosModules.nix-flatpak
         home-manager.nixosModules.home-manager
         ./systems/work
       ];

systems/gandalf/default.nix

@@ -23,7 +23,7 @@
       ../modules/qbittorrent.nix
       ../modules/gimp.nix
       ../modules/openscad.nix
-      ../modules/bambu-studio-flatpak.nix
+      ../modules/flatpak.nix
     ];
 
   boot.loader.systemd-boot.enable = true;

systems/modules/bambu-studio-flatpak.nix

@@ -1,8 +0,0 @@
-{ pkgs, ...}:
-
-{
-  services.flatpak.enable = true;
-  services.flatpak.packages = [
-    "com.bambulab.BambuStudio"
-  ];
-}

systems/modules/bambu-studio.nix

@@ -0,0 +1,7 @@
+{ config, pkgs, ... } :
+
+{
+  environment.systemPackages = with pkgs; [
+    bambu-studio
+  ];
+}

systems/modules/flatpak.nix

@@ -0,0 +1,5 @@
+{ pkgs, ...}: 
+
+{
+  services.flatpak.enable = true;
+}

systems/modules/home/programs/git.nix

@@ -1,4 +1,4 @@
-{ lib, pkgsUnstable, config, ... }:
+{ lib, pkgs, config, ... }:
 
 {
   options.home.git = {
@@ -18,7 +18,6 @@
   config = {
     programs.git = {
       enable = true;
-      package = pkgsUnstable.git;
       settings.user = {
         name = config.home.git.userName;
         email = config.home.git.userEmail;

systems/modules/ollama.nix

@@ -1,9 +1,9 @@
-{ pkgs, ... }:
+{ pkgsUnstable, ... }:
 
 {
   services.ollama = {
     enable = true;
-    package = pkgs.ollama-cuda;
+    package = pkgsUnstable.ollama-cuda;
   };
 
   services.open-webui.enable = true;