From 69fa5d2ee0d26547b5b27e0e5f0b6812c8298611 Mon Sep 17 00:00:00 2001 From: alydev Date: Tue, 21 Oct 2025 16:23:10 +1000 Subject: [PATCH 1/6] update --- Justfile | 3 ++- home/aly.nix | 11 ----------- system/aly-laptop.nix | 9 ++++++++- system/aly-server.nix | 2 +- 4 files changed, 11 insertions(+), 14 deletions(-) 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"; From bdb85b5df4e94c931dec9787e0e6adbfb827087f Mon Sep 17 00:00:00 2001 From: alydev Date: Tue, 21 Oct 2025 16:26:35 +1000 Subject: [PATCH 2/6] revert --- home/aly.nix | 11 +++++++++++ system/aly-laptop.nix | 8 +------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/home/aly.nix b/home/aly.nix index 956c4b2..bdea448 100644 --- a/home/aly.nix +++ b/home/aly.nix @@ -22,6 +22,17 @@ 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 6bc7ff5..9679d4d 100644 --- a/system/aly-laptop.nix +++ b/system/aly-laptop.nix @@ -4,16 +4,10 @@ laptop = { config = '' config /home/aly/.secrets/laptop.ovpn ''; }; }; fileSystems."/mnt/storage" = { - device = "aly@vpn.aly.pet:/mnt/storage"; + device = "aly@lan.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"; From b067a85b195cdd33fd604fb9a2efa2ae6a69794f Mon Sep 17 00:00:00 2001 From: alydev Date: Tue, 21 Oct 2025 16:31:12 +1000 Subject: [PATCH 3/6] update --- flake.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index 9725997..16b205b 100644 --- a/flake.nix +++ b/flake.nix @@ -42,12 +42,13 @@ nix-search.packages.x86_64-linux.default ]; } - home-manager.nixosModules.home-manager + home-manager.nixosModules.home-manager.home-manager { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.extraSpecialArgs.gui = true; - home-manager.users.aly = import ./home/aly.nix; + useGlobalPkgs = true; + useUserPackages = true; + extraSpecialArgs.gui = true; + users.aly = import ./home/aly.nix; + backupFileExtension = "bak"; } ]; }; From ff1e5205fc0681823ed6e896794c54c3dc1c9d6e Mon Sep 17 00:00:00 2001 From: alydev Date: Tue, 21 Oct 2025 16:32:07 +1000 Subject: [PATCH 4/6] update --- flake.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 16b205b..6d05009 100644 --- a/flake.nix +++ b/flake.nix @@ -42,13 +42,13 @@ nix-search.packages.x86_64-linux.default ]; } - home-manager.nixosModules.home-manager.home-manager + home-manager.nixosModules.home-manager { - useGlobalPkgs = true; - useUserPackages = true; - extraSpecialArgs.gui = true; - users.aly = import ./home/aly.nix; - backupFileExtension = "bak"; + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.extraSpecialArgs.gui = true; + home-manager.users.aly = import ./home/aly.nix; + home-manager.backupFileExtension = "bak"; } ]; }; From 23a3f595f1fba6d312e89a4e9c7d3ecaa3b7c672 Mon Sep 17 00:00:00 2001 From: alydev Date: Tue, 21 Oct 2025 16:34:28 +1000 Subject: [PATCH 5/6] update --- system/aly-laptop.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/aly-laptop.nix b/system/aly-laptop.nix index 9679d4d..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"]; }; From c29abd2cee9fb7f3d2b0426e25055fc24123832d Mon Sep 17 00:00:00 2001 From: alydev Date: Tue, 21 Oct 2025 16:44:50 +1000 Subject: [PATCH 6/6] update --- system/global.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) 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;