diff options
| -rwxr-xr-x | build.sh | 2 | ||||
| -rw-r--r-- | flake.lock | 58 | ||||
| -rwxr-xr-x | flake.nix | 4 | ||||
| -rw-r--r-- | host/Rory-desktop/configuration.nix | 4 | ||||
| -rwxr-xr-x | modules/base-client.nix | 8 | ||||
| -rwxr-xr-x | modules/base.nix | 1 |
6 files changed, 47 insertions, 30 deletions
diff --git a/build.sh b/build.sh index dcf7787..27d0e11 100755 --- a/build.sh +++ b/build.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p git nixos-install-tools +#!nix-shell -i bash -p git nixos-install-tools nix-output-monitor if [ $# -ne 2 ]; then echo "Usage: $0 <root> <config>" echo "NOTE: hardware config will be generated from root!" diff --git a/flake.lock b/flake.lock index c8892a9..23a40fb 100644 --- a/flake.lock +++ b/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1706834364, - "narHash": "sha256-X/xoXRX+fT4FirW+Br9T6NwRTTJSJgDq4Y3paiP/s4o=", + "lastModified": 1707271697, + "narHash": "sha256-1/EojOyjhEM10QwmyCUeKf2R75Jx2IMsGFS5wif+6AQ=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "3ac42129ac0f72a9ba87ad6e93b22b4566214968", + "rev": "e0cdcf66d34b77aa1deb24844455f4308dbde0c1", "type": "github" }, "original": { @@ -221,11 +221,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1706798041, - "narHash": "sha256-BbvuF4CsVRBGRP8P+R+JUilojk0M60D7hzqE0bEvJBQ=", + "lastModified": 1707175763, + "narHash": "sha256-0MKHC6tQ4KEuM5rui6DjKZ/VNiSANB4E+DJ/+wPS1PU=", "owner": "nix-community", "repo": "home-manager", - "rev": "4d53427bce7bf3d17e699252fd84dc7468afc46e", + "rev": "f99eace7c167b8a6a0871849493b1c613d0f1b80", "type": "github" }, "original": { @@ -291,11 +291,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1706867893, - "narHash": "sha256-c5bADvtL35S3vsJaXR5YWTXe08W0gSwOrTOXfpJB4Ac=", + "lastModified": 1707162675, + "narHash": "sha256-ZojPqn5+cuuqCt/VVGo+uuRxYLtMomahHseFj9HB3O8=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "bcae8dc73b931b7f0fc65f1f1ef93dc379dfd66b", + "rev": "4bb6b2e814be63caa115038e917c6c25b7fc2ac1", "type": "github" }, "original": { @@ -322,11 +322,11 @@ }, "nixpkgs-RoryNix": { "locked": { - "lastModified": 1706718339, - "narHash": "sha256-S+S97c/HzkO2A/YsU7ZmNF9w2s7Xk6P8dzmfDdckzLs=", + "lastModified": 1707091808, + "narHash": "sha256-LahKBAfGbY836gtpVNnWwBTIzN7yf/uYM/S0g393r0Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "53fbe41cf76b6a685004194e38e889bc8857e8c2", + "rev": "9f2ee8c91ac42da3ae6c6a1d21555f283458247e", "type": "github" }, "original": { @@ -338,14 +338,18 @@ }, "nixpkgs-rory": { "locked": { - "lastModified": 0, - "narHash": "sha256-ROsiHMIVoUPuyMH0vVt1XNkjCuGsynC04xH0XH0eZh4=", - "path": "/Rory-Open-Architecture/nixpkgs", - "type": "path" + "lastModified": 1707316549, + "narHash": "sha256-U36dzysJ9/M8e4xxMEWcJceKt6qIiowf7/7cQsJJLos=", + "owner": "TheArcaneBrony", + "repo": "nixpkgs", + "rev": "ca384dc955827486152aa6c61e8ea125e9d7be38", + "type": "github" }, "original": { - "path": "/Rory-Open-Architecture/nixpkgs", - "type": "path" + "owner": "TheArcaneBrony", + "ref": "master", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-stable": { @@ -382,11 +386,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1706191920, - "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=", + "lastModified": 1706732774, + "narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae5c332cbb5827f6b1f02572496b141021de335f", + "rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d", "type": "github" }, "original": { @@ -398,11 +402,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1705774713, - "narHash": "sha256-j6ADaDH9XiumUzkTPlFyCBcoWYhO83lfgiSqEJF2zcs=", + "lastModified": 1706826059, + "narHash": "sha256-N69Oab+cbt3flLvYv8fYnEHlBsWwdKciNZHUbynVEOA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1b64fc1287991a9cce717a01c1973ef86cb1af0b", + "rev": "25e3d4c0d3591c99929b1ec07883177f6ea70c9d", "type": "github" }, "original": { @@ -414,11 +418,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1706732774, - "narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=", + "lastModified": 1707092692, + "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d", + "rev": "faf912b086576fd1a15fca610166c98d47bc667e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 58d17bd..752aece 100755 --- a/flake.nix +++ b/flake.nix @@ -7,8 +7,8 @@ #url="path:/Rory-Open-Architecture/nixpkgs"; }; nixpkgs-rory = { - url = "path:/Rory-Open-Architecture/nixpkgs"; - #url = "github:TheArcaneBrony/nixpkgs/master"; + #url = "path:/Rory-Open-Architecture/nixpkgs"; + url = "github:TheArcaneBrony/nixpkgs/master"; }; nixpkgs-RoryNix = { #url = "github:NixOS/nixpkgs/nixos-23.05"; diff --git a/host/Rory-desktop/configuration.nix b/host/Rory-desktop/configuration.nix index 7f885e8..6e42bd1 100644 --- a/host/Rory-desktop/configuration.nix +++ b/host/Rory-desktop/configuration.nix @@ -153,6 +153,10 @@ insomnia vscode + # - Utilities + inkscape-with-extensions + gimp-with-plugins + # - Languages #dotnet-sdk_7 #dotnet-sdk_8 diff --git a/modules/base-client.nix b/modules/base-client.nix index ae95934..f36cd16 100755 --- a/modules/base-client.nix +++ b/modules/base-client.nix @@ -63,4 +63,12 @@ sudo.wheelNeedsPassword = false; }; + systemd.network.wait-online.enable = false; + boot.initrd.systemd.network.wait-online.enable = false; + + # disable all serial ports/consoles + systemd.suppressedSystemUnits = [ + "serial-getty@.service" + ]; + } diff --git a/modules/base.nix b/modules/base.nix index e7a1f9f..116d496 100755 --- a/modules/base.nix +++ b/modules/base.nix @@ -9,6 +9,7 @@ ]; boot = { + initrd.systemd.enable = true; kernelParams = [ "memory_hotplug.memmap_on_memory=1" "memhp_default_state=online" |