diff --git a/home-manager/config/default.nix b/home-manager/config/default.nix index 86005fb..88b23c8 100644 --- a/home-manager/config/default.nix +++ b/home-manager/config/default.nix @@ -8,7 +8,6 @@ # Individual files ./beets.nix ./desktop.nix - ./flatpak.nix ./firefox.nix ./gpg.nix ./gtk.nix diff --git a/home-manager/config/flatpak.nix b/home-manager/config/flatpak.nix deleted file mode 100644 index cd96fbf..0000000 --- a/home-manager/config/flatpak.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ lib, config, ... }: -{ - xdg.systemDirs.data = lib.optionals - config.meta.home-manager.desktop.enable - [ "/var/lib/flatpak/exports/share" "${config.xdg.dataHome}/flatpak/exports/share" ]; - services.flatpak = lib.mkIf config.meta.home-manager.desktop.enable { - enableModule = true; - packages = [ - "sober:app/org.vinegarhq.Sober/x86_64/master" - ]; - remotes = { - sober = "https://sober.vinegarhq.org/sober.flatpakref"; - }; - }; -} diff --git a/home-manager/meta.nix b/home-manager/meta.nix index b17a8ce..36fcdaa 100644 --- a/home-manager/meta.nix +++ b/home-manager/meta.nix @@ -35,8 +35,8 @@ type = lib.types.str; default = "ty"; defaultText = lib.literalExpression ''"ty"''; - description = "The username to apply the config as"; - } + description = "The username to apply the config as (only applies in standalone config)"; + }; interface = lib.mkOption { type = lib.types.enum [ "nixos" "nix-on-droid" ]; diff --git a/home-manager/standalone.nix b/home-manager/standalone.nix index a3112ed..47575ed 100644 --- a/home-manager/standalone.nix +++ b/home-manager/standalone.nix @@ -1,4 +1,4 @@ -{ ... }: +{ inputs, config, ... }: { imports = [ # Import plasma manager and all of my custom modules for use @@ -12,7 +12,7 @@ home = { stateVersion = "24.11"; - username = meta.home-manager.username; - homeDirectory = /. + "/home/${meta.home-manager.username}"; + username = config.meta.home-manager.username; + homeDirectory = /. + "/home/${config.meta.home-manager.username}"; }; } diff --git a/utils/default.nix b/utils/default.nix index 0fa245e..3439925 100644 --- a/utils/default.nix +++ b/utils/default.nix @@ -4,9 +4,9 @@ system ? "x86_64-linux", meta ? {} }: inputs.home-manager.lib.homeManagerConfiguration { - pkgs = inputs.nixpkgs.legacyPackages.${system}; + pkgs = import inputs.nixpkgs { inherit system; config.allowUnfree = true; }; modules = [ - ./home-manager/standalone.nix + ../home-manager/standalone.nix { meta.home-manager = meta; } ]; extraSpecialArgs = {