From 4743a2a78be4fea6f5dfd63af2b999f829dabdd8 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Wed, 30 Sep 2020 13:30:53 +0200 Subject: [PATCH] Service fixes --- configurations/pass.nix | 2 +- configurations/sway.nix | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/configurations/pass.nix b/configurations/pass.nix index 05568dda..1348607d 100644 --- a/configurations/pass.nix +++ b/configurations/pass.nix @@ -8,7 +8,7 @@ home-manager.users.charlotte = { pkgs, ... }: { programs.password-store = { enable = true; - settings = { PASSWORD_STORE_DIR = "$HOME/repos/passwords"; }; + settings = { PASSWORD_STORE_DIR = "/home/charlotte/repos/passwords"; }; }; services.password-store-sync.enable = true; }; diff --git a/configurations/sway.nix b/configurations/sway.nix index 970095e2..cb3ea5ea 100644 --- a/configurations/sway.nix +++ b/configurations/sway.nix @@ -19,24 +19,24 @@ in profiles = { "home-undocked" = { outputs = [ - { criteria = "Unknown 0x2036 0x00000000"; position = "0 0"; mode = "2560x1440"; scale = 1.0; } + { criteria = "Unknown 0x2036 0x00000000"; position = "0,0"; mode = "2560x1440"; scale = 1.0; } ]; }; "home-docked" = { outputs = [ - { criteria = "Unknown 0x2036 0x00000000"; position = "0 0"; mode = "2560x1440"; scale = 1.0; } - { criteria = "Dell Inc. DELL U2718Q FN84K01T095L"; position = "2560 0"; mode = "3840x2160"; scale = 1.25; } + { criteria = "Unknown 0x2036 0x00000000"; position = "0,0"; mode = "2560x1440"; scale = 1.0; } + { criteria = "Dell Inc. DELL U2718Q FN84K01T095L"; position = "2560,0"; mode = "3840x2160"; scale = 1.25; } ]; }; "work-undocked" = { outputs = [ - { criteria = "Chimei Innolux Corporation 0x14D3 0x00000000"; position = "0 0"; mode = "1920x1080"; scale = 1.0; } + { criteria = "Chimei Innolux Corporation 0x14D3 0x00000000"; position = "0,0"; mode = "1920x1080"; scale = 1.0; } ]; }; "work-docked" = { outputs = [ - { criteria = "Chimei Innolux Corporation 0x14D3 0x00000000"; position = "0 0"; mode = "1920x1080"; scale = 1.0; } - { criteria = "Dell Inc. DELL U2718Q FN84K83Q1KHL"; position = "1920 0"; mode = "3840x2160"; scale = 1.25; } + { criteria = "Chimei Innolux Corporation 0x14D3 0x00000000"; position = "0,0"; mode = "1920x1080"; scale = 1.0; } + { criteria = "Dell Inc. DELL U2718Q FN84K83Q1KHL"; position = "1920,0"; mode = "3840x2160"; scale = 1.25; } ]; }; }; @@ -71,10 +71,10 @@ in } ]; output = { - "Unknown 0x2036 0x00000000" = { position = "0 0"; mode = "2560x1440"; scale = "1.0"; }; - "Dell Inc. DELL U2718Q FN84K01T095L" = { position = "2560 0"; mode = "3840x2160"; scale = "1.25"; }; - "Chimei Innolux Corporation 0x14D3 0x00000000" = { position = "0 0"; mode = "1920x1080"; scale = "1.0"; }; - "Dell Inc. DELL U2718Q FN84K83Q1KHL" = { position = "1920 0"; mode = "3840x2160"; scale = "1.25"; }; + "Unknown 0x2036 0x00000000" = { position = "0,0"; mode = "2560x1440"; scale = "1.0"; }; + "Dell Inc. DELL U2718Q FN84K01T095L" = { position = "2560,0"; mode = "3840x2160"; scale = "1.25"; }; + "Chimei Innolux Corporation 0x14D3 0x00000000" = { position = "0,0"; mode = "1920x1080"; scale = "1.0"; }; + "Dell Inc. DELL U2718Q FN84K83Q1KHL" = { position = "1920,0"; mode = "3840x2160"; scale = "1.25"; }; }; startup = [ { command = "${pkgs.swayidle}/bin/swayidle -w timeout 300 '${pkgs.swaylock}/bin/swaylock -f -c 000000' timeout 150 '${pkgs.sway}/bin/swaymsg \"output * dpms off\"' resume '${pkgs.sway}/bin/swaymsg \"output * dpms on\"' before-sleep '${pkgs.swaylock}/bin/swaylock -f -c 000000'"; }