From 05a7d7897baec6a08c2be312a0bc3d86c7fa856a Mon Sep 17 00:00:00 2001 From: Dave Gallant Date: Sat, 18 Nov 2023 22:35:17 -0500 Subject: [PATCH] Consolidate nix files --- modules/common/linux-desktop.nix | 31 --------------- modules/common/linux.nix | 43 +++++++++++++++++++- modules/common/networking.nix | 12 ------ modules/common/printing.nix | 3 -- modules/packages/linux-desktop.nix | 63 ------------------------------ modules/packages/linux.nix | 50 +++++++++++++++++++++++- outputs.nix | 4 -- 7 files changed, 90 insertions(+), 116 deletions(-) delete mode 100644 modules/common/linux-desktop.nix delete mode 100644 modules/common/networking.nix delete mode 100644 modules/common/printing.nix delete mode 100644 modules/packages/linux-desktop.nix diff --git a/modules/common/linux-desktop.nix b/modules/common/linux-desktop.nix deleted file mode 100644 index 0ddca62..0000000 --- a/modules/common/linux-desktop.nix +++ /dev/null @@ -1,31 +0,0 @@ -{...}: { - services.xserver = { - enable = true; - displayManager = { - gdm = { - enable = true; - wayland = false; - }; - }; - desktopManager = { - gnome = { - enable = true; - }; - }; - }; - - services.gnome.gnome-keyring.enable = true; - - services.avahi = { - enable = true; - nssmdns = true; - publish = { - enable = true; - addresses = true; - domain = true; - hinfo = true; - userServices = true; - workstation = true; - }; - }; -} diff --git a/modules/common/linux.nix b/modules/common/linux.nix index 3877ca2..8d83671 100644 --- a/modules/common/linux.nix +++ b/modules/common/linux.nix @@ -7,7 +7,6 @@ system.autoUpgrade.enable = true; systemd.services.tailscaled.after = ["network-online.target" "systemd-resolved.service"]; - nix.extraOptions = "experimental-features = nix-command flakes"; nix.package = pkgs.nixUnstable; @@ -54,4 +53,46 @@ enableSSHSupport = true; }; programs.corectrl.enable = true; + + services = { + avahi = { + enable = true; + nssmdns = true; + publish = { + enable = true; + addresses = true; + domain = true; + hinfo = true; + userServices = true; + workstation = true; + }; + }; + gnome.gnome-keyring.enable = true; + printing.enable = true; + tailscale.enable = true; + + xserver = { + enable = true; + displayManager = { + gdm = { + enable = true; + wayland = false; + }; + }; + desktopManager = { + gnome = { + enable = true; + }; + }; + }; + }; + + networking = { + firewall = { + allowPing = false; + enable = true; + checkReversePath = "loose"; + trustedInterfaces = ["tailscale0"]; + }; + }; } diff --git a/modules/common/networking.nix b/modules/common/networking.nix deleted file mode 100644 index b0e1120..0000000 --- a/modules/common/networking.nix +++ /dev/null @@ -1,12 +0,0 @@ -{pkgs, ...}: { - services.tailscale.enable = true; - - networking = { - firewall = { - allowPing = false; - enable = true; - checkReversePath = "loose"; - trustedInterfaces = ["tailscale0"]; - }; - }; -} diff --git a/modules/common/printing.nix b/modules/common/printing.nix deleted file mode 100644 index 744d24c..0000000 --- a/modules/common/printing.nix +++ /dev/null @@ -1,3 +0,0 @@ -{pkgs, ...}: { - services.printing.enable = true; -} diff --git a/modules/packages/linux-desktop.nix b/modules/packages/linux-desktop.nix deleted file mode 100644 index da45412..0000000 --- a/modules/packages/linux-desktop.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - config, - lib, - pkgs, - unstable, - ... -}: let - inherit (pkgs) stdenv; -in { - environment.systemPackages = with pkgs; let - linuxDesktop = [ - albert - bitwarden - bitwarden-cli - chromium - deja-dup - discord - foliate - ghostscript - gimp-with-plugins - gnome.gnome-sound-recorder - gnome.gnome-tweaks - gnome.seahorse - gnomeExtensions.appindicator - gnomeExtensions.bluetooth-quick-connect - gnomeExtensions.blur-my-shell - gnomeExtensions.caffeine - gnomeExtensions.clipboard-indicator - gnomeExtensions.dash-to-dock - gnomeExtensions.grand-theft-focus - gnomeExtensions.notification-banner-reloaded - gnomeExtensions.quick-settings-tweaker - gnomeExtensions.tailscale-status - gnomeExtensions.tray-icons-reloaded - gnomeExtensions.vitals - google-cloud-sdk - kazam - legendary-gl - obs-studio - pavucontrol - podman - prismlauncher - psst - qemu - ryujinx - steam-tui - unstable.signal-desktop - unstable.unityhub - unstable.yuzu - unstable.zoom-us - usbutils - virt-manager - vlc - wine - wine64 - wireshark-qt - yaru-theme - ]; - in - linuxDesktop; - - programs.gnupg.agent.enable = true; -} diff --git a/modules/packages/linux.nix b/modules/packages/linux.nix index da2834b..04d3450 100644 --- a/modules/packages/linux.nix +++ b/modules/packages/linux.nix @@ -9,19 +9,65 @@ in { environment.systemPackages = with pkgs; let linux = [ + albert + bitwarden + bitwarden-cli + chromium cpu-x cryptsetup + deja-dup + discord docker docker-compose + foliate + ghostscript + gimp-with-plugins glibcLocales + gnome.gnome-sound-recorder + gnome.gnome-tweaks + gnome.seahorse + gnomeExtensions.appindicator + gnomeExtensions.bluetooth-quick-connect + gnomeExtensions.blur-my-shell + gnomeExtensions.caffeine + gnomeExtensions.clipboard-indicator + gnomeExtensions.dash-to-dock + gnomeExtensions.grand-theft-focus + gnomeExtensions.notification-banner-reloaded + gnomeExtensions.quick-settings-tweaker + gnomeExtensions.tailscale-status + gnomeExtensions.tray-icons-reloaded + gnomeExtensions.vitals + google-cloud-sdk + kazam + legendary-gl lm_sensors netdata - pinentry-curses nfs-utils + obs-studio + pavucontrol + pinentry-curses + podman + prismlauncher + psst + qemu rustup + ryujinx + steam-tui strace - unstable.tailscale traceroute + unstable.signal-desktop + unstable.tailscale + unstable.unityhub + unstable.yuzu + unstable.zoom-us + usbutils + virt-manager + vlc + wine + wine64 + wireshark-qt + yaru-theme ]; in linux; diff --git a/outputs.nix b/outputs.nix index a47c961..49af859 100644 --- a/outputs.nix +++ b/outputs.nix @@ -64,10 +64,6 @@ ]; desktopLinuxModules = [ ./modules/common/linux.nix - ./modules/common/linux-desktop.nix - ./modules/common/networking.nix - ./modules/common/printing.nix - ./modules/packages/linux-desktop.nix ./modules/packages/linux.nix ./modules/services/netdata/default.nix ];