diff --git a/machines/kitchen/configuration.nix b/machines/kitchen/configuration.nix index 57a0844..a4c35ae 100644 --- a/machines/kitchen/configuration.nix +++ b/machines/kitchen/configuration.nix @@ -27,6 +27,7 @@ wget micro firefox + chromium pkgs.gnome.gnome-tweaks ]; @@ -57,8 +58,7 @@ users.users.michael = { isNormalUser = true; description = "Michael Thomas"; - extraGroups = [ "wheel" "docker" "adbusers" ]; # Enable ‘sudo’ for the user. - + extraGroups = [ "wheel" "docker" "adbusers" "dialout" ]; shell = pkgs.zsh; }; diff --git a/machines/work/configuration.nix b/machines/work/configuration.nix index cadde05..dae2962 100644 --- a/machines/work/configuration.nix +++ b/machines/work/configuration.nix @@ -34,7 +34,7 @@ in users.users.${defaultUser} = { isNormalUser = true; - extraGroups = [ "wheel" "docker" ]; + extraGroups = [ "wheel" "docker" "podman" ]; shell = pkgs.zsh; }; diff --git a/modules/containers.nix b/modules/containers.nix index db20045..9cb3218 100644 --- a/modules/containers.nix +++ b/modules/containers.nix @@ -1,5 +1,14 @@ +{ pkgs, ... }: { - # Enable Docker - # TODO: podman - virtualisation.docker.enable = true; + # Enable Podman w/ docker compose compatibility + virtualisation.podman = { + enable = true; + dockerSocket.enable = true; + defaultNetwork.dnsname.enable = true; + }; + + environment.systemPackages = with pkgs; [ + docker-client + docker-compose + ]; } \ No newline at end of file diff --git a/user/.gitignore b/user/.gitignore deleted file mode 100644 index bb462fd..0000000 --- a/user/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/home.nix -/config.nix \ No newline at end of file diff --git a/user/README.md b/user/README.md index 6ece2ce..6d56a4e 100644 --- a/user/README.md +++ b/user/README.md @@ -1,5 +1,5 @@ # Home Manager Configuration -This directory contains my configuration for home-manager, which can be easily installed by running `./install.sh {machine name}`. +This directory contains my configuration for home-manager. The `machines` folder contains userland configs for specific machines. Each of these configs will import modules from the `modules` folder for shell config, git config, etc. \ No newline at end of file diff --git a/user/install.sh b/user/install.sh deleted file mode 100755 index 441fcdd..0000000 --- a/user/install.sh +++ /dev/null @@ -1,5 +0,0 @@ -# Where first arg is directory under machines -mkdir -p $HOME/.config -ln -s $(pwd) $HOME/.config/nixpkgs -ln -s $(pwd)/machines/$1/home.nix $HOME/.config/nixpkgs/home.nix -ln -s $(pwd)/machines/$1/config.nix $HOME/.config/nixpkgs/config.nix