From 586fd9524bc7ceee59e434a484f988802f8322fb Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Tue, 16 Jan 2024 21:14:14 -0600
Subject: [PATCH] Paranoid

---
 modules/home-manager/default.nix |  1 +
 modules/home-manager/gnome.nix   |  7 +++++++
 modules/home-manager/sway.nix    | 10 ++++------
 modules/nixos/common.nix         |  2 +-
 modules/nixos/daniel.nix         |  1 +
 modules/nixos/default.nix        |  1 +
 modules/nixos/gnome.nix          |  6 ++++++
 modules/nixos/lutris.nix         | 14 ++++++++++++++
 nixos/foxtrot.nix                |  2 ++
 9 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100644 modules/home-manager/gnome.nix
 create mode 100644 modules/nixos/lutris.nix

diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index f10eb78..8504fd5 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -12,6 +12,7 @@ with builtins;
       "firefox"
       "fish"
       "git"
+      "gnome"
       "helix"
       "htop"
       "hyprland"
diff --git a/modules/home-manager/gnome.nix b/modules/home-manager/gnome.nix
new file mode 100644
index 0000000..74eebb7
--- /dev/null
+++ b/modules/home-manager/gnome.nix
@@ -0,0 +1,7 @@
+{...}: {
+  dconf.settings = {
+    "org/gnome/mutter" = {
+      experimental-features = ["scale-monitor-framebuffer"];
+    };
+  };
+}
diff --git a/modules/home-manager/sway.nix b/modules/home-manager/sway.nix
index ecf328a..0680abd 100644
--- a/modules/home-manager/sway.nix
+++ b/modules/home-manager/sway.nix
@@ -133,9 +133,9 @@
         {
           command = lib.concatStringsSep " " [
             "swayidle -w"
-            "timeout 300  'notify-send \"Idling in 300 seconds\"'"
-            "after-resume 'notify-send \"Idling cancelled.\"'"
-            "timeout 480  'notify-send -u critical \"Idling in 120 seconds\"'"
+            "before-sleep 'swaylock'"
+            "timeout 300 'notify-send \"Idling in 5 minutes\"' resume 'notify-send \"Idling cancelled.\"'"
+            "timeout 480  'notify-send -u critical \"Idling in 2 minutes\"'"
             "timeout 510  'notify-send -u critical \"Idling in 90 seconds\"'"
             "timeout 540  'notify-send -u critical \"Idling in 60 seconds!\"'"
             "timeout 570  'notify-send -u critical \"Idling in 30 seconds!\"'"
@@ -150,9 +150,7 @@
             "timeout 598  'notify-send -u critical \"Idling in 2 seconds!\"'"
             "timeout 599  'notify-send -u critical \"Idling in 1 second!\"'"
             "timeout 600  'swaylock -f'"
-            "timeout 600  'swaymsg \"output * dpms off\"'"
-            "after-resume 'swaymsg \"output * dpms on\" & maybe-good-morning &'"
-            "before-sleep 'swaylock'"
+            "timeout 600  'swaymsg \"output * dpms off\"' resume 'swaymsg \"output * dpms on\" & maybe-good-morning &'"
           ];
         }
         # {command = "firefox";}
diff --git a/modules/nixos/common.nix b/modules/nixos/common.nix
index c8e8cda..59a6948 100644
--- a/modules/nixos/common.nix
+++ b/modules/nixos/common.nix
@@ -144,7 +144,7 @@
   };
 
   console = {
-    font = "Lat2-Terminus16";
+    # font = "Lat2-Terminus16";
     useXkbConfig = true;
     earlySetup = true;
 
diff --git a/modules/nixos/daniel.nix b/modules/nixos/daniel.nix
index 061023d..0049442 100644
--- a/modules/nixos/daniel.nix
+++ b/modules/nixos/daniel.nix
@@ -35,6 +35,7 @@
 
       imports = with outputs.homeManagerModules; [
         common
+        gnome
         senpai
         iex
         cargo
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 4afed8b..1df0dbc 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -8,6 +8,7 @@ with builtins;
       "ewwbar"
       "desktop-usage"
       "intel"
+      "lutris"
       "pipewire"
       "pipewire-low-latency"
       "podman"
diff --git a/modules/nixos/gnome.nix b/modules/nixos/gnome.nix
index 3d451f9..4e45ac8 100644
--- a/modules/nixos/gnome.nix
+++ b/modules/nixos/gnome.nix
@@ -10,6 +10,12 @@
 
   services.xserver.desktopManager.gnome = {
     enable = true;
+
+    extraGSettingsOverridePackages = [pkgs.gnome.mutter];
+    extraGSettingsOverrides = ''
+      [org.gnome.mutter]
+      experimental-features=['scale-monitor-framebuffer']
+    '';
   };
 
   programs.gnupg.agent = {
diff --git a/modules/nixos/lutris.nix b/modules/nixos/lutris.nix
new file mode 100644
index 0000000..98af089
--- /dev/null
+++ b/modules/nixos/lutris.nix
@@ -0,0 +1,14 @@
+{pkgs, ...}: {
+  environment = {
+    systemPackages = with pkgs; [
+      (
+        lutris.override {
+          extraPkgs = pkgs: [
+            # List package dependencies here
+            wineWowPackages.waylandFull
+          ];
+        }
+      )
+    ];
+  };
+}
diff --git a/nixos/foxtrot.nix b/nixos/foxtrot.nix
index 5112b52..43895df 100644
--- a/nixos/foxtrot.nix
+++ b/nixos/foxtrot.nix
@@ -15,7 +15,9 @@ in {
     flake.diskoConfigurations.standard
     inputs.hardware.nixosModules.framework-13-7040-amd
     desktop-usage
+    gnome
     podman
+    lutris
     postgres
     wifi
     # hyprland