diff --git a/flake.lock b/flake.lock index 94a2fa4..79c9228 100644 --- a/flake.lock +++ b/flake.lock @@ -145,11 +145,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1774152686, - "narHash": "sha256-RlEgsdHr9IQm79SsXKNT8iU+ZjjIOPTJXcatMqgSfwk=", + "lastModified": 1774497795, + "narHash": "sha256-tzgxKaCEMcU6XT0fjV/vEqDCM9yij6wBgPPBKiK8Dfk=", "owner": "rycee", "repo": "nur-expressions", - "rev": "4c83dbe717272428562a33db817f492195e227ae", + "rev": "11af6f465a038233b8123022dcb7e293f3229f11", "type": "gitlab" }, "original": { @@ -349,11 +349,11 @@ ] }, "locked": { - "lastModified": 1774201162, - "narHash": "sha256-th4i3X3P3yikPk3qu1A5DQ40tIztZKvAKPaa9hjXF+U=", + "lastModified": 1774539458, + "narHash": "sha256-H9GIOqdMfQZ6lFetsQhO9TCq53hYzpTHDWOt3PRh9V0=", "owner": "nix-community", "repo": "home-manager", - "rev": "932ca46013acabbedd13c27dc278e3d043707e46", + "rev": "e2e5f512b33ed19a7a3271d0b73ed5eefcc0be5f", "type": "github" }, "original": { @@ -422,11 +422,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1773821835, - "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", + "lastModified": 1774386573, + "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", + "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", "type": "github" }, "original": { @@ -467,22 +467,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1770107345, - "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "noctalia": { "inputs": { "nixpkgs": [ @@ -491,11 +475,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1774202729, - "narHash": "sha256-rSyMyO1xwqOUwYYQz8R89VKygYMNhvpiqOXp9Fp0mEA=", + "lastModified": 1774536980, + "narHash": "sha256-j7I4XVEaUsiR0EOUJGnY7DZ0V/GYtcGJ97K3abzU9QY=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "56c0904dc6f1c1b2fbfc06756252eda5c8828a60", + "rev": "396fba755b515913f4ac7596c30b827b0f67d53a", "type": "github" }, "original": { @@ -514,11 +498,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1774059741, - "narHash": "sha256-ObYsrf7XLJDqWVbJ+GWH5JYV/EUc7SVdhGx5r5wWKno=", + "lastModified": 1774351986, + "narHash": "sha256-N131zILQ06ZNEvtgtjjFZ0N5qEI70rKKhCZsBcZoDH8=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "c9beee5c634ec784af128b8e7c56db14012ab17f", + "rev": "066835ebd5daeabc86df1e62fb5fe82a51407cc0", "type": "github" }, "original": { @@ -797,7 +781,11 @@ }, "treefmt-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "noctalia", + "noctalia-qs", + "nixpkgs" + ] }, "locked": { "lastModified": 1772660329, diff --git a/hosts/Garand-Desktop/system-modules.nix b/hosts/Garand-Desktop/system-modules.nix index 1115fb9..e546995 100644 --- a/hosts/Garand-Desktop/system-modules.nix +++ b/hosts/Garand-Desktop/system-modules.nix @@ -3,7 +3,7 @@ _: { Container & Packaging */ docker.enable = true; # Docker: container runtime and management - virtualbox.enable = false; # VirtualBox: PC emulator + virtualbox.enable = true; # VirtualBox: PC emulator flatpak = { enable = true; # Flatpak: universal packaging system for Linux packages = { @@ -89,7 +89,7 @@ _: { eddieAirVPN.enable = true; # Eddie AirVPN: VPN client gnomeCalculator.enable = true; # gnomeCalculator: simple calculator gedit.enable = true; # Gedit: GNOME text editor - winboat.enable = true; # Winboat: Windows remote desktop via RDP + winboat.enable = false; # Winboat: Windows remote desktop via RDP adb.enable = false; # ADB: Android SDK platform tools }; } diff --git a/modules/home/bash/aliases.nix b/modules/home/bash/aliases.nix index 3caf8eb..01de8a7 100644 --- a/modules/home/bash/aliases.nix +++ b/modules/home/bash/aliases.nix @@ -6,13 +6,13 @@ programs.bash.shellAliases = { # GarandOS aliases pullos = "git -C /home/${username}/garandos pull"; - upd = "nh os switch --hostname ${host}"; - upg = "nh os switch --hostname ${host} --update"; + upd = "nh os switch -H ${host} -d always"; + upg = "nh os switch -H ${host} --update -d always"; upf = "sudo nix flake update --flake /home/${username}/garandos"; upf-undo = "git -C /home/${username}/garandos restore /home/${username}/garandos/flake.lock"; - upd-bt = "nh os boot --hostname ${host}"; - upd-ts = "nh os test --hostname ${host}"; - upd-bd = "nh os build --hostname ${host}"; + upd-bt = "nh os boot -H ${host} -d always"; + upd-ts = "nh os test -H ${host} -d always"; + upd-bd = "nh os build -H ${host} -d always"; tui = "garandos-tui"; ncg = "nh clean all";