flake.lock

@@ -101,16 +101,16 @@
     },
     "nix-flatpak": {
       "locked": {
-        "lastModified": 1711997201,
+        "lastModified": 1739444422,
-        "narHash": "sha256-J71xzQlVYsjagA4AsVwRazhBh2rZrPpKvxTgs6UzL7c=",
+        "narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=",
         "owner": "gmodena",
         "repo": "nix-flatpak",
-        "rev": "b76fa31346db7fc958a9898f3c594696ca71c4fd",
+        "rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177",
         "type": "github"
       },
       "original": {
         "owner": "gmodena",
-        "ref": "v0.4.1",
+        "ref": "v0.6.0",
         "repo": "nix-flatpak",
         "type": "github"
       }

flake.nix

@@ -1,13 +1,8 @@
 {
   description = "Wyatt's nix configuration suite";
   inputs = {
-<<<<<<< HEAD
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
-    nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.6.0";
-=======
     nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
-    nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1";
+    nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.6.0";
->>>>>>> origin
     home-manager = {
       url = "github:nix-community/home-manager/release-25.05";
       inputs.nixpkgs.follows = "nixpkgs";

flake.nix.orig

@@ -1,131 +0,0 @@
-{
-  description = "Wyatt's nix configuration suite";
-  inputs = {
-    nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.6.0";
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
-    home-manager = {
-      url = "github:nix-community/home-manager/release-25.05";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    darwin = {
-      url = "github:lnl7/nix-darwin/nix-darwin-25.05";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    ghostty.url = "github:ghostty-org/ghostty";
-  };
-
-  outputs = inputs @ {
-    self,
-    nixpkgs,
-    nix-flatpak,
-    darwin,
-    home-manager,
-    ghostty,
-    ...
-  }: let
-    userName = "wyatt";
-    userEmail = "wyatt@wyattjmiller.com";
-    extraSpecialArgs = {
-      inherit userName userEmail ghostty;
-    };
-  in {
-    # Primary laptop - MacBook Pro (2023, M3)
-    darwinConfigurations."sephiroth" = darwin.lib.darwinSystem {
-      system = "aarch64-darwin";
-      specialArgs = {
-        inherit userName userEmail ghostty;
-        hostname = "sephiroth";
-        role = "devel";
-      };
-      modules = [
-        ./modules/common
-        ./modules/machine/sephiroth
-
-        home-manager.darwinModules.home-manager
-        {
-          home-manager.useGlobalPkgs = true;
-          home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs;
-          home-manager.users.${userName} = import ./home;
-        }
-      ];
-    };
-
-    # Primary desktop computer
-    nixosConfigurations."cloud" = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      specialArgs = {
-        inherit userName userEmail ghostty;
-        hostname = "cloud";
-        role = "devel";
-      };
-      modules = [
-        nix-flatpak.nixosModules.nix-flatpak
-        ./modules/common
-        ./modules/machine/cloud
-
-        home-manager.nixosModules.home-manager
-        {
-          home-manager.useGlobalPkgs = true;
-          home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs;
-          home-manager.users.${userName}.imports = [
-            ./home
-          ];
-        }
-      ];
-    };
-
-    # Apartment appliance server
-    nixosConfigurations."valefor" = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      specialArgs = {
-        inherit userName userEmail;
-        hostname = "valefor";
-        role = "server";
-      };
-      modules = [
-        ./modules/common
-        ./modules/machine/valefor
-
-        home-manager.nixosModules.home-manager
-        {
-          home-manager.useGlobalPkgs = true;
-          home-manager.useUserPackages = true;
-          home-manager.extraSpecialArgs = extraSpecialArgs;
-          home-manager.users.${userName}.imports = [
-            ./home
-          ];
-        }
-      ];
-    };
-
-    # Storage, status, game, and media server
-    nixosConfigurations."ixion" = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      specialArgs = {
-        inherit userName userEmail;
-        hostname = "ixion";
-        role = "server";
-      };
-      # modules = [
-      #   nix-flatpak.nixosModules.nix-flatpak
-      #   nix-ld.nixosModules.nix-ld
-      #   ./modules/nixos/hardware-configuration.nix
-      #   ./modules/nix-core.nix
-      #   ./modules/nixos/configuration.nix
-      #   ./modules/host-users.nix
-      #
-      #   home-manager.nixosModules.home-manager
-      #   {
-      #     home-manager.useGlobalPkgs = true;
-      #     home-manager.useUserPackages = true;
-      #     home-manager.extraSpecialArgs = extraSpecialArgs;
-      #     home-manager.users.${userName}.imports = [
-      #       ./home
-      #     ];
-      #   }
-      # ];
-    };
-  };
-}