This commit is contained in:
fleaz 2022-03-02 15:28:37 +01:00
parent 05a203c066
commit 1148de4f8a
5 changed files with 58 additions and 56 deletions

View file

@ -1,29 +1,29 @@
{ {
programs.git = { programs.git = {
enable = true; enable = true;
ignores = [".vscode"]; ignores = [ ".vscode" ];
userName = "fleaz"; userName = "fleaz";
userEmail = "mail@felixbreidenstein.de"; userEmail = "mail@felixbreidenstein.de";
aliases = { aliases = {
cpr = "!f() { git fetch origin refs/pull/$1/head && git checkout FETCH_HEAD; }; f"; 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";
};
};
}];
};
} }

View file

@ -4,30 +4,30 @@
profiles = { profiles = {
"laptop" = { "laptop" = {
outputs = [ outputs = [
{ {
criteria = "eDP-1"; criteria = "eDP-1";
scale = 1.8; scale = 1.8;
} }
]; ];
}; };
"homeoffice" = { "homeoffice" = {
outputs = [ outputs = [
{ {
criteria = "eDP-1"; criteria = "eDP-1";
scale = 1.8; scale = 1.8;
position = "0,0"; position = "0,0";
} }
{ {
criteria = "DP-3"; criteria = "DP-3";
scale = 1.3; scale = 1.3;
position = "2133,0"; position = "2133,0";
} }
{ {
criteria = "DP-1"; criteria = "DP-1";
scale = 1.3; scale = 1.3;
position = "5087,0"; position = "5087,0";
} }
]; ];
}; };
}; };
}; };

View file

@ -13,9 +13,9 @@ in
input = { input = {
"type:keyboard" = { xkb_layout = "eu"; }; "type:keyboard" = { xkb_layout = "eu"; };
"1:1:AT_Translated_Set_2_keyboard" = { "1:1:AT_Translated_Set_2_keyboard" = {
xkb_options = "caps:ctrl_modifier"; xkb_options = "caps:ctrl_modifier";
}; };
}; };
output = { output = {
"*".bg = "/home/fleaz/Downloads/spongebob.jpg fill"; "*".bg = "/home/fleaz/Downloads/spongebob.jpg fill";
@ -44,13 +44,15 @@ in
bars = [{ command = "${pkgs.waybar}/bin/waybar"; }]; bars = [{ command = "${pkgs.waybar}/bin/waybar"; }];
startup = [ startup = [
{ command = ''${pkgs.swayidle}/bin/swayidle -w \ {
command = ''${pkgs.swayidle}/bin/swayidle -w \
timeout 300 "${lockCmd}" \ timeout 300 "${lockCmd}" \
timeout 600 "${pkgs.sway}/bin/swaymsg output * dpms off" \ timeout 600 "${pkgs.sway}/bin/swaymsg output * dpms off" \
resume "${pkgs.sway}/bin/swaymsg output * dpms on" \ resume "${pkgs.sway}/bin/swaymsg output * dpms on" \
before-sleep "${lockCmd}"''; } before-sleep "${lockCmd}"'';
]; }
];

View file

@ -1,4 +1,4 @@
{ {
# Allow swaylock to talk to PAM # Allow swaylock to talk to PAM
security.pam.services.swaylock = {}; security.pam.services.swaylock = { };
} }

@ -1 +1 @@
Subproject commit 3af42978d507ad02777179cec8ef4029d103cdc3 Subproject commit ccfeeb06bf7ad992c1ba8a69b6823a574b2df5a1