18 files changed, 88 insertions, 89 deletions
diff --git a/user/autorandr/.config/autorandr/docked-close/block b/system/autorandr/docked-close/block
index 782c3a74..782c3a74 100755
--- a/user/autorandr/.config/autorandr/docked-close/block
+++ b/system/autorandr/docked-close/block
diff --git a/system/autorandr/docked-close/config b/system/autorandr/docked-close/config
new file mode 100644
index 00000000..1f4ebdb1
--- /dev/null
+++ b/system/autorandr/docked-close/config
@@ -0,0 +1,20 @@
+output DP-1
+off
+output HDMI-1
+off
+output DP-2
+off
+output HDMI-2
+off
+output DP-2-3
+off
+output eDP-1
+off
+output DP-2-1
+mode 2560x1440
+pos 1920x0
+rate 59.95
+output DP-2-2
+mode 2560x1440
+pos 4480x0
+rate 59.95
diff --git a/user/autorandr/.config/autorandr/docked-close/setup b/system/autorandr/docked-close/setup
index 607eacbc..607eacbc 100644
--- a/user/autorandr/.config/autorandr/docked-close/setup
+++ b/system/autorandr/docked-close/setup
diff --git a/user/autorandr/.config/autorandr/docked-open/block b/system/autorandr/docked-open/block
index 4c82692a..4c82692a 100755
--- a/user/autorandr/.config/autorandr/docked-open/block
+++ b/system/autorandr/docked-open/block
diff --git a/system/autorandr/docked-open/config b/system/autorandr/docked-open/config
new file mode 100644
index 00000000..84771820
--- /dev/null
+++ b/system/autorandr/docked-open/config
@@ -0,0 +1,23 @@
+output DP-1
+off
+output HDMI-1
+off
+output DP-2
+off
+output HDMI-2
+off
+output DP-2-3
+off
+output eDP-1
+mode 1920x1080
+pos 0x0
+primary
+rate 60.03
+output DP-2-1
+mode 2560x1440
+pos 1920x0
+rate 59.95
+output DP-2-2
+mode 2560x1440
+pos 4480x0
+rate 59.95
diff --git a/user/autorandr/.config/autorandr/docked-open/setup b/system/autorandr/docked-open/setup
index 607eacbc..607eacbc 100644
--- a/user/autorandr/.config/autorandr/docked-open/setup
+++ b/system/autorandr/docked-open/setup
diff --git a/system/autorandr/laptop/config b/system/autorandr/laptop/config
new file mode 100644
index 00000000..0048c8b9
--- /dev/null
+++ b/system/autorandr/laptop/config
@@ -0,0 +1,19 @@
+output DP-1
+off
+output HDMI-1
+off
+output DP-2
+off
+output HDMI-2
+off
+output DP-2-1
+off
+output DP-2-2
+off
+output DP-2-3
+off
+output eDP-1
+mode 1920x1080
+pos 0x0
+primary
+rate 60.03
diff --git a/user/autorandr/.config/autorandr/laptop/setup b/system/autorandr/laptop/setup
index dc17ff13..dc17ff13 100644
--- a/user/autorandr/.config/autorandr/laptop/setup
+++ b/system/autorandr/laptop/setup
diff --git a/user/autorandr/.config/autorandr/postswitch b/system/autorandr/postswitch
index 25b068d2..25b068d2 100755
--- a/user/autorandr/.config/autorandr/postswitch
+++ b/system/autorandr/postswitch
diff --git a/system/autorandr/work-1/config b/system/autorandr/work-1/config
new file mode 100644
index 00000000..3573f22d
--- /dev/null
+++ b/system/autorandr/work-1/config
@@ -0,0 +1,21 @@
+output DP-1
+off
+output HDMI-1
+off
+output DP-2
+off
+output HDMI-2
+mode 1920x1200
+pos 0x0
+primary
+rate 59.95
+output DP-2-1
+off
+output DP-2-2
+off
+output DP-2-3
+off
+output eDP-1
+mode 1920x1080
+pos 1920x0
+rate 60.03
diff --git a/user/autorandr/.config/autorandr/work-1/setup b/system/autorandr/work-1/setup
index 12a4c698..12a4c698 100644
--- a/user/autorandr/.config/autorandr/work-1/setup
+++ b/system/autorandr/work-1/setup
diff --git a/system/settings/hardware/laptop.nix b/system/settings/hardware/laptop.nix
index bec1f7f6..f8f2979c 100644
--- a/system/settings/hardware/laptop.nix
+++ b/system/settings/hardware/laptop.nix
@@ -32,6 +32,11 @@
   programs.light.enable = true;
 
   services.autorandr.enable = true;
