Merge branch 'main' of https://git.thomasfamily.duckdns.org/michael/nix-dots
This commit is contained in:
commit
d2e66aa07c
@ -27,6 +27,7 @@
|
|||||||
wget
|
wget
|
||||||
micro
|
micro
|
||||||
firefox
|
firefox
|
||||||
|
chromium
|
||||||
pkgs.gnome.gnome-tweaks
|
pkgs.gnome.gnome-tweaks
|
||||||
];
|
];
|
||||||
|
|
||||||
@ -57,8 +58,7 @@
|
|||||||
users.users.michael = {
|
users.users.michael = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
description = "Michael Thomas";
|
description = "Michael Thomas";
|
||||||
extraGroups = [ "wheel" "docker" "adbusers" ]; # Enable ‘sudo’ for the user.
|
extraGroups = [ "wheel" "docker" "adbusers" "dialout" ];
|
||||||
|
|
||||||
shell = pkgs.zsh;
|
shell = pkgs.zsh;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -34,7 +34,7 @@ in
|
|||||||
|
|
||||||
users.users.${defaultUser} = {
|
users.users.${defaultUser} = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
extraGroups = [ "wheel" "docker" ];
|
extraGroups = [ "wheel" "docker" "podman" ];
|
||||||
shell = pkgs.zsh;
|
shell = pkgs.zsh;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1,5 +1,14 @@
|
|||||||
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
# Enable Docker
|
# Enable Podman w/ docker compose compatibility
|
||||||
# TODO: podman
|
virtualisation.podman = {
|
||||||
virtualisation.docker.enable = true;
|
enable = true;
|
||||||
|
dockerSocket.enable = true;
|
||||||
|
defaultNetwork.dnsname.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
docker-client
|
||||||
|
docker-compose
|
||||||
|
];
|
||||||
}
|
}
|
2
user/.gitignore
vendored
2
user/.gitignore
vendored
@ -1,2 +0,0 @@
|
|||||||
/home.nix
|
|
||||||
/config.nix
|
|
@ -1,5 +1,5 @@
|
|||||||
# Home Manager Configuration
|
# 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.
|
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.
|
@ -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
|
|
Loading…
x
Reference in New Issue
Block a user