diff --git a/home/guz-lite/configuration.nix b/home/guz-lite/configuration.nix index 0abfcf0..4abd284 100644 --- a/home/guz-lite/configuration.nix +++ b/home/guz-lite/configuration.nix @@ -1,32 +1,12 @@ -{ - config, - inputs, - pkgs, - self, - ... -}: { - # Users - users.users."guz" = { - useDefaultShell = true; - isNormalUser = true; +{...}: { + imports = [ + ../worm/configuration.nix + ]; - hashedPasswordFile = builtins.toString config.sops.secrets."guz/password".path; - extraGroups = ["wheel" "guz"]; - }; - users.groups."guz" = {}; - - # Home-manager configurations for when it is used as a NixOS module. - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.backupFileExtension = "bkp"; - home-manager.extraSpecialArgs = {inherit inputs self;}; home-manager.users.guz = import ./default.nix; services.flatpak.enable = true; - programs.zsh.enable = true; - users.users."guz".shell = pkgs.zsh; - # Xremap run-as-user hardware.uinput.enable = true; users.groups.uinput.members = ["guz"]; diff --git a/home/guz-lite/default.nix b/home/guz-lite/default.nix index f7b612b..c0a1ad3 100644 --- a/home/guz-lite/default.nix +++ b/home/guz-lite/default.nix @@ -1,9 +1,9 @@ -{self, ...}: { +{...}: { home.username = "guz"; home.homeDirectory = "/home/guz"; imports = [ - self.homeManagerModules.devkit + ../worm/default.nix ./apps.nix ./style.nix @@ -11,8 +11,6 @@ ./keymaps.nix ]; - devkit.enable = true; - # The *state version* indicates which default # settings are in effect and will therefore help avoid breaking # program configurations. Switching to a higher state version diff --git a/home/guz/default.nix b/home/guz/default.nix index 9cdf958..0bc64af 100644 --- a/home/guz/default.nix +++ b/home/guz/default.nix @@ -3,7 +3,7 @@ home.homeDirectory = "/home/guz"; imports = [ - ../guz-lite + ../guz-lite/default.nix ./apps.nix ]; diff --git a/home/worm/configuration.nix b/home/worm/configuration.nix index 0abfcf0..4085f1d 100644 --- a/home/worm/configuration.nix +++ b/home/worm/configuration.nix @@ -1,5 +1,6 @@ { config, + lib, inputs, pkgs, self, @@ -20,15 +21,16 @@ home-manager.useUserPackages = true; home-manager.backupFileExtension = "bkp"; home-manager.extraSpecialArgs = {inherit inputs self;}; - home-manager.users.guz = import ./default.nix; - - services.flatpak.enable = true; + home-manager.users.guz = lib.mkDefault (import ./default.nix); programs.zsh.enable = true; users.users."guz".shell = pkgs.zsh; - # Xremap run-as-user - hardware.uinput.enable = true; - users.groups.uinput.members = ["guz"]; - users.groups.input.members = ["guz"]; + # Podman (not necessarily user-specific, but environment specific) + virtualisation.podman.enable = true; + virtualisation.podman.dockerCompat = true; + virtualisation.podman.dockerSocket.enable = true; + virtualisation.podman.extraPackages = with pkgs; [ + podman-compose + ]; }