From e8065469c372e72804a310897b6095a2f883eacd Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Sat, 28 Sep 2024 11:54:10 +0100 Subject: [PATCH] Remove kanshi from laptops --- system/Northstar.nix | 29 +--------------- system/Ronin.nix | 81 -------------------------------------------- system/Tone.nix | 9 ----- 3 files changed, 1 insertion(+), 118 deletions(-) diff --git a/system/Northstar.nix b/system/Northstar.nix index 0f2709c8..003f39f5 100644 --- a/system/Northstar.nix +++ b/system/Northstar.nix @@ -1,31 +1,4 @@ -{ username, ... }: +{ ... }: { imports = [ ./laptop.nix ]; - home-manager.users.${username} = { - wayland.windowManager.sway.config = { - output."eDP-1".scale = "1.25"; - workspaceOutputAssign = [ - { - output = "eDP-1"; - workspace = "1"; - } - ]; - }; - services.kanshi = { - enable = true; - settings = [ - { - profile = { - name = "default"; - outputs = [ - { - criteria = "eDP-1"; - position = "0,0"; - } - ]; - }; - } - ]; - }; - }; } diff --git a/system/Ronin.nix b/system/Ronin.nix index 21c91092..2d294c29 100644 --- a/system/Ronin.nix +++ b/system/Ronin.nix @@ -3,87 +3,6 @@ imports = [ ./laptop.nix ]; home-manager.users.${username} = { imports = [ ./home/work.nix ]; - wayland.windowManager.sway.config = { - output = { - # Built-in - "eDP-1".scale = "1.25"; - # Work - "Dell Inc. DELL P3223QE CCG8YN3".scale = "1.5"; - # Home - "Acer Technologies ED270R TJMEE0043W01".mode = "1920x1080@120Hz"; - "Microstep MSI G27CQ4 E2 Unknown" = { - mode = "2560x1440@120Hz"; - scale = "1.25"; - }; - }; - workspaceOutputAssign = [ - { - output = "eDP-1"; - workspace = "1"; - } - ]; - }; - services.kanshi = { - enable = true; - settings = - let - laptopScreen.criteria = "eDP-1"; - workMonitor.criteria = "Dell Inc. DELL P3223QE CCG8YN3"; - homeMonitor1.criteria = "Acer Technologies ED270R TJMEE0043W01"; - homeMonitor2.criteria = "Microstep MSI G27CQ4 E2 Unknown"; - in - [ - { - profile = { - name = "default"; - outputs = [ - { - inherit (laptopScreen) criteria; - status = "enable"; - position = "0,0"; - } - ]; - }; - } - { - profile = { - name = "work"; - outputs = [ - { - inherit (laptopScreen) criteria; - status = "disable"; - } - { - inherit (workMonitor) criteria; - status = "enable"; - position = "0,0"; - } - ]; - }; - } - { - profile = { - name = "home"; - outputs = [ - { - inherit (laptopScreen) criteria; - status = "disable"; - } - { - inherit (homeMonitor1) criteria; - status = "enable"; - position = "0,140"; - } - { - inherit (homeMonitor2) criteria; - status = "enable"; - position = "1920,0"; - } - ]; - }; - } - ]; - }; }; boot.initrd = { secrets = { diff --git a/system/Tone.nix b/system/Tone.nix index 9ca0a277..79b55edf 100644 --- a/system/Tone.nix +++ b/system/Tone.nix @@ -3,15 +3,6 @@ imports = [ ./desktop.nix ]; home-manager.users.${username} = { imports = [ ./home/work.nix ]; - wayland.windowManager.sway.config = { - output."Dell Inc. DELL P3223QE CCG8YN3".scale = "1.5"; - workspaceOutputAssign = [ - { - output = "DP-1"; - workspace = "1"; - } - ]; - }; }; boot = { loader.efi.efiSysMountPoint = "/boot/efi";