hosts/common.nix

@@ -23,7 +23,7 @@
     };
     identityFile = lib.mkOption {
       type = lib.types.str;
-      description = "Path to existing private key file.";
+      description = "Path to existing identity file.";
       default = "/etc/ssh/ssh_host_ed25519_key";
     };
     gui = {

hosts/desktop/default.nix

@@ -14,6 +14,7 @@ nixpkgs.lib.nixosSystem {
       nix.registry.nixpkgs.flake = nixpkgs;
       identityFile = "/home/${globals.user}/.ssh/id_ed25519";
       gaming.steam = true;
+      gaming.leagueoflegends = true;
       gaming.legendary = true;
       gui = {
         enable = true;

modules/graphical/i3.nix

@@ -9,11 +9,11 @@ let
 
 in {
 
-  config = {
+  config = lib.mkIf config.services.xserver.enable {
 
     services.xserver.windowManager = {
       i3 = {
-        enable = config.services.xserver.enable;
+        enable = true;
         package = pkgs.i3-gaps;
       };
     };
@@ -25,7 +25,7 @@ in {
 
     home-manager.users.${config.user} = {
       xsession.windowManager.i3 = {
-        enable = config.services.xserver.enable;
+        enable = true;
         package = pkgs.i3-gaps;
         config = let
           modifier = "Mod4"; # Super key
@@ -238,7 +238,7 @@ in {
       };
 
       programs.fish.functions = {
-        update-lock-screen = lib.mkIf config.services.xserver.enable {
+        update-lock-screen = {
           description = "Update lockscreen with wallpaper";
           body = lockUpdate;
         };
@@ -247,19 +247,17 @@ in {
       # Update lock screen cache only if cache is empty
       home.activation.updateLockScreenCache =
         let cacheDir = "${config.homePath}/.cache/betterlockscreen/current";
-        in lib.mkIf config.services.xserver.enable
+        in config.home-manager.users.${config.user}.lib.dag.entryAfter
-        (config.home-manager.users.${config.user}.lib.dag.entryAfter
+        [ "writeBoundary" ] ''
-          [ "writeBoundary" ] ''
+          if [ ! -d ${cacheDir} ] || [ -z "$(ls ${cacheDir})" ]; then
-            if [ ! -d ${cacheDir} ] || [ -z "$(ls ${cacheDir})" ]; then
+              $DRY_RUN_CMD ${lockUpdate}
-                $DRY_RUN_CMD ${lockUpdate}
+          fi
-            fi
+        '';
-          '');
 
     };
 
     # Ref: https://github.com/betterlockscreen/betterlockscreen/blob/next/system/betterlockscreen%40.service
     systemd.services.lock = {
-      enable = config.services.xserver.enable;
       description = "Lock the screen on resume from suspend";
       before = [ "sleep.target" "suspend.target" ];
       serviceConfig = {

modules/hardware/boot.nix

@@ -10,9 +10,6 @@
       # Check for other OSes and make them available
       useOSProber = true;
 
-      # Attempt to display GRUB on widescreen monitor
-      gfxmodeEfi = "1920x1080";
-
       # Install GRUB onto the boot disk
       # device = config.fileSystems."/boot".device;