+  environment.etc.autorandr = {
+    enable = true;
+    source = ../../autorandr;
+    target = "xdg/autorandr";
+  };
 
   services.logind.extraConfig = ''
     IdleAction=suspend
diff --git a/user/autorandr/.config/autorandr/docked-close/config b/user/autorandr/.config/autorandr/docked-close/config
deleted file mode 100644
index d8ce5031..00000000
--- a/user/autorandr/.config/autorandr/docked-close/config
+++ /dev/null
@@ -1,23 +0,0 @@
-output DP1
-off
-output DP2
-off
-output DP2-3
-off
-output HDMI1
-off
-output HDMI2
-off
-output VIRTUAL1
-off
-output eDP1
-off
-output DP2-1
-mode 2560x1440
-pos 0x0
-primary
-rate 59.95
-output DP2-2
-mode 2560x1440
-pos 2560x0
-rate 59.95
diff --git a/user/autorandr/.config/autorandr/docked-open/config b/user/autorandr/.config/autorandr/docked-open/config
deleted file mode 100644
index 44749be1..00000000
--- a/user/autorandr/.config/autorandr/docked-open/config
+++ /dev/null
@@ -1,25 +0,0 @@
-output DP1
-off
-output DP2
-off
-output DP2-3
-off
-output HDMI1
-off
-output HDMI2
-off
-output VIRTUAL1
-off
-output DP2-1
-mode 2560x1440
-pos 0x0
-primary
-rate 59.95
-output DP2-2
-mode 2560x1440
-pos 2560x0
-rate 59.95
-output eDP1
-mode 1920x1080
-pos 1632x1440
-rate 60.03
diff --git a/user/autorandr/.config/autorandr/laptop/config b/user/autorandr/.config/autorandr/laptop/config
deleted file mode 100644
index 152d1b95..00000000
--- a/user/autorandr/.config/autorandr/laptop/config
+++ /dev/null
@@ -1,15 +0,0 @@
-output DP1
-off
-output DP2
-off
-output HDMI1
-off
-output HDMI2
-off
-output VIRTUAL1
-off
-output eDP1
-mode 1920x1080
-pos 0x0
-primary
-rate 60.03
diff --git a/user/autorandr/.config/autorandr/work-1/config b/user/autorandr/.config/autorandr/work-1/config
deleted file mode 100644
index 834278c8..00000000
--- a/user/autorandr/.config/autorandr/work-1/config
+++ /dev/null
@@ -1,17 +0,0 @@
-output DP1
-off
-output DP2
-off
-output HDMI1
-off
-output VIRTUAL1
-off
-output HDMI2
-mode 1920x1200
-pos 0x0
-primary
-rate 59.95
-output eDP1
-mode 1920x1080
-pos 1920x0
-rate 60.03
diff --git a/user/satoshipad.nix b/user/satoshipad.nix
index 4af9e46f..c244e6f6 100644
--- a/user/satoshipad.nix
+++ b/user/satoshipad.nix
@@ -2,7 +2,6 @@
 
 {
   imports = [
-    ./settings/autorandr.nix
     ./settings/base.nix
     ./settings/development/base.nix
     ./settings/dunst.nix
diff --git a/user/settings/autorandr.nix b/user/settings/autorandr.nix
deleted file mode 100644
index f63095a4..00000000
--- a/user/settings/autorandr.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  xdg.configFile.autorandr = {
-    recursive = true;
-    source = ../autorandr/.config/autorandr;
-  };
-}