diff --git a/flake.lock b/flake.lock index 2df8c49..381213d 100644 --- a/flake.lock +++ b/flake.lock @@ -51,11 +51,11 @@ "stable": "stable" }, "locked": { - "lastModified": 1665296779, - "narHash": "sha256-fzk7ZcsZiBBHxUfBA8IoIz/Uqazp02effUogVoxUxbE=", + "lastModified": 1665350797, + "narHash": "sha256-7XAcfqRlsJf+y7174WcKJzHoZlq5ChrrymShL0xj8QY=", "owner": "zhaofengli", "repo": "colmena", - "rev": "4e4f9ad4d23191cc747bb91be496b59e62cc20f2", + "rev": "872949504befb9b5540e69f846c6965def7150f9", "type": "github" }, "original": { @@ -439,11 +439,11 @@ "wlroots": "wlroots" }, "locked": { - "lastModified": 1665305182, - "narHash": "sha256-f5k08odmCgzM38eJRDDCDEpLhVmF5Aeaco8QktcWak0=", + "lastModified": 1665347456, + "narHash": "sha256-FdjdpWgsvM75/wtmgRjY/91VBGFX1YRQ9AtT4sffzP8=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "1263bd5dcb44ab879b1a6efd1669a656f53ce693", + "rev": "cb687c208c116ea870f827d8b2ee963655599f1f", "type": "github" }, "original": { @@ -550,11 +550,11 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1665280314, - "narHash": "sha256-tLi4kz6HWLpIP46p0ZBGUn+1XyE25y6bxFviCMoiy4Q=", + "lastModified": 1665367069, + "narHash": "sha256-tlVT20lHZR0mXNoxY+hDgc/3h/J3PCx8kUDO6CD+oJs=", "owner": "jyooru", "repo": "nix-minecraft-servers", - "rev": "df842e3a1d3e617f59d525c7d2652d65f2cb0381", + "rev": "2615d292a38bc8a791b26494dfc7b655ca2c4838", "type": "github" }, "original": { @@ -706,11 +706,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1665081174, - "narHash": "sha256-6hsmzdhdy8Kbvl5e0xZNE83pW3fKQvNiobJkM6KQrgA=", + "lastModified": 1665259268, + "narHash": "sha256-ONFhHBLv5nZKhwV/F2GOH16197PbvpyWhoO0AOyktkU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "598f83ebeb2235435189cf84d844b8b73e858e0f", + "rev": "c5924154f000e6306030300592f4282949b2db6c", "type": "github" }, "original": { @@ -737,11 +737,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1665329665, - "narHash": "sha256-9xbehDP1SUZGet5aHPtwcAZsSHwnP7fJ/hnuzC2QnZ4=", + "lastModified": 1665405393, + "narHash": "sha256-aSmFxF0XxIUcmx7WZZU/oyBcCm3qNroRLYQL26DFyGU=", "owner": "NULLx76", "repo": "nixpkgs", - "rev": "e3c61a2685ef6ad6f6b2eff685b44a2bbe31f68c", + "rev": "b1da428acecbe0e91c4d211f06037a34e0ad2e1d", "type": "github" }, "original": { @@ -1111,11 +1111,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1665155573, - "narHash": "sha256-oAzkBNVm0N6JC4Jz9tfaF+l4K++zqDMOmxieemiyRnw=", + "lastModified": 1665331677, + "narHash": "sha256-3Dh1i11mHK80jx5figC1oh1V0rCjieh0Mj+MajXdbPw=", "owner": "wlroots", "repo": "wlroots", - "rev": "ff9c52801f26eb85d2a51f12ad6d2819f97a66e6", + "rev": "ab8341975e62b1f668d8c9779ec8e72d04718a99", "type": "gitlab" }, "original": { diff --git a/nixos/common/default.nix b/nixos/common/default.nix index 4fae9cf..5482ec0 100644 --- a/nixos/common/default.nix +++ b/nixos/common/default.nix @@ -33,9 +33,9 @@ "https://nixpkgs-review-bot.cachix.org" "https://colmena.cachix.org" "https://hyprland.cachix.org" + "https://cache.garnix.io" "https://0x76-infra.cachix.org" "https://webcord.cachix.org" - "https://cache.garnix.io" ]; trusted-public-keys = [ "cachix.cachix.org-1:eWNHQldwUO7G2VkjpnjDbWwy4KQ/HNxht7H4SSoMckM=" @@ -43,9 +43,9 @@ "nixpkgs-review-bot.cachix.org-1:eppgiDjPk7Hkzzz7XlUesk3rcEHqNDozGOrcLc8IqwE=" "colmena.cachix.org-1:7BzpDnjjH8ki2CT3f6GdOk7QAzPOl+1t3LvTLXqYcSg=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" "0x76-infra.cachix.org-1:dC1qp+VEN3jj5pdK4URlXR9hf3atT+MnpKGu6PZjMc8=" "webcord.cachix.org-1:l555jqOZGHd2C9+vS8ccdh8FhqnGe8L78QrHNn+EFEs=" - "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" ]; }; optimise = { diff --git a/nixos/hosts/olympus/default.nix b/nixos/hosts/olympus/default.nix index a40399a..36be93d 100644 --- a/nixos/hosts/olympus/default.nix +++ b/nixos/hosts/olympus/default.nix @@ -158,6 +158,11 @@ profile = "vault-1"; tags = [ "vault" ]; } + { + hostname = "vaultwarden"; + ip = "10.42.42.31"; + mac = "FA:71:3F:31:34:41"; + } { hostname = "nuc"; ip = "10.42.42.42"; diff --git a/nixos/hosts/olympus/mailserver/configuration.nix b/nixos/hosts/olympus/mailserver/configuration.nix index 6cc3f26..bd011a8 100644 --- a/nixos/hosts/olympus/mailserver/configuration.nix +++ b/nixos/hosts/olympus/mailserver/configuration.nix @@ -53,6 +53,10 @@ let vs = config.vault-secrets.secrets; in hashedPasswordFile = "${vs.mailserver}/outline@0x76.dev"; sendOnly = true; }; + "vaultwarden@0x76.dev" = { + hashedPasswordFile = "${vs.mailserver}/vaultwarden@0x76.dev"; + sendOnly = true; + }; }; indexDir = "/var/lib/dovecot/indices"; diff --git a/nixos/hosts/olympus/nginx/configuration.nix b/nixos/hosts/olympus/nginx/configuration.nix index 7bfc32c..6ee1cfe 100644 --- a/nixos/hosts/olympus/nginx/configuration.nix +++ b/nixos/hosts/olympus/nginx/configuration.nix @@ -58,6 +58,7 @@ in virtualHosts."grafana.0x76.dev" = proxy "http://victoriametrics.olympus:2342"; virtualHosts."outline.0x76.dev" = proxy "http://outline.olympus:3000"; virtualHosts."id.0x76.dev" = proxy "http://keycloak.olympus:80"; + # virtualHosts."pass.0x76.dev" = proxy "http://vaultwarden.olympus:8222"; # Redshifts virtualHosts."andreea.redshifts.xyz" = proxy "http://zmeura.olympus:8008"; diff --git a/nixos/hosts/olympus/vaultwarden/configuration.nix b/nixos/hosts/olympus/vaultwarden/configuration.nix new file mode 100644 index 0000000..0c87461 --- /dev/null +++ b/nixos/hosts/olympus/vaultwarden/configuration.nix @@ -0,0 +1,48 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ config, pkgs, ... }: +let vs = config.vault-secrets.secrets; +in { + imports = [ ]; + + # This value determines the NixOS release from which the default + # settings for stateful data, like file locations and database versions + # on your system were taken. It‘s perfectly fine and recommended to leave + # this value at the release version of the first install of this system. + # Before changing this value read the documentation for this option + # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + system.stateVersion = "22.11"; # Did you read the comment? + + # Additional packages + environment.systemPackages = with pkgs; [ ]; + + networking.firewall.allowedTCPPorts = [ ]; + + vault-secrets.secrets.vaultwarden = { + user = "vaultwarden"; + group = "vaultwarden"; + }; + + services.vaultwarden = { + enable = true; + dbBackend = "sqlite"; + environmentFile = "${vs.vaultwarden}/environment"; + config = { + DOMAIN = "https://pass.0x76.dev"; + SIGNUPS_ALLOWED = false; + ROCKET_ADDRESS = "127.0.0.1"; + ROCKET_PORT = 8222; + + SMTP_HOST = "mail.0x76.dev"; + SMTP_FROM = "vaultwarden@0x76.dev"; + SMTP_PORT = 465; + SMTP_SECURITY = "force_tls"; + SMTP_DEBUG = false; + + SIGNUPS_VERIFY = true; + SIGNUPS_DOMAINS_WHITELIST = "xirion.net,0x76.dev,meowy.tech"; + }; + }; +} diff --git a/nixos/hosts/thalassa/null/home/hyprland.nix b/nixos/hosts/thalassa/null/home/hyprland.nix index 65d657c..4eca844 100644 --- a/nixos/hosts/thalassa/null/home/hyprland.nix +++ b/nixos/hosts/thalassa/null/home/hyprland.nix @@ -62,7 +62,7 @@ bind=SUPER,f,exec,firefox-devedition bind=SUPER,d,exec,wofi --show run,drun - bind=,Print,exec,grim -g "$(slurp)" - | wl-copy -t image/png + bind=,Print,exec,grim -g "$(slurp)" -t png - | wl-copy -t image/png bind=SUPER,W,killactive, bind=SUPERSHIFT,Q,exit, bind=SUPER,S,togglefloating,