From a6db9e3b8aa511fadbffcee41381fc94d7e3eeee Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 4 Mar 2025 00:37:22 -0500 Subject: [PATCH] bring vaultwarden home and play "games" --- home/codium.nix | 27 ++++++++++++------------- home/yt/ytnix.nix | 6 ++---- home/zsh/default.nix | 6 +++--- hosts/ytnix/default.nix | 44 +++++++++++++++++++++++++++++++++++++---- 4 files changed, 58 insertions(+), 25 deletions(-) diff --git a/home/codium.nix b/home/codium.nix index ee1b67e..2d7bb9d 100644 --- a/home/codium.nix +++ b/home/codium.nix @@ -10,20 +10,18 @@ extensions = # if unfree # with pkgs.vscode-marketplace; - ( - with pkgs.open-vsx; - [ - vscodevim.vim - jnoortheen.nix-ide - github.github-vscode-theme - rust-lang.rust-analyzer - shd101wyy.markdown-preview-enhanced - alefragnani.bookmarks - tomrijndorp.find-it-faster - streetsidesoftware.code-spell-checker - emilast.logfilehighlighter - ] - ); + with pkgs.open-vsx; + [ + vscodevim.vim + jnoortheen.nix-ide + github.github-vscode-theme + rust-lang.rust-analyzer + shd101wyy.markdown-preview-enhanced + alefragnani.bookmarks + tomrijndorp.find-it-faster + streetsidesoftware.code-spell-checker + emilast.logfilehighlighter + ]; userSettings = let vimCommonKeyBindings = [ @@ -54,6 +52,7 @@ "editor.acceptSuggestionOnCommitCharacter" = false; "git.openRepositoryInParentFolders" = "never"; "git.ignoreLimitWarning" = true; + "git.blame.editorDecoration.enabled" = true; "extensions.ignoreRecommendations" = true; "telemetry.enableTelemetry" = false; "telemetry.telemetryLevel" = "off"; diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index 0f8322f..b368bae 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -31,6 +31,7 @@ ungoogled-chromium librewolf bitwarden-desktop + bitwarden-cli fastfetch (with kdePackages; [ gwenview @@ -93,11 +94,8 @@ syncthingtray (with llvmPackages; [ clangUseLLVM - libcxxClang - stdenv - libcxx - libcxxStdenv compiler-rt + libllvm ]) nix-output-monitor ]; diff --git a/home/zsh/default.nix b/home/zsh/default.nix index 29a7ef9..9b5bcc6 100644 --- a/home/zsh/default.nix +++ b/home/zsh/default.nix @@ -90,9 +90,9 @@ "ta" = "tmux new-session -A -s"; "se" = "sudoedit"; "s" = "sudo"; - "nrs" = "sudo nixos-rebuild switch -L --flake ."; - "nrt" = "sudo nixos-rebuild test -L --flake ."; - "hrs" = "home-manager switch -L --flake ."; + "nrs" = "sudo nixos-rebuild switch -L --flake . --log-format internal-json -v |& nom --json"; + "nrt" = "sudo nixos-rebuild test -L --flake . --log-format internal-json -v |& nom --json"; + "hrs" = "home-manager switch -L --flake . |& nom --json"; "g" = "git"; "ga" = "git add"; "gaa" = "git add --all"; diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index 66607a3..7fd9309 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -31,6 +31,9 @@ sopsFile = ../../secrets/yt/aws.yaml; owner = "yt"; }; + "vaultwarden/env" = { + sopsFile = ../../secrets/services/vaultwarden.yaml; + }; }; boot = { @@ -140,7 +143,7 @@ "adbusers" ]; - environment.systemPackages = with pkgs; [ + environment.systemPackages = with pkgs; lib.flatten [ tmux vim wget @@ -157,14 +160,29 @@ traceroute sops sbctl # secure boot - wine-wayland - wine64 lm_sensors sshfs openssl just killall lshw + bubblewrap + fuse-overlayfs + dwarfs + wineWowPackages.stagingFull + (with gst_all_1; [ + gst-plugins-good + gst-plugins-bad + gst-plugins-ugly + gst-plugins-base + ]) + vulkan-loader + (heroic.override { + extraPkgs = pkgs: [ + pkgs.gamescope + pkgs.gamemode + ]; + }) ]; environment.sessionVariables = { @@ -242,7 +260,7 @@ extest.enable = true; extraCompatPackages = with pkgs; [ proton-ge-bin ]; }; - hardware.steam-hardware.enable = true; + programs.gamescope.enable = true; services.logind = { lidSwitch = "suspend"; @@ -380,4 +398,22 @@ programs.ccache.enable = true; nix.settings.extra-sandbox-paths = [ config.programs.ccache.cacheDir ]; + + services.postgresql = { + enable = true; + settings.port = 5432; + package = pkgs.postgresql_17; + enableTCPIP = true; + }; + + services.vaultwarden = { + enable = true; + dbBackend = "postgresql"; + environmentFile = config.sops.secrets."vaultwarden/env".path; + config = { + ROCKET_ADDRESS = "0.0.0.0"; + ROCKET_PORT = "8081"; + DATABASE_URL = "postgresql://vaultwarden:vaultwarden@127.0.0.1:5432/vaultwarden"; + }; + }; }