From d0089ca72ef99a1cac7f476f607b0499251d5c97 Mon Sep 17 00:00:00 2001 From: Bad Date: Thu, 9 Sep 2021 23:24:25 +0200 Subject: [PATCH] Stuff too lazy to list --- flake.lock | 24 ++++++++++++------------ overlays/overrides.nix | 1 + profiles/develop/default.nix | 4 +++- users/mae/home-manager-base.nix | 2 +- users/mae/user.nix | 2 +- users/profiles/podman/default.nix | 11 +++++++++++ 6 files changed, 29 insertions(+), 15 deletions(-) create mode 100644 users/profiles/podman/default.nix diff --git a/flake.lock b/flake.lock index 4e75851..aa15930 100644 --- a/flake.lock +++ b/flake.lock @@ -184,11 +184,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1630981439, - "narHash": "sha256-x1nNKhqMPE834b1FPuz8K/oaE/Wp9Tw/6ppUeVXzM6o=", + "lastModified": 1631067971, + "narHash": "sha256-z+qlJaCaw/OAoFGdzm0nDKkjRdCwstHzduF74nMn3bY=", "owner": "nix-community", "repo": "fenix", - "rev": "77f8934bacfbdc937ab08e9450faeb87754a77e4", + "rev": "0771140f0a6a6622c509fb2d6d2c87f0bfda703d", "type": "github" }, "original": { @@ -287,11 +287,11 @@ }, "latest": { "locked": { - "lastModified": 1630938467, - "narHash": "sha256-GiSjPKDmFJPaM10lMWhwOrZViAB2kLX6NsHjRSZ/vWE=", + "lastModified": 1631015389, + "narHash": "sha256-9SKTwRbp7OQGa4wKTo1wB6ctC2VlaIeKFZ+flqzPuoI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "efcfe3676268c789e78a22b20a94c00227d20bc8", + "rev": "bc06c93905f60a82d6ebbb78f78cf289257860cc", "type": "github" }, "original": { @@ -384,11 +384,11 @@ }, "nixos": { "locked": { - "lastModified": 1630964657, - "narHash": "sha256-owGDhoOhY9AXsqkPvGJrprxfH3VEEiRmmzZiHy2bibM=", + "lastModified": 1631098960, + "narHash": "sha256-6j6G/omHEFAnI2x7UvdrviGDNqiq1Fjd1A58Q6uc4sQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e421291bdd94c79d6ae98f05ed8f09412d0b6ad7", + "rev": "12eb1d16ae3b6cbf0ea83e9228bca8ffd7cfe347", "type": "github" }, "original": { @@ -439,11 +439,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1630850248, - "narHash": "sha256-OzJi6Olf7mSVhGt3W7qOMVP5Qk1lH60zlHeCcITzfv0=", + "lastModified": 1630938467, + "narHash": "sha256-GiSjPKDmFJPaM10lMWhwOrZViAB2kLX6NsHjRSZ/vWE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "23d5823337f4502dfa17e192d8c53a47cabcb6b4", + "rev": "efcfe3676268c789e78a22b20a94c00227d20bc8", "type": "github" }, "original": { diff --git a/overlays/overrides.nix b/overlays/overrides.nix index 68742ee..882c769 100644 --- a/overlays/overrides.nix +++ b/overlays/overrides.nix @@ -8,6 +8,7 @@ channels: final: prev: { discord element-desktop rage + podman nixpkgs-fmt qutebrowser nvfetcher diff --git a/profiles/develop/default.nix b/profiles/develop/default.nix index 967c2cd..bed0cfe 100644 --- a/profiles/develop/default.nix +++ b/profiles/develop/default.nix @@ -14,7 +14,9 @@ kondo # for removing unused files ]; virtualisation.podman.enable = true; - virtualisation.docker.enable = true; + virtualisation.podman.defaultNetwork.dnsname.enable = true; + virtualisation.podman.dockerSocket.enable = true; +# virtualisation.docker.enable = true; programs.adb.enable = true; } diff --git a/users/mae/home-manager-base.nix b/users/mae/home-manager-base.nix index 8b77c88..2e32956 100644 --- a/users/mae/home-manager-base.nix +++ b/users/mae/home-manager-base.nix @@ -1,6 +1,6 @@ { pkgs, ... }: { - imports = [ ../profiles/direnv ../profiles/git ../profiles/zsh ../profiles/neovim ../profiles/syncthing ../profiles/kdeconnect ]; + imports = [ ../profiles/direnv ../profiles/git ../profiles/zsh ../profiles/neovim ../profiles/syncthing ../profiles/kdeconnect ../profiles/podman ]; home.sessionVariables = { XDG_DATA_DIRS = "$XDG_DATA_DIRS:/var/lib/flatpak/exports/share:$HOME/.local/share/flatpak/exports/share"; diff --git a/users/mae/user.nix b/users/mae/user.nix index 7c61b14..054f83c 100644 --- a/users/mae/user.nix +++ b/users/mae/user.nix @@ -6,6 +6,6 @@ isNormalUser = true; hashedPassword = "$6$vyS4lqYbl3$OXztJnAC5ZayA4eCBSIRlYtsi9u1HnafsfNL28l4CJh0BISVlSj6D48CA80cshnvYW/EEzfEj7z4zTNFpJAT/."; shell = pkgs.zsh; - extraGroups = [ "wheel" "video" "lp" "scanner" "adbusers" "render" "libvirtd" "docker" ]; + extraGroups = [ "wheel" "video" "lp" "scanner" "adbusers" "render" "libvirtd" "podman" "docker" ]; }; } diff --git a/users/profiles/podman/default.nix b/users/profiles/podman/default.nix new file mode 100644 index 0000000..4996642 --- /dev/null +++ b/users/profiles/podman/default.nix @@ -0,0 +1,11 @@ +{pkgs, ...}: +{ + xdg.configFile.podman-service ={ + target = "systemd/user/podman.service"; + source = "${pkgs.podman}/lib/systemd/system/podman.service"; + }; + xdg.configFile.podman-socket ={ + target = "systemd/user/podman.socket"; + source = "${pkgs.podman}/lib/systemd/system/podman.socket"; + }; +}