From 4ebecbfdf32e7c1fd54118acebdac81cddfbedf5 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Fri, 7 Mar 2025 18:45:30 -0500 Subject: [PATCH 1/3] flatpak upgrade updating branch version --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index d893951..52291c9 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Wyatt's nix configuration suite"; inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; - nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; + nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.6.0"; home-manager = { url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; -- 2.47.2 From 8a0a3f862bf74787659e074bcd8396992f881e04 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Wed, 21 May 2025 13:31:53 -0400 Subject: [PATCH 2/3] upgrade flatpak nix to 0.6.0 --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 7f6343d..2def8e3 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Wyatt's nix configuration suite"; inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; - nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; + nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.6.0"; home-manager = { url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; -- 2.47.2 From 9dfcfa898a4f916c566476021770231b6ae1632a Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Thu, 29 May 2025 13:06:00 -0400 Subject: [PATCH 3/3] stupid git --- flake.lock | 8 +-- flake.nix | 7 +-- flake.nix.orig | 131 ------------------------------------------------- 3 files changed, 5 insertions(+), 141 deletions(-) delete mode 100644 flake.nix.orig diff --git a/flake.lock b/flake.lock index e506187..316ce5a 100644 --- a/flake.lock +++ b/flake.lock @@ -101,16 +101,16 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1711997201, - "narHash": "sha256-J71xzQlVYsjagA4AsVwRazhBh2rZrPpKvxTgs6UzL7c=", + "lastModified": 1739444422, + "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" } diff --git a/flake.nix b/flake.nix index 0185d56..0d2941e 100644 --- a/flake.nix +++ b/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"; ->>>>>>> origin + nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.6.0"; home-manager = { url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/flake.nix.orig b/flake.nix.orig deleted file mode 100644 index f45352f..0000000 --- a/flake.nix.orig +++ /dev/null @@ -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 - # ]; - # } - # ]; - }; - }; -} -- 2.47.2