diff --git a/home-manager/modules/git.nix b/home-manager/modules/git.nix index bc122de..9131c87 100644 --- a/home-manager/modules/git.nix +++ b/home-manager/modules/git.nix @@ -1,29 +1,29 @@ { -programs.git = { - enable = true; - ignores = [".vscode"]; - userName = "fleaz"; - userEmail = "mail@felixbreidenstein.de"; - aliases = { - cpr = "!f() { git fetch origin refs/pull/$1/head && git checkout FETCH_HEAD; }; f"; + programs.git = { + enable = true; + ignores = [ ".vscode" ]; + userName = "fleaz"; + userEmail = "mail@felixbreidenstein.de"; + aliases = { + cpr = "!f() { git fetch origin refs/pull/$1/head && git checkout FETCH_HEAD; }; f"; + }; + includes = [{ + condition = "gitdir:~/codemonauts/"; + contents = { + user = { + email = "felix@codemonauts.com"; + name = "Felix Breidenstein"; + }; + }; + } + { + condition = "gitdir:~/kundendaten/"; + contents = { + user = { + email = "felix@codemonauts.com"; + name = "Felix Breidenstein"; + }; + }; + }]; }; - includes = [{ - condition = "gitdir:~/codemonauts/"; - contents = { - user = { - email = "felix@codemonauts.com"; - name = "Felix Breidenstein"; - }; - }; - } - { - condition = "gitdir:~/kundendaten/"; - contents = { - user = { - email = "felix@codemonauts.com"; - name = "Felix Breidenstein"; - }; - }; - }]; -}; } diff --git a/home-manager/modules/kanshi.nix b/home-manager/modules/kanshi.nix index 065606c..c1a23d2 100644 --- a/home-manager/modules/kanshi.nix +++ b/home-manager/modules/kanshi.nix @@ -4,30 +4,30 @@ profiles = { "laptop" = { outputs = [ - { - criteria = "eDP-1"; - scale = 1.8; - } - ]; + { + criteria = "eDP-1"; + scale = 1.8; + } + ]; }; "homeoffice" = { outputs = [ - { - criteria = "eDP-1"; - scale = 1.8; - position = "0,0"; - } - { - criteria = "DP-3"; - scale = 1.3; - position = "2133,0"; - } - { - criteria = "DP-1"; - scale = 1.3; - position = "5087,0"; - } - ]; + { + criteria = "eDP-1"; + scale = 1.8; + position = "0,0"; + } + { + criteria = "DP-3"; + scale = 1.3; + position = "2133,0"; + } + { + criteria = "DP-1"; + scale = 1.3; + position = "5087,0"; + } + ]; }; }; }; diff --git a/home-manager/modules/sway.nix b/home-manager/modules/sway.nix index a9d5fdd..8a869a4 100644 --- a/home-manager/modules/sway.nix +++ b/home-manager/modules/sway.nix @@ -13,9 +13,9 @@ in input = { "type:keyboard" = { xkb_layout = "eu"; }; - "1:1:AT_Translated_Set_2_keyboard" = { - xkb_options = "caps:ctrl_modifier"; - }; + "1:1:AT_Translated_Set_2_keyboard" = { + xkb_options = "caps:ctrl_modifier"; + }; }; output = { "*".bg = "/home/fleaz/Downloads/spongebob.jpg fill"; @@ -44,13 +44,15 @@ in bars = [{ command = "${pkgs.waybar}/bin/waybar"; }]; - startup = [ - { command = ''${pkgs.swayidle}/bin/swayidle -w \ + startup = [ + { + command = ''${pkgs.swayidle}/bin/swayidle -w \ timeout 300 "${lockCmd}" \ timeout 600 "${pkgs.sway}/bin/swaymsg output * dpms off" \ resume "${pkgs.sway}/bin/swaymsg output * dpms on" \ - before-sleep "${lockCmd}"''; } - ]; + before-sleep "${lockCmd}"''; + } + ]; diff --git a/modules/pam.nix b/modules/pam.nix index 93f031b..5760a84 100644 --- a/modules/pam.nix +++ b/modules/pam.nix @@ -1,4 +1,4 @@ { # Allow swaylock to talk to PAM - security.pam.services.swaylock = {}; + security.pam.services.swaylock = { }; } diff --git a/secrets b/secrets index 3af4297..ccfeeb0 160000 --- a/secrets +++ b/secrets @@ -1 +1 @@ -Subproject commit 3af42978d507ad02777179cec8ef4029d103cdc3 +Subproject commit ccfeeb06bf7ad992c1ba8a69b6823a574b2df5a1