refactor: streamline upgrade script and update Flutter environment variable
All checks were successful
Nix Format Check / check-format (push) Successful in 39s

This commit is contained in:
Menno van Leeuwen 2024-11-21 22:25:19 +01:00
parent 5c73283e5f
commit eabff41a56
Signed by: vleeuwenmenno
SSH Key Fingerprint: SHA256:OJFmjANpakwD3F2Rsws4GLtbdz1TJ5tkQF0RZmF0TRE
9 changed files with 57 additions and 43 deletions

View File

@ -81,11 +81,8 @@ if [ -d "/home/menno/Projects/Work" ]; then
export TRADAWARE_DEVOPS=true export TRADAWARE_DEVOPS=true
fi fi
# Flutter Environment # Flutter Web and other tools that require Chrome
if [ -d "$HOME/flutter" ]; then export CHROME_EXECUTABLE=$(which brave)
export PATH="$PATH:$HOME/flutter/bin"
export CHROME_EXECUTABLE=/usr/bin/brave-browser
fi
# 1Password Source Plugin (Assuming bash compatibility) # 1Password Source Plugin (Assuming bash compatibility)
if [ -f /home/menno/.config/op/plugins.sh ]; then if [ -f /home/menno/.config/op/plugins.sh ]; then

View File

@ -1,8 +1,26 @@
#!/usr/bin/env bash #!/usr/bin/env bash
source $HOME/dotfiles/bin/helpers/functions.sh source $HOME/dotfiles/bin/helpers/functions.sh
printfe "%s\n" "cyan" "Upgrading NixOS packages..." while [[ "$#" -gt 0 ]]; do
cd $HOME/dotfiles/config/nixos && sudo nixos-rebuild switch --upgrade --flake .#$DOTF_HOSTNAME --impure 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..." if [[ -z "$RUN_HA" && -z "$RUN_NIX" ]]; then
cd $HOME/dotfiles/config/home-manager && NIXPKGS_ALLOW_UNFREE=1 home-manager switch -b backup --flake .#$DOTF_HOSTNAME --impure 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

View File

@ -1 +1 @@
/nix/store/ya7gf1qaczdxzgrb0phms5zhc7yfbvim-home-manager-files/.config/autostart/ulauncher.desktop /nix/store/xibrqca2cl3bpl7c8kd93ps6myy47k8n-home-manager-files/.config/autostart/ulauncher.desktop

View File

@ -65,6 +65,6 @@
nvidiaSettings = true; nvidiaSettings = true;
# Optionally, you may need to select the appropriate driver version for your specific GPU. # 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;
}; };
} }

View File

