From ca95081b3eb4a0a64f47aa439cd63f863865ea67 Mon Sep 17 00:00:00 2001
From: fleaz <mail@felixbreidenstein.de>
Date: Wed, 23 Feb 2022 20:55:25 +0100
Subject: [PATCH] kanshi only on jimbo, static monitor config on cray

---
 home-manager/default.nix        |  2 ++
 home-manager/modules/kanshi.nix |  6 ++++++
 home-manager/modules/sway.nix   | 15 ++++++++-------
 machines/cray/configuration.nix | 29 +----------------------------
 4 files changed, 17 insertions(+), 35 deletions(-)
 create mode 100644 home-manager/modules/kanshi.nix

diff --git a/home-manager/default.nix b/home-manager/default.nix
index d02dcfe..87d4e86 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -14,6 +14,8 @@ in
       modules/neovim.nix
       modules/vscode.nix
       modules/sway.nix
+    ] ++ lib.optionals (config.networking.hostName == "jimbo") [
+      modules/kanshi.nix
     ];
 
     gtk = {
diff --git a/home-manager/modules/kanshi.nix b/home-manager/modules/kanshi.nix
new file mode 100644
index 0000000..2b1d8e3
--- /dev/null
+++ b/home-manager/modules/kanshi.nix
@@ -0,0 +1,6 @@
+{
+    services.kanshi = {
+      enable = true;
+    };
+
+}
diff --git a/home-manager/modules/sway.nix b/home-manager/modules/sway.nix
index 67e7b10..c7f6330 100644
--- a/home-manager/modules/sway.nix
+++ b/home-manager/modules/sway.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, nixosConfig, lib, ... }:
 {
     wayland.windowManager.sway = {
       enable = true;
@@ -16,23 +16,24 @@
         };
         output = {
           "*".bg = "/home/fleaz/Downloads/spongebob.jpg fill";
-          "DVI-D-1" = {
+	} // lib.optionals (nixosConfig.networking.hostName == "cray") {
+          "DP-1" = {
             mode = "1920x1200";
             transform = "270";
             position = "0,0";
           };
           "HDMI-A-1" = {
             mode = "3840x2160";
-            scale = "1.2";
+            scale = "1.3";
             position = "1200,0";
           };
-          "DP-1" = {
+          "DP-2" = {
             mode = "3840x2160";
-            scale = "1.2";
-            position = "4400,0";
+            scale = "1.3";
+            position = "4152,0";
           };
-
         };
+
         gaps = { inner = 8; };
         window.border = 0;
         workspaceAutoBackAndForth = true;
diff --git a/machines/cray/configuration.nix b/machines/cray/configuration.nix
index e250f65..9a31b74 100644
--- a/machines/cray/configuration.nix
+++ b/machines/cray/configuration.nix
@@ -61,37 +61,10 @@ in
   services.printing.enable = true;
   services.printing.drivers = with pkgs; [ splix ];
 
-  # output = {
-  #   "*".bg = "/home/fleaz/Downloads/spongebob.jpg fill";
-  #   "DVI-D-1" = {
-  #     mode = "1920x1200";
-  #     transform = "270";
-  #     position = "0,0";
-  #   };
-  #   "HDMI-A-1" = {
-  #     mode = "3840x2160";
-  #     scale = "1.2";
-  #     position = "1200,0";
-  #   };
-  #   "DP-1" = {
-  #     mode = "3840x2160";
-  #     scale = "1.2";
-  #     position = "4400,0";
-  #   };
 
 
-  # Multimedia Keys
-  # "XF86AudioMute" =
-  #   "exec ${pkgs.pulseaudio}/bin/pactl set-sink-mute @DEFAULT_SINK@ toggle";
-  # "XF86AudioRaiseVolume" =
-  #   "exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ +5%";
-  # "XF86AudioLowerVolume" =
-  #   "exec ${pkgs.pulseaudio}/bin/pactl set-sink-volume @DEFAULT_SINK@ -5%";
-
   # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; [ neovim wget curl git ];
-  programs.neovim.vimAlias = true;
+  environment.systemPackages = with pkgs; [ vim wget curl git ];
 
 
   # This value determines the NixOS release from which the default