migrate to nixos modules

2021-04-11 21:43:27 -04:00
parent 7b70b48de4
commit a9c6b46ff5
25 changed files with 544 additions and 459 deletions
--- a/common/pc/audio.nix
+++ b/common/pc/audio.nix
@@ -1,28 +1,32 @@
-{ config, pkgs, ... }:
+{ lib, config, pkgs, ... }:

-{
-  # Audio
-  sound.enable = true;
+let
+  cfg = config.de;
+in {
+  config = lib.mkIf cfg.enable {
+    # Audio
+    sound.enable = true;

-  # enable pulseaudio support for packages
-  nixpkgs.config.pulseaudio = true;
+    # enable pulseaudio support for packages
+    nixpkgs.config.pulseaudio = true;

-  # realtime pulseaudio
-  security.rtkit.enable = true;
+    # realtime pulseaudio
+    security.rtkit.enable = true;

-  hardware.pulseaudio = {
-    enable = true;
-    support32Bit = true;
-    package = pkgs.pulseaudioFull; # bt headset support
+    hardware.pulseaudio = {
+      enable = true;
+      support32Bit = true;
+      package = pkgs.pulseaudioFull; # bt headset support

-    # TODO: switch on connect isn't working for some reason (at least when in kde)
-    extraConfig = "
-      load-module module-switch-on-connect
-      load-module module-switch-on-connect ignore_virtual=no
-    ";
+      # TODO: switch on connect isn't working for some reason (at least when in kde)
+      extraConfig = "
+        load-module module-switch-on-connect
+        load-module module-switch-on-connect ignore_virtual=no
+      ";
+    };
+    users.users.googlebot.extraGroups = [ "audio" ];
+
+    # bt headset support
+    hardware.bluetooth.enable = true;
  };
-  users.users.googlebot.extraGroups = [ "audio" ];
-
-  # bt headset support
-  hardware.bluetooth.enable = true;
 }
--- a/common/pc/chromium.nix
+++ b/common/pc/chromium.nix
@@ -1,40 +1,44 @@
-{ config, pkgs, ... }:
+{ lib, config, pkgs, ... }:

-{
-  # chromium with specific extensions + settings
-  programs.chromium = {
-    enable = true;
-    extensions = [
-      "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin
-      "gcbommkclmclpchllfjekcdonpmejbdp" # https everywhere
-      "oboonakemofpalcgghocfoadofidjkkk" # keepassxc plugin
-      "cimiefiiaegbelhefglklhhakcgmhkai" # plasma integration
-      "hkgfoiooedgoejojocmhlaklaeopbecg" # picture in picture
-    ];
-    extraOpts = {
-      "BrowserSignin" = 0;
-      "SyncDisabled" = true;
-      "PasswordManagerEnabled" = false;
-      "SpellcheckEnabled" = true;
-      "SpellcheckLanguage" = [ "en-US" ];
+let
+  cfg = config.de;
+in {
+  config = lib.mkIf cfg.enable {
+    # chromium with specific extensions + settings
+    programs.chromium = {
+      enable = true;
+      extensions = [
+        "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin
+        "gcbommkclmclpchllfjekcdonpmejbdp" # https everywhere
+        "oboonakemofpalcgghocfoadofidjkkk" # keepassxc plugin
+        "cimiefiiaegbelhefglklhhakcgmhkai" # plasma integration
+        "hkgfoiooedgoejojocmhlaklaeopbecg" # picture in picture
+      ];
+      extraOpts = {
+        "BrowserSignin" = 0;
+        "SyncDisabled" = true;
+        "PasswordManagerEnabled" = false;
+        "SpellcheckEnabled" = true;
+        "SpellcheckLanguage" = [ "en-US" ];
+      };
+      defaultSearchProviderSuggestURL = null;
+      defaultSearchProviderSearchURL = " https://duckduckgo.com/?q={searchTerms}&kp=-1&kl=us-en";
    };
-    defaultSearchProviderSuggestURL = null;
-    defaultSearchProviderSearchURL = " https://duckduckgo.com/?q={searchTerms}&kp=-1&kl=us-en";
-  };

-  # hardware accelerated video playback (on intel)
-  nixpkgs.config.packageOverrides = pkgs: {
-    vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
-    chromium = pkgs.chromium.override { enableVaapi = true; };
+    # hardware accelerated video playback (on intel)
+    nixpkgs.config.packageOverrides = pkgs: {
+      vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
+      chromium = pkgs.chromium.override { enableVaapi = true; };
+    };
+    hardware.opengl = {
+      enable = true;
+      extraPackages = with pkgs; [
+        intel-media-driver # LIBVA_DRIVER_NAME=iHD
+        vaapiIntel         # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
+        vaapiVdpau
+        libvdpau-va-gl
+      ];
+      extraPackages32 = with pkgs.pkgsi686Linux; [ vaapiIntel ];
+    };
  };
-  hardware.opengl = {
-    enable = true;
-    extraPackages = with pkgs; [
-      intel-media-driver # LIBVA_DRIVER_NAME=iHD
-      vaapiIntel         # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
-      vaapiVdpau
-      libvdpau-va-gl
-    ];
-    extraPackages32 = with pkgs.pkgsi686Linux; [ vaapiIntel ];
-  };  
 }
--- a/common/pc/de.nix
+++ b/common/pc/de.nix
@@ -1,7 +1,8 @@
 { config, pkgs, lib, ... }:

-{
-  # General
+let
+  cfg = config.de;
+in {
  imports = [
    ./kde.nix
    ./xfce.nix
@@ -14,32 +15,39 @@
    ./vscodium.nix
    ./discord.nix
    ./steam.nix
+    ./touchpad.nix
  ];

-  # allow specific unfree packages
-  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
-    "tigervnc" "font-bh-lucidatypewriter" # tigervnc
-    "steam" "steam-original" "steam-runtime" # TODO move to steam.nix
-    "discord" # TODO move to discord.nix
-  ];
+  options.de = {
+    enable = lib.mkEnableOption "enable desktop environment";
+  };

-  # vulkan
-  hardware.opengl.driSupport = true;
-  hardware.opengl.driSupport32Bit = true;
+  config = lib.mkIf cfg.enable {
+    # allow specific unfree packages
+    nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+      "tigervnc" "font-bh-lucidatypewriter" # tigervnc
+      "steam" "steam-original" "steam-runtime" # TODO move to steam.nix
+      "discord" # TODO move to discord.nix
+    ];

-  # Applications
-  users.users.googlebot.packages = with pkgs; [
-    chromium keepassxc mumble tigervnc bluez-tools vscodium element-desktop mpv
-  ];
+    # vulkan
+    hardware.opengl.driSupport = true;
+    hardware.opengl.driSupport32Bit = true;

-  # Networking
-  networking.networkmanager.enable = true;
-  users.users.googlebot.extraGroups = [ "networkmanager" ];
+    # Applications
+    users.users.googlebot.packages = with pkgs; [
+      chromium keepassxc mumble tigervnc bluez-tools vscodium element-desktop mpv
+    ];

-  # Printing
-  services.printing.enable = true;
+    # Networking
+    networking.networkmanager.enable = true;
+    users.users.googlebot.extraGroups = [ "networkmanager" ];

-  # Security
-  services.gnome3.gnome-keyring.enable = true;
-  security.pam.services.googlebot.enableGnomeKeyring = true;
+    # Printing
+    services.printing.enable = true;
+
+    # Security
+    services.gnome3.gnome-keyring.enable = true;
+    security.pam.services.googlebot.enableGnomeKeyring = true;
+  };
 }
--- a/common/pc/discord.nix
+++ b/common/pc/discord.nix
@@ -1,7 +1,11 @@
-{ config, pkgs, ... }:
+{ lib, config, pkgs, ... }:

-{
-  users.users.googlebot.packages = [
-    pkgs.discord
-  ];
+let
+  cfg = config.de;
+in {
+  config = lib.mkIf cfg.enable {
+    users.users.googlebot.packages = [
+      pkgs.discord
+    ];
+  };
 }
--- a/common/pc/firefox.nix
+++ b/common/pc/firefox.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ lib, config, pkgs, ... }:

 #
 # Sort of private firefox
@@ -12,6 +12,8 @@
 #

 let
+  cfg = config.de;
+
  somewhatPrivateFF = pkgs.firefox-unwrapped.override {
    privacySupport = true;
    webrtcSupport = true; # mostly private ;)
@@ -87,5 +89,7 @@ let
  };
 in
 {
-  users.users.googlebot.packages = [ firefox ];
+  config = lib.mkIf cfg.enable {
+    users.users.googlebot.packages = [ firefox ];
+  };
 }
--- a/common/pc/kde.nix
+++ b/common/pc/kde.nix
@@ -1,16 +1,20 @@
-{ config, pkgs, ... }:
+{ lib, config, pkgs, ... }:

-{
-  # kde plasma
-  services.xserver = {
-    enable = true;
-    desktopManager.plasma5.enable = true;
-    displayManager.sddm.enable = true;
-  };
+let
+  cfg = config.de;
+in {
+  config = lib.mkIf cfg.enable {
+    # kde plasma
+    services.xserver = {
+      enable = true;
+      desktopManager.plasma5.enable = true;
+      displayManager.sddm.enable = true;
+    };

-  # kde apps
-  nixpkgs.config.firefox.enablePlasmaBrowserIntegration = true;
-  users.users.googlebot.packages = with pkgs; [
-    akonadi kmail plasma5Packages.kmail-account-wizard
-  ];  
+    # kde apps
+    nixpkgs.config.firefox.enablePlasmaBrowserIntegration = true;
+    users.users.googlebot.packages = with pkgs; [
+      akonadi kmail plasma5Packages.kmail-account-wizard
+    ];
+  };  
 }
--- a/common/pc/pithos.nix
+++ b/common/pc/pithos.nix
@@ -1,22 +1,26 @@
-{ config, pkgs, ... }:
+{ lib, config, pkgs, ... }:

-{
-  nixpkgs.overlays = [
-    (self: super: {
-      pithos = super.pithos.overrideAttrs (old: rec {
-        pname = "pithos";
-        version = "1.5.1";
-        src = super.fetchFromGitHub {
-          owner = pname;
-          repo  = pname;
-          rev = version;
-          sha256 = "il7OAALpHFZ6wjco9Asp04zWHCD8Ni+iBdiJWcMiQA4=";
-        };
-      });
-    })
-  ];
+let
+  cfg = config.de;
+in {
+  config = lib.mkIf cfg.enable {
+    nixpkgs.overlays = [
+      (self: super: {
+        pithos = super.pithos.overrideAttrs (old: rec {
+          pname = "pithos";
+          version = "1.5.1";
+          src = super.fetchFromGitHub {
+            owner = pname;
+            repo  = pname;
+            rev = version;
+            sha256 = "il7OAALpHFZ6wjco9Asp04zWHCD8Ni+iBdiJWcMiQA4=";
+          };
+        });
+      })
+    ];

-  users.users.googlebot.packages = with pkgs; [
-    pithos
-  ];
+    users.users.googlebot.packages = with pkgs; [
+      pithos
+    ];
+  };
 }
--- a/common/pc/steam.nix
+++ b/common/pc/steam.nix
@@ -1,10 +1,14 @@
-{ config, pkgs, ... }:
+{ lib, config, pkgs, ... }:

-{
-  programs.steam.enable = true;
-  hardware.steam-hardware.enable = true; # steam controller
+let
+  cfg = config.de;
+in {
+  config = lib.mkIf cfg.enable {
+    programs.steam.enable = true;
+    hardware.steam-hardware.enable = true; # steam controller

-  users.users.googlebot.packages = [
-    pkgs.steam
-  ];
+    users.users.googlebot.packages = [
+      pkgs.steam
+    ];
+  };
 }
--- a/common/pc/torbrowser.nix
+++ b/common/pc/torbrowser.nix
@@ -1,20 +1,24 @@
-{ config, pkgs, ... }:
+{ lib, config, pkgs, ... }:

-{
-  nixpkgs.overlays = [
-    (self: super: {
-      tor-browser-bundle-bin = super.tor-browser-bundle-bin.overrideAttrs (old: rec {
-        version = "10.0.10";
-        lang = "en-US";
-        src = pkgs.fetchurl {
-          url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
-          sha256 = "vYWZ+NsGN8YH5O61+zrUjlFv3rieaBqjBQ+a18sQcZg=";
-        };
-      });
-    })
-  ];
+let
+  cfg = config.de;
+in {
+  config = lib.mkIf cfg.enable {
+    nixpkgs.overlays = [
+      (self: super: {
+        tor-browser-bundle-bin = super.tor-browser-bundle-bin.overrideAttrs (old: rec {
+          version = "10.0.10";
+          lang = "en-US";
+          src = pkgs.fetchurl {
+            url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
+            sha256 = "vYWZ+NsGN8YH5O61+zrUjlFv3rieaBqjBQ+a18sQcZg=";
+          };
+        });
+      })
+    ];

-  users.users.googlebot.packages = with pkgs; [
-    tor-browser-bundle-bin
-  ];
+    users.users.googlebot.packages = with pkgs; [
+      tor-browser-bundle-bin
+    ];
+  };
 }
--- a/common/pc/touchpad.nix
+++ b/common/pc/touchpad.nix
@@ -1,6 +1,14 @@
-{ config, pkgs, ... }:
+{ lib, config, pkgs, ... }:

-{
-  services.xserver.libinput.enable = true;
-  services.xserver.libinput.touchpad.naturalScrolling = true;
+let
+  cfg = config.de.touchpad;
+in {
+  options.de.touchpad = {
+    enable = lib.mkEnableOption "enable touchpad";
+  };
+
+  config = lib.mkIf cfg.enable {
+    services.xserver.libinput.enable = true;
+    services.xserver.libinput.touchpad.naturalScrolling = true;
+  };
 }
--- a/common/pc/vscodium.nix
+++ b/common/pc/vscodium.nix
@@ -1,6 +1,8 @@
-{ config, pkgs, ... }:
+{ lib, config, pkgs, ... }:

 let
+  cfg = config.de;
+
  extensions = with pkgs.vscode-extensions; [
    bbenoist.Nix # nix syntax support
 #    arrterian.nix-env-selector  # nix dev envs
@@ -12,7 +14,9 @@ let
  };
 in
 {
-  users.users.googlebot.packages = [
-    vscodium-with-extensions
-  ];
+  config = lib.mkIf cfg.enable {
+    users.users.googlebot.packages = [
+      vscodium-with-extensions
+    ];
+  };
 }
--- a/common/pc/xfce.nix
+++ b/common/pc/xfce.nix
@@ -1,16 +1,20 @@
-{ config, pkgs, ... }:
+{ lib, config, pkgs, ... }:

-{
-  services.xserver = {
-    enable = true;
-    desktopManager = {
-      xterm.enable = false;
-      xfce.enable = true;
+let
+  cfg = config.de;
+in {
+  config = lib.mkIf cfg.enable {
+    services.xserver = {
+      enable = true;
+      desktopManager = {
+        xterm.enable = false;
+        xfce.enable = true;
+      };
+      displayManager.sddm.enable = true;
    };
-    displayManager.sddm.enable = true;
-  };

-  # xfce apps
-  users.users.googlebot.packages = with pkgs; [
-  ];  
+    # xfce apps
+    users.users.googlebot.packages = with pkgs; [
+    ];
+  };
 }
--- a/common/pc/yubikey.nix
+++ b/common/pc/yubikey.nix
@@ -1,7 +1,11 @@
-{ config, pkgs, ... }:
+{ lib, config, pkgs, ... }:

-{
-  # yubikey
-  services.pcscd.enable = true;
-  services.udev.packages = [ pkgs.yubikey-personalization ];  
+let
+  cfg = config.de;
+in {
+  config = lib.mkIf cfg.enable {
+    # yubikey
+    services.pcscd.enable = true;
+    services.udev.packages = [ pkgs.yubikey-personalization ];
+  };
 }