@ -2,7 +2,6 @@
{ {
imports = [ ./virtualisation.nix ]; imports = [ ./virtualisation.nix ];
programs.adb.enable = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
yubikey-manager yubikey-manager
trash-cli trash-cli

View File

@ -1,9 +1,9 @@
-----BEGIN PGP MESSAGE----- -----BEGIN PGP MESSAGE-----
jA0ECQMI1/r+VnIxlUT/0sAKAQjTxJQbnn7OWukMK79HYhm5Rdui20re6P8xvsGt jA0ECQMIfCkBxDc8TWD/0sAAAVHWFLZ7uRkcGSscboaZ4RMJnRJB50a2tLPwpC2i
O72UQWPsYQRQOHKXd330WH4mOX6gY/kGzVfXz8MgjNVvHTt01Bycd0HZx3jNmFlc RoQyaeNcW7CLnCDUvZhJUQw6PPYZ0HvedyXesVQM11d5S0OI55bRLfYLCItGEbcB
KLMDyCzxlO1lqD/4u/0UjW4fCMgFH3FMok2FJeudM1GTd+ltwulrx+3aOZWh4taK L0Ys7X5tk3c21XM4BpWAY1JCM0KcavPvJIiGk6EF0NxhkC+wJ15kd+QqHaR6CW9F
X+HM3XcaDTunk/DMTh8P/zckWOc1Ng6VgFeDYbbiKGNdsZCnxGscnNctAKiVpSFW F0tUzKDmnlVkg1PM0DE2ol4p/ZpkAavlKtDjNCAkresprnX4n+kDuVhlfhDrCCFO
IE1Z+RKgEpMa+xLCQfwheJKlX/UwMZVHjAoQ9A== SgXz2UTZQz3ZCD1rw1u12uXF
=D8Oy =9dgy
-----END PGP MESSAGE----- -----END PGP MESSAGE-----

View File

@ -1,10 +1,10 @@
-----BEGIN PGP MESSAGE----- -----BEGIN PGP MESSAGE-----
jA0ECQMI9K855NRHvZn/0sA2Ad1WfRHgB8vPtrPs9XXSm/NRgopAvuUON9AucQEE jA0ECQMIFuda29+CynX/0sA5AcCWoIWjhpr/Yt7lEjQeLDJdydrE4IGJ+fUhJw4U
MCwfFuVbCyI9Ys3QrlyVhVgCb87YWYymT6LwxA8qSci1Y+WO5Pou5QD9zKnhNR2m Qn6ibdx/f77UE2lE/uxloBdtSpak1l1aSqjEDIhqG6Mqo3xpsjL/sR2ks6xrrBET
KusG784K9YYj0cs7F0h8ecHAqpiu+kjhD6lEENCtYrHBd2Nv5Y3dTsFVgWVkBAYw mGngCNQMDpu3U48Ntce8VrVyaqERIHYh/GjO3PUFHZHmP2VAQB3lNdPEdVUH4TMi
YMoRb/e3d76BM2Jxm3nQLC+Bq6YrAPBbV6iwAZ/3yiunVBmzSdtB5Ksiz2y14C2U yB8QiZyDerLTdIly+xtVjx7O7Gse5rH92QpFCD/DojdYWYa9hZMd3QtHJNU+BqcM
X3c6+m5x1eZj8IIufp0HR6AKbhtrHI5pRWtSEIcZnR9L1AiPTCfaT18JH2qZ1x81 gxdKAT3afxge27AMZZXh6exqEK4aM1+Xp/NXVQXVDleQnndQEPXqv/AP4a1e1a2h
qQdWGj2donyx451Gbi1JXPrCdOP3tszR XN2eS90chEWLTTrm1TU7Y2izdbOrBYtyi+N3
=BP/T =iUxp
-----END PGP MESSAGE----- -----END PGP MESSAGE-----

View File

@ -1,12 +1,12 @@
-----BEGIN PGP MESSAGE----- -----BEGIN PGP MESSAGE-----
jA0ECQMI35Tv4sOHHFP/0sCiATjXa++7x2ShpxMOSYkYv9EjI3Bw20iC3S6eN9EM jA0ECQMIMu3XXOPLCIP/0sCgAXbVifGOa6+M7lEAY9APajBS8fSDPQfRNhHQRSam
mKo/zxJHCytI936OT9buxcEWgz9eIzQqFPl1H6W+ElKbQ79X401hLC3VkFUnlF/5 f1eJm4XfWw/mlnz0IFaf69wGjrd5qiGaPHwtQlZzapaxSgNZquWXSqAH2x6I9gGa
RPAyVObbSoH1u1H3KVJ0LIguyCghxqxBCt1BEmS8R+y27PC0yCAl3fms6bfSt+mF yS7eay1vjr/bkTOgzWJBLksrUTcfU3UmxW41/ORVnSD8UfqSOg9j+RLYadAQhian
MZIGXSrczmmuwzIRIUhXwqEpSLnnmpziQ22B/Npr2Asu3nwCA4zHan7doVPwCroH 11vn2G+1AlmTFgY9zbOflbw+pU83x0t2DX7cTHDO5A/BWQ3ZXEhId8t9PHaobZ9e
XA5HsQThAWx5G5FyQRAeAPneg6icJso7gvqBVMkuGLfh1BGAf2u5eHgbKopfdYh2 M/I0k0kEr5UjeXuQwP1Bwiqd47lEOjlSbgu/MJ+ptbWoxyemmlYLGZbeoCuqEdPS
NpE4JujzwMpp3e36NAuYcaR3JCodB3ULp0iPBtfqC7nfgm/XWHtul9pyIjIqFZG7 V2NgeYauLblQ9z1SQpB5POr9x1csXviIj4AMU6+0eNjDfnK4trtNjjiryYybvJtz
8NFHRcbvvVRpP04/ESWS9Qlbc8x9A3jV3JdCHLup/W5xVJBVH0/XBP70rRCyVyxQ mzmsvltZRN/oTBHwNiDo6nqHo2DETDT1VpUMrodjdX92OsCcRxCfe9PC7ULnfh9n
/4NJviMnzAXfFDRoEcNKVtdz2zQ20gVCBBOFVv/aGAtpuZNC 4/jQ/75dJYpWYZIWbC3nG5D76xz8TSTjGbgywvkN4rdnjQ==
=DPk2 =JAg8
-----END PGP MESSAGE----- -----END PGP MESSAGE-----

View File

@ -1,12 +1,12 @@
-----BEGIN PGP MESSAGE----- -----BEGIN PGP MESSAGE-----
jA0ECQMIy4/a+BamXVv/0sCXAeA0EVKKki2mEoXI7GFg1orbBpnUfvM/sj7ISlHE jA0ECQMIKAqIdDLxbRz/0sCVARMDv657J+xXkIKk4c1zesqgKfLc1/6O1Fd2Ftho
hues8qd3343KYZyIv/dBweWK13koZmXchfMPMHN61ygA9Y0uf35VLaMKWSudF77a 7Sc1g74tXidtPEerJPT1baZbVDNc0EC2p55sNxpB1e7jgvzbgBebTulTz5u1g77Z
aHDdnMtuSnd0fdDQ3GaYIRGFd6SlRCpfiQ2Nhno+69GRotCxpgoNife9AQVPS4nM v83ei7O9Zcb1e/NeuH+BXc5IJFqb5wIBqrEiSrohC4TCWI9EPCw5gfiWfZOatj1l
ycqURKfck2UG0bPLSpjMEiZz+pFaNQ3vyGl6sjC5Zj2SkZDzftJb+TkEshwI6FZ/ hZ0RGXPITvJU2GWDq1GJrxtDCM7ozKi45+bFXlKq1WYMODC3kBgaaZA7lrWBCYXM
XFaodI2rFLQb/oGFQKnZ/fbyChhgfqWn3Na+KMupqJ4S3/Ef3WpTdZ/kYvgVUih6 lp8aOVABCtBg8N5XHFCTCll5VEcvKkWywPCFs7g1Qrwz1m4KxYtQPJgYfjRnOJcw
H3iZFptSJ8sfOnabebwvziHKTh/3H7Tek9jgoBsJ2fYdpDx5l/Oz9jy7IZUo7+hl TL1KhwEwOXmYU4LOO7PZhlI3/zDsWroJHtkrtOS2ocDCxQqcjLf//wwYHf63qLNL
xYWEHENxNQAXIZAl80uaCuLzzW8wK0vWDju8en4dAxms1dNRiZRNSMuE4IZ+/eYP qdEOQ6zDdckwmkaExidTevhUPy+PlhD4mnKhlXivmk7SEPq7Epxqm37uP/xfAfDz
bz9JnJguccAyaJvDGrGnE9GtegN3l3jYaw== aVohRYRI0rooMZ+xjGlncc15ZCDhLPk=
=p0YP =uIWs
-----END PGP MESSAGE----- -----END PGP MESSAGE-----