diff --git a/.forgejo/workflows/deploy-rs.yml b/.forgejo/workflows/deploy-rs.yml index 1f84f7be..6c1c72bb 100644 --- a/.forgejo/workflows/deploy-rs.yml +++ b/.forgejo/workflows/deploy-rs.yml @@ -27,9 +27,10 @@ jobs: - name: "Setup: Runner" run: | - apk update - apk add git nodejs nix openssh-client qemu tailscale sudo --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing/ - + apt update -y + apt install git nodejs nix-bin -y + git config --global user.email "${{github.actor}}" + git config --global user.name "Albert J. Copeland" - name: "Setup: SSH" run: | mkdir /root/.ssh diff --git a/flake.nix b/flake.nix index aa00becb..f8f8474d 100644 --- a/flake.nix +++ b/flake.nix @@ -59,8 +59,8 @@ milan-linode-01 = libx.mkHost { hostname = "milan-linode-01"; type = "small";}; framework-server = libx.mkHost { hostname = "framework-server"; }; nuc-server = libx.mkHost { hostname = "nuc-server"; }; - nixos-desktop = libx.mkHost { hostname = "nixos-desktop"; unfree = true; desktop = "hyprland"; theme = "tokyo-night"; }; - nixos-framework = libx.mkHost { hostname = "nixos-framework"; unfree = true; desktop = "hyprland"; theme = "sakura-night"; }; + nixos-desktop = libx.mkHost { hostname = "nixos-desktop"; unfree = true; desktop = "hyprland"; theme = "green"; }; + nixos-framework = libx.mkHost { hostname = "nixos-framework"; unfree = true; desktop = "hyprland"; theme = "green"; }; backups-rpi4 = libx.mkHost { hostname = "backups-rpi4"; system = "aarch64-linux"; type = "small"; }; piaware-rpi4 = libx.mkHost { hostname = "piaware-rpi4"; system = "aarch64-linux"; type = "small"; }; quitman-rpi4 = libx.mkHost { hostname = "quitman-rpi4"; system = "aarch64-linux"; type = "small"; }; @@ -70,8 +70,8 @@ "albert@milan-linode-01" = libx.mkHome { hostname = "milan-linode-01"; type = "small"; }; "albert@framework-server" = libx.mkHome { hostname = "framework-server"; }; "albert@nuc-server" = libx.mkHome { hostname = "nuc-server"; }; - "albert@nixos-desktop" = libx.mkHome { hostname = "nixos-desktop"; desktop = "hyprland"; theme = "tokyo-night"; }; - "albert@nixos-framework" = libx.mkHome { hostname = "nixos-framework"; desktop = "hyprland"; theme = "sakura-night"; }; + "albert@nixos-desktop" = libx.mkHome { hostname = "nixos-desktop"; desktop = "hyprland"; theme = "green"; }; + "albert@nixos-framework" = libx.mkHome { hostname = "nixos-framework"; desktop = "hyprland"; theme = "green"; }; "albert@backups-rpi4" = libx.mkHome { hostname = "backups-rpi4"; system = "aarch64-linux"; type = "small"; }; "albert@piaware-rpi4" = libx.mkHome { hostname = "piaware-rpi4"; system = "aarch64-linux"; type = "small"; }; "albert@quitman-rpi4" = libx.mkHome { hostname = "quitman-rpi4"; system = "aarch64-linux"; type = "small"; }; diff --git a/home-manager/common/desktops/xfce/xfconf/xfce4-panel.xml b/home-manager/common/desktops/xfce/xfconf/xfce4-panel.xml index f81c83f0..3356604c 100644 --- a/home-manager/common/desktops/xfce/xfconf/xfce4-panel.xml +++ b/home-manager/common/desktops/xfce/xfconf/xfce4-panel.xml @@ -58,8 +58,12 @@ + + + + @@ -73,7 +77,7 @@ - + diff --git a/home-manager/common/desktops/xfce/xfconf/xfce4-terminal.xml b/home-manager/common/desktops/xfce/xfconf/xfce4-terminal.xml index acca3607..dfa45a88 100644 --- a/home-manager/common/desktops/xfce/xfconf/xfce4-terminal.xml +++ b/home-manager/common/desktops/xfce/xfconf/xfce4-terminal.xml @@ -27,4 +27,5 @@ + diff --git a/nixos/common/desktops/xfce/default.nix b/nixos/common/desktops/xfce/default.nix index ee1fc40a..a74340e3 100644 --- a/nixos/common/desktops/xfce/default.nix +++ b/nixos/common/desktops/xfce/default.nix @@ -5,7 +5,7 @@ # Enable sound with pipewire. sound.enable = true; - hardware.pulseaudio.enable = false; + hardware.pulseaudio.enable = true; security.rtkit.enable = true; services.pipewire = { enable = true; diff --git a/nixos/containers/default.nix b/nixos/containers/default.nix index e40e2192..6f417eb8 100644 --- a/nixos/containers/default.nix +++ b/nixos/containers/default.nix @@ -1,4 +1,4 @@ -{ ip, config, pkgs, stateVersion, hostname, username, ... }: { +{ ip, stateVersion, hostname, ... }: { imports = [ ./${hostname} # Modules diff --git a/nixos/hosts/piaware-rpi4/containers/piaware.nix b/nixos/hosts/piaware-rpi4/containers/piaware.nix index f1649071..2d2e60f1 100644 --- a/nixos/hosts/piaware-rpi4/containers/piaware.nix +++ b/nixos/hosts/piaware-rpi4/containers/piaware.nix @@ -14,7 +14,6 @@ extraOptions = [ "--device=/dev/bus/usb:/dev/bus/usb" "--network-alias=piaware" - "--network=piaware-default" ]; }; } diff --git a/nixos/users/albert/default.nix b/nixos/users/albert/default.nix index 1c32d494..2306a07b 100644 --- a/nixos/users/albert/default.nix +++ b/nixos/users/albert/default.nix @@ -12,6 +12,7 @@ in { description = "Albert J. Copeland"; # video is required for the "light" command to work extraGroups = [ "networkmanager" "wheel" ] + ++ ifExists [ "audio" ] ++ ifExists [ "video" ] ++ ifExists [ "docker" ] ++ ifExists [ "podman" ]