diff --git a/flake.lock b/flake.lock index 6cad189..f4604a7 100644 --- a/flake.lock +++ b/flake.lock @@ -80,25 +80,6 @@ "type": "github" } }, - "copyparty": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1758061721, - "narHash": "sha256-+agPUV+fOJSpqjVOEM0xC8+xhBFbnQesyy+8ErwGpks=", - "owner": "9001", - "repo": "copyparty", - "rev": "5996a58b20fa015bd404dfdb2cef8892909b3d69", - "type": "github" - }, - "original": { - "owner": "9001", - "repo": "copyparty", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -268,40 +249,6 @@ } }, "flake-utils": { - "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils-plus": { - "inputs": { - "flake-utils": "flake-utils_2" - }, - "locked": { - "lastModified": 1715533576, - "narHash": "sha256-fT4ppWeCJ0uR300EH3i7kmgRZnAVxrH+XtK09jQWihk=", - "owner": "gytis-ivaskevicius", - "repo": "flake-utils-plus", - "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f", - "type": "github" - }, - "original": { - "owner": "gytis-ivaskevicius", - "repo": "flake-utils-plus", - "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f", - "type": "github" - } - }, - "flake-utils_2": { "inputs": { "systems": "systems_5" }, @@ -319,6 +266,25 @@ "type": "github" } }, + "flake-utils-plus": { + "inputs": { + "flake-utils": "flake-utils" + }, + "locked": { + "lastModified": 1715533576, + "narHash": "sha256-fT4ppWeCJ0uR300EH3i7kmgRZnAVxrH+XtK09jQWihk=", + "owner": "gytis-ivaskevicius", + "repo": "flake-utils-plus", + "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f", + "type": "github" + }, + "original": { + "owner": "gytis-ivaskevicius", + "repo": "flake-utils-plus", + "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -497,7 +463,7 @@ "hyprlang": "hyprlang_2", "hyprutils": "hyprutils_2", "hyprwayland-scanner": "hyprwayland-scanner_2", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "pre-commit-hooks": "pre-commit-hooks_2", "systems": "systems_3", "xdph": "xdph" @@ -794,7 +760,7 @@ }, "musnix": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1756852730, @@ -826,21 +792,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1748162331, - "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-25.05", - "type": "indirect" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1754725699, "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", @@ -856,7 +807,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_2": { "locked": { "lastModified": 1756542300, "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=", @@ -872,7 +823,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1760524057, "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", @@ -953,7 +904,6 @@ "inputs": { "agenix": "agenix", "agenix-rekey": "agenix-rekey", - "copyparty": "copyparty", "darwin": "darwin_2", "disko": "disko", "docker-compose-1": "docker-compose-1", @@ -961,7 +911,7 @@ "hypridle": "hypridle", "hyprland": "hyprland", "musnix": "musnix", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "quadlet": "quadlet", "rose-pine-hyprcursor": "rose-pine-hyprcursor", "snowfall": "snowfall", diff --git a/flake.nix b/flake.nix index 9e98260..e619425 100644 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,6 @@ disko.nixosModules.default agenix.nixosModules.default agenix-rekey.nixosModules.default - copyparty.nixosModules.default ./modules/common ]; darwin = [ @@ -30,11 +29,9 @@ # Add modules only to specific hosts systems.hosts = with inputs; { cobalt.modules = [ - copyparty.nixosModules.default musnix.nixosModules.default ]; beryllium.modules = [ - copyparty.nixosModules.default quadlet.nixosModules.quadlet ]; europium.modules = [ @@ -53,9 +50,7 @@ permittedInsecurePackages = []; }; - overlays = with inputs; [ - copyparty.overlays.default - ]; + overlays = with inputs; []; outputs-builder = channels: { formatter = channels.nixpkgs.alejandra; @@ -98,8 +93,6 @@ agenix-rekey.url = "github:oddlama/agenix-rekey"; agenix-rekey.inputs.nixpkgs.follows = "nixpkgs"; - copyparty.url = "github:9001/copyparty"; - hyprland.url = "github:hyprwm/hyprland"; hypridle = { diff --git a/homes/x86_64-linux/christopher@cobalt/default.nix b/homes/x86_64-linux/christopher@cobalt/default.nix index e4e60c9..da818b6 100644 --- a/homes/x86_64-linux/christopher@cobalt/default.nix +++ b/homes/x86_64-linux/christopher@cobalt/default.nix @@ -21,7 +21,6 @@ key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHl33DPxxzxrNNjM8rL4ktAj4ExzCyGiU8rKog0csxNA"; needs = { - copypartyPassword = "copyparty-password.age"; repoUpdatePAT = "repo-update-pat.age"; npmrc = { rekeyFile = "npmrc.age"; diff --git a/homes/x86_64-linux/christopher@cobalt/misc/everything.nix b/homes/x86_64-linux/christopher@cobalt/misc/everything.nix index 0a8752d..75dc8f4 100644 --- a/homes/x86_64-linux/christopher@cobalt/misc/everything.nix +++ b/homes/x86_64-linux/christopher@cobalt/misc/everything.nix @@ -7,6 +7,8 @@ yubikey-manager croc # File transfer solaar # Logitech mouse driver + btop # Better resource monitor + bottom # System resource monitor # GUI vesktop # Discord client diff --git a/secrets/copyparty-password.age b/secrets/copyparty-password.age deleted file mode 100644 index e8e94a6..0000000 Binary files a/secrets/copyparty-password.age and /dev/null differ diff --git a/secrets/rekeyed/christopher_cobalt/8b7841e1fb795a01f358cb86b43dfc3b-copypartyPassword.age b/secrets/rekeyed/christopher_cobalt/8b7841e1fb795a01f358cb86b43dfc3b-copypartyPassword.age deleted file mode 100644 index 06bf4cd..0000000 --- a/secrets/rekeyed/christopher_cobalt/8b7841e1fb795a01f358cb86b43dfc3b-copypartyPassword.age +++ /dev/null @@ -1,8 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 Sih9FA 0KicXG2Efz0e9uzmZVEVfJT/i7enxSZOHN403NX/TQI -SMTWuslXUrZ4uTAAoBJPW2qI/uyUpirNs+qutENWpEY --> u1J0d-grease 3Yf,I\u njKv!al -7tlxC1cHMMzeCC9BuAmRXuC19dLT2Oa416bN5ZEU9y7bKKwxdlHDCQA40E8yuSRk -asdGgYzSxPIqTwIsTQ ---- S+Dtx+pCwnQtyh1lSa7CA1wy0Ye4Yy8rqg5RXXFAVPc -$zM2\z:N@:,3zyf  U7x \ No newline at end of file diff --git a/secrets/rekeyed/cobalt/afecc51553c369aac56ed88fd0c798ef-copypartyPassword.age b/secrets/rekeyed/cobalt/afecc51553c369aac56ed88fd0c798ef-copypartyPassword.age deleted file mode 100644 index caf6f4d..0000000 --- a/secrets/rekeyed/cobalt/afecc51553c369aac56ed88fd0c798ef-copypartyPassword.age +++ /dev/null @@ -1,7 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 /u/eYA xmiJ76GC9OgIuJcMRzPK1Mwo1DdRsAc1LPXbpshXag8 -5WmXKC4YQhc9qqmQVs26GXXlpmxh7rYvww3L0FPLmPQ --> ]KoF}\i-grease _q#e -JnCuJ2FjXe3WtG0VmvNj3ww+sa7i ---- YdgtSb+pPQgjgdtY7XLBHGcbWPLDXd0ph7s6Pq3Sn7M -XSPfѧٕjMV\mTpY4sR0 \ No newline at end of file diff --git a/systems/x86_64-linux/cobalt/default.nix b/systems/x86_64-linux/cobalt/default.nix index 98486a5..9c5e29a 100644 --- a/systems/x86_64-linux/cobalt/default.nix +++ b/systems/x86_64-linux/cobalt/default.nix @@ -21,14 +21,6 @@ with lib._elements; { secrets = { key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPjqieS4GkYAa1WRYZpxjgYsj7VGZ9U+rTFCkX8M0umD"; - - needs = { - copypartyPassword = rec { - owner = "christopher"; - group = owner; - rekeyFile = "copyparty-password.age"; - }; - }; }; }; @@ -137,38 +129,6 @@ with lib._elements; { # Smartcard support, necessary for Yubikey logins pcscd.enable = true; - - copyparty = { - enable = false; - user = "christopher"; - - settings = { - i = "0.0.0.0"; - }; - - accounts.c.passwordFile = config.age.secrets.copypartyPassword.path; - - volumes = { - "/" = { - path = "/home/christopher"; - access.rwmdga = "c"; - flags = { - fk = 4; - scan = 60; - e2d = true; - }; - }; - "/hdd" = { - path = "/mnt/hdd"; - access.rwmdga = "c"; - flags = { - fk = 4; - scan = 60; - e2d = true; - }; - }; - }; - }; }; programs = {