From eabff41a5642e601cfcb6cbb75045d05c4e615d6 Mon Sep 17 00:00:00 2001 From: Menno van Leeuwen Date: Thu, 21 Nov 2024 22:25:19 +0100 Subject: [PATCH] refactor: streamline upgrade script and update Flutter environment variable --- .bashrc | 7 ++----- bin/actions/upgrade.sh | 26 ++++++++++++++++++++---- config/autostart/ulauncher.desktop | 2 +- config/nixos/hardware/mennos-server.nix | 2 +- config/nixos/packages/common/default.nix | 1 - secrets/ssh_config/dev.conf.gpg | 12 +++++------ secrets/ssh_config/personal.conf.gpg | 14 ++++++------- secrets/ssh_config/prod.conf.gpg | 18 ++++++++-------- secrets/wireguard/work.wg0.conf.gpg | 18 ++++++++-------- 9 files changed, 57 insertions(+), 43 deletions(-) diff --git a/.bashrc b/.bashrc index fdae6fb..ffd9596 100644 --- a/.bashrc +++ b/.bashrc @@ -81,11 +81,8 @@ if [ -d "/home/menno/Projects/Work" ]; then export TRADAWARE_DEVOPS=true fi -# Flutter Environment -if [ -d "$HOME/flutter" ]; then - export PATH="$PATH:$HOME/flutter/bin" - export CHROME_EXECUTABLE=/usr/bin/brave-browser -fi +# Flutter Web and other tools that require Chrome +export CHROME_EXECUTABLE=$(which brave) # 1Password Source Plugin (Assuming bash compatibility) if [ -f /home/menno/.config/op/plugins.sh ]; then diff --git a/bin/actions/upgrade.sh b/bin/actions/upgrade.sh index c18de42..b3568b5 100755 --- a/bin/actions/upgrade.sh +++ b/bin/actions/upgrade.sh @@ -1,8 +1,26 @@ #!/usr/bin/env bash source $HOME/dotfiles/bin/helpers/functions.sh -printfe "%s\n" "cyan" "Upgrading NixOS packages..." -cd $HOME/dotfiles/config/nixos && sudo nixos-rebuild switch --upgrade --flake .#$DOTF_HOSTNAME --impure +while [[ "$#" -gt 0 ]]; do + case $1 in + --ha) RUN_HA=true ;; + --nix) RUN_NIX=true ;; + *) echo "Unknown parameter passed: $1"; exit 1 ;; + esac + shift +done -printfe "%s\n" "cyan" "Upgrading Home Manager packages..." -cd $HOME/dotfiles/config/home-manager && NIXPKGS_ALLOW_UNFREE=1 home-manager switch -b backup --flake .#$DOTF_HOSTNAME --impure +if [[ -z "$RUN_HA" && -z "$RUN_NIX" ]]; then + RUN_HA=true + RUN_NIX=true +fi + +if [[ "$RUN_NIX" == true ]]; then + printfe "%s\n" "cyan" "Upgrading NixOS packages..." + cd $HOME/dotfiles/config/nixos && sudo nixos-rebuild switch --upgrade --flake .#$DOTF_HOSTNAME --impure +fi + +if [[ "$RUN_HA" == true ]]; then + printfe "%s\n" "cyan" "Upgrading Home Manager packages..." + cd $HOME/dotfiles/config/home-manager && NIXPKGS_ALLOW_UNFREE=1 home-manager switch -b backup --flake .#$DOTF_HOSTNAME --impure +fi diff --git a/config/autostart/ulauncher.desktop b/config/autostart/ulauncher.desktop index d27731b..572b630 120000 --- a/config/autostart/ulauncher.desktop +++ b/config/autostart/ulauncher.desktop @@ -1 +1 @@ -/nix/store/ya7gf1qaczdxzgrb0phms5zhc7yfbvim-home-manager-files/.config/autostart/ulauncher.desktop \ No newline at end of file +/nix/store/xibrqca2cl3bpl7c8kd93ps6myy47k8n-home-manager-files/.config/autostart/ulauncher.desktop \ No newline at end of file diff --git a/config/nixos/hardware/mennos-server.nix b/config/nixos/hardware/mennos-server.nix index c875854..1c9b7be 100644 --- a/config/nixos/hardware/mennos-server.nix +++ b/config/nixos/hardware/mennos-server.nix @@ -65,6 +65,6 @@ nvidiaSettings = true; # Optionally, you may need to select the appropriate driver version for your specific GPU. - package = config.boot.kernelPackages.nvidiaPackages.stable; + package = config.boot.kernelPackages.nvidiaPackages.unstable; }; } diff --git a/config/nixos/packages/common/default.nix b/config/nixos/packages/common/default.nix index 6fe01e8..71f4574 100644 --- a/config/nixos/packages/common/default.nix +++ b/config/nixos/packages/common/default.nix @@ -2,7 +2,6 @@ { imports = [ ./virtualisation.nix ]; - programs.adb.enable = true; environment.systemPackages = with pkgs; [ yubikey-manager trash-cli diff --git a/secrets/ssh_config/dev.conf.gpg b/secrets/ssh_config/dev.conf.gpg index 6e64cbd..d7a3bd2 100644 --- a/secrets/ssh_config/dev.conf.gpg +++ b/secrets/ssh_config/dev.conf.gpg @@ -1,9 +1,9 @@ -----BEGIN PGP MESSAGE----- -jA0ECQMI1/r+VnIxlUT/0sAKAQjTxJQbnn7OWukMK79HYhm5Rdui20re6P8xvsGt -O72UQWPsYQRQOHKXd330WH4mOX6gY/kGzVfXz8MgjNVvHTt01Bycd0HZx3jNmFlc -KLMDyCzxlO1lqD/4u/0UjW4fCMgFH3FMok2FJeudM1GTd+ltwulrx+3aOZWh4taK -X+HM3XcaDTunk/DMTh8P/zckWOc1Ng6VgFeDYbbiKGNdsZCnxGscnNctAKiVpSFW -IE1Z+RKgEpMa+xLCQfwheJKlX/UwMZVHjAoQ9A== -=D8Oy +jA0ECQMIfCkBxDc8TWD/0sAAAVHWFLZ7uRkcGSscboaZ4RMJnRJB50a2tLPwpC2i +RoQyaeNcW7CLnCDUvZhJUQw6PPYZ0HvedyXesVQM11d5S0OI55bRLfYLCItGEbcB +L0Ys7X5tk3c21XM4BpWAY1JCM0KcavPvJIiGk6EF0NxhkC+wJ15kd+QqHaR6CW9F +F0tUzKDmnlVkg1PM0DE2ol4p/ZpkAavlKtDjNCAkresprnX4n+kDuVhlfhDrCCFO +SgXz2UTZQz3ZCD1rw1u12uXF +=9dgy -----END PGP MESSAGE----- diff --git a/secrets/ssh_config/personal.conf.gpg b/secrets/ssh_config/personal.conf.gpg index 84f7289..1cb4f86 100644 --- a/secrets/ssh_config/personal.conf.gpg +++ b/secrets/ssh_config/personal.conf.gpg @@ -1,10 +1,10 @@ -----BEGIN PGP MESSAGE----- -jA0ECQMI9K855NRHvZn/0sA2Ad1WfRHgB8vPtrPs9XXSm/NRgopAvuUON9AucQEE -MCwfFuVbCyI9Ys3QrlyVhVgCb87YWYymT6LwxA8qSci1Y+WO5Pou5QD9zKnhNR2m -KusG784K9YYj0cs7F0h8ecHAqpiu+kjhD6lEENCtYrHBd2Nv5Y3dTsFVgWVkBAYw -YMoRb/e3d76BM2Jxm3nQLC+Bq6YrAPBbV6iwAZ/3yiunVBmzSdtB5Ksiz2y14C2U -X3c6+m5x1eZj8IIufp0HR6AKbhtrHI5pRWtSEIcZnR9L1AiPTCfaT18JH2qZ1x81 -qQdWGj2donyx451Gbi1JXPrCdOP3tszR -=BP/T +jA0ECQMIFuda29+CynX/0sA5AcCWoIWjhpr/Yt7lEjQeLDJdydrE4IGJ+fUhJw4U +Qn6ibdx/f77UE2lE/uxloBdtSpak1l1aSqjEDIhqG6Mqo3xpsjL/sR2ks6xrrBET +mGngCNQMDpu3U48Ntce8VrVyaqERIHYh/GjO3PUFHZHmP2VAQB3lNdPEdVUH4TMi +yB8QiZyDerLTdIly+xtVjx7O7Gse5rH92QpFCD/DojdYWYa9hZMd3QtHJNU+BqcM +gxdKAT3afxge27AMZZXh6exqEK4aM1+Xp/NXVQXVDleQnndQEPXqv/AP4a1e1a2h +XN2eS90chEWLTTrm1TU7Y2izdbOrBYtyi+N3 +=iUxp -----END PGP MESSAGE----- diff --git a/secrets/ssh_config/prod.conf.gpg b/secrets/ssh_config/prod.conf.gpg index 85a5767..a2ecaaf 100644 --- a/secrets/ssh_config/prod.conf.gpg +++ b/secrets/ssh_config/prod.conf.gpg @@ -1,12 +1,12 @@ -----BEGIN PGP MESSAGE----- -jA0ECQMI35Tv4sOHHFP/0sCiATjXa++7x2ShpxMOSYkYv9EjI3Bw20iC3S6eN9EM -mKo/zxJHCytI936OT9buxcEWgz9eIzQqFPl1H6W+ElKbQ79X401hLC3VkFUnlF/5 -RPAyVObbSoH1u1H3KVJ0LIguyCghxqxBCt1BEmS8R+y27PC0yCAl3fms6bfSt+mF -MZIGXSrczmmuwzIRIUhXwqEpSLnnmpziQ22B/Npr2Asu3nwCA4zHan7doVPwCroH -XA5HsQThAWx5G5FyQRAeAPneg6icJso7gvqBVMkuGLfh1BGAf2u5eHgbKopfdYh2 -NpE4JujzwMpp3e36NAuYcaR3JCodB3ULp0iPBtfqC7nfgm/XWHtul9pyIjIqFZG7 -8NFHRcbvvVRpP04/ESWS9Qlbc8x9A3jV3JdCHLup/W5xVJBVH0/XBP70rRCyVyxQ -/4NJviMnzAXfFDRoEcNKVtdz2zQ20gVCBBOFVv/aGAtpuZNC -=DPk2 +jA0ECQMIMu3XXOPLCIP/0sCgAXbVifGOa6+M7lEAY9APajBS8fSDPQfRNhHQRSam +f1eJm4XfWw/mlnz0IFaf69wGjrd5qiGaPHwtQlZzapaxSgNZquWXSqAH2x6I9gGa +yS7eay1vjr/bkTOgzWJBLksrUTcfU3UmxW41/ORVnSD8UfqSOg9j+RLYadAQhian +11vn2G+1AlmTFgY9zbOflbw+pU83x0t2DX7cTHDO5A/BWQ3ZXEhId8t9PHaobZ9e +M/I0k0kEr5UjeXuQwP1Bwiqd47lEOjlSbgu/MJ+ptbWoxyemmlYLGZbeoCuqEdPS +V2NgeYauLblQ9z1SQpB5POr9x1csXviIj4AMU6+0eNjDfnK4trtNjjiryYybvJtz +mzmsvltZRN/oTBHwNiDo6nqHo2DETDT1VpUMrodjdX92OsCcRxCfe9PC7ULnfh9n +4/jQ/75dJYpWYZIWbC3nG5D76xz8TSTjGbgywvkN4rdnjQ== +=JAg8 -----END PGP MESSAGE----- diff --git a/secrets/wireguard/work.wg0.conf.gpg b/secrets/wireguard/work.wg0.conf.gpg index 002119a..ab651f7 100644 --- a/secrets/wireguard/work.wg0.conf.gpg +++ b/secrets/wireguard/work.wg0.conf.gpg @@ -1,12 +1,12 @@ -----BEGIN PGP MESSAGE----- -jA0ECQMIy4/a+BamXVv/0sCXAeA0EVKKki2mEoXI7GFg1orbBpnUfvM/sj7ISlHE -hues8qd3343KYZyIv/dBweWK13koZmXchfMPMHN61ygA9Y0uf35VLaMKWSudF77a -aHDdnMtuSnd0fdDQ3GaYIRGFd6SlRCpfiQ2Nhno+69GRotCxpgoNife9AQVPS4nM -ycqURKfck2UG0bPLSpjMEiZz+pFaNQ3vyGl6sjC5Zj2SkZDzftJb+TkEshwI6FZ/ -XFaodI2rFLQb/oGFQKnZ/fbyChhgfqWn3Na+KMupqJ4S3/Ef3WpTdZ/kYvgVUih6 -H3iZFptSJ8sfOnabebwvziHKTh/3H7Tek9jgoBsJ2fYdpDx5l/Oz9jy7IZUo7+hl -xYWEHENxNQAXIZAl80uaCuLzzW8wK0vWDju8en4dAxms1dNRiZRNSMuE4IZ+/eYP -bz9JnJguccAyaJvDGrGnE9GtegN3l3jYaw== -=p0YP +jA0ECQMIKAqIdDLxbRz/0sCVARMDv657J+xXkIKk4c1zesqgKfLc1/6O1Fd2Ftho +7Sc1g74tXidtPEerJPT1baZbVDNc0EC2p55sNxpB1e7jgvzbgBebTulTz5u1g77Z +v83ei7O9Zcb1e/NeuH+BXc5IJFqb5wIBqrEiSrohC4TCWI9EPCw5gfiWfZOatj1l +hZ0RGXPITvJU2GWDq1GJrxtDCM7ozKi45+bFXlKq1WYMODC3kBgaaZA7lrWBCYXM +lp8aOVABCtBg8N5XHFCTCll5VEcvKkWywPCFs7g1Qrwz1m4KxYtQPJgYfjRnOJcw +TL1KhwEwOXmYU4LOO7PZhlI3/zDsWroJHtkrtOS2ocDCxQqcjLf//wwYHf63qLNL +qdEOQ6zDdckwmkaExidTevhUPy+PlhD4mnKhlXivmk7SEPq7Epxqm37uP/xfAfDz +aVohRYRI0rooMZ+xjGlncc15ZCDhLPk= +=uIWs -----END PGP MESSAGE-----