From f4ccc803d589e144215c30014cf303287d815688 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Gro=C3=9Fmann?= Date: Sat, 4 Feb 2023 21:23:43 +0100 Subject: [PATCH] Chore: Formatting --- modules/rekey.nix | 8 ++++---- users/common/autorandr.nix | 30 ++++++++++++++++-------------- users/common/default.nix | 6 +++--- users/patrick.nix | 2 +- 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/modules/rekey.nix b/modules/rekey.nix index 0c0a342..8762cc3 100644 --- a/modules/rekey.nix +++ b/modules/rekey.nix @@ -18,10 +18,10 @@ in mapAttrs (name: value: value // {file = newPath name;}) config.rekey.secrets; }; - warnings = optional (! pathExists (removeSuffix ".drv" drv.drvPath)) '' - Rekeyed secrets not available. - Maybe you forgot to run "nix run '.#rekey'" to rekey them? - ''; + warnings = optional (! pathExists (removeSuffix ".drv" drv.drvPath)) '' + Rekeyed secrets not available. + Maybe you forgot to run "nix run '.#rekey'" to rekey them? + ''; }; options = with lib; { diff --git a/users/common/autorandr.nix b/users/common/autorandr.nix index 7911eae..745692d 100644 --- a/users/common/autorandr.nix +++ b/users/common/autorandr.nix @@ -8,9 +8,11 @@ dpi_uhd = 216; set_dpi = dpi: "echo 'Xft.dpi: ${toString dpi}' | ${pkgs.xorg.xrdb}/bin/xrdb -merge"; eDP-1 = "00ffffffffffff0006afeb3000000000251b0104a5221378020925a5564f9b270c50540000000101010101010101010101010101010152d000a0f0703e803020350058c11000001852d000a0f07095843020350025a51000001800000000000000000000000000000000000000000002001430ff123caa8f0e29aa202020003e"; - # AStA config as function as we want to enable it for two different setups - asta_conf = {DP-1-1, DP-1-2}: - { + # AStA config as function as we want to enable it for two different setups + asta_conf = { + DP-1-1, + DP-1-2, + }: { fingerprint = { inherit eDP-1 DP-1-1 DP-1-2; }; @@ -42,17 +44,17 @@ in { enable = true; profiles.AStA_links = asta_conf { - # AStA linker arbeitsplatz linker Monitor - DP-1-1 = "00ffffffffffff000472ed0688687101111e010380351e782aa135a35b4fa327115054b30c00714f818081c081009500b300d1c001012a4480a070382740082098040f282100001a023a801871382d40582c45000f282100001e000000fd00304b1e5512000a202020202020000000fc00423234375920430a202020202001cf020327f14b9002030411121300001f01230907078301000065030c001000681a00000101304be6023a801871382d40582c45000f282100001e8c0ad08a20e02d10103e96000f2821000018011d007251d01e206e2855000f282100001e8c0ad090204031200c4055000f282100001800000000000000000000000000000000d0"; - # AStA linker arbeitsplatz rechter Monitor - DP-1-2 = "00ffffffffffff000472ed0682687101111e010380351e782aa135a35b4fa327115054b30c00714f818081c081009500b300d1c001012a4480a070382740082098040f282100001a023a801871382d40582c45000f282100001e000000fd00304b1e5512000a202020202020000000fc00423234375920430a202020202001d5020327f14b9002030411121300001f01230907078301000065030c001000681a00000101304be6023a801871382d40582c45000f282100001e8c0ad08a20e02d10103e96000f2821000018011d007251d01e206e2855000f282100001e8c0ad090204031200c4055000f282100001800000000000000000000000000000000d0"; - }; - profiles.AStA_rechts = asta_conf{ - # AStA rechter arbeitsplatz linker Monitor - DP-1-1 = "00ffffffffffff000472ed068d687101111e010380351e782aa135a35b4fa327115054b30c00714f818081c081009500b300d1c001012a4480a070382740082098040f282100001a023a801871382d40582c45000f282100001e000000fd00304b1e5512000a202020202020000000fc00423234375920430a202020202001ca020327f14b9002030411121300001f01230907078301000065030c001000681a00000101304be6023a801871382d40582c45000f282100001e8c0ad08a20e02d10103e96000f2821000018011d007251d01e206e2855000f282100001e8c0ad090204031200c4055000f282100001800000000000000000000000000000000d0"; - # AStA rechter arbeitsplatz rechter Monitor - DP-1-2 = "00ffffffffffff000472ed0680687101111e010380351e782aa135a35b4fa327115054b30c00714f818081c081009500b300d1c001012a4480a070382740082098040f282100001a023a801871382d40582c45000f282100001e000000fd00304b1e5512000a202020202020000000fc00423234375920430a202020202001d7020327f14b9002030411121300001f01230907078301000065030c001000681a00000101304be6023a801871382d40582c45000f282100001e8c0ad08a20e02d10103e96000f2821000018011d007251d01e206e2855000f282100001e8c0ad090204031200c4055000f282100001800000000000000000000000000000000d0"; - }; + # AStA linker arbeitsplatz linker Monitor + DP-1-1 = "00ffffffffffff000472ed0688687101111e010380351e782aa135a35b4fa327115054b30c00714f818081c081009500b300d1c001012a4480a070382740082098040f282100001a023a801871382d40582c45000f282100001e000000fd00304b1e5512000a202020202020000000fc00423234375920430a202020202001cf020327f14b9002030411121300001f01230907078301000065030c001000681a00000101304be6023a801871382d40582c45000f282100001e8c0ad08a20e02d10103e96000f2821000018011d007251d01e206e2855000f282100001e8c0ad090204031200c4055000f282100001800000000000000000000000000000000d0"; + # AStA linker arbeitsplatz rechter Monitor + DP-1-2 = "00ffffffffffff000472ed0682687101111e010380351e782aa135a35b4fa327115054b30c00714f818081c081009500b300d1c001012a4480a070382740082098040f282100001a023a801871382d40582c45000f282100001e000000fd00304b1e5512000a202020202020000000fc00423234375920430a202020202001d5020327f14b9002030411121300001f01230907078301000065030c001000681a00000101304be6023a801871382d40582c45000f282100001e8c0ad08a20e02d10103e96000f2821000018011d007251d01e206e2855000f282100001e8c0ad090204031200c4055000f282100001800000000000000000000000000000000d0"; + }; + profiles.AStA_rechts = asta_conf { + # AStA rechter arbeitsplatz linker Monitor + DP-1-1 = "00ffffffffffff000472ed068d687101111e010380351e782aa135a35b4fa327115054b30c00714f818081c081009500b300d1c001012a4480a070382740082098040f282100001a023a801871382d40582c45000f282100001e000000fd00304b1e5512000a202020202020000000fc00423234375920430a202020202001ca020327f14b9002030411121300001f01230907078301000065030c001000681a00000101304be6023a801871382d40582c45000f282100001e8c0ad08a20e02d10103e96000f2821000018011d007251d01e206e2855000f282100001e8c0ad090204031200c4055000f282100001800000000000000000000000000000000d0"; + # AStA rechter arbeitsplatz rechter Monitor + DP-1-2 = "00ffffffffffff000472ed0680687101111e010380351e782aa135a35b4fa327115054b30c00714f818081c081009500b300d1c001012a4480a070382740082098040f282100001a023a801871382d40582c45000f282100001e000000fd00304b1e5512000a202020202020000000fc00423234375920430a202020202001d7020327f14b9002030411121300001f01230907078301000065030c001000681a00000101304be6023a801871382d40582c45000f282100001e8c0ad08a20e02d10103e96000f2821000018011d007251d01e206e2855000f282100001e8c0ad090204031200c4055000f282100001800000000000000000000000000000000d0"; + }; profiles.laptop = { fingerprint = { inherit eDP-1; diff --git a/users/common/default.nix b/users/common/default.nix index 5b8d368..9c8101b 100644 --- a/users/common/default.nix +++ b/users/common/default.nix @@ -66,9 +66,9 @@ "localhost" = { inherit identityFile; }; - "gitlab.lrz.de" = { - inherit identityFile; - }; + "gitlab.lrz.de" = { + inherit identityFile; + }; "*" = { identitiesOnly = true; }; diff --git a/users/patrick.nix b/users/patrick.nix index 9a8a848..e6516d7 100644 --- a/users/patrick.nix +++ b/users/patrick.nix @@ -8,7 +8,7 @@ common/herbstluftwm.nix common/autorandr.nix common/desktop.nix - # common/polybar.nix + # common/polybar.nix ./common ];