From e4f38440f88c9d2fe1dcd54986e32e9667110e51 Mon Sep 17 00:00:00 2001 From: Swarsel Date: Thu, 5 Sep 2024 13:27:42 +0200 Subject: [PATCH] feat: add seminary work screen --- SwarselSystems.org | 12 +++- flake.lock | 115 +++++++++++++++++++++++++++++++- profiles/common/home/sway.nix | 2 + profiles/nbl-imba-2/default.nix | 10 ++- 4 files changed, 136 insertions(+), 3 deletions(-) diff --git a/SwarselSystems.org b/SwarselSystems.org index 5bb4b7f..fa8313e 100644 --- a/SwarselSystems.org +++ b/SwarselSystems.org @@ -1889,7 +1889,7 @@ My work machine. Built for more security, this is the gold standard of my config mode = "2560x1600"; # TEMPLATE scale = "1"; position = "2560,0"; - workspace = "10:十"; + workspace = "15:L"; output = "eDP-2"; }; homedesktop = { @@ -1941,6 +1941,14 @@ My work machine. Built for more security, this is the gold standard of my config workspace = "12:S"; output = "DP-9"; }; + work_seminary = { + name = "Applied Creative Technology Transmitter QUATTRO201811"; + mode = "1280x720"; + scale = "1"; + position = "10000,10000"; + workspace = "12:S"; + output = "DP-4"; + }; }; inputs = { "12972:18:Framework_Laptop_16_Keyboard_Module_-_ANSI_Keyboard" = { @@ -8630,6 +8638,8 @@ Currently, I am too lazy to explain every option here, but most of it is very se "${modifier}+Ctrl+Shift+e" = "move container to workspace 13:E"; "${modifier}+Ctrl+t" = "workspace 14:T"; "${modifier}+Ctrl+Shift+t" = "move container to workspace 14:T"; + "${modifier}+Ctrl+l" = "workspace 15:L"; + "${modifier}+Ctrl+Shift+l" = "move container to workspace 15:L"; "${modifier}+Left" = "focus left"; "${modifier}+Right" = "focus right"; "${modifier}+Down" = "focus down"; diff --git a/flake.lock b/flake.lock index a7dcf15..ea0b85e 100644 --- a/flake.lock +++ b/flake.lock @@ -135,6 +135,27 @@ "type": "github" } }, + "crane_2": { + "inputs": { + "nixpkgs": [ + "zjstatus", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1724537630, + "narHash": "sha256-gpqINM71zp3kw5XYwUXa84ZtPnCmLLnByuFoYesT1bY=", + "owner": "ipetkov", + "repo": "crane", + "rev": "3e08f4b1fc9aaede5dd511d8f5f4ef27501e49b0", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -334,6 +355,24 @@ "type": "github" } }, + "flake-utils_5": { + "inputs": { + "systems": "systems_5" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "fromYaml": { "flake": false, "locked": { @@ -890,6 +929,22 @@ "type": "github" } }, + "nixpkgs_8": { + "locked": { + "lastModified": 1724748588, + "narHash": "sha256-NlpGA4+AIf1dKNq76ps90rxowlFXUsV9x7vK/mN37JM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a6292e34000dc93d43bccf78338770c1c5ec8a99", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nmd": { "flake": false, "locked": { @@ -1018,7 +1073,8 @@ "nur": "nur", "sops-nix": "sops-nix", "stylix": "stylix", - "systems": "systems_4" + "systems": "systems_4", + "zjstatus": "zjstatus" } }, "rust-overlay": { @@ -1042,6 +1098,27 @@ "type": "github" } }, + "rust-overlay_2": { + "inputs": { + "nixpkgs": [ + "zjstatus", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1724811750, + "narHash": "sha256-PvhVgQ1rm3gfhK7ts4emprhh/KMkFwXogmgsQ3srR7g=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "6a1c4915dca7149e7258d8c7f3ac634d8c65f6c6", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "sops-nix": { "inputs": { "nixpkgs": "nixpkgs_6", @@ -1151,6 +1228,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1659877975, @@ -1165,6 +1257,27 @@ "repo": "flake-utils", "type": "github" } + }, + "zjstatus": { + "inputs": { + "crane": "crane_2", + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_8", + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1724858904, + "narHash": "sha256-QGzfl4YHTl/HuYy6oe/OqAX8xViYht1BCCIpWq7uH5U=", + "owner": "dj95", + "repo": "zjstatus", + "rev": "b2f15019bdfc04f65cac7cd073418ac6ad4dbddc", + "type": "github" + }, + "original": { + "owner": "dj95", + "repo": "zjstatus", + "type": "github" + } } }, "root": "root", diff --git a/profiles/common/home/sway.nix b/profiles/common/home/sway.nix index 78936dc..bf9f301 100644 --- a/profiles/common/home/sway.nix +++ b/profiles/common/home/sway.nix @@ -84,6 +84,8 @@ in "${modifier}+Ctrl+Shift+e" = "move container to workspace 13:E"; "${modifier}+Ctrl+t" = "workspace 14:T"; "${modifier}+Ctrl+Shift+t" = "move container to workspace 14:T"; + "${modifier}+Ctrl+l" = "workspace 15:L"; + "${modifier}+Ctrl+Shift+l" = "move container to workspace 15:L"; "${modifier}+Left" = "focus left"; "${modifier}+Right" = "focus right"; "${modifier}+Down" = "focus down"; diff --git a/profiles/nbl-imba-2/default.nix b/profiles/nbl-imba-2/default.nix index 17521c8..3dd1f25 100644 --- a/profiles/nbl-imba-2/default.nix +++ b/profiles/nbl-imba-2/default.nix @@ -98,7 +98,7 @@ mode = "2560x1600"; # TEMPLATE scale = "1"; position = "2560,0"; - workspace = "10:十"; + workspace = "15:L"; output = "eDP-2"; }; homedesktop = { @@ -150,6 +150,14 @@ workspace = "12:S"; output = "DP-9"; }; + work_seminary = { + name = "Applied Creative Technology Transmitter QUATTRO201811"; + mode = "1280x720"; + scale = "1"; + position = "10000,10000"; + workspace = "12:S"; + output = "DP-4"; + }; }; inputs = { "12972:18:Framework_Laptop_16_Keyboard_Module_-_ANSI_Keyboard" = {