From 39737718a4c6fda0d42207758fbde05ba2c5f07f Mon Sep 17 00:00:00 2001 From: xinyangli Date: Thu, 23 Jan 2025 18:19:04 +0800 Subject: [PATCH 1/5] home/xin: add thunar,zathura,burpsuite --- home/xin/calcite.nix | 9 +++++++++ home/xin/common/gui/default.nix | 12 ++++++++++++ home/xin/common/pentesting.nix | 6 ++++++ modules/home-manager/gui/niri.nix | 4 ---- 4 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 home/xin/common/gui/default.nix create mode 100644 home/xin/common/pentesting.nix diff --git a/home/xin/calcite.nix b/home/xin/calcite.nix index ff95985..40b93c9 100644 --- a/home/xin/calcite.nix +++ b/home/xin/calcite.nix @@ -5,7 +5,9 @@ in { imports = [ ./common + ./common/pentesting.nix ./common/gui/foot.nix + ./common/gui/default.nix ]; programs.nix-index-database.comma.enable = true; @@ -116,6 +118,13 @@ in flags = [ "--disable-up-arrow" ]; }; + programs.zathura = { + enable = true; + options = { + recolor = false; + }; + }; + programs.firefox = { enable = true; policies.DefaultDownloadDirectory = "/media/data/Downloads"; diff --git a/home/xin/common/gui/default.nix b/home/xin/common/gui/default.nix new file mode 100644 index 0000000..38af792 --- /dev/null +++ b/home/xin/common/gui/default.nix @@ -0,0 +1,12 @@ +{ config, pkgs, ... }: +{ + home.packages = with pkgs; [ + # File Manager + xfce.thunar + xfce.thunar-archive-plugin + xfce.thunar-media-tags-plugin + xfce.thunar-volman + + swayimg + ]; +} diff --git a/home/xin/common/pentesting.nix b/home/xin/common/pentesting.nix new file mode 100644 index 0000000..92601a6 --- /dev/null +++ b/home/xin/common/pentesting.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + burpsuite + ]; +} diff --git a/modules/home-manager/gui/niri.nix b/modules/home-manager/gui/niri.nix index d26bf93..527e9e6 100644 --- a/modules/home-manager/gui/niri.nix +++ b/modules/home-manager/gui/niri.nix @@ -34,10 +34,6 @@ in }; config = mkIf cfg.enable { - home.packages = with pkgs; [ - cosmic-files - ]; - systemd.user.services.xwayland-satellite = { Install = { WantedBy = [ "graphical-session.target" ]; From 13bb545ac77da32f0c6693fe28876c4c1f2dc57c Mon Sep 17 00:00:00 2001 From: xinyangli Date: Thu, 23 Jan 2025 18:43:12 +0800 Subject: [PATCH 2/5] modules/nix: disable channel --- modules/nixos/common-settings/nix-conf.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/nixos/common-settings/nix-conf.nix b/modules/nixos/common-settings/nix-conf.nix index 1af1419..f6a7684 100644 --- a/modules/nixos/common-settings/nix-conf.nix +++ b/modules/nixos/common-settings/nix-conf.nix @@ -41,6 +41,8 @@ in nix.optimise.automatic = true; + nix.channel.enable = false; + nix.settings = { experimental-features = [ "nix-command" From 48e1801df6d27f0ae8f86626c44426f6789d988d Mon Sep 17 00:00:00 2001 From: xinyangli Date: Fri, 31 Jan 2025 15:09:45 +0800 Subject: [PATCH 3/5] flake.lock: update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Updated input 'catppuccin': 'github:catppuccin/nix/4a5ac694d7f8a63dec75cbe0ac1c84c818b6b789?narHash=sha256-xHe4X4Je/4WjBL3BPlI1KGqA5N7VQpi4x57YYU9ZOlI%3D' (2025-01-13) → 'github:catppuccin/nix/06f0ea19334bcc8112e6d671fd53e61f9e3ad63a?narHash=sha256-8kBIYfn8TI9jbffhDNS12SdbQHb9ITXflwcgIJBeGqw%3D' (2025-01-22) • Removed input 'catppuccin/catppuccin-v1_1' • Removed input 'catppuccin/catppuccin-v1_2' • Removed input 'catppuccin/home-manager' • Removed input 'catppuccin/home-manager-stable' • Removed input 'catppuccin/home-manager-stable/nixpkgs' • Removed input 'catppuccin/nixpkgs-stable' • Removed input 'catppuccin/nuscht-search' • Removed input 'catppuccin/nuscht-search/flake-utils' • Removed input 'catppuccin/nuscht-search/flake-utils/systems' • Removed input 'catppuccin/nuscht-search/ixx' • Removed input 'catppuccin/nuscht-search/ixx/flake-utils' • Removed input 'catppuccin/nuscht-search/ixx/nixpkgs' • Removed input 'catppuccin/nuscht-search/nixpkgs' • Updated input 'disko': 'github:nix-community/disko/f720e64ec37fa16ebba6354eadf310f81555cc07?narHash=sha256-8hKhPQuMtXfJi%2B4lPvw3FBk/zSJVHeb726Zo0uF1PP8%3D' (2025-01-12) → 'github:nix-community/disko/18d0a984cc2bc82cf61df19523a34ad463aa7f54?narHash=sha256-KYOATYEwaKysL3HdHdS5kbQMXvzS4iPJzJrML%2B3TKAo%3D' (2025-01-29) • Updated input 'home-manager': 'github:nix-community/home-manager/fc52a210b60f2f52c74eac41a8647c1573d2071d?narHash=sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m%2BYq%2B%2BC9AyE%3D' (2025-01-13) → 'github:nix-community/home-manager/a8159195bfaef3c64df75d3b1e6a68d49d392be9?narHash=sha256-PM%2BcGduJ05EZ%2BYXulqAwUFjvfKpPmW080mcuN6R1POw%3D' (2025-01-30) • Updated input 'nix-index-database': 'github:Mic92/nix-index-database/271e5bd7c57e1f001693799518b10a02d1123b12?narHash=sha256-8uolHABgroXqzs03QdulHp8H9e5kWQZnnhcda1MKbBM%3D' (2025-01-12) → 'github:Mic92/nix-index-database/79b7b8eae3243fc5aa9aad34ba6b9bbb2266f523?narHash=sha256-LIRtMvAwLGb8pBoamzgEF67oKlNPz4LuXiRPVZf%2BTpE%3D' (2025-01-26) • Updated input 'nix-vscode-extensions': 'github:nix-community/nix-vscode-extensions/44474e2ca975af013f1594abd6c922f2c8dba022?narHash=sha256-6232F8et5z7XTxK0RuX6bocT6yYGJhlmlHbFdZuHcP0%3D' (2025-01-13) → 'github:nix-community/nix-vscode-extensions/529e0a84346f34db86ea24203c0b2e975fefb4f2?narHash=sha256-q8pOnhaA95ZZf%2BCJ4ahScSzt5pbnL7lShFuMwTwiw7I%3D' (2025-01-31) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/8870dcaff63dfc6647fb10648b827e9d40b0a337?narHash=sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb%2BmxySIP93o%3D' (2025-01-09) → 'github:NixOS/nixos-hardware/dfad538f751a5aa5d4436d9781ab27a6128ec9d4?narHash=sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4%3D' (2025-01-24) • Updated input 'nixos-sbc': 'github:nakato/nixos-sbc/dc96cdfb4805e11aa641f75d21200202a5ed951b?narHash=sha256-iUWzuHgbRXjFkRZ%2BsafF6vCszN8EW59Y%2B//mlF7hTXA%3D' (2025-01-13) → 'github:nakato/nixos-sbc/21be4ab012197a2eea4bbff8315c40f26f715a18?narHash=sha256-SYpvOn0v/wi8lrgEBhobjKFvFWPlJ3gP7SZPfyw9td0%3D' (2025-01-30) • Updated input 'nur': 'github:nix-community/NUR/16ff3063cb4a4cf6fb5f48ca7dc55c27f2ea4891?narHash=sha256-JaWZU7wFWsI4rGAemVciyhTxadaZyubJpLqupKLZUtI%3D' (2025-01-13) → 'github:nix-community/NUR/663390a62b2986f8ea650de7768c4b4c98d49a96?narHash=sha256-9YcoURYAAbMt7fFd0mBtyNH51a2pgxDu94qKnNIt7Ic%3D' (2025-01-31) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/ed4a395ea001367c1f13d34b1e01aa10290f67d6?narHash=sha256-jG/%2BMvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA%3D' (2025-01-12) → 'github:nixos/nixpkgs/9d3ae807ebd2981d593cddd0080856873139aa40?narHash=sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9%2BWC4%3D' (2025-01-29) • Updated input 'sops-nix': 'github:Mic92/sops-nix/0f4744b5a95151a85c4f35010dd2d748228f7f53?narHash=sha256-eON7amRmBl59QH6K9uypewkKveaNbosY6CtUgRcv7YU%3D' (2025-01-13) → 'github:Mic92/sops-nix/4c1251904d8a08c86ac6bc0d72cc09975e89aef7?narHash=sha256-wkwYJc8cKmmQWUloyS9KwttBnja2ONRuJQDEsmef320%3D' (2025-01-31) --- flake.lock | 260 +++++++++++------------------------------------------ 1 file changed, 51 insertions(+), 209 deletions(-) diff --git a/flake.lock b/flake.lock index fd620f0..ed7d6fc 100644 --- a/flake.lock +++ b/flake.lock @@ -2,24 +2,16 @@ "nodes": { "catppuccin": { "inputs": { - "catppuccin-v1_1": "catppuccin-v1_1", - "catppuccin-v1_2": "catppuccin-v1_2", - "home-manager": [ - "home-manager" - ], - "home-manager-stable": "home-manager-stable", "nixpkgs": [ "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable", - "nuscht-search": "nuscht-search" + ] }, "locked": { - "lastModified": 1736785029, - "narHash": "sha256-xHe4X4Je/4WjBL3BPlI1KGqA5N7VQpi4x57YYU9ZOlI=", + "lastModified": 1737579274, + "narHash": "sha256-8kBIYfn8TI9jbffhDNS12SdbQHb9ITXflwcgIJBeGqw=", "owner": "catppuccin", "repo": "nix", - "rev": "4a5ac694d7f8a63dec75cbe0ac1c84c818b6b789", + "rev": "06f0ea19334bcc8112e6d671fd53e61f9e3ad63a", "type": "github" }, "original": { @@ -28,38 +20,10 @@ "type": "github" } }, - "catppuccin-v1_1": { - "locked": { - "lastModified": 1734055249, - "narHash": "sha256-pCWJgwo77KD7EJpwynwKrWPZ//dwypHq2TfdzZWqK68=", - "rev": "7221d6ca17ac36ed20588e1c3a80177ac5843fa7", - "revCount": 326, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.1.1/0193bdc0-b045-7eed-bbec-95611a8ecdf5/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/catppuccin/nix/1.1.%2A.tar.gz" - } - }, - "catppuccin-v1_2": { - "locked": { - "lastModified": 1734734291, - "narHash": "sha256-CFX4diEQHKvZYjnhf7TLg20m3ge1O4vqgplsk/Kuaek=", - "rev": "1e4c3803b8da874ff75224ec8512cb173036bbd8", - "revCount": 344, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.2.1/0193e646-1107-7f69-a402-f2a3988ecf1d/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/catppuccin/nix/1.2.%2A.tar.gz" - } - }, "colmena": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nix-github-actions": "nix-github-actions", "nixpkgs": [ "nixpkgs" @@ -129,11 +93,11 @@ ] }, "locked": { - "lastModified": 1736711425, - "narHash": "sha256-8hKhPQuMtXfJi+4lPvw3FBk/zSJVHeb726Zo0uF1PP8=", + "lastModified": 1738148035, + "narHash": "sha256-KYOATYEwaKysL3HdHdS5kbQMXvzS4iPJzJrML+3TKAo=", "owner": "nix-community", "repo": "disko", - "rev": "f720e64ec37fa16ebba6354eadf310f81555cc07", + "rev": "18d0a984cc2bc82cf61df19523a34ad463aa7f54", "type": "github" }, "original": { @@ -250,6 +214,21 @@ } }, "flake-utils": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "inputs": { "systems": "systems" }, @@ -267,43 +246,10 @@ "type": "github" } }, - "flake-utils_2": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flake-utils_3": { "inputs": { "systems": "systems_2" }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_3" - }, "locked": { "lastModified": 1726560853, "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", @@ -381,11 +327,11 @@ ] }, "locked": { - "lastModified": 1736785676, - "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", + "lastModified": 1738275749, + "narHash": "sha256-PM+cGduJ05EZ+YXulqAwUFjvfKpPmW080mcuN6R1POw=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", + "rev": "a8159195bfaef3c64df75d3b1e6a68d49d392be9", "type": "github" }, "original": { @@ -394,28 +340,6 @@ "type": "github" } }, - "home-manager-stable": { - "inputs": { - "nixpkgs": [ - "catppuccin", - "nixpkgs-stable" - ] - }, - "locked": { - "lastModified": 1736373539, - "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-24.11", - "repo": "home-manager", - "type": "github" - } - }, "home-manager_2": { "inputs": { "nixpkgs": [ @@ -439,34 +363,6 @@ } }, "ixx": { - "inputs": { - "flake-utils": [ - "catppuccin", - "nuscht-search", - "flake-utils" - ], - "nixpkgs": [ - "catppuccin", - "nuscht-search", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729958008, - "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.0.6", - "repo": "ixx", - "type": "github" - } - }, - "ixx_2": { "inputs": { "flake-utils": [ "my-nixvim", @@ -568,11 +464,11 @@ ] }, "locked": { - "lastModified": 1736652904, - "narHash": "sha256-8uolHABgroXqzs03QdulHp8H9e5kWQZnnhcda1MKbBM=", + "lastModified": 1737861961, + "narHash": "sha256-LIRtMvAwLGb8pBoamzgEF67oKlNPz4LuXiRPVZf+TpE=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "271e5bd7c57e1f001693799518b10a02d1123b12", + "rev": "79b7b8eae3243fc5aa9aad34ba6b9bbb2266f523", "type": "github" }, "original": { @@ -592,11 +488,11 @@ ] }, "locked": { - "lastModified": 1736733107, - "narHash": "sha256-6232F8et5z7XTxK0RuX6bocT6yYGJhlmlHbFdZuHcP0=", + "lastModified": 1738287944, + "narHash": "sha256-q8pOnhaA95ZZf+CJ4ahScSzt5pbnL7lShFuMwTwiw7I=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "44474e2ca975af013f1594abd6c922f2c8dba022", + "rev": "529e0a84346f34db86ea24203c0b2e975fefb4f2", "type": "github" }, "original": { @@ -607,11 +503,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1736441705, - "narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=", + "lastModified": 1737751639, + "narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337", + "rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4", "type": "github" }, "original": { @@ -628,11 +524,11 @@ ] }, "locked": { - "lastModified": 1736785579, - "narHash": "sha256-iUWzuHgbRXjFkRZ+safF6vCszN8EW59Y+//mlF7hTXA=", + "lastModified": 1738254353, + "narHash": "sha256-SYpvOn0v/wi8lrgEBhobjKFvFWPlJ3gP7SZPfyw9td0=", "owner": "nakato", "repo": "nixos-sbc", - "rev": "dc96cdfb4805e11aa641f75d21200202a5ed951b", + "rev": "21be4ab012197a2eea4bbff8315c40f26f715a18", "type": "github" }, "original": { @@ -671,22 +567,6 @@ } }, "nixpkgs-stable": { - "locked": { - "lastModified": 1736061677, - "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { "locked": { "lastModified": 1735563628, "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", @@ -720,11 +600,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1736701207, - "narHash": "sha256-jG/+MvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA=", + "lastModified": 1738142207, + "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6", + "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", "type": "github" }, "original": { @@ -767,11 +647,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1736786866, - "narHash": "sha256-JaWZU7wFWsI4rGAemVciyhTxadaZyubJpLqupKLZUtI=", + "lastModified": 1738305622, + "narHash": "sha256-9YcoURYAAbMt7fFd0mBtyNH51a2pgxDu94qKnNIt7Ic=", "owner": "nix-community", "repo": "NUR", - "rev": "16ff3063cb4a4cf6fb5f48ca7dc55c27f2ea4891", + "rev": "663390a62b2986f8ea650de7768c4b4c98d49a96", "type": "github" }, "original": { @@ -780,33 +660,10 @@ "type": "github" } }, - "nuscht-search": { - "inputs": { - "flake-utils": "flake-utils", - "ixx": "ixx", - "nixpkgs": [ - "catppuccin", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735854821, - "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=", - "owner": "NuschtOS", - "repo": "search", - "rev": "836908e3bddd837ae0f13e215dd48767aee355f0", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_4", - "ixx": "ixx_2", + "flake-utils": "flake-utils_3", + "ixx": "ixx", "nixpkgs": [ "my-nixvim", "nixvim", @@ -833,7 +690,7 @@ "colmena": "colmena", "comin": "comin", "disko": "disko", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "home-manager": "home-manager", "my-nixvim": "my-nixvim", "nix-index-database": "nix-index-database", @@ -841,7 +698,7 @@ "nixos-hardware": "nixos-hardware", "nixos-sbc": "nixos-sbc", "nixpkgs": "nixpkgs_2", - "nixpkgs-stable": "nixpkgs-stable_2", + "nixpkgs-stable": "nixpkgs-stable", "nur": "nur", "sops-nix": "sops-nix" } @@ -853,11 +710,11 @@ ] }, "locked": { - "lastModified": 1736777442, - "narHash": "sha256-eON7amRmBl59QH6K9uypewkKveaNbosY6CtUgRcv7YU=", + "lastModified": 1738291974, + "narHash": "sha256-wkwYJc8cKmmQWUloyS9KwttBnja2ONRuJQDEsmef320=", "owner": "Mic92", "repo": "sops-nix", - "rev": "0f4744b5a95151a85c4f35010dd2d748228f7f53", + "rev": "4c1251904d8a08c86ac6bc0d72cc09975e89aef7", "type": "github" }, "original": { @@ -912,21 +769,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ From 068a7fe4e7c2b36038dfef0627ed23ad13b40d95 Mon Sep 17 00:00:00 2001 From: xinyangli Date: Fri, 31 Jan 2025 15:11:19 +0800 Subject: [PATCH 4/5] dolomite: add user zx --- machines/dolomite/common.nix | 1 + machines/dolomite/secrets/secrets.yaml | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/machines/dolomite/common.nix b/machines/dolomite/common.nix index 0b80ae4..322786f 100644 --- a/machines/dolomite/common.nix +++ b/machines/dolomite/common.nix @@ -44,6 +44,7 @@ "wyj" "yhb" "xin" + "zx" ]; }; }; diff --git a/machines/dolomite/secrets/secrets.yaml b/machines/dolomite/secrets/secrets.yaml index e0df929..87c4677 100644 --- a/machines/dolomite/secrets/secrets.yaml +++ b/machines/dolomite/secrets/secrets.yaml @@ -9,6 +9,9 @@ sing-box: xin: password: ENC[AES256_GCM,data:SRiPFO+Uwy/PT41SIg7eI68wk4AX6so=,iv:aXwP5wa1IrlnvFo/ZL+DYFFHDdWw2Z83de3ApHUTsXo=,tag:sxXoy1FnDxZBQCDeNxphzQ==,type:str] uuid: ENC[AES256_GCM,data:7xK53SO4x0tOIEIYl6kmmAvnpdsR/tYQoG1t/ytsnO4QqWY3,iv:i694Fnu7g1OA3IGzSaoSGA5/eMPo+I/1TZbYuaQrgNA=,tag:4cUlioJn/IvsvZclgboOSA==,type:str] + zx: + password: ENC[AES256_GCM,data:UkRaj5aadq8Ea3j3wh6YQDzxmew=,iv:vrJ7h97KaWmp7+rkYowdTDI7HIq71ZUIERE3o0BY5Fc=,tag:YEPydn9fLmEBYBDD//6Pfw==,type:str] + uuid: ENC[AES256_GCM,data:W+qXN1Xa5ZMXRQh+7dtZkExFrp6qqEOkoxn8Fj5qQ5U23ytz,iv:559UEoMyY3/RfmwJLFCerkuV0DjTbhaRPbW56toxMEU=,tag:pv706bZgEblyGS7V9mwABA==,type:str] sops: kms: [] gcp_kms: [] @@ -51,8 +54,8 @@ sops: K1F1SzI2NFNIKzlreVBXSjAxaUxQd28KFaf1uu7OlqIe0TirJFgS3iPjhXPyfNDE m2XUjzdXp+chJCzVOFvpYStqz+e08ADEc+jp3YsTLcxyqvXhQdyL/Q== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-12-06T04:35:52Z" - mac: ENC[AES256_GCM,data:DAg4UTwNv+rs6hye2z5UUtA1a4yZbFaAWjLoKAXf87tKgBCZzK8C1q6gLyTQOqp07ptYQd5Q951kfE1a/35SFJsubREzJmu6haxznRgq7pO5HDGqgtjYEHsngsWZh3bUSX/aG2dLISdD81VY68nLzTO0r4h/SL6DNG36RzJgL8E=,iv:V0WhENNt/Szi5VWVD2t5AsWP1tOZUGjFjMNYPDq59XI=,tag:ThRstdzVNtSs6E7qlvKPOw==,type:str] + lastmodified: "2025-01-31T07:11:08Z" + mac: ENC[AES256_GCM,data:CYOPIN29pg5ldsLgkMaqSqKmTKusSBKVVifU2eGPIEILcYEwMmmGkvCH7jG8+QnOicfSTIonA0sPBO/g36X5bLhQIcmzUEnImSXVFLXpvHM2haIxPSHG/xvaLbIPcHMKvHbeyIGIhIdfPp7ssyH1Aa/+PgtfTIMUeOFbIWykgfE=,iv:+u7kyGUgmeEJ2T6rnBS9ACAk4Ka2OPJrz4sCZLVTPP8=,tag:d2eimY7wGwoQZZEh3d0UZA==,type:str] pgp: [] unencrypted_suffix: _unencrypted - version: 3.9.1 + version: 3.9.2 From 68228aca1f000ae1a995a207ce667a1a7a220604 Mon Sep 17 00:00:00 2001 From: xinyangli Date: Fri, 31 Jan 2025 15:11:57 +0800 Subject: [PATCH 5/5] weilite: use one virtiofs mount --- machines/weilite/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/machines/weilite/default.nix b/machines/weilite/default.nix index d3e8de7..9d7aee5 100644 --- a/machines/weilite/default.nix +++ b/machines/weilite/default.nix @@ -91,13 +91,6 @@ }; systemd.mounts = [ - { - what = "immich"; - where = "/mnt/XinPhotos/immich"; - type = "virtiofs"; - options = "rw,nodev,nosuid"; - wantedBy = [ "immich-server.service" ]; - } { what = "originals"; where = "/mnt/XinPhotos/originals"; @@ -111,7 +104,6 @@ type = "virtiofs"; options = "rw,nodev,nosuid"; } - { what = "/mnt/nixos/ocis"; where = "/var/lib/ocis";