Compare commits
No commits in common. "f86e222e48426d30e3e0279231500b6bcd71a40c" and "b0262c229f98529337f22e14f27a448ff14e5719" have entirely different histories.
f86e222e48
...
b0262c229f
7 changed files with 58 additions and 99 deletions
90
flake.lock
generated
90
flake.lock
generated
|
|
@ -96,11 +96,11 @@
|
|||
"systems": "systems_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728852607,
|
||||
"narHash": "sha256-PhJdr8b4nZVHts5KMEsf7vCDXVpFIFCa7VlCt+oYpL4=",
|
||||
"lastModified": 1728684316,
|
||||
"narHash": "sha256-fQ4LkmZeW4eGowbVfvct1hLFD0hNkZiX5SzRlWqhgxc=",
|
||||
"owner": "Kirottu",
|
||||
"repo": "anyrun",
|
||||
"rev": "6e0385f6945d701545edc5bccfc5f544e1e12663",
|
||||
"rev": "6c974bc5f3f82f505278befa4b24d96ba8eb06f1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -196,11 +196,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728964350,
|
||||
"narHash": "sha256-8q7j9tHJKk910tszdZrk8SbF+B8e9WibnwcAtOKB0Ag=",
|
||||
"lastModified": 1728691493,
|
||||
"narHash": "sha256-u8MgMwvrMFuW944H4Cx2B4tTpDp2LbiI0SIAa/i4whA=",
|
||||
"owner": "firecat53",
|
||||
"repo": "bitwarden-menu",
|
||||
"rev": "71efc0740250019836388eb2641c7fe33ee6a32a",
|
||||
"rev": "c0b12494118bbe3c5507a3d66ebd54648da425ef",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -292,11 +292,11 @@
|
|||
"onchg": "onchg"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728874779,
|
||||
"narHash": "sha256-498cQTDaU7bU3CbWPCQgSGkV25T8sZQmMwhU58WkIXE=",
|
||||
"lastModified": 1728751665,
|
||||
"narHash": "sha256-9FBIjikKjGNtcZCHW0g1I+qSJImW2Ta3IDELmzOkhkE=",
|
||||
"owner": "aksiksi",
|
||||
"repo": "compose2nix",
|
||||
"rev": "07cad037b8887ba94cd7236ffd1a8ee47002a9fe",
|
||||
"rev": "3aed8b68fffa45f9a140be90cecaeced2f11bbff",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -471,11 +471,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729099656,
|
||||
"narHash": "sha256-VftVIg7UXTy1bq+tzi1aVYOWl7PQ35IpjW88yMYjjpc=",
|
||||
"lastModified": 1728687662,
|
||||
"narHash": "sha256-D9TChzb00eTG1YWBx8eN2s6lJJnBjB5Y7RpxkAzGvyQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "d7d57edb72e54891fa67a6f058a46b2bb405663b",
|
||||
"rev": "bdbdb725d632863bdedb80baabf21327614dd237",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1097,11 +1097,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729027341,
|
||||
"narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=",
|
||||
"lastModified": 1728726232,
|
||||
"narHash": "sha256-8ZWr1HpciQsrFjvPMvZl0W+b0dilZOqXPoKa2Ux36bc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "2a4fd1cfd8ed5648583dadef86966a8231024221",
|
||||
"rev": "d57112db877f07387ce7104b5ac346ede556d2d7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1344,11 +1344,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728168612,
|
||||
"narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=",
|
||||
"lastModified": 1721324361,
|
||||
"narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprlang",
|
||||
"rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e",
|
||||
"rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1396,11 +1396,11 @@
|
|||
"systems": "systems_10"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728821111,
|
||||
"narHash": "sha256-3dDOBfFkmusoF+6LWXkvQaSfzXb0DEqMEQQvEBbjN9Q=",
|
||||
"lastModified": 1728661487,
|
||||
"narHash": "sha256-4PiVL3GGz5kSWrt5QX+/7LTymyJ49VQ3JvSdKnZuZto=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprlock",
|
||||
"rev": "11694528b4e0af597f25a5308d6872afd0b06807",
|
||||
"rev": "7362ce3435afd1fffd2c81d5d7f58996f496b533",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1518,11 +1518,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1727300645,
|
||||
"narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=",
|
||||
"lastModified": 1721324102,
|
||||
"narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprutils",
|
||||
"rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c",
|
||||
"rev": "962582a090bc233c4de9d9897f46794280288989",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1664,11 +1664,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729110149,
|
||||
"narHash": "sha256-tPGZ0N9SBVwWVxmhhdKkQb8eF+p51521Nl/aVLjqCOM=",
|
||||
"lastModified": 1728679815,
|
||||
"narHash": "sha256-3IXvY30zzFq7lHFujMupPz3TiPXo8o8qiIjkXUvznCI=",
|
||||
"owner": "Jovian-Experiments",
|
||||
"repo": "Jovian-NixOS",
|
||||
"rev": "e5c6aed9b62f7f0bc8d48d61c83b897a20903ad8",
|
||||
"rev": "e4f4d7832cc559389b93798c1f0d615e3816f4ef",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1825,11 +1825,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728790083,
|
||||
"narHash": "sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y=",
|
||||
"lastModified": 1728263287,
|
||||
"narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "5c54c33aa04df5dd4b0984b7eb861d1981009b22",
|
||||
"rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1845,11 +1845,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1728790083,
|
||||
"narHash": "sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y=",
|
||||
"lastModified": 1728263287,
|
||||
"narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "5c54c33aa04df5dd4b0984b7eb861d1981009b22",
|
||||
"rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1890,11 +1890,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729043231,
|
||||
"narHash": "sha256-Dhn3CI3e8cexWhwDVuKGQu7DjCXKLut5aT928x5WIDw=",
|
||||
"lastModified": 1728179514,
|
||||
"narHash": "sha256-mOGZFPYm9SuEXnYiXhgs/JmLu7RofRaMpAYyJiWudkc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-vscode-extensions",
|
||||
"rev": "81a5fdadd8b5b473d8a51a6ec751c94ed180707e",
|
||||
"rev": "018196c371073d669510fd69dd2f6dc0ec608c41",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -2088,11 +2088,11 @@
|
|||
},
|
||||
"nixpkgs-stable_4": {
|
||||
"locked": {
|
||||
"lastModified": 1728909085,
|
||||
"narHash": "sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg=",
|
||||
"lastModified": 1728627514,
|
||||
"narHash": "sha256-r+SF9AnHrTg+bk6YszoKfV9lgyw+yaFUQe0dOjI0Z2o=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c0b1da36f7c34a7146501f684e9ebdf15d2bebf8",
|
||||
"rev": "c505ebf777526041d792a49d5f6dd4095ea391a7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -2104,11 +2104,11 @@
|
|||
},
|
||||
"nixpkgs-staging-next": {
|
||||
"locked": {
|
||||
"lastModified": 1729109393,
|
||||
"narHash": "sha256-O5Ti7jc8d7inYMH2Rs595N0I26TSViCk+YCkDYadJTU=",
|
||||
"lastModified": 1728756491,
|
||||
"narHash": "sha256-AkjU98eN+VvTSnasI+QVjCvLSFXAbmWDOEULENQGcWw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1a4d05c8bb37017435b3cee89f5a157a18698cd7",
|
||||
"rev": "001fb496bf1c2f0fb28fcdb58af1002939109572",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -2120,11 +2120,11 @@
|
|||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1728888510,
|
||||
"narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
|
||||
"lastModified": 1728492678,
|
||||
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
|
||||
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -1,42 +0,0 @@
|
|||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.custom.containers.conduwuit;
|
||||
in {
|
||||
options.custom.containers.conduwuit.enable = mkOption {default = false;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
age.secrets = let
|
||||
secret = filename: {
|
||||
file = "${inputs.self}/secrets/${filename}";
|
||||
};
|
||||
in {
|
||||
"${config.custom.profile}/conduwuit/conduwuit.toml" = secret "${config.custom.profile}/conduwuit/conduwuit.toml";
|
||||
};
|
||||
|
||||
#?? arion-conduwuit pull
|
||||
environment.shellAliases.arion-conduwuit = "sudo arion --prebuilt-file ${config.virtualisation.arion.projects.conduwuit.settings.out.dockerComposeYaml}";
|
||||
|
||||
virtualisation.arion.projects.conduwuit.settings.services = {
|
||||
conduwuit.service = {
|
||||
container_name = "conduwuit";
|
||||
image = "girlbossceo/conduwuit:main";
|
||||
ports = ["127.0.0.1:6167:6167"];
|
||||
restart = "unless-stopped";
|
||||
|
||||
environment = {
|
||||
CONDUWUIT_CONFIG = "/etc/conduwuit/conduwuit.toml";
|
||||
};
|
||||
|
||||
volumes = [
|
||||
"${config.custom.containers.directory}/conduwuit/db:/var/lib/conduwuit"
|
||||
"${config.age.secrets."${config.custom.profile}/conduwuit/conduwuit.toml".path}:/etc/conduwuit/conduwuit.toml"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -242,6 +242,10 @@ in {
|
|||
(class "Xdg-desktop-portal-gtk" ["noborder" "noshadow"])
|
||||
|
||||
#!! Expressions are not wrapped in ^$
|
||||
(fields {
|
||||
class = "^1Password$";
|
||||
title = "^1Password$";
|
||||
} ["stayfocused"])
|
||||
(fields {
|
||||
class = "^com\\.github\\.wwmm\\.easyeffects$";
|
||||
title = "^Easy Effects$"; # Main window
|
||||
|
|
|
|||
|
|
@ -70,15 +70,14 @@ in {
|
|||
wofi
|
||||
xclip
|
||||
])
|
||||
# TODO: Convert to options and disable clipboard.sh
|
||||
# (bash "clipboard" [
|
||||
# cliphist
|
||||
# libnotify
|
||||
# procps
|
||||
# wl-clipboard
|
||||
# wofi
|
||||
# xclip
|
||||
# ])
|
||||
(bash "clipboard" [
|
||||
cliphist
|
||||
libnotify
|
||||
procps
|
||||
wl-clipboard
|
||||
wofi
|
||||
xclip
|
||||
])
|
||||
(bash "close" [
|
||||
coreutils
|
||||
hyprland
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
enable = true;
|
||||
boot = true;
|
||||
#// actualbudget.enable = true;
|
||||
conduwuit.enable = true;
|
||||
coturn.enable = true;
|
||||
forgejo.enable = true;
|
||||
foundryvtt.enable = true;
|
||||
|
|
@ -21,7 +20,7 @@
|
|||
|
||||
services = {
|
||||
caddy.enable = true;
|
||||
#// matrix-conduit.enable = true;
|
||||
matrix-conduit.enable = true;
|
||||
#// modufur.enable = true;
|
||||
#// tailscale.cert = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -67,7 +67,6 @@ in {
|
|||
### Server
|
||||
"server/borgmatic/borgbase".publicKeys = server;
|
||||
"server/caddy/Caddyfile".publicKeys = server;
|
||||
"server/conduwuit/conduwuit.toml".publicKeys = server;
|
||||
"server/coturn/coturn.conf".publicKeys = server;
|
||||
"server/forgejo/.env".publicKeys = server;
|
||||
"server/forgejo/db.env".publicKeys = server;
|
||||
|
|
|
|||
Binary file not shown.
Loading…
Add table
Reference in a new issue