Compare commits

..

2 Commits

5 changed files with 70 additions and 56 deletions

18
flake.lock generated
View File

@@ -79,7 +79,8 @@
"musnix": "musnix",
"nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable",
"sops-nix": "sops-nix"
"sops-nix": "sops-nix",
"wrapper-manager": "wrapper-manager"
}
},
"sops-nix": {
@@ -101,6 +102,21 @@
"repo": "sops-nix",
"type": "github"
}
},
"wrapper-manager": {
"locked": {
"lastModified": 1751998186,
"narHash": "sha256-np2RxS8tRz/jGfUSYKxzg7cCi4dS8PL8gutLZfPMbIY=",
"owner": "viperML",
"repo": "wrapper-manager",
"rev": "8ad2484b485acad0632cb0af15b5eb704e3c1d0a",
"type": "github"
},
"original": {
"owner": "viperML",
"repo": "wrapper-manager",
"type": "github"
}
}
},
"root": "root",

View File

@@ -13,6 +13,8 @@
musnix.url = "github:musnix/musnix";
musnix.inputs.nixpkgs.follows = "nixpkgs";
wrapper-manager.url = "github:viperML/wrapper-manager";
};
outputs = {

View File

@@ -2,9 +2,11 @@
lib,
config,
pkgs,
inputs,
...
}: let
cfg = config.myConfig.programs;
in {
imports = [./foot.nix ./thunderbird.nix ./nextcloud.nix ./udiskie.nix ./wezterm.nix ./rclone.nix];
@@ -22,6 +24,18 @@ in {
};
home.packages = with pkgs; [
(inputs.wrapper-manager.lib.wrapWith pkgs {
basePackage = element-desktop;
prependFlags = ["--enable-features=UseOzonePlatform,WebRTCPipeWireCapturer" "--ozone-platform=wayland"];
})
(inputs.wrapper-manager.lib.wrapWith pkgs {
basePackage = discord;
prependFlags = ["--enable-features=UseOzonePlatform,WebRTCPipeWireCapturer" "--ozone-platform=wayland"];
})
(inputs.wrapper-manager.lib.wrapWith pkgs {
basePackage = obsidian;
prependFlags = ["--enable-features=UseOzonePlatform" "--ozone-platform=wayland"];
})
unzip
firefox
xournalpp
@@ -37,7 +51,6 @@ in {
sops
pwvucontrol
qpwgraph
discord
libreoffice-fresh
mate.caja
mate.atril
@@ -47,15 +60,14 @@ in {
wine
prusa-slicer
kicad
element-desktop
chromium
wl-clipboard
gimp
godot_4
ripgrep-all
flatpak
obsidian
marksman
alejandra
];
};
}

View File

@@ -93,31 +93,11 @@ in {
output = let
bgdir = ../../../assets;
bg1080 = bgdir + "/bg1080.png";
bg1080vert = bgdir + "/bg1080vert.png";
bg4k = bgdir + "/bg4k.png";
in
lib.mkIf cfg.laptop {
eDP-1 = {
bg = "'${bg1080}' fit";
};
HDMI-A-1 = {
bg = "'${bg4k}' fit";
};
DP-3 = {
bg = "'${bg1080}' fit";
};
DP-4 = {
bg = "'${bg1080}' fit";
};
DP-5 = {
bg = "'${bg1080vert}' fit";
};
DP-6 = {
bg = "'${bg1080}' fit";
};
DP-7 = {
bg = "'${bg1080vert}' fit";
};
};
input = {
@@ -185,6 +165,7 @@ in {
{app_id = "thunderbird";}
{app_id = "discord";}
{app_id = "Element";}
{class = "Element";}
];
"music" = [{app_id = "org.rncbc.qpwgraph";}];
"obsidian" = [{app_id = "obsidian";} {class = "obsidian";}];
@@ -228,27 +209,21 @@ in {
workspaceOutputAssign = lib.mkIf cfg.laptop [
{
workspace = "main";
output = ["DP-3" "DP-4" "DP-6" "HDMI-A-1" "eDP-1"];
}
{
workspace = "term";
output = ["DP-5" "DP-4" "DP-7" "eDP-1"];
}
{
workspace = "msg";
output = ["eDP-1"];
}
{
workspace = "music";
output = ["eDP-1"];
}
{
workspace = "5";
output = ["DP-3" "DP-4" "DP-6" "HDMI-A-1" "eDP-1"];
}
{
workspace = "obsidian";
output = ["eDP-1"];
}
];

View File

@@ -18,32 +18,41 @@ in {
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'"
];
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;