diff --git a/.forgejo/workflows/deploy-rs.yml b/.forgejo/workflows/deploy-rs.yml index bdb66ead..a06e8735 100644 --- a/.forgejo/workflows/deploy-rs.yml +++ b/.forgejo/workflows/deploy-rs.yml @@ -28,7 +28,7 @@ jobs: - name: "Setup: Runner" run: | apt update -y - apt install git nodejs nix-bin -y + apt install git nodejs nix-bin sudo -y git config --global user.email "${{github.actor}}" git config --global user.name "Albert J. Copeland" - name: "Setup: SSH" diff --git a/nixos/common/desktops/xfce/default.nix b/nixos/common/desktops/xfce/default.nix index 806d9a4f..b70867d8 100644 --- a/nixos/common/desktops/xfce/default.nix +++ b/nixos/common/desktops/xfce/default.nix @@ -3,15 +3,16 @@ ../../modules/fonts.nix ]; - # Enable sound with pipewire. - hardware.pulseaudio.enable = false; - sound.enable = true; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; + services = { + gnome.gnome-keyring.enable = true; + pipewire = { + enable = true; + alsa = { + enable = true; + support32Bit = true; + }; + pulse.enable = true; + }; }; # Configure keymap in X11 @@ -30,6 +31,54 @@ papirus-nord xfce.xfwm4-themes dconf2nix # https://github.com/gvolpe/dconf2nix - arc-theme + arc-theme + blueman + chromium + deja-dup + drawing + elementary-xfce-icon-theme + evince + firefox + foliate + font-manager + gimp-with-plugins + gnome.file-roller + gnome.gnome-disk-utility + inkscape-with-extensions + libqalculate + libreoffice + orca + pavucontrol + qalculate-gtk + thunderbird + wmctrl + xclip + xcolor + xcolor + xdo + xdotool + xfce.catfish + xfce.gigolo + xfce.orage + xfce.xfburn + xfce.xfce4-appfinder + xfce.xfce4-clipman-plugin + xfce.xfce4-cpugraph-plugin + xfce.xfce4-dict + xfce.xfce4-fsguard-plugin + xfce.xfce4-genmon-plugin + xfce.xfce4-netload-plugin + xfce.xfce4-panel + xfce.xfce4-pulseaudio-plugin + xfce.xfce4-systemload-plugin + xfce.xfce4-weather-plugin + xfce.xfce4-whiskermenu-plugin + xfce.xfce4-xkb-plugin + xfce.xfdashboard + xorg.xev + xsel + xtitle + xwinmosaic + zuki-themes ]; } diff --git a/nixos/containers/rdesktop/default.nix b/nixos/containers/rdesktop/default.nix index bc007359..5752b0dd 100644 --- a/nixos/containers/rdesktop/default.nix +++ b/nixos/containers/rdesktop/default.nix @@ -1,4 +1,4 @@ -{ pkgs, desktop, username, ... }: { +{ desktop, username, ... }: { imports = [ ../../users/${username} ../../common/desktops/${desktop}