diff --git a/Justfile b/Justfile index 338ff70..c37f950 100644 --- a/Justfile +++ b/Justfile @@ -9,13 +9,14 @@ boot: commit: git add . + -git pull origin main -git commit -a -m "update" _switch: nixos-rebuild switch --flake . --use-remote-sudo push: - git push origin --all + git push origin main switch: commit _switch push diff --git a/home/aly.nix b/home/aly.nix index bdea448..956c4b2 100644 --- a/home/aly.nix +++ b/home/aly.nix @@ -22,17 +22,6 @@ nix-direnv.enable = true; }; - programs.firefox = lib.mkIf gui { - enable = true; - profiles.default = { - extensions = { - packages = with pkgs.nur.repos.rycee.firefox-addons; [ - ublock-origin bitwarden darkreader indie-wiki-buddy sponsorblock - ]; - }; - }; - }; - programs.git = { enable = true; userName = "alydev"; diff --git a/system/aly-laptop.nix b/system/aly-laptop.nix index 6903d20..6bc7ff5 100644 --- a/system/aly-laptop.nix +++ b/system/aly-laptop.nix @@ -4,14 +4,21 @@ laptop = { config = '' config /home/aly/.secrets/laptop.ovpn ''; }; }; fileSystems."/mnt/storage" = { - device = "aly@lan.aly.pet:/mnt/storage"; + device = "aly@vpn.aly.pet:/mnt/storage"; fsType = "sshfs"; options = ["nodev,noatime,allow_other,IdentityFile=/home/aly/.ssh/id_ed25519"]; }; + programs.firefox = { + enable = true; + }; + services.gnome = { + gnome-browser-connector.enable = true; + }; services.logind = { lidSwitch = "suspend"; lidSwitchDocked = "ignore"; lidSwitchExternalPower = "ignore"; + powerKey = "ignore"; }; services.flatpak.enable = true; services.flatpak.packages = [ diff --git a/system/aly-server.nix b/system/aly-server.nix index 9701810..05fd02d 100644 --- a/system/aly-server.nix +++ b/system/aly-server.nix @@ -15,7 +15,7 @@ services.cron = { enable = true; systemCronJobs = [ - "0 3 * * 0,2,4,6 /mnt/storage/media/randomintro.sh" + "* * * * * /mnt/storage/media/randomintro.sh" ]; }; system.stateVersion = "25.05";