From b1c446ebfe281c830c1046d2891325cb45f650fc Mon Sep 17 00:00:00 2001
From: tristan <tristan@tristans.cloud>
Date: Sat, 6 Jan 2024 02:36:27 +0000
Subject: [PATCH] add vm config (graphics seem borked)

---
 .gitignore              |  1 +
 flake.nix               |  3 ++
 hardware/vm.nix         | 18 +++++++++
 home/programs/sway.nix  | 90 +++++++++++++++++++++++++++++++++++++++++
 nixos/programs/sway.nix | 87 +--------------------------------------
 5 files changed, 113 insertions(+), 86 deletions(-)
 create mode 100644 hardware/vm.nix
 create mode 100644 home/programs/sway.nix

diff --git a/.gitignore b/.gitignore
index b2be92b..c7e1460 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 result
+nixos.qcow2
diff --git a/flake.nix b/flake.nix
index 0d80956..4794e26 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,6 +27,9 @@
       zenix = mkConf "zenix" {
         inherit inputs nixpkgs system user userName home-manager;
       };
+      vm = mkConf "vm" {
+        inherit inputs nixpkgs system user userName home-manager;
+      };
       FCS-Tristan-Nixbook = mkConf "work" {
         inherit inputs nixpkgs system user userName home-manager;
         work = true;
diff --git a/hardware/vm.nix b/hardware/vm.nix
new file mode 100644
index 0000000..a30ab9b
--- /dev/null
+++ b/hardware/vm.nix
@@ -0,0 +1,18 @@
+{user}: {
+  modulesPath,
+  lib,
+  config,
+  ...
+}: {
+  imports = [
+  ];
+
+  system.stateVersion = "24.05";
+
+  home-manager.users.${user}.imports = [
+    {
+      home.stateVersion = "24.05";
+    }
+    ../home/programs/sway.nix
+  ];
+}
diff --git a/home/programs/sway.nix b/home/programs/sway.nix
new file mode 100644
index 0000000..a32d452
--- /dev/null
+++ b/home/programs/sway.nix
@@ -0,0 +1,90 @@
+{pkgs, ...}: {
+  imports = [
+    (import ./swaylock.nix)
+    (import ./swayidle.nix)
+    (import ./waybar.nix)
+  ];
+  xdg.portal = {
+    enable = true;
+    configPackages = [pkgs.sway];
+    extraPortals = [pkgs.xdg-desktop-portal-wlr pkgs.xdg-desktop-portal-gtk];
+  };
+
+  wayland.windowManager.sway = {
+    enable = true;
+  };
+
+  services.swayidle = {
+    enable = true;
+    systemdTarget = "graphical-session.target";
+    events = [
+      {
+        event = "before-sleep";
+        command = "${pkgs.swaylock-effects}/bin/swaylock";
+      }
+      {
+        event = "lock";
+        command = "${pkgs.swaylock-effects}/bin/swaylock";
+      }
+    ];
+    timeouts = [
+      {
+        timeout = 300;
+        command = "${pkgs.swaylock-effects}/bin/swaylock -f";
+      }
+      {
+        timeout = 600;
+        command = "systemctl suspend";
+      }
+    ];
+  };
+
+  services.mako.enable = true;
+
+  programs.waybar = {
+    enable = true;
+    settings = {
+      mainBar = {
+        layer = "top";
+        position = "top";
+        height = 36;
+        modules-left = ["sway/workspaces" "sway/window"];
+        modules-right = ["mpris" "pulseaudio" "clock" "tray" "battery"];
+        clock = {
+          format = "📅 {:%a %b-%d %I:%M %p}";
+        };
+        pulseaudio = {
+          format-muted = "🔇 {volume}";
+          format = "{icon} {volume}";
+          format-icons.default = ["🔈" "🔉" "🔊"];
+          on-click = "${pkgs.pavucontrol}/bin/pavucontrol";
+        };
+        mpris = {
+          format = "{player_icon} {artist} - {title}";
+          format-paused = "{status_icon} {player_icon} {artist} - {title}";
+          player-icons = {
+            default = "▶️";
+            mpd = "🎵";
+            kdeconnect = "☎️";
+          };
+          status-icons = {
+            paused = "⏸️";
+          };
+        };
+        battery = {
+          format = "{icon} {capacity}%";
+          format-icons = ["🤏" "🪫" "🔋" "🔋"];
+          format-charging = "🔌 {capacity}%";
+          states = {
+            warning = 30;
+            critical = 15;
+          };
+        };
+      };
+    };
+    systemd = {
+      enable = true;
+      target = "graphical-session.target";
+    };
+  };
+}
diff --git a/nixos/programs/sway.nix b/nixos/programs/sway.nix
index cd1358c..8b66c5b 100644
--- a/nixos/programs/sway.nix
+++ b/nixos/programs/sway.nix
@@ -16,91 +16,6 @@
   };
 
   home-manager.users.${user}.imports = [
-    (import ./home/swaylock.nix)
-    {
-      xdg.portal = {
-        enable = true;
-        configPackages = [pkgs.sway];
-        extraPortals = [pkgs.xdg-desktop-portal-sway pkgs.xdg-desktop-portal-gtk];
-      };
-
-      wayland.windowManager.sway = {
-        enable = true;
-      };
-
-      services.swayidle = {
-        enable = true;
-        systemdTarget = "graphical-session.target";
-        events = [
-          {
-            event = "before-sleep";
-            command = "${pkgs.swaylock-effects}/bin/swaylock";
-          }
-          {
-            event = "lock";
-            command = "${pkgs.swaylock-effects}/bin/swaylock";
-          }
-        ];
-        timeouts = [
-          {
-            timeout = 300;
-            command = "${pkgs.swaylock-effects}/bin/swaylock -f";
-          }
-          {
-            timeout = 600;
-            command = "systemctl suspend";
-          }
-        ];
-      };
-
-      services.mako.enable = true;
-
-      programs.waybar = {
-        enable = true;
-        settings = {
-          mainBar = {
-            layer = "top";
-            position = "top";
-            height = 36;
-            modules-left = ["sway/workspaces" "sway/window"];
-            modules-right = ["mpris" "pulseaudio" "clock" "tray" "battery"];
-            clock = {
-              format = "📅 {:%a %b-%d %I:%M %p}";
-            };
-            pulseaudio = {
-              format-muted = "🔇 {volume}";
-              format = "{icon} {volume}";
-              format-icons.default = ["🔈" "🔉" "🔊"];
-              on-click = "${pkgs.pavucontrol}/bin/pavucontrol";
-            };
-            mpris = {
-              format = "{player_icon} {artist} - {title}";
-              format-paused = "{status_icon} {player_icon} {artist} - {title}";
-              player-icons = {
-                default = "▶️";
-                mpd = "🎵";
-                kdeconnect = "☎️";
-              };
-              status-icons = {
-                paused = "⏸️";
-              };
-            };
-            battery = {
-              format = "{icon} {capacity}%";
-              format-icons = ["🤏" "🪫" "🔋" "🔋"];
-              format-charging = "🔌 {capacity}%";
-              states = {
-                warning = 30;
-                critical = 15;
-              };
-            };
-          };
-        };
-        systemd = {
-          enable = true;
-          target = "graphical-session.target";
-        };
-      };
-    }
+    ../../home/programs/sway.nix
   ];
 }