diff options
73 files changed, 212 insertions, 28 deletions
diff --git a/.gitattributes b/.gitattributes index 94f480d..94f480d 100644..100755 --- a/.gitattributes +++ b/.gitattributes diff --git a/.gitignore b/.gitignore index 45d5e0e..4d5a68d 100644..100755 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ hardware-configuration.nix .vscode/ matrix-user-tokens.txt -nixpkgs/ +#nixpkgs/ +result diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..fffe1db --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "nixpkgs"] + path = nixpkgs + url = https://github.com/TheArcaneBrony/nixpkgs.git diff --git a/README.md b/README.md index 7f4e0c5..7f4e0c5 100644..100755 --- a/README.md +++ b/README.md diff --git a/build.sh b/build.sh index 070b847..070b847 100644..100755 --- a/build.sh +++ b/build.sh diff --git a/flake.lock b/flake.lock index 90501df..0526bb1 100644 --- a/flake.lock +++ b/flake.lock @@ -107,6 +107,22 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -125,16 +141,34 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1692799911, + "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1694643239, - "narHash": "sha256-pv2k/5FvyirDE8g4TNehzwZ0T4UOMMmqWSQnM/luRtE=", + "lastModified": 1695738267, + "narHash": "sha256-LTNAbTQ96xSj17xBfsFrFS9i56U2BMLpD0BduhrsVkU=", "owner": "nix-community", "repo": "home-manager", - "rev": "d9b88b43524db1591fb3d9410a21428198d75d49", + "rev": "0f4e5b4999fd6a42ece5da8a3a2439a50e48e486", "type": "github" }, "original": { @@ -144,6 +178,26 @@ "type": "github" } }, + "nixos-wsl": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1694522206, + "narHash": "sha256-mb34WlyHi/whE6gIMEtXKfGRALzvB6/U7CYdUnJKN+c=", + "owner": "nix-community", + "repo": "NixOS-WSL", + "rev": "e7d93d0f478b6fbb47c00d03449dc3d08b90abb7", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NixOS-WSL", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1683408522, @@ -162,11 +216,11 @@ }, "nixpkgs-RoryNix": { "locked": { - "lastModified": 1694499547, - "narHash": "sha256-R7xMz1Iia6JthWRHDn36s/E248WB1/je62ovC/dUVKI=", + "lastModified": 1695825837, + "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=", "owner": "NixOs", "repo": "nixpkgs", - "rev": "e5f018cf150e29aac26c61dac0790ea023c46b24", + "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e", "type": "github" }, "original": { @@ -178,23 +232,27 @@ }, "nixpkgs-rory": { "locked": { - "lastModified": 0, - "narHash": "sha256-7bD3zk/UkVeI7R4ztsCiFOfvOaZUb9FiHhcUARbDB4k=", - "path": "/Rory-Open-Architecture/nixpkgs", - "type": "path" + "lastModified": 1695727562, + "narHash": "sha256-ON/1Gp508BTZVZ1MllTApqkeq5uwCOKl/m2t6OGcY1w=", + "owner": "TheArcaneBrony", + "repo": "nixpkgs", + "rev": "b20f5df4486be87b6d502aa1d2945fcaf3c524f5", + "type": "github" }, "original": { - "path": "/Rory-Open-Architecture/nixpkgs", - "type": "path" + "owner": "TheArcaneBrony", + "ref": "master", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1694422566, - "narHash": "sha256-lHJ+A9esOz9vln/3CJG23FV6Wd2OoOFbDeEs4cMGMqc=", + "lastModified": 1695360818, + "narHash": "sha256-JlkN3R/SSoMTa+CasbxS1gq+GpGxXQlNZRUh9+LIy/0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3a2786eea085f040a66ecde1bc3ddc7099f6dbeb", + "rev": "e35dcc04a3853da485a396bdd332217d0ac9054f", "type": "github" }, "original": { @@ -206,11 +264,27 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1694422566, - "narHash": "sha256-lHJ+A9esOz9vln/3CJG23FV6Wd2OoOFbDeEs4cMGMqc=", + "lastModified": 1694048570, + "narHash": "sha256-PEQptwFCVaJ+jLFJgrZll2shQ9VI/7xVhrCYkJo8iIw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3a2786eea085f040a66ecde1bc3ddc7099f6dbeb", + "rev": "4f77ea639305f1de0a14d9d41eef83313360638c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1695644571, + "narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6500b4580c2a1f3d0f980d32d285739d8e156d92", "type": "github" }, "original": { @@ -225,7 +299,8 @@ "botcore-v4": "botcore-v4", "conduit": "conduit", "home-manager": "home-manager", - "nixpkgs": "nixpkgs_3", + "nixos-wsl": "nixos-wsl", + "nixpkgs": "nixpkgs_4", "nixpkgs-RoryNix": "nixpkgs-RoryNix", "nixpkgs-rory": "nixpkgs-rory" } @@ -288,6 +363,21 @@ "repo": "default", "type": "github" } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 1a4eb5f..833d949 100644..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"; @@ -73,9 +73,9 @@ modules = [ nixos-wsl.nixosModules.default ./host/Rory-wsl/configuration.nix - ./hardware-configuration.nix +# ./hardware-configuration.nix home-manager.nixosModules.home-manager - ]; + ]; }; }; }; diff --git a/hardware-configuration.nix b/hardware-configuration.nix new file mode 100644 index 0000000..1332e7a --- /dev/null +++ b/hardware-configuration.nix @@ -0,0 +1,74 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = [ ]; + + boot.initrd.availableKernelModules = [ "virtio_pci" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/111f8fcb-03cc-4804-98bd-e8c41567dd09"; + fsType = "ext4"; + }; + + fileSystems."/usr/lib/wsl/drivers" = + { device = "none"; + fsType = "9p"; + }; + + fileSystems."/usr/lib/wsl/lib" = + { device = "none"; + fsType = "overlay"; + }; + + fileSystems."/mnt/wsl" = + { device = "none"; + fsType = "tmpfs"; + }; + + fileSystems."/mnt/wslg" = + { device = "none"; + fsType = "tmpfs"; + }; + + fileSystems."/mnt/wslg/distro" = + { device = ""; + fsType = "none"; + options = [ "bind" ]; + }; + + fileSystems."/mnt/wslg/doc" = + { device = "none"; + fsType = "overlay"; + }; + + fileSystems."/tmp/.X11-unix" = + { device = "/mnt/wslg/.X11-unix"; + fsType = "none"; + options = [ "bind" ]; + }; + + fileSystems."/mnt/c" = + { device = "drvfs"; + fsType = "9p"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/c3f339c1-3c4d-48a3-991a-1c370c276e49"; } + ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.bonding_masters.useDHCP = lib.mkDefault true; + # networking.interfaces.eth0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; +} diff --git a/host/Rory-devenv/configuration.nix b/host/Rory-devenv/configuration.nix index 108ff82..108ff82 100644..100755 --- a/host/Rory-devenv/configuration.nix +++ b/host/Rory-devenv/configuration.nix diff --git a/host/Rory-devenv/software.nix b/host/Rory-devenv/software.nix index 93b430e..93b430e 100644..100755 --- a/host/Rory-devenv/software.nix +++ b/host/Rory-devenv/software.nix diff --git a/host/Rory-fosscord/configuration.nix b/host/Rory-fosscord/configuration.nix index 84c997e..84c997e 100644..100755 --- a/host/Rory-fosscord/configuration.nix +++ b/host/Rory-fosscord/configuration.nix diff --git a/host/Rory-fosscord/software.nix b/host/Rory-fosscord/software.nix index 231b74d..231b74d 100644..100755 --- a/host/Rory-fosscord/software.nix +++ b/host/Rory-fosscord/software.nix diff --git a/host/Rory-nginx/configuration.nix b/host/Rory-nginx/configuration.nix index 28b6125..28b6125 100644..100755 --- a/host/Rory-nginx/configuration.nix +++ b/host/Rory-nginx/configuration.nix diff --git a/host/Rory-nginx/post-rebuild.sh b/host/Rory-nginx/post-rebuild.sh index 9b0c17c..9b0c17c 100644..100755 --- a/host/Rory-nginx/post-rebuild.sh +++ b/host/Rory-nginx/post-rebuild.sh diff --git a/host/Rory-nginx/services/containers/matrixunittests/container.nix b/host/Rory-nginx/services/containers/matrixunittests/container.nix index 7c15e04..7c15e04 100644..100755 --- a/host/Rory-nginx/services/containers/matrixunittests/container.nix +++ b/host/Rory-nginx/services/containers/matrixunittests/container.nix diff --git a/host/Rory-nginx/services/containers/matrixunittests/root.nix b/host/Rory-nginx/services/containers/matrixunittests/root.nix index b42a38a..b42a38a 100644..100755 --- a/host/Rory-nginx/services/containers/matrixunittests/root.nix +++ b/host/Rory-nginx/services/containers/matrixunittests/root.nix diff --git a/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix b/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix index 8e49043..8e49043 100644..100755 --- a/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix +++ b/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix diff --git a/host/Rory-nginx/services/containers/matrixunittests/services/nginx.nix b/host/Rory-nginx/services/containers/matrixunittests/services/nginx.nix index d6697be..d6697be 100644..100755 --- a/host/Rory-nginx/services/containers/matrixunittests/services/nginx.nix +++ b/host/Rory-nginx/services/containers/matrixunittests/services/nginx.nix diff --git a/host/Rory-nginx/services/containers/matrixunittests/services/pantalaimon.nix b/host/Rory-nginx/services/containers/matrixunittests/services/pantalaimon.nix index b5f7f77..b5f7f77 100644..100755 --- a/host/Rory-nginx/services/containers/matrixunittests/services/pantalaimon.nix +++ b/host/Rory-nginx/services/containers/matrixunittests/services/pantalaimon.nix diff --git a/host/Rory-nginx/services/containers/pluralcontactbotpoc/container.nix b/host/Rory-nginx/services/containers/pluralcontactbotpoc/container.nix index f1ddb3f..f1ddb3f 100644..100755 --- a/host/Rory-nginx/services/containers/pluralcontactbotpoc/container.nix +++ b/host/Rory-nginx/services/containers/pluralcontactbotpoc/container.nix diff --git a/host/Rory-nginx/services/containers/pluralcontactbotpoc/root.nix b/host/Rory-nginx/services/containers/pluralcontactbotpoc/root.nix index b42a38a..b42a38a 100644..100755 --- a/host/Rory-nginx/services/containers/pluralcontactbotpoc/root.nix +++ b/host/Rory-nginx/services/containers/pluralcontactbotpoc/root.nix diff --git a/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/conduit.nix b/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/conduit.nix index 069b055..069b055 100644..100755 --- a/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/conduit.nix +++ b/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/conduit.nix diff --git a/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/nginx.nix b/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/nginx.nix index 9ec08fd..9ec08fd 100644..100755 --- a/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/nginx.nix +++ b/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/nginx.nix diff --git a/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/pantalaimon.nix b/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/pantalaimon.nix index b5f7f77..b5f7f77 100644..100755 --- a/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/pantalaimon.nix +++ b/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/pantalaimon.nix diff --git a/host/Rory-nginx/services/discordbots.nix b/host/Rory-nginx/services/discordbots.nix index 93622e7..93622e7 100644..100755 --- a/host/Rory-nginx/services/discordbots.nix +++ b/host/Rory-nginx/services/discordbots.nix diff --git a/host/Rory-nginx/services/matrix/conduit.nix b/host/Rory-nginx/services/matrix/conduit.nix index 3594244..3594244 100644..100755 --- a/host/Rory-nginx/services/matrix/conduit.nix +++ b/host/Rory-nginx/services/matrix/conduit.nix diff --git a/host/Rory-nginx/services/matrix/coturn.nix b/host/Rory-nginx/services/matrix/coturn.nix index 427721a..427721a 100644..100755 --- a/host/Rory-nginx/services/matrix/coturn.nix +++ b/host/Rory-nginx/services/matrix/coturn.nix diff --git a/host/Rory-nginx/services/matrix/draupnir.nix b/host/Rory-nginx/services/matrix/draupnir.nix index b5f5608..b5f5608 100644..100755 --- a/host/Rory-nginx/services/matrix/draupnir.nix +++ b/host/Rory-nginx/services/matrix/draupnir.nix diff --git a/host/Rory-nginx/services/matrix/matrix-appservice-discord.nix b/host/Rory-nginx/services/matrix/matrix-appservice-discord.nix index 8c31e10..8c31e10 100644..100755 --- a/host/Rory-nginx/services/matrix/matrix-appservice-discord.nix +++ b/host/Rory-nginx/services/matrix/matrix-appservice-discord.nix diff --git a/host/Rory-nginx/services/matrix/root.nix b/host/Rory-nginx/services/matrix/root.nix index d624542..d624542 100644..100755 --- a/host/Rory-nginx/services/matrix/root.nix +++ b/host/Rory-nginx/services/matrix/root.nix diff --git a/host/Rory-nginx/services/matrix/synapse.nix b/host/Rory-nginx/services/matrix/synapse.nix index d41072e..d41072e 100644..100755 --- a/host/Rory-nginx/services/matrix/synapse.nix +++ b/host/Rory-nginx/services/matrix/synapse.nix diff --git a/host/Rory-nginx/services/nginx/boorunav.com/root.nix b/host/Rory-nginx/services/nginx/boorunav.com/root.nix index a859950..a859950 100644..100755 --- a/host/Rory-nginx/services/nginx/boorunav.com/root.nix +++ b/host/Rory-nginx/services/nginx/boorunav.com/root.nix diff --git a/host/Rory-nginx/services/nginx/catgirlsaresexy.com/root.nix b/host/Rory-nginx/services/nginx/catgirlsaresexy.com/root.nix index e28c2e0..e28c2e0 100644..100755 --- a/host/Rory-nginx/services/nginx/catgirlsaresexy.com/root.nix +++ b/host/Rory-nginx/services/nginx/catgirlsaresexy.com/root.nix diff --git a/host/Rory-nginx/services/nginx/nginx.nix b/host/Rory-nginx/services/nginx/nginx.nix index 4364a2b..4364a2b 100644..100755 --- a/host/Rory-nginx/services/nginx/nginx.nix +++ b/host/Rory-nginx/services/nginx/nginx.nix diff --git a/host/Rory-nginx/services/nginx/rory.boo/tunnel.nix b/host/Rory-nginx/services/nginx/rory.boo/tunnel.nix index b50823b..b50823b 100644..100755 --- a/host/Rory-nginx/services/nginx/rory.boo/tunnel.nix +++ b/host/Rory-nginx/services/nginx/rory.boo/tunnel.nix diff --git a/host/Rory-nginx/services/nginx/rory.gay/bots.nix b/host/Rory-nginx/services/nginx/rory.gay/bots.nix index 7652dc9..7652dc9 100644..100755 --- a/host/Rory-nginx/services/nginx/rory.gay/bots.nix +++ b/host/Rory-nginx/services/nginx/rory.gay/bots.nix diff --git a/host/Rory-nginx/services/nginx/rory.gay/conduit.nix b/host/Rory-nginx/services/nginx/rory.gay/conduit.nix index 5d96342..5d96342 100644..100755 --- a/host/Rory-nginx/services/nginx/rory.gay/conduit.nix +++ b/host/Rory-nginx/services/nginx/rory.gay/conduit.nix diff --git a/host/Rory-nginx/services/nginx/rory.gay/git.nix b/host/Rory-nginx/services/nginx/rory.gay/git.nix index 812e946..812e946 100644..100755 --- a/host/Rory-nginx/services/nginx/rory.gay/git.nix +++ b/host/Rory-nginx/services/nginx/rory.gay/git.nix diff --git a/host/Rory-nginx/services/nginx/rory.gay/lfs.nix b/host/Rory-nginx/services/nginx/rory.gay/lfs.nix index f944eea..f944eea 100644..100755 --- a/host/Rory-nginx/services/nginx/rory.gay/lfs.nix +++ b/host/Rory-nginx/services/nginx/rory.gay/lfs.nix diff --git a/host/Rory-nginx/services/nginx/rory.gay/matrix-bak.nix b/host/Rory-nginx/services/nginx/rory.gay/matrix-bak.nix index 2780979..2780979 100644..100755 --- a/host/Rory-nginx/services/nginx/rory.gay/matrix-bak.nix +++ b/host/Rory-nginx/services/nginx/rory.gay/matrix-bak.nix diff --git a/host/Rory-nginx/services/nginx/rory.gay/matrix.nix b/host/Rory-nginx/services/nginx/rory.gay/matrix.nix index c7b3e5d..c7b3e5d 100644..100755 --- a/host/Rory-nginx/services/nginx/rory.gay/matrix.nix +++ b/host/Rory-nginx/services/nginx/rory.gay/matrix.nix diff --git a/host/Rory-nginx/services/nginx/rory.gay/matrixunittests.nix b/host/Rory-nginx/services/nginx/rory.gay/matrixunittests.nix index 65a2c6c..65a2c6c 100644..100755 --- a/host/Rory-nginx/services/nginx/rory.gay/matrixunittests.nix +++ b/host/Rory-nginx/services/nginx/rory.gay/matrixunittests.nix diff --git a/host/Rory-nginx/services/nginx/rory.gay/mru.nix b/host/Rory-nginx/services/nginx/rory.gay/mru.nix index b65bf51..b65bf51 100644..100755 --- a/host/Rory-nginx/services/nginx/rory.gay/mru.nix +++ b/host/Rory-nginx/services/nginx/rory.gay/mru.nix diff --git a/host/Rory-nginx/services/nginx/rory.gay/pcpoc.nix b/host/Rory-nginx/services/nginx/rory.gay/pcpoc.nix index 05f1a0c..05f1a0c 100644..100755 --- a/host/Rory-nginx/services/nginx/rory.gay/pcpoc.nix +++ b/host/Rory-nginx/services/nginx/rory.gay/pcpoc.nix diff --git a/host/Rory-nginx/services/nginx/rory.gay/root.nix b/host/Rory-nginx/services/nginx/rory.gay/root.nix index 9e96a4f..9e96a4f 100644..100755 --- a/host/Rory-nginx/services/nginx/rory.gay/root.nix +++ b/host/Rory-nginx/services/nginx/rory.gay/root.nix diff --git a/host/Rory-nginx/services/nginx/sugarcanemc.org/root.nix b/host/Rory-nginx/services/nginx/sugarcanemc.org/root.nix index 772cde1..772cde1 100644..100755 --- a/host/Rory-nginx/services/nginx/sugarcanemc.org/root.nix +++ b/host/Rory-nginx/services/nginx/sugarcanemc.org/root.nix diff --git a/host/Rory-nginx/services/nginx/thearcanebrony.net/awooradio.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/awooradio.nix index af52ec8..af52ec8 100644..100755 --- a/host/Rory-nginx/services/nginx/thearcanebrony.net/awooradio.nix +++ b/host/Rory-nginx/services/nginx/thearcanebrony.net/awooradio.nix diff --git a/host/Rory-nginx/services/nginx/thearcanebrony.net/files.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/files.nix index 45de296..45de296 100644..100755 --- a/host/Rory-nginx/services/nginx/thearcanebrony.net/files.nix +++ b/host/Rory-nginx/services/nginx/thearcanebrony.net/files.nix diff --git a/host/Rory-nginx/services/nginx/thearcanebrony.net/git.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/git.nix index 3006b57..3006b57 100644..100755 --- a/host/Rory-nginx/services/nginx/thearcanebrony.net/git.nix +++ b/host/Rory-nginx/services/nginx/thearcanebrony.net/git.nix diff --git a/host/Rory-nginx/services/nginx/thearcanebrony.net/http.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/http.nix index a4184ac..a4184ac 100644..100755 --- a/host/Rory-nginx/services/nginx/thearcanebrony.net/http.nix +++ b/host/Rory-nginx/services/nginx/thearcanebrony.net/http.nix diff --git a/host/Rory-nginx/services/nginx/thearcanebrony.net/lfs.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/lfs.nix index 8e7b51f..8e7b51f 100644..100755 --- a/host/Rory-nginx/services/nginx/thearcanebrony.net/lfs.nix +++ b/host/Rory-nginx/services/nginx/thearcanebrony.net/lfs.nix diff --git a/host/Rory-nginx/services/nginx/thearcanebrony.net/root.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/root.nix index bd23f10..bd23f10 100644..100755 --- a/host/Rory-nginx/services/nginx/thearcanebrony.net/root.nix +++ b/host/Rory-nginx/services/nginx/thearcanebrony.net/root.nix diff --git a/host/Rory-nginx/services/nginx/thearcanebrony.net/search.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/search.nix index 6298ba8..6298ba8 100644..100755 --- a/host/Rory-nginx/services/nginx/thearcanebrony.net/search.nix +++ b/host/Rory-nginx/services/nginx/thearcanebrony.net/search.nix diff --git a/host/Rory-nginx/services/nginx/thearcanebrony.net/sentry.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/sentry.nix index 96ffe4b..96ffe4b 100644..100755 --- a/host/Rory-nginx/services/nginx/thearcanebrony.net/sentry.nix +++ b/host/Rory-nginx/services/nginx/thearcanebrony.net/sentry.nix diff --git a/host/Rory-nginx/services/nginx/thearcanebrony.net/siliconheaven.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/siliconheaven.nix index 57af15e..57af15e 100644..100755 --- a/host/Rory-nginx/services/nginx/thearcanebrony.net/siliconheaven.nix +++ b/host/Rory-nginx/services/nginx/thearcanebrony.net/siliconheaven.nix diff --git a/host/Rory-nginx/services/nginx/thearcanebrony.net/spigotav.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/spigotav.nix index ef98887..ef98887 100644..100755 --- a/host/Rory-nginx/services/nginx/thearcanebrony.net/spigotav.nix +++ b/host/Rory-nginx/services/nginx/thearcanebrony.net/spigotav.nix diff --git a/host/Rory-nginx/services/nginx/thearcanebrony.net/terra.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/terra.nix index 58b7c14..58b7c14 100644..100755 --- a/host/Rory-nginx/services/nginx/thearcanebrony.net/terra.nix +++ b/host/Rory-nginx/services/nginx/thearcanebrony.net/terra.nix diff --git a/host/Rory-nginx/services/nginx/thearcanebrony.net/vives.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/vives.nix index 3fc280c..3fc280c 100644..100755 --- a/host/Rory-nginx/services/nginx/thearcanebrony.net/vives.nix +++ b/host/Rory-nginx/services/nginx/thearcanebrony.net/vives.nix diff --git a/host/Rory-nginx/services/postgres.nix b/host/Rory-nginx/services/postgres.nix index 26ceed7..26ceed7 100644..100755 --- a/host/Rory-nginx/services/postgres.nix +++ b/host/Rory-nginx/services/postgres.nix diff --git a/host/Rory-wsl/configuration.nix b/host/Rory-wsl/configuration.nix index 35eaff5..313eeb4 100644 --- a/host/Rory-wsl/configuration.nix +++ b/host/Rory-wsl/configuration.nix @@ -1,6 +1,9 @@ { lib, pkgs, config, modulesPath, ... }: { + imports = [ + ../../modules/base-client.nix + ]; wsl = { enable = true; automountPath = "/mnt"; @@ -14,10 +17,7 @@ # docker-desktop.enable = true; }; - - nix.extraOptions = '' - experimental-features = nix-command flakes - ''; + networking.hostName = "Rory-wsl"; environment.systemPackages = with pkgs; [ wget @@ -43,4 +43,5 @@ ]; system.stateVersion = "23.05"; + home-manager.users.Rory.home.stateVersion = "23.05"; } diff --git a/modules/base-client.nix b/modules/base-client.nix index 78988b9..78988b9 100644..100755 --- a/modules/base-client.nix +++ b/modules/base-client.nix diff --git a/modules/base-server.nix b/modules/base-server.nix index 8986ee3..8986ee3 100644..100755 --- a/modules/base-server.nix +++ b/modules/base-server.nix diff --git a/modules/base.nix b/modules/base.nix index 032df12..d405e4c 100644..100755 --- a/modules/base.nix +++ b/modules/base.nix @@ -92,6 +92,7 @@ pv dig cloud-utils + nix-output-monitor ]; systemd.coredump.extraConfig = lib.mkDefault '' diff --git a/modules/environments/home.nix b/modules/environments/home.nix index 9408644..9408644 100644..100755 --- a/modules/environments/home.nix +++ b/modules/environments/home.nix diff --git a/modules/packages/gitfs.nix b/modules/packages/gitfs.nix index 804a747..804a747 100644..100755 --- a/modules/packages/gitfs.nix +++ b/modules/packages/gitfs.nix diff --git a/modules/packages/vim.nix b/modules/packages/vim.nix index 3524e2c..3524e2c 100644..100755 --- a/modules/packages/vim.nix +++ b/modules/packages/vim.nix diff --git a/modules/users/Rory.nix b/modules/users/Rory.nix index 94b702f..94b702f 100644..100755 --- a/modules/users/Rory.nix +++ b/modules/users/Rory.nix diff --git a/modules/users/chris.nix b/modules/users/chris.nix index 86acee5..86acee5 100644..100755 --- a/modules/users/chris.nix +++ b/modules/users/chris.nix diff --git a/modules/users/db2k.nix b/modules/users/db2k.nix index a6dc7cd..a6dc7cd 100644..100755 --- a/modules/users/db2k.nix +++ b/modules/users/db2k.nix diff --git a/modules/users/levi.nix b/modules/users/levi.nix index bb28656..bb28656 100644..100755 --- a/modules/users/levi.nix +++ b/modules/users/levi.nix diff --git a/rebuild-wsl.sh b/rebuild-wsl.sh new file mode 100755 index 0000000..afa93ef --- /dev/null +++ b/rebuild-wsl.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env sh + +if [ -d "nixpkgs" ]; then + cd nixpkgs + git remote add upstream https://github.com/NixOS/nixpkgs || git remote set-url upstream https://github.com/NixOS/nixpkgs + git fetch --all -v + git rebase upstream/nixos-unstable -v + cd .. +fi + +nix flake update +nom build .#nixosConfigurations.${HOSTNAME}.config.system.build.toplevel +sudo nixos-rebuild switch --flake .#${HOSTNAME} +#./build.sh / $HOSTNAME diff --git a/rebuild.sh b/rebuild.sh index 0e02eab..0e02eab 100644..100755 --- a/rebuild.sh +++ b/rebuild.sh diff --git a/update.sh b/update.sh index 6ce5622..6ce5622 100644..100755 --- a/update.sh +++ b/update.sh |