From e496f90e623b8d12ca067ac806ae2ee8905f4348 Mon Sep 17 00:00:00 2001 From: atagen Date: Fri, 3 Oct 2025 14:14:13 +1000 Subject: [PATCH] switch back to bitwarden --- beam.crt | 25 ------------------------- common/network.nix | 1 - graphical/browser.nix | 3 +-- graphical/desktop/quickshell/shell.qml | 2 +- graphical/dev.nix | 2 +- graphical/kernel.nix | 2 +- graphical/password-manager.nix | 18 ++++++++---------- hosts/quiver/hw.nix | 15 +++++++++------ pkgs/rbw-helper.nix | 6 +++--- 9 files changed, 24 insertions(+), 50 deletions(-) delete mode 100644 beam.crt diff --git a/beam.crt b/beam.crt deleted file mode 100644 index aa35ec8..0000000 --- a/beam.crt +++ /dev/null @@ -1,25 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIESzCCArOgAwIBAgIQZX9Vy/qEDy1WwnZdCIa9XzANBgkqhkiG9w0BAQsFADBh -MR4wHAYDVQQKExVta2NlcnQgZGV2ZWxvcG1lbnQgQ0ExGzAZBgNVBAsMEnN1bnNo -aW5lQHJlZmxlY3RvcjEiMCAGA1UEAwwZbWtjZXJ0IHN1bnNoaW5lQHJlZmxlY3Rv -cjAeFw0yNTA5MTYwNTM3MjdaFw0yNzEyMTYwNDM3MjdaMEYxJzAlBgNVBAoTHm1r -Y2VydCBkZXZlbG9wbWVudCBjZXJ0aWZpY2F0ZTEbMBkGA1UECwwSc3Vuc2hpbmVA -cmVmbGVjdG9yMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuUAzzURx -itJ9z09xKJNRiEu+aoxUQEdKFkEIMgDN5KnKnebRrd4hpFcxiVX+s5+zkiv84Yns -Pg+Gs/kaEo/cdV+QgH1ymQv1+QWmLlJfLmyWgphXRY9D4Qi9fHOzM5IA872YD69Z -8icN0WxKG5HOdJYPEFECLWTc3KMJid7HOi1NWwkUYTxeHyxqspfbnlkTYkZi7Iiu -sOwooEYn40JM1MHk3lXXA4Xga8RNMXe5zjb1BQIGgmaBhSAHX7Dpofzjou7o6220 -ldgBMLBUHioyp7++ZZEcyBYBxzyzVqmFBiKq3eElxQ64kjDOpa4cpWF5B7yJbPVo -2SIozYxH38roYwIDAQABo4GZMIGWMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAK -BggrBgEFBQcDATAfBgNVHSMEGDAWgBTaLeNon3aXzYidcbPv2NKbZV7q4DBOBgNV -HREERzBFgg5yZWZsZWN0b3IuYmVhbYIQKi5yZWZsZWN0b3IuYmVhbYIJbG9jYWxo -b3N0hwR/AAABhxAAAAAAAAAAAAAAAAAAAAABMA0GCSqGSIb3DQEBCwUAA4IBgQAt -6FLEAX0XFq87Hcjh+iR4fUHf6qop1IEioTTSpCkgO62SAZRP5unEKXiuVH9SjqTV -4K0ik+UoRXCLXJbueQ08EwXgNOv2BG2dppjHJK8pYh1RRBmCn4yTHqJ5Wd/+ID5R -zjNjZwYn9kTo9DGxAaPfIae/dHGBguIK+0f8h/QAhd7oY3E+sTK9ez+5iHz6oQff -1v+K92GL+rE9pHmPjbUtsZ8zUYXo8g+Tc9PJumG5HoWxZV4M2zLg+I+ojpdujMHL -aEM5nS3nv8mrn7BFJTA++BAMUUuiccmbn9ksyWN00sCiyqHvBeaZGAaRSaYiqapw -vevK5dtHSj917xOtJsZ8151MaByWfquUh9VPGMUKNcjkMNxFPuUIj7WueQwqJHXL -ch+wwkckZUMZ7L4IcqAjuqvIPvLPRZiIYsVtrc+uPLvn/QP+EPH8dw/dYTFz9pxO -BRiHwkrLD33UjyRdgtPGpQGdSiUdA+Nd/DdPv51OtdNPaNGRS0suO99dNytNKyE= ------END CERTIFICATE----- diff --git a/common/network.nix b/common/network.nix index 88daa65..9bdb40e 100644 --- a/common/network.nix +++ b/common/network.nix @@ -1,5 +1,4 @@ { lib, ... }: { networking.useDHCP = lib.mkDefault true; - security.pki.certificateFiles = [ ../beam.crt ]; } diff --git a/graphical/browser.nix b/graphical/browser.nix index 59ca9ce..f91d12b 100644 --- a/graphical/browser.nix +++ b/graphical/browser.nix @@ -55,8 +55,7 @@ scope "programs.firefox" { "vimium-c@gdh1995.cn" = officialAddon "vimium-c"; "{b86e4813-687a-43e6-ab65-0bde4ab75758}" = officialAddon "localcdn-fork-of-decentraleyes"; "jid1-5Fs7iTLscUaZBgwr@jetpack" = officialAddon "happy-bonobo-disable-webrtc"; - "keepassxc-browser@keepassxc.org" = officialAddon "keepassxc-browser"; - # "{446900e4-71c2-419f-a6a7-df9c091e268b}" = officialAddon "bitwarden-password-mananger"; + "{446900e4-71c2-419f-a6a7-df9c091e268b}" = officialAddon "bitwarden-password-mananger"; }; Preferences = { diff --git a/graphical/desktop/quickshell/shell.qml b/graphical/desktop/quickshell/shell.qml index e1e1a94..1873519 100644 --- a/graphical/desktop/quickshell/shell.qml +++ b/graphical/desktop/quickshell/shell.qml @@ -29,7 +29,7 @@ ShellRoot { right: true } exclusionMode: ExclusionMode.Ignore - WlrLayershell.layer: WlrLayer.Bottom + WlrLayershell.layer: WlrLayer.Background Image { id: img diff --git a/graphical/dev.nix b/graphical/dev.nix index fa5d9d7..9cbf4fb 100644 --- a/graphical/dev.nix +++ b/graphical/dev.nix @@ -29,7 +29,7 @@ scope "user" { "https://git.atagen.co/".insteadOf = "atagen:"; "https://codeberg.org/".insteadOf = "codeberg:"; }; - credential.helper = "keepassxc --git-groups"; + credential.helper = "rbw"; }; integrations = { difftastic.enable = true; diff --git a/graphical/kernel.nix b/graphical/kernel.nix index 41c8ac2..b86aa52 100644 --- a/graphical/kernel.nix +++ b/graphical/kernel.nix @@ -7,5 +7,5 @@ enable = true; scheduler = "scx_bpfland"; }; - boot.kernelPackages = pkgs.linuxPackages_cachyos; + boot.kernelPackages = pkgs.linuxPackages_cachyos-gcc; } diff --git a/graphical/password-manager.nix b/graphical/password-manager.nix index 48d27dd..33b23c1 100644 --- a/graphical/password-manager.nix +++ b/graphical/password-manager.nix @@ -1,17 +1,15 @@ { pkgs, lib, ... }: { - # user.xdg.config.files."rbw/config.json" = { - # generator = lib.generators.toJSON { }; - # value = { - # email = "boss@atagen.co"; - # pinentry = lib.getExe pkgs.pinentry-qt; - # base_url = "https://v.atagen.co"; - # }; - # }; + user.xdg.config.files."rbw/config.json" = { + generator = lib.generators.toJSON { }; + value = { + email = "boss@atagen.co"; + pinentry = lib.getExe pkgs.pinentry-qt; + base_url = "https://vault.atagen.co"; + }; + }; apps = with pkgs; { - migration = keepassxc; - migrationCli = git-credential-keepassxc; passwordManager = bitwarden; passwordCli = rbw; }; diff --git a/hosts/quiver/hw.nix b/hosts/quiver/hw.nix index df600c8..c16caa2 100644 --- a/hosts/quiver/hw.nix +++ b/hosts/quiver/hw.nix @@ -1,24 +1,27 @@ -{ config, ... }: +{ + config, + lib, + pkgs, + ... +}: { security.tpm2.enable = true; hardware.cpu.amd.updateMicrocode = true; - services.xserver.videoDrivers = [ "nvidia" ]; + hardware.graphics.enable = true; + hardware.graphics.enable32Bit = true; + services.xserver.videoDrivers = [ "nvidia" ]; nixpkgs.config.cudaSupport = true; hardware.nvidia = { package = config.boot.kernelPackages.nvidiaPackages.latest; modesetting.enable = true; powerManagement.enable = true; - # nvidiaPersistenced = true; open = true; }; - hardware.graphics.enable = true; - hardware.graphics.enable32Bit = true; - # openrgb no longer recognises the device? # systemd.services.no-rgb = { # wantedBy = ["multi-user.target"]; diff --git a/pkgs/rbw-helper.nix b/pkgs/rbw-helper.nix index 025d3eb..46a9fb5 100644 --- a/pkgs/rbw-helper.nix +++ b/pkgs/rbw-helper.nix @@ -27,8 +27,8 @@ pkgs.writeTextFile { exit fi - user=`rbw get --full $\{params["host"]} | grep "Username:" | cut -d' ' -f2-` - pass=`rbw get $\{params["host"]}` + user=`rbw get --folder Git --full $\{params["host"]} | grep "Username:" | cut -d' ' -f2-` + pass=`rbw get --folder Git $\{params["host"]}` if [ "x$user" == "x" ] || [ "x$pass" == "x" ]; then echo "Couldn't find host in rbw DB." > /dev/stderr @@ -40,5 +40,5 @@ pkgs.writeTextFile { fi ''; executable = true; - destination = "/bin/git-credential-rw"; + destination = "/bin/git-credential-rbw"; }