From 0d13ca10a7c4069ef562405db1e517cd83a175ea Mon Sep 17 00:00:00 2001 From: Tyler Mayoff Date: Sat, 12 Jul 2025 10:01:22 -0400 Subject: [PATCH] added docker config, nix formatting --- dot_config/flake/home/common.nix | 3 +++ dot_config/flake/machines/wash/configuration.nix | 4 +++- dot_config/flake/modules/nixos/docker.nix | 9 +++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 dot_config/flake/modules/nixos/docker.nix diff --git a/dot_config/flake/home/common.nix b/dot_config/flake/home/common.nix index ea42c83..f5aaf4b 100644 --- a/dot_config/flake/home/common.nix +++ b/dot_config/flake/home/common.nix @@ -36,6 +36,7 @@ taplo sumneko-lua-language-server nil + alejandra # nix formatting ]; programs.helix = { @@ -57,7 +58,9 @@ statusline = { left = ["mode" "spinner" "spacer" "version-control" "file-name"]; }; + file-picker = { + git-ignore = false; }; lsp = { diff --git a/dot_config/flake/machines/wash/configuration.nix b/dot_config/flake/machines/wash/configuration.nix index 4da6ee5..a3f1151 100644 --- a/dot_config/flake/machines/wash/configuration.nix +++ b/dot_config/flake/machines/wash/configuration.nix @@ -11,6 +11,7 @@ ../../modules/nixos/gnome.nix # ../../modules/nixos/android-studio.nix + ../../modules/nixos/docker.nix ]; nixpkgs = { @@ -30,7 +31,7 @@ # Nix options nix.optimise.automatic = true; nix.settings.experimental-features = ["nix-command" "flakes"]; - nix.settings.trusted-users = ["tyler" "@wheel" "docker"]; + nix.settings.trusted-users = ["tyler" "@wheel"]; nix.settings = { substituters = ["https://cosmic.cachix.org/"]; trusted-public-keys = ["cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="]; @@ -120,6 +121,7 @@ ghostty + unstable.android-studio jetbrains.rust-rover # jetbrains.rider diff --git a/dot_config/flake/modules/nixos/docker.nix b/dot_config/flake/modules/nixos/docker.nix new file mode 100644 index 0000000..462d1b6 --- /dev/null +++ b/dot_config/flake/modules/nixos/docker.nix @@ -0,0 +1,9 @@ +{...}: { + virtualisation.docker = { + enable = true; + rootless = { + enable = true; + setSocketVariable = true; + }; + }; +}