wip

system/android.nix

@@ -0,0 +1,17 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+  options.my.android.enable = lib.mkEnableOption { };
+
+  config = lib.mkIf config.my.android.enable {
+    # Open kde connect ports
+    programs.kdeconnect.enable = true;
+
+    programs.adb.enable = true;
+    services.udev.packages = [ pkgs.android-udev-rules ];
+  };
+}

system/boot.nix

@@ -2,7 +2,6 @@
   config,
   pkgs,
   lib,
-  inputs,
   ...
 }:
 {

system/configuration.nix

@@ -1,14 +1,10 @@
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
-{
+{ pkgs, ... }:
-  config,
-  pkgs,
-  inputs,
-  ...
-}:
 {
   imports = [
+    ./android.nix
     ./gaming.nix
     ./media-packages.nix
     ./boot.nix
@@ -25,39 +21,27 @@
     ../settings
   ];
 
-  my = import ../user/variables.nix;
+  my = import ../user/variables.nix // {
+    android.enable = true;
+    media-packages.enable = true;
+    containers.enable = true;
+  };
 
   zramSwap.enable = true;
 
-  programs.adb.enable = true;
-  services.udev.packages = [ pkgs.android-udev-rules ];
-
   # Enable touchpad support (enabled default in most desktopManager).
   services.libinput.enable = true;
 
-  packages.media-packages.enable = true;
   environment.systemPackages = with pkgs; [
     pavucontrol
 
     glib # gsettings
     usbutils
-    # dracula-theme # gtk theme
     adwaita-icon-theme # default gnome cursors
-
-    nix-output-monitor
   ];
 
   services.geoclue2.enable = true;
 
-  # Workaround for nm-wait-online hanging??
-  # Ref: https://github.com/NixOS/nixpkgs/issues/180175
-  systemd.services.NetworkManager-wait-online = {
-    serviceConfig.ExecStart = [
-      ""
-      "${pkgs.networkmanager}/bin/nm-online -q"
-    ];
-  };
-
   systemd.extraConfig = ''
     DefaultTimeoutStopSec=10s
   '';

system/containers.nix

@@ -1,30 +1,39 @@
-{ pkgs, lib, ... }:
 {
-  services.flatpak.enable = true;
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+{
+  options.my.containers.enable = lib.mkEnableOption { };
 
-  virtualisation.docker = {
+  config = lib.mkIf config.my.containers.enable {
-    enable = true;
+    services.flatpak.enable = true;
-    autoPrune = {
+
+    virtualisation.docker = {
       enable = true;
-      dates = "monthly";
+      autoPrune = {
-      flags = [
+        enable = true;
-        "--all"
+        dates = "monthly";
-        "--volumes"
+        flags = [
-      ];
+          "--all"
-    };
+          "--volumes"
-    daemon.settings = {
+        ];
-      # needed by bitbucket runner ???
+      };
-      log-driver = "json-file";
+      daemon.settings = {
-      log-opts = {
+        # needed by bitbucket runner ???
-        max-size = "10m";
+        log-driver = "json-file";
-        max-file = "3";
+        log-opts = {
+          max-size = "10m";
+          max-file = "3";
+        };
       };
     };
+
+    networking.firewall.extraCommands = lib.getExe pkgs._docker-block-external-connections;
+
+    programs.extra-container.enable = true;
+
+    programs.firejail.enable = true;
   };
-
-  networking.firewall.extraCommands = lib.getExe pkgs._docker-block-external-connections;
-
-  programs.extra-container.enable = true;
-
-  programs.firejail.enable = true;
 }

system/media-packages.nix

@@ -5,10 +5,10 @@
   ...
 }:
 let
-  cfg = config.packages.media-packages;
+  cfg = config.my.media-packages;
 in
 {
-  options.packages.media-packages = {
+  options.my.media-packages = {
     enable = lib.mkEnableOption "media packages";
   };
   config = lib.mkIf cfg.enable {

system/network.nix

@@ -6,8 +6,6 @@
   # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
   # Enable networking
   networking.networkmanager.enable = true;
-  # Open kde connect ports
-  programs.kdeconnect.enable = true;
 
   networking.firewall = {
     enable = true;
@@ -15,7 +13,7 @@
   };
 
   # Enable CUPS to print documents.
-  # services.printing.enable = true;
+  services.printing.enable = true;
 
   security.rtkit.enable = true;
   services.openssh = {
@@ -27,4 +25,13 @@
       KbdInteractiveAuthentication = false;
     };
   };
+
+  # Workaround for nm-wait-online hanging??
+  # Ref: https://github.com/NixOS/nixpkgs/issues/180175
+  systemd.services.NetworkManager-wait-online = {
+    serviceConfig.ExecStart = [
+      ""
+      "${pkgs.networkmanager}/bin/nm-online -q"
+    ];
+  };
 }

user/dummy.nix

@@ -0,0 +1,8 @@
+{ lib, ... }:
+{
+  options.my = {
+    android.enable = lib.mkEnableOption { };
+    media-packages.enable = lib.mkEnableOption { };
+    containers.enable = lib.mkEnableOption { };
+  };
+}

user/home.nix

@@ -8,6 +8,7 @@
 }:
 {
   imports = [
+    ./dummy.nix
     ./waybar
     ./helix.nix
     ./kakoune
@@ -127,6 +128,8 @@
 
     unstable.blade-formatter
     nixfmt-rfc-style
+
+    nix-output-monitor
   ];
 
   fonts.fontconfig.enable = true;

user/sway/default.nix

@@ -73,7 +73,7 @@ in
           };
         output = {
           "*" = {
-            adaptive_sync = "off";
+            adaptive_sync = "on";
             bg = "${theme.background} fill";
             mode = "1920x1080@144.000Hz";
           };