Myned/nixos
Myned/nixos
1
1
Fork 0
Code Issues Activity

Compare commits

base: Myned:b0262c229f98529337f22e14f27a448ff14e5719
Branches Tags
Myned:master
...
compare: Myned:f86e222e48426d30e3e0279231500b6bcd71a40c
Branches Tags
Myned:master

4 commits
b0262c229f ... f86e222e48

Author SHA1 Message Date
Myned
f86e222e48
nix: update flake.lock 
Signed-off-by: Myned <dev@bjork.tech>
 2024-10-16 20:39:43 -05:00
Myned
e677deaa67
hyprland: remove stayfocused rule 
Signed-off-by: Myned <dev@bjork.tech>
 2024-10-16 20:39:36 -05:00
Myned
43847724eb
scripts: disable clipboard.sh 
Signed-off-by: Myned <dev@bjork.tech>
 2024-10-16 20:39:20 -05:00
Myned
eb1c5d0b56
conduwuit: migrate to container 
Signed-off-by: Myned <dev@bjork.tech>
 2024-10-16 20:39:08 -05:00
7 changed files with 99 additions and 58 deletions
Show stats Expand all files Collapse all files

90
flake.lock generated
View file

@ -96,11 +96,11 @@
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1728684316, "lastModified": 1728852607,
"narHash": "sha256-fQ4LkmZeW4eGowbVfvct1hLFD0hNkZiX5SzRlWqhgxc=", "narHash": "sha256-PhJdr8b4nZVHts5KMEsf7vCDXVpFIFCa7VlCt+oYpL4=",
"owner": "Kirottu", "owner": "Kirottu",
"repo": "anyrun", "repo": "anyrun",
"rev": "6c974bc5f3f82f505278befa4b24d96ba8eb06f1", "rev": "6e0385f6945d701545edc5bccfc5f544e1e12663",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -196,11 +196,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728691493, "lastModified": 1728964350,
"narHash": "sha256-u8MgMwvrMFuW944H4Cx2B4tTpDp2LbiI0SIAa/i4whA=", "narHash": "sha256-8q7j9tHJKk910tszdZrk8SbF+B8e9WibnwcAtOKB0Ag=",
"owner": "firecat53", "owner": "firecat53",
"repo": "bitwarden-menu", "repo": "bitwarden-menu",
"rev": "c0b12494118bbe3c5507a3d66ebd54648da425ef", "rev": "71efc0740250019836388eb2641c7fe33ee6a32a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -292,11 +292,11 @@
"onchg": "onchg" "onchg": "onchg"
}, },
"locked": { "locked": {
"lastModified": 1728751665, "lastModified": 1728874779,
"narHash": "sha256-9FBIjikKjGNtcZCHW0g1I+qSJImW2Ta3IDELmzOkhkE=", "narHash": "sha256-498cQTDaU7bU3CbWPCQgSGkV25T8sZQmMwhU58WkIXE=",
"owner": "aksiksi", "owner": "aksiksi",
"repo": "compose2nix", "repo": "compose2nix",
"rev": "3aed8b68fffa45f9a140be90cecaeced2f11bbff", "rev": "07cad037b8887ba94cd7236ffd1a8ee47002a9fe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -471,11 +471,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728687662, "lastModified": 1729099656,
"narHash": "sha256-D9TChzb00eTG1YWBx8eN2s6lJJnBjB5Y7RpxkAzGvyQ=", "narHash": "sha256-VftVIg7UXTy1bq+tzi1aVYOWl7PQ35IpjW88yMYjjpc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "bdbdb725d632863bdedb80baabf21327614dd237", "rev": "d7d57edb72e54891fa67a6f058a46b2bb405663b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1097,11 +1097,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728726232, "lastModified": 1729027341,
"narHash": "sha256-8ZWr1HpciQsrFjvPMvZl0W+b0dilZOqXPoKa2Ux36bc=", "narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d57112db877f07387ce7104b5ac346ede556d2d7", "rev": "2a4fd1cfd8ed5648583dadef86966a8231024221",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1344,11 +1344,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1721324361, "lastModified": 1728168612,
"narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=", "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086", "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1396,11 +1396,11 @@
"systems": "systems_10" "systems": "systems_10"
}, },
"locked": { "locked": {
"lastModified": 1728661487, "lastModified": 1728821111,
"narHash": "sha256-4PiVL3GGz5kSWrt5QX+/7LTymyJ49VQ3JvSdKnZuZto=", "narHash": "sha256-3dDOBfFkmusoF+6LWXkvQaSfzXb0DEqMEQQvEBbjN9Q=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlock", "repo": "hyprlock",
"rev": "7362ce3435afd1fffd2c81d5d7f58996f496b533", "rev": "11694528b4e0af597f25a5308d6872afd0b06807",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1518,11 +1518,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1721324102, "lastModified": 1727300645,
"narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=", "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "962582a090bc233c4de9d9897f46794280288989", "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1664,11 +1664,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728679815, "lastModified": 1729110149,
"narHash": "sha256-3IXvY30zzFq7lHFujMupPz3TiPXo8o8qiIjkXUvznCI=", "narHash": "sha256-tPGZ0N9SBVwWVxmhhdKkQb8eF+p51521Nl/aVLjqCOM=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "e4f4d7832cc559389b93798c1f0d615e3816f4ef", "rev": "e5c6aed9b62f7f0bc8d48d61c83b897a20903ad8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1825,11 +1825,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728263287, "lastModified": 1728790083,
"narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=", "narHash": "sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259", "rev": "5c54c33aa04df5dd4b0984b7eb861d1981009b22",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1845,11 +1845,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728263287, "lastModified": 1728790083,
"narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=", "narHash": "sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259", "rev": "5c54c33aa04df5dd4b0984b7eb861d1981009b22",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1890,11 +1890,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728179514, "lastModified": 1729043231,
"narHash": "sha256-mOGZFPYm9SuEXnYiXhgs/JmLu7RofRaMpAYyJiWudkc=", "narHash": "sha256-Dhn3CI3e8cexWhwDVuKGQu7DjCXKLut5aT928x5WIDw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "018196c371073d669510fd69dd2f6dc0ec608c41", "rev": "81a5fdadd8b5b473d8a51a6ec751c94ed180707e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2088,11 +2088,11 @@
}, },
"nixpkgs-stable_4": { "nixpkgs-stable_4": {
"locked": { "locked": {
"lastModified": 1728627514, "lastModified": 1728909085,
"narHash": "sha256-r+SF9AnHrTg+bk6YszoKfV9lgyw+yaFUQe0dOjI0Z2o=", "narHash": "sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c505ebf777526041d792a49d5f6dd4095ea391a7", "rev": "c0b1da36f7c34a7146501f684e9ebdf15d2bebf8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2104,11 +2104,11 @@
}, },
"nixpkgs-staging-next": { "nixpkgs-staging-next": {
"locked": { "locked": {
"lastModified": 1728756491, "lastModified": 1729109393,
"narHash": "sha256-AkjU98eN+VvTSnasI+QVjCvLSFXAbmWDOEULENQGcWw=", "narHash": "sha256-O5Ti7jc8d7inYMH2Rs595N0I26TSViCk+YCkDYadJTU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "001fb496bf1c2f0fb28fcdb58af1002939109572", "rev": "1a4d05c8bb37017435b3cee89f5a157a18698cd7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2120,11 +2120,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1728492678, "lastModified": 1728888510,
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
"type": "github" "type": "github"
}, },
"original": { "original": {

42
options/custom/containers/conduwuit.nix Normal file
View file

@ -0,0 +1,42 @@
{
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"
];
};
};
};
}

4
options/custom/desktops/hyprland/rules.nix
View file

@ -242,10 +242,6 @@ in {
(class "Xdg-desktop-portal-gtk" ["noborder" "noshadow"]) (class "Xdg-desktop-portal-gtk" ["noborder" "noshadow"])
#!! Expressions are not wrapped in ^$ #!! Expressions are not wrapped in ^$
(fields {
class = "^1Password$";
title = "^1Password$";
} ["stayfocused"])
(fields { (fields {
class = "^com\\.github\\.wwmm\\.easyeffects$"; class = "^com\\.github\\.wwmm\\.easyeffects$";
title = "^Easy Effects$"; # Main window title = "^Easy Effects$"; # Main window

17
options/custom/scripts/default.nix
View file

@ -70,14 +70,15 @@ in {
wofi wofi
xclip xclip
]) ])
(bash "clipboard" [ # TODO: Convert to options and disable clipboard.sh
cliphist # (bash "clipboard" [
libnotify # cliphist
procps # libnotify
wl-clipboard # procps
wofi # wl-clipboard
xclip # wofi
]) # xclip
# ])
(bash "close" [ (bash "close" [
coreutils coreutils
hyprland hyprland

3
profiles/server/default.nix
View file

@ -7,6 +7,7 @@
enable = true; enable = true;
boot = true; boot = true;
#// actualbudget.enable = true; #// actualbudget.enable = true;
conduwuit.enable = true;
coturn.enable = true; coturn.enable = true;
forgejo.enable = true; forgejo.enable = true;
foundryvtt.enable = true; foundryvtt.enable = true;
@ -20,7 +21,7 @@
services = { services = {
caddy.enable = true; caddy.enable = true;
matrix-conduit.enable = true; #// matrix-conduit.enable = true;
#// modufur.enable = true; #// modufur.enable = true;
#// tailscale.cert = true; #// tailscale.cert = true;

1
secrets/secrets.nix
View file

@ -67,6 +67,7 @@ in {
### Server ### Server
"server/borgmatic/borgbase".publicKeys = server; "server/borgmatic/borgbase".publicKeys = server;
"server/caddy/Caddyfile".publicKeys = server; "server/caddy/Caddyfile".publicKeys = server;
"server/conduwuit/conduwuit.toml".publicKeys = server;
"server/coturn/coturn.conf".publicKeys = server; "server/coturn/coturn.conf".publicKeys = server;
"server/forgejo/.env".publicKeys = server; "server/forgejo/.env".publicKeys = server;
"server/forgejo/db.env".publicKeys = server; "server/forgejo/db.env".publicKeys = server;

BIN
secrets/server/conduwuit/conduwuit.toml Normal file
View file

Binary file not shown.