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/flake.nix b/flake.nix index 9725997..6d05009 100644 --- a/flake.nix +++ b/flake.nix @@ -48,6 +48,7 @@ home-manager.useUserPackages = true; home-manager.extraSpecialArgs.gui = true; home-manager.users.aly = import ./home/aly.nix; + home-manager.backupFileExtension = "bak"; } ]; }; diff --git a/system/aly-laptop.nix b/system/aly-laptop.nix index 6903d20..6cd616f 100644 --- a/system/aly-laptop.nix +++ b/system/aly-laptop.nix @@ -4,7 +4,7 @@ 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"]; }; @@ -12,6 +12,7 @@ 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"; diff --git a/system/global.nix b/system/global.nix index 712fa6e..df2f0f0 100644 --- a/system/global.nix +++ b/system/global.nix @@ -4,10 +4,16 @@ boot.loader.efi.canTouchEfiVariables = true; nix.settings.experimental-features = [ "nix-command" "flakes" ]; environment.systemPackages = with pkgs; [ - cargo rustc just git wget gcc gnumake autoconf automake pkg-config cifs-utils ntfs3g + cargo rustc just git wget gcc gnumake autoconf automake pkg-config cifs-utils ntfs3g nixd ]; - programs.nixvim.enable = true; - programs.nixvim.defaultEditor = true; + programs.nixvim = { + enable = true; + defaultEditor = true; + plugins.lsp = { + enable = true; + servers.nixd.enable = true; + }; + }; security.sudo.wheelNeedsPassword = false; networking.networkmanager.enable = true;