Compare commits

...

2 Commits

Author SHA1 Message Date
d1c3ec9b75 add background for each output 2025-08-21 16:32:34 +02:00
9b973e3ed4 update 2025-08-20 15:30:59 +02:00
7 changed files with 116 additions and 245 deletions

24
flake.lock generated
View File

@@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1751810233,
"narHash": "sha256-kllkNbIqQi3VplgTMeGzuh1t8Gk8TauvkTRt93Km+tQ=",
"lastModified": 1753592768,
"narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "9b0873b46c9f9e4b7aa01eb634952c206af53068",
"rev": "fc3add429f21450359369af74c2375cb34a2d204",
"type": "github"
},
"original": {
@@ -43,11 +43,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1751741127,
"narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=",
"lastModified": 1755593991,
"narHash": "sha256-BA9MuPjBDx/WnpTJ0EGhStyfE7hug8g85Y3Ju9oTsM4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "29e290002bfff26af1db6f64d070698019460302",
"rev": "a58390ab6f1aa810eb8e0f0fc74230e7cc06de03",
"type": "github"
},
"original": {
@@ -59,11 +59,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1751792365,
"narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=",
"lastModified": 1755615617,
"narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb",
"rev": "20075955deac2583bb12f07151c2df830ef346b4",
"type": "github"
},
"original": {
@@ -89,11 +89,11 @@
]
},
"locked": {
"lastModified": 1751606940,
"narHash": "sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA=",
"lastModified": 1754988908,
"narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "3633fc4acf03f43b260244d94c71e9e14a2f6e0d",
"rev": "3223c7a92724b5d804e9988c6b447a0d09017d48",
"type": "github"
},
"original": {

View File

@@ -26,7 +26,7 @@
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
unstable.bambu-studio
bambu-studio
neovim
wget
fprintd

View File

@@ -53,7 +53,6 @@ in {
gimp
godot_4
ripgrep-all
stm32cubemx
flatpak
obsidian
marksman

View File

@@ -1,7 +1,6 @@
{
lib,
config,
pkgs,
...
}: let
cfg = config.myConfig.programs.nextcloud;
@@ -11,9 +10,6 @@ in {
};
config = lib.mkIf cfg.enable {
services.nextcloud-client = {
enable = true;
package = pkgs.unstable.nextcloud-client;
};
services.nextcloud-client.enable = true;
};
}

View File

@@ -12,7 +12,40 @@ in {
};
config = lib.mkIf cfg.enable {
services.kanshi = {
services.kanshi = let
bgdir = ../../../assets;
bg1080 = bgdir + "/bg1080.png";
bg1080vert = bgdir + "/bg1080vert.png";
bg4k = bgdir + "/bg4k.png";
luhbots_workstation = settings: {
profile.outputs = [
{
criteria = "eDP-1";
position = if settings.vertical.left then "1080,1080" else "0,1080";
}
{
criteria = settings.horizontal.name;
position = if settings.vertical.left then "1080,0" else "0,0";
}
{
criteria = settings.vertical.name;
transform = settings.vertical.orientation;
position = if settings.vertical.left then "0,0" else "1920,0";
}
];
profile.exec = [
"${pkgs.sway}/bin/swaymsg 'workspace \"main\" output \"${settings.horizontal.name}\", workspace --no-auto-back-and-forth main, move workspace to \"${settings.horizontal.name}\", workspace back_and_forth'"
"${pkgs.sway}/bin/swaymsg 'workspace \"term\" output \"${settings.vertical.name}\", workspace --no-auto-back-and-forth term, move workspace to \"${settings.vertical.name}\", workspace back_and_forth'"
"${pkgs.sway}/bin/swaymsg 'workspace \"msg\" output eDP-1, workspace --no-auto-back-and-forth msg, move workspace to eDP-1, workspace back_and_forth'"
"${pkgs.sway}/bin/swaymsg 'workspace \"msg\" output eDP-1, workspace --no-auto-back-and-forth music, move workspace to eDP-1, workspace back_and_forth'"
"${pkgs.sway}/bin/swaymsg 'workspace \"5\" output \"${settings.horizontal.name}\", workspace --no-auto-back-and-forth 5, move workspace to \"${settings.horizontal.name}\", workspace back_and_forth'"
"${pkgs.sway}/bin/swaymsg 'output \"eDP-1\" bg ${bg1080} fit'"
"${pkgs.sway}/bin/swaymsg 'output \"${settings.horizontal.name}\" bg ${bg4k} fit'"
"${pkgs.sway}/bin/swaymsg 'output \"${settings.vertical.name}\" bg ${bg1080vert} fit'"
"${pkgs.sway}/bin/swaymsg 'workspace --no-auto-back-and-forth msg, workspace --no-auto-back-and-forth term, workspace --no-auto-back-and-forth main'"
];
};
in {
enable = true;
settings = lib.mkIf cfg.laptop [
{
@@ -24,223 +57,70 @@ in {
}
];
}
{
profile.outputs = [
{
criteria = "eDP-1";
position = "0,1080";
}
{
criteria = "Dell Inc. DELL U2422HE GRCPH83";
position = "0,0";
}
{
criteria = "NEC Corporation E243WMi 7X313185NB";
transform = "90";
position = "1920,0";
}
];
profile.exec = [
"${pkgs.sway}/bin/swaymsg workspace main; move workspace to DP-4; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace term; move workspace to DP-5; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace msg; move workspace to eDP-1; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace music; move workspace to eDP-1; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace 5; move workspace to DP-4; workspace back_and_forth"
];
}
{
profile.outputs = [
{
criteria = "eDP-1";
position = "0,1080";
}
{
criteria = "Dell Inc. DELL U2422HE 8YCPH83";
transform = "normal";
position = "0,0";
}
{
criteria = "Dell Inc. DELL P2422HE 28XL9M3";
transform = "normal";
position = "1920,0";
}
];
profile.exec = [
"${pkgs.sway}/bin/swaymsg workspace main; move workspace to '\"Dell Inc. DELL U2422HE 8YCPH83\"'; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace term; move workspace to '\"Dell Inc. DELL P2422HE 28XL9M3\"'; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace msg; move workspace to eDP-1; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace music; move workspace to eDP-1; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace 5; move workspace to '\"Dell Inc. DELL U2422HE 8YCPH83\"'; workspace back_and_forth"
];
}
{
profile.outputs = [
{
criteria = "eDP-1";
position = "0,1080";
}
{
criteria = "Dell Inc. DELL U2422HE 53DCH83";
position = "0,0";
}
{
criteria = "Dell Inc. DELL U2412M 0FFXD46I4U5S";
transform = "90";
position = "1920,0";
}
];
profile.exec = [
"${pkgs.sway}/bin/swaymsg workspace main; move workspace to DP-6; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace term; move workspace to DP-7; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace msg; move workspace to eDP-1; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace music; move workspace to eDP-1; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace 5; move workspace to DP-6; workspace back_and_forth"
];
}
{
profile.outputs = [
{
criteria = "eDP-1";
position = "1080,1080";
}
{
criteria = "Dell Inc. DELL P2422HE 4BXL9M3";
position = "1080,0";
}
{
criteria = "NEC Corporation E243WMi 75309334NB";
transform = "90";
position = "0,0";
}
];
profile.exec = [
"${pkgs.sway}/bin/swaymsg workspace main; move workspace to DP-3; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace term; move workspace to DP-4; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace msg; move workspace to eDP-1; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace music; move workspace to eDP-1; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace 5; move workspace to DP-3; workspace back_and_forth"
];
}
{
profile.outputs = [
{
criteria = "eDP-1";
position = "1080,1080";
}
{
criteria = "Dell Inc. DELL P2422HE JLXL9M3";
position = "1080,0";
}
{
criteria = "NEC Corporation E243WMi 59118576NB";
transform = "90";
position = "0,0";
}
];
profile.exec = [
"${pkgs.sway}/bin/swaymsg workspace main; move workspace to DP-3; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace term; move workspace to DP-4; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace msg; move workspace to eDP-1; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace music; move workspace to eDP-1; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace 5; move workspace to DP-3; workspace back_and_forth"
];
}
{
profile.outputs = [
{
criteria = "eDP-1";
position = "0,1080";
}
{
criteria = "Dell Inc. DELL P2422HE 7VWL9M3";
position = "0,0";
}
{
criteria = "ViewSonic Corporation VG2448 V5E201960167";
transform = "90";
position = "1920,0";
}
];
profile.exec = [
"${pkgs.sway}/bin/swaymsg workspace main; move workspace to '\"Dell Inc. DELL P2422HE 7VWL9M3\"'; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace term; move workspace to '\"ViewSonic Corporation VG2448 V5E201960167\"'; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace msg; move workspace to eDP-1; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace music; move workspace to eDP-1; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace 5; move workspace to '\"Dell Inc. DELL P2422HE 7VWL9M3\"'; workspace back_and_forth"
];
}
{
profile.outputs = [
{
criteria = "eDP-1";
position = "1080,1080";
}
{
criteria = "Dell Inc. DELL U2422HE 7HCPH83";
position = "1080,0";
}
{
criteria = "Dell Inc. DELL U2422HE 1XFFH83";
transform = "90";
position = "0,0";
}
];
profile.exec = [
"${pkgs.sway}/bin/swaymsg workspace main; move workspace to '\"Dell Inc. DELL U2422HE 7HCPH83\"'; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace term; move workspace to '\"Dell Inc. DELL U2422HE 1XFFH83\"'; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace msg; move workspace to eDP-1; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace music; move workspace to eDP-1; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace 5; move workspace to '\"Dell Inc. DELL U2422HE 7HCPH83\"'; workspace back_and_forth"
];
}
{
profile.outputs = [
{
criteria = "eDP-1";
position = "1080,1080";
}
{
criteria = "Dell Inc. DELL U2422HE 5XY5H83";
position = "1080,0";
}
{
criteria = "Dell Inc. DELL U2419H 11B7Y13";
transform = "270";
position = "0,0";
}
];
profile.exec = [
"${pkgs.sway}/bin/swaymsg workspace main; move workspace to '\"Dell Inc. DELL U2422HE 5XY5H83\"'; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace term; move workspace to '\"Dell Inc. DELL U2419H 11B7Y13\"'; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace msg; move workspace to eDP-1; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace music; move workspace to eDP-1; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace 5; move workspace to '\"Dell Inc. DELL U2422HE 5XY5H83\"'; workspace back_and_forth"
];
}
{
profile.outputs = [
{
criteria = "eDP-1";
position = "1080,1080";
}
{
criteria = "DP-3";
position = "1080,0";
}
{
criteria = "DP-1";
transform = "90";
position = "0,0";
}
];
profile.exec = [
"${pkgs.sway}/bin/swaymsg workspace main; move workspace to DP-3; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace term; move workspace to DP-1; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace msg; move workspace to eDP-1; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace music; move workspace to eDP-1; workspace back_and_forth"
"${pkgs.sway}/bin/swaymsg workspace 5; move workspace to DP-3; workspace back_and_forth"
];
}
(luhbots_workstation {
horizontal.name = "Dell Inc. DELL U2422HE GRCPH83";
vertical = {
name = "NEC Corporation E243WMi 7X313185NB";
left = false;
orientation = "90";
};
})
(luhbots_workstation {
horizontal.name = "Dell Inc. DELL U2422HE 8YCPH83";
vertical = {
name = "Dell Inc. DELL P2422HE 28XL9M3";
left = false;
orientation = "normal";
};
})
(luhbots_workstation {
horizontal.name = "Dell Inc. DELL U2422HE 53DCH83";
vertical = {
name = "Dell Inc. DELL U2412M 0FFXD46I4U5S";
left = false;
orientation = "90";
};
})
(luhbots_workstation {
horizontal.name = "Dell Inc. DELL P2422HE 4BXL9M";
vertical = {
name = "NEC Corporation E243WMi 75309334NB";
left = true;
orientation = "90";
};
})
(luhbots_workstation {
horizontal.name = "Dell Inc. DELL P2422HE JLXL9M3";
vertical = {
name = "NEC Corporation E243WMi 59118576NB";
left = true;
orientation = "90";
};
})
(luhbots_workstation {
horizontal.name = "Dell Inc. DELL P2422HE 7VWL9M3";
vertical = {
name = "ViewSonic Corporation VG2448 V5E201960167";
left = false;
orientation = "90";
};
})
(luhbots_workstation {
horizontal.name = "Dell Inc. DELL U2422HE 7HCPH83";
vertical = {
name = "Dell Inc. DELL U2422HE 1XFFH83";
left = true;
orientation = "90";
};
})
(luhbots_workstation {
horizontal.name = "Dell Inc. DELL U2422HE 5XY5H83";
vertical = {
name = "Dell Inc. DELL U2419H 11B7Y13";
left = true;
orientation = "270";
};
})
{
profile.name = "docked-4k";
profile.outputs = [

View File

@@ -25,11 +25,7 @@ in {
ovmf = {
enable = true;
packages = [
(pkgs.OVMF.override {
secureBoot = true;
tpmSupport = true;
})
.fd
pkgs.OVMFFull.fd
];
};
};

View File

@@ -1,7 +1,7 @@
cloud:
url: ENC[AES256_GCM,data:BoSdQrtLNKYpaHIWUj5Ak8PGMJz3hj/z88XVBgN6AbyT2K/bC412p3oi+X9MmYATR3A=,iv:wez+v5kEN+niZmZXzaJoygHf4mqKVI6CINktAZe8WTs=,tag:20W87Kcn94smiLtX9mMdOw==,type:str]
user: ENC[AES256_GCM,data:kFza,iv:OrDNF/h+xLuuyq2cpaHnQuRM1lwuXhe8Ue0rm/wRmkY=,tag:9t+hEx38r/yBIzWIFD0GnQ==,type:str]
pass: ENC[AES256_GCM,data:08OVCCBRmYY6bfRLSLu1lLNybs3cuCYNvFM2cLUMODMTgkVNJt/0Ko9kTlqi74t+yJtdexQJHnNN9kHU,iv:wXp/dz8Qi0npRR52EmNQDE4ENhqJAXLDMGB4fr7V+Ck=,tag:XedJlS92WbZGezgXfaDHGA==,type:str]
pass: ENC[AES256_GCM,data:Li7KW31pcwL0rq/Ottz+A6fjusX+Msay4dLkM1DAEsRp1cb6nqauD51pWIkGqntZtC6Z3U3sOpY73Wo5,iv:zI3z1dlCBn/s5EquH18ILTUg0YuMBnQKUCgNkTKJY8o=,tag:sKzadnNXwf1kMFlhK56+jA==,type:str]
luhbots:
url: ENC[AES256_GCM,data:5hnCSyNcr3un83FaNGYaiZdbxCJe87+hzpoRtWozbn0OW31pxONIEQnSikXh59/OlVJN9TEmv+bd3uO210NPoKUL0D2MWw==,iv:fvY7fLbiAVGq0hh4ifs/LRgixlZsIDczw0hpiUvFSw0=,tag:gXNgNWMDXnRMdyhTjnG6oA==,type:str]
user: ENC[AES256_GCM,data:ucJ21fRmDKvHtyA=,iv:IYfNwBBWYxVb7ptwhfBiBgXwaoj5oCWg6gCI3WD8sjE=,tag:sB6/PJuquUL/GugpfzNMRw==,type:str]
@@ -17,7 +17,7 @@ sops:
cVV3dFpNbjY1bkZtUlltanpSNDlPd28KQ4FQrC6KyZEzzkmByh07q1RAGnWnCNtr
XTDQhlbSq/LdptpqNbUD2g9H9vC2CAC0av39ExvT55JiK4dEWmrwUA==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2025-08-07T10:39:21Z"
mac: ENC[AES256_GCM,data:7rZ0z+V1DDx78BCOolzw+IkzO+Cm5CKfzuvFBT5t7t6Q9W6Qz5aV/DbNYZjn4LLPHRx7AepvmDgVzEYAIPME0jtvWUTWomWCS8BsKxXBQsUXaKUkqEJqo6hw0irhrHi+/8ZGtQgMQsL1H3mFTRDTt4UXyk5XYvttxx6IvXCxChE=,iv:x7IJ7CViWv0cd5/zWH9e34TWQO0gnFlHKvoVDwLzDTY=,tag:p1Tg9ub8w0UOiEB7qfztbw==,type:str]
lastmodified: "2025-08-21T11:59:42Z"
mac: ENC[AES256_GCM,data:AjDUc3G435FGlZysR+84u+SXeeou9HzTvGnZjEXZbS+AaHEv3CEXPG0qSUbyzudbF3G8oFTgMzlQlZ2ayTJKCNjzn9cgbo1K9iUfphkMD7vrPaIiB7y6GYaA6HRVdUvGNM7kwrH/HpkzgvVP96ey3jb0ZYd4g7sbaGPwDdsd7vk=,iv:u5UrX9QpycSpQ9DKnAtGr3PJ28GEKIagggdZ9ZpWsKw=,tag:911biSbujzMmlTP/5KWw+Q==,type:str]
unencrypted_suffix: _unencrypted
version: 3.10.2