From f7f502d7b92c9193179b141c67a60f50848fe08b Mon Sep 17 00:00:00 2001 From: Evan Reichard Date: Sun, 6 Apr 2025 21:07:19 -0400 Subject: [PATCH] add docker --- .../wms/hyprland/config/hyprland.conf | 2 +- .../wms/hyprland/config/waybar-style.css | 3 ++ .../graphical/wms/hyprland/default.nix | 2 +- .../nixos/virtualisation/podman/default.nix | 43 +++++++++++++++++++ systems/aarch64-linux/mbp-nixos/default.nix | 4 ++ 5 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 modules/nixos/virtualisation/podman/default.nix diff --git a/modules/home/programs/graphical/wms/hyprland/config/hyprland.conf b/modules/home/programs/graphical/wms/hyprland/config/hyprland.conf index 98dd3e2..7355184 100755 --- a/modules/home/programs/graphical/wms/hyprland/config/hyprland.conf +++ b/modules/home/programs/graphical/wms/hyprland/config/hyprland.conf @@ -27,7 +27,7 @@ $menu = wofi --show drun # exec-once = $terminal # exec-once = nm-applet & -exec-once = waybar & $terminal & firefox +exec-once = uwsm app -- waybar & uwsm app -- $terminal & uwsm app -- firefox ############################# diff --git a/modules/home/programs/graphical/wms/hyprland/config/waybar-style.css b/modules/home/programs/graphical/wms/hyprland/config/waybar-style.css index d0bf955..4319551 100644 --- a/modules/home/programs/graphical/wms/hyprland/config/waybar-style.css +++ b/modules/home/programs/graphical/wms/hyprland/config/waybar-style.css @@ -48,6 +48,7 @@ /* Node Styles */ #workspaces, #window, +#tray, #cpu, #memory, #pulseaudio, @@ -126,6 +127,7 @@ #clock, #network, #cpu, +#tray, #workspaces { margin-left: 0.5rem; border-top-left-radius: 1rem; @@ -135,6 +137,7 @@ /* Right Border Radius */ #pulseaudio, #clock, +#tray, #battery, #workspaces { margin-right: 0.5rem; diff --git a/modules/home/programs/graphical/wms/hyprland/default.nix b/modules/home/programs/graphical/wms/hyprland/default.nix index 2e577d2..2d17186 100755 --- a/modules/home/programs/graphical/wms/hyprland/default.nix +++ b/modules/home/programs/graphical/wms/hyprland/default.nix @@ -31,9 +31,9 @@ in ]; # modules-center = [ "hyprland/window" ]; modules-right = [ + "tray" "cpu" "memory" - "tray" "pulseaudio" "network" "backlight" diff --git a/modules/nixos/virtualisation/podman/default.nix b/modules/nixos/virtualisation/podman/default.nix new file mode 100644 index 0000000..cd4b066 --- /dev/null +++ b/modules/nixos/virtualisation/podman/default.nix @@ -0,0 +1,43 @@ +{ config, lib, pkgs, namespace, ... }: +let + inherit (lib) mkIf; + + cfg = config.${namespace}.virtualisation.podman; +in +{ + options.${namespace}.virtualisation.podman = { + enable = lib.mkEnableOption "podman"; + }; + + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ + podman-compose + podman-desktop + ]; + + reichard = { + user = { + extraGroups = [ + "docker" + "podman" + ]; + }; + }; + + virtualisation = { + podman = { + inherit (cfg) enable; + + autoPrune = { + enable = true; + flags = [ "--all" ]; + dates = "weekly"; + }; + + defaultNetwork.settings.dns_enabled = true; + dockerCompat = true; + dockerSocket.enable = true; + }; + }; + }; +} diff --git a/systems/aarch64-linux/mbp-nixos/default.nix b/systems/aarch64-linux/mbp-nixos/default.nix index 1a93e0a..9b54c56 100755 --- a/systems/aarch64-linux/mbp-nixos/default.nix +++ b/systems/aarch64-linux/mbp-nixos/default.nix @@ -48,6 +48,10 @@ in }; }; + virtualisation = { + podman = enabled; + }; + programs = { graphical = { wms.hyprland = enabled;