From d2b2a1d5947db5405c96709eaba8d4aabc9d0816 Mon Sep 17 00:00:00 2001 From: Andre Date: Mon, 15 Apr 2024 12:00:08 -0400 Subject: [PATCH] Update nix-flatpak to 0.4.1 --- flake.lock | 20 +++++++------- flake.nix | 2 +- modules/ui/flatpak.nix | 4 +-- modules/users/gremlin/default.nix | 46 +++++++++++++++---------------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index 3e3c4c1..d1f8f36 100644 --- a/flake.lock +++ b/flake.lock @@ -117,11 +117,11 @@ ] }, "locked": { - "lastModified": 1713019815, - "narHash": "sha256-jzTo97VeKMNfnKw3xU+uiU5C7wtnLudsbwl/nwPLC7s=", + "lastModified": 1713166971, + "narHash": "sha256-t0P/rKlsE5l1O3O2LYtAelLzp7PeoPCSzsIietQ1hSM=", "owner": "nix-community", "repo": "home-manager", - "rev": "8fdf329526f06886b53b94ddf433848a0d142984", + "rev": "1c43dcfac48a2d622797f7ab741670fdbcf8f609", "type": "github" }, "original": { @@ -158,16 +158,16 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1708268179, - "narHash": "sha256-NNVuhf84AeDTxadfSGnFqPHR0ED+QyM2gmu+Wyz6PrY=", + "lastModified": 1711997201, + "narHash": "sha256-J71xzQlVYsjagA4AsVwRazhBh2rZrPpKvxTgs6UzL7c=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "a243cb0522f6240c194b873dde68e25370b06034", + "rev": "b76fa31346db7fc958a9898f3c594696ca71c4fd", "type": "github" }, "original": { "owner": "gmodena", - "ref": "v0.3.0", + "ref": "v0.4.1", "repo": "nix-flatpak", "type": "github" } @@ -222,11 +222,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1712791164, - "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", + "lastModified": 1712963716, + "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", + "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 081e201..6ec44df 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,7 @@ lanzaboote.url = "github:nix-community/lanzaboote/v0.3.0"; # Flatpak support - nix-flatpak.url = "github:gmodena/nix-flatpak/v0.3.0"; + nix-flatpak.url = "github:gmodena/nix-flatpak/v0.4.1"; # Hardware configurations nixos-hardware.url = "github:NixOS/nixos-hardware/master"; diff --git a/modules/ui/flatpak.nix b/modules/ui/flatpak.nix index 55b2c87..dbc87ef 100644 --- a/modules/ui/flatpak.nix +++ b/modules/ui/flatpak.nix @@ -15,8 +15,8 @@ with lib; services.flatpak = { enable = true; - # Manage all Flatpaks - uninstallUnmanagedPackages = true; + # Manage all Flatpak packages and remotes + uninstallUnmanaged = true; # Enable daily automatic updates update.auto = { diff --git a/modules/users/gremlin/default.nix b/modules/users/gremlin/default.nix index 93c2b7a..619af70 100644 --- a/modules/users/gremlin/default.nix +++ b/modules/users/gremlin/default.nix @@ -66,31 +66,31 @@ with lib; ]; }; - programs = { - # Let home Manager install and manage itself. - home-manager.enable = true; + programs = { + # Let home Manager install and manage itself. + home-manager.enable = true; - # Set up git - git = { - # Name and email set in nix-secrets - enable = true; - extraConfig = { - push.autoSetupRemote = "true"; - }; - }; + # Set up git + git = { + # Name and email set in nix-secrets + enable = true; + extraConfig = { + push.autoSetupRemote = "true"; + }; + }; - # Set up Zsh - zsh = { - # Install and source the p10k theme - plugins = [ - { name = "powerlevel10k"; src = pkgs.zsh-powerlevel10k; file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme"; } - { name = "powerlevel10k-config"; src = ./p10k-config; file = "p10k.zsh"; } - ]; - shellAliases = { - please = "sudo"; - }; - }; - }; + # Set up Zsh + zsh = { + # Install and source the p10k theme + plugins = [ + { name = "powerlevel10k"; src = pkgs.zsh-powerlevel10k; file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme"; } + { name = "powerlevel10k-config"; src = ./p10k-config; file = "p10k.zsh"; } + ]; + shellAliases = { + please = "sudo"; + }; + }; + }; # SSH entries set in nix-secrets };