diff options
| author | Emma (Rory&) <root@rory.gay> | 2023-09-28 14:55:08 +0200 |
|---|---|---|
| committer | Emma (Rory&) <root@rory.gay> | 2023-09-28 14:55:08 +0200 |
| commit | 8f1f6c1c0930eb527b6500289f1c75928e7c2589 (patch) | |
| tree | cda909f13b091f50fef65d48fe08758041307de9 | |
| parent | Fix domains (diff) | |
| download | Rory-Open-Architecture-8f1f6c1c0930eb527b6500289f1c75928e7c2589.tar.xz | |
Formatting changes
72 files changed, 71 insertions, 42 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..94f480d --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto eol=lf \ No newline at end of file diff --git a/.gitignore b/.gitignore index 45d5e0e..45d5e0e 100755..100644 --- a/.gitignore +++ b/.gitignore diff --git a/README.md b/README.md new file mode 100644 index 0000000..7f4e0c5 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +`^\s?\n(\s?\n)+` -> `\n`: REPLACE ALL MULTIPLE NEWLINES \ No newline at end of file diff --git a/build.sh b/build.sh index 070b847..070b847 100755..100644 --- a/build.sh +++ b/build.sh diff --git a/flake.nix b/flake.nix index 965913c..1a4eb5f 100755..100644 --- a/flake.nix +++ b/flake.nix @@ -27,9 +27,10 @@ # will probably also require you to always build from source. inputs.nixpkgs.follows = "nixpkgs"; }; + nixos-wsl.url = "github:nix-community/NixOS-WSL"; }; - outputs = { self, nixpkgs, nixpkgs-RoryNix, nixpkgs-rory, home-manager, botcore-v4, conduit }: { + outputs = { self, nixpkgs, nixpkgs-RoryNix, nixpkgs-rory, home-manager, botcore-v4, conduit, nixos-wsl }: { nixosConfigurations = { Rory-nginx = nixpkgs-rory.lib.nixosSystem { system = "x86_64-linux"; @@ -55,6 +56,8 @@ inherit home-manager; }; }; + + #STABLE RoryNix = nixpkgs-RoryNix.lib.nixosSystem { system = "i686-linux"; modules = [ @@ -63,6 +66,17 @@ ({...}: { nix.registry.nixpkgs.flake = nixpkgs-RoryNix; }) ]; }; + + #WSL + Rory-wsl = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + nixos-wsl.nixosModules.default + ./host/Rory-wsl/configuration.nix + ./hardware-configuration.nix + home-manager.nixosModules.home-manager + ]; + }; }; }; } diff --git a/host/Rory-desktop/configuration.nix b/host/Rory-desktop/configuration.nix index ae30435..55ee3a8 100644 --- a/host/Rory-desktop/configuration.nix +++ b/host/Rory-desktop/configuration.nix @@ -86,7 +86,6 @@ }; }; - sound.enable = true; hardware.pulseaudio.enable = false; @@ -167,7 +166,6 @@ sudo.wheelNeedsPassword = false; }; - system.stateVersion = "22.11"; # DO NOT EDIT! } diff --git a/host/Rory-devenv/configuration.nix b/host/Rory-devenv/configuration.nix index 108ff82..108ff82 100755..100644 --- 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 af07bdf..93b430e 100755..100644 --- a/host/Rory-devenv/software.nix +++ b/host/Rory-devenv/software.nix @@ -71,6 +71,5 @@ (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) ]; - system.stateVersion = "22.11"; # DO NOT EDIT! } diff --git a/host/Rory-fosscord/configuration.nix b/host/Rory-fosscord/configuration.nix index 84c997e..84c997e 100755..100644 --- 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 78f4412..231b74d 100755..100644 --- a/host/Rory-fosscord/software.nix +++ b/host/Rory-fosscord/software.nix @@ -8,7 +8,4 @@ discord-client-proxy.modules.proxy discord-client-proxy.modules.users ]; - - system.stateVersion = "22.11"; # DO NOT EDIT! -} - +} \ No newline at end of file diff --git a/host/Rory-nginx/configuration.nix b/host/Rory-nginx/configuration.nix index 28b6125..28b6125 100755..100644 --- 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 0ea1293..9b0c17c 100755..100644 --- a/host/Rory-nginx/post-rebuild.sh +++ b/host/Rory-nginx/post-rebuild.sh @@ -10,7 +10,6 @@ REACHABLE_DOMAIN='http://localhost:8008' # Explicit authorisation to use the code has been granted by the original author # for use by members of the Rory& system (https://rory.gay) - # the magic function: register(){ echo "Registering $1" @@ -23,8 +22,6 @@ register(){ # -- END OF LICENSED CODE - - PASSWD=`cat /etc/matrix-user-pass` for u in {draupnir,Alicia,Emma,Rory,root,Quetzelle} do diff --git a/host/Rory-nginx/services/containers/matrixunittests/container.nix b/host/Rory-nginx/services/containers/matrixunittests/container.nix index 7c15e04..7c15e04 100755..100644 --- 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 6ee6f26..b42a38a 100755..100644 --- a/host/Rory-nginx/services/containers/matrixunittests/root.nix +++ b/host/Rory-nginx/services/containers/matrixunittests/root.nix @@ -27,5 +27,5 @@ dig cloud-utils ]; - system.stateVersion = "22.11"; # DO NOT EDIT! + } \ No newline at end of file diff --git a/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix b/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix index a617eb2..8e49043 100755..100644 --- a/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix +++ b/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix @@ -33,6 +33,5 @@ }; }; - system.stateVersion = "22.11"; # DO NOT EDIT! } diff --git a/host/Rory-nginx/services/containers/matrixunittests/services/nginx.nix b/host/Rory-nginx/services/containers/matrixunittests/services/nginx.nix index 817822f..d6697be 100755..100644 --- a/host/Rory-nginx/services/containers/matrixunittests/services/nginx.nix +++ b/host/Rory-nginx/services/containers/matrixunittests/services/nginx.nix @@ -97,5 +97,4 @@ security.acme.acceptTerms = true; security.acme.defaults.email = "root@rory.gay"; - system.stateVersion = "22.11"; # DO NOT EDIT! } diff --git a/host/Rory-nginx/services/containers/matrixunittests/services/pantalaimon.nix b/host/Rory-nginx/services/containers/matrixunittests/services/pantalaimon.nix index 88b81a9..b5f7f77 100755..100644 --- a/host/Rory-nginx/services/containers/matrixunittests/services/pantalaimon.nix +++ b/host/Rory-nginx/services/containers/matrixunittests/services/pantalaimon.nix @@ -12,6 +12,5 @@ }; }; - system.stateVersion = "22.11"; # DO NOT EDIT! } diff --git a/host/Rory-nginx/services/containers/pluralcontactbotpoc/container.nix b/host/Rory-nginx/services/containers/pluralcontactbotpoc/container.nix index f1ddb3f..f1ddb3f 100755..100644 --- 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 6ee6f26..b42a38a 100755..100644 --- a/host/Rory-nginx/services/containers/pluralcontactbotpoc/root.nix +++ b/host/Rory-nginx/services/containers/pluralcontactbotpoc/root.nix @@ -27,5 +27,5 @@ dig cloud-utils ]; - system.stateVersion = "22.11"; # DO NOT EDIT! + } \ No newline at end of file diff --git a/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/conduit.nix b/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/conduit.nix index d0df4e8..069b055 100755..100644 --- a/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/conduit.nix +++ b/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/conduit.nix @@ -36,6 +36,5 @@ }; }; - system.stateVersion = "22.11"; # DO NOT EDIT! } diff --git a/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/nginx.nix b/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/nginx.nix index de8151c..9ec08fd 100755..100644 --- a/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/nginx.nix +++ b/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/nginx.nix @@ -97,5 +97,4 @@ security.acme.acceptTerms = true; security.acme.defaults.email = "root@rory.gay"; - system.stateVersion = "22.11"; # DO NOT EDIT! } diff --git a/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/pantalaimon.nix b/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/pantalaimon.nix index 88b81a9..b5f7f77 100755..100644 --- a/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/pantalaimon.nix +++ b/host/Rory-nginx/services/containers/pluralcontactbotpoc/services/pantalaimon.nix @@ -12,6 +12,5 @@ }; }; - system.stateVersion = "22.11"; # DO NOT EDIT! } diff --git a/host/Rory-nginx/services/discordbots.nix b/host/Rory-nginx/services/discordbots.nix index 0775d95..93622e7 100755..100644 --- a/host/Rory-nginx/services/discordbots.nix +++ b/host/Rory-nginx/services/discordbots.nix @@ -9,5 +9,4 @@ botcore-v4.modules.users ]; - system.stateVersion = "22.11"; # DO NOT EDIT! } \ No newline at end of file diff --git a/host/Rory-nginx/services/matrix/conduit.nix b/host/Rory-nginx/services/matrix/conduit.nix index ab36263..3594244 100755..100644 --- a/host/Rory-nginx/services/matrix/conduit.nix +++ b/host/Rory-nginx/services/matrix/conduit.nix @@ -29,6 +29,6 @@ Group = "root"; }; }; - system.stateVersion = "22.11"; # DO NOT EDIT! + } diff --git a/host/Rory-nginx/services/matrix/coturn.nix b/host/Rory-nginx/services/matrix/coturn.nix index 090f91d..427721a 100755..100644 --- a/host/Rory-nginx/services/matrix/coturn.nix +++ b/host/Rory-nginx/services/matrix/coturn.nix @@ -48,6 +48,6 @@ # turn_shared_secret = static-auth-secret; # turn_user_lifetime = "1h"; #}; - system.stateVersion = "22.11"; # DO NOT EDIT! + } diff --git a/host/Rory-nginx/services/matrix/draupnir.nix b/host/Rory-nginx/services/matrix/draupnir.nix index 9be989b..b5f5608 100755..100644 --- a/host/Rory-nginx/services/matrix/draupnir.nix +++ b/host/Rory-nginx/services/matrix/draupnir.nix @@ -42,6 +42,5 @@ }; }; - system.stateVersion = "22.11"; # DO NOT EDIT! } diff --git a/host/Rory-nginx/services/matrix/matrix-appservice-discord.nix b/host/Rory-nginx/services/matrix/matrix-appservice-discord.nix index 3f2225f..8c31e10 100755..100644 --- a/host/Rory-nginx/services/matrix/matrix-appservice-discord.nix +++ b/host/Rory-nginx/services/matrix/matrix-appservice-discord.nix @@ -21,6 +21,6 @@ }; }; }; - system.stateVersion = "22.11"; # DO NOT EDIT! + } diff --git a/host/Rory-nginx/services/matrix/root.nix b/host/Rory-nginx/services/matrix/root.nix index e9ce5c5..d624542 100755..100644 --- a/host/Rory-nginx/services/matrix/root.nix +++ b/host/Rory-nginx/services/matrix/root.nix @@ -10,5 +10,4 @@ ./conduit.nix ]; - system.stateVersion = "22.11"; # DO NOT EDIT! } \ No newline at end of file diff --git a/host/Rory-nginx/services/matrix/synapse.nix b/host/Rory-nginx/services/matrix/synapse.nix index f9b746d..d41072e 100755..100644 --- a/host/Rory-nginx/services/matrix/synapse.nix +++ b/host/Rory-nginx/services/matrix/synapse.nix @@ -36,7 +36,6 @@ }; }; - # Alicia - figure this out later... #registration_shared_secret = builtins.exec ["cat" "/dev/urandom" "|" "tr" "-dc" "a-zA-Z0-9" "|" "fold" "-w" "256" "|" "head" "-n" "1"]; registration_shared_secret_path = "/var/lib/matrix-synapse/registration_shared_secret.txt"; @@ -205,6 +204,6 @@ WorkingDirectory = "/var/lib/matrix-synapse"; }; }; - system.stateVersion = "22.11"; # DO NOT EDIT! + } 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 100755..100644 --- 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 100755..100644 --- 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 ac1f29b..4364a2b 100755..100644 --- a/host/Rory-nginx/services/nginx/nginx.nix +++ b/host/Rory-nginx/services/nginx/nginx.nix @@ -90,5 +90,4 @@ #gitfs ]; - system.stateVersion = "22.11"; # DO NOT EDIT! } 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 100755..100644 --- 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 100755..100644 --- 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 03072af..5d96342 100755..100644 --- a/host/Rory-nginx/services/nginx/rory.gay/conduit.nix +++ b/host/Rory-nginx/services/nginx/rory.gay/conduit.nix @@ -23,7 +23,6 @@ }; #locations."/_synapse/client".proxyPass = "http://192.168.1.5:8008"; - locations."= /.well-known/matrix/server".extraConfig = '' more_set_headers 'Content-Type application/json'; more_set_headers 'Access-Control-Allow-Origin *'; 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 100755..100644 --- 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 100755..100644 --- 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 100755..100644 --- 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 46514a2..c7b3e5d 100755..100644 --- a/host/Rory-nginx/services/nginx/rory.gay/matrix.nix +++ b/host/Rory-nginx/services/nginx/rory.gay/matrix.nix @@ -148,7 +148,6 @@ proxyPass = "http://stream_writer_typing_stream_workers_upstream$request_uri"; }; - # https://matrix-org.github.io/synapse/latest/workers.html#the-to_device-stream locations."~ ^/_matrix/client/(r0|v3|unstable)/sendToDevice/" = { proxyPass = "http://stream_writer_to_device_stream_workers_upstream$request_uri"; @@ -245,7 +244,6 @@ proxyPass = "http://generic_workers_upstream$request_uri"; }; - ##### media repo # https://matrix-org.github.io/synapse/latest/workers.html#synapseappmedia_repository @@ -271,7 +269,6 @@ proxyPass = "http://media_repository_workers_upstream$request_uri"; }; - #locations."/" = { #resolver 127.0.0.11 valid=5s; #set $backend "matrix-synapse:8048"; 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 100755..100644 --- 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 100755..100644 --- 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 100755..100644 --- 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 100755..100644 --- 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 100755..100644 --- 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 100755..100644 --- 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 100755..100644 --- 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 100755..100644 --- 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 100755..100644 --- 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 100755..100644 --- 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 100755..100644 --- 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 100755..100644 --- 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 100755..100644 --- 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 100755..100644 --- 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 100755..100644 --- 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 100755..100644 --- 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 100755..100644 --- 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 d5acd3c..26ceed7 100755..100644 --- a/host/Rory-nginx/services/postgres.nix +++ b/host/Rory-nginx/services/postgres.nix @@ -30,6 +30,5 @@ }; }; - system.stateVersion = "22.11"; # DO NOT EDIT! } diff --git a/host/Rory-wsl/configuration.nix b/host/Rory-wsl/configuration.nix new file mode 100644 index 0000000..35eaff5 --- /dev/null +++ b/host/Rory-wsl/configuration.nix @@ -0,0 +1,46 @@ +{ lib, pkgs, config, modulesPath, ... }: + +{ + wsl = { + enable = true; + automountPath = "/mnt"; + defaultUser = "nixos"; + startMenuLaunchers = true; + + # Enable native Docker support + # docker-native.enable = true; + + # Enable integration with Docker Desktop (needs to be installed) + # docker-desktop.enable = true; + + }; + + nix.extraOptions = '' + experimental-features = nix-command flakes + ''; + + environment.systemPackages = with pkgs; [ + wget + neofetch + lnav + git + lsd + duf + htop + btop + kitty.terminfo + jq + yq + pv + dig + cinnamon.nemo + gnome-console + kitty + feh + vimPlugins.vim-nix + neovim + tree + ]; + + system.stateVersion = "23.05"; +} diff --git a/host/RoryNix/configuration.nix b/host/RoryNix/configuration.nix index 1f86609..26c1c25 100644 --- a/host/RoryNix/configuration.nix +++ b/host/RoryNix/configuration.nix @@ -80,7 +80,6 @@ }; }; - sound.enable = true; hardware.pulseaudio.enable = false; @@ -161,7 +160,6 @@ sudo.wheelNeedsPassword = false; }; - system.stateVersion = "22.11"; # DO NOT EDIT! } diff --git a/modules/base-client.nix b/modules/base-client.nix index 1f482ee..78988b9 100755..100644 --- a/modules/base-client.nix +++ b/modules/base-client.nix @@ -57,5 +57,4 @@ sudo.wheelNeedsPassword = false; }; - system.stateVersion = "22.11"; # DO NOT EDIT! } diff --git a/modules/base-server.nix b/modules/base-server.nix index e579c6d..8986ee3 100755..100644 --- a/modules/base-server.nix +++ b/modules/base-server.nix @@ -56,7 +56,6 @@ nix.daemonIOSchedClass = lib.mkDefault "idle"; nix.daemonIOSchedPriority = lib.mkDefault 7; - # My servers always use /dev/sda as boot disk... boot = { kernelPackages = pkgs.linuxPackages_latest; diff --git a/modules/base.nix b/modules/base.nix index 35a0b17..032df12 100755..100644 --- a/modules/base.nix +++ b/modules/base.nix @@ -67,7 +67,6 @@ }; }; - systemd = { sleep.extraConfig = '' AllowSuspend=no @@ -112,5 +111,4 @@ sudo.wheelNeedsPassword = false; }; - system.stateVersion = "22.11"; # DO NOT EDIT! } diff --git a/modules/environments/home.nix b/modules/environments/home.nix index 8e90207..9408644 100755..100644 --- a/modules/environments/home.nix +++ b/modules/environments/home.nix @@ -37,5 +37,5 @@ ]; }; }; - system.stateVersion = "22.11"; # DO NOT EDIT! + } diff --git a/modules/extra-substituters.nix b/modules/extra-substituters.nix index e6b24a8..9eea94f 100644 --- a/modules/extra-substituters.nix +++ b/modules/extra-substituters.nix @@ -13,5 +13,4 @@ "numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE=" ]; - system.stateVersion = "22.11"; # DO NOT EDIT! } diff --git a/modules/packages/gitfs.nix b/modules/packages/gitfs.nix index 804a747..804a747 100755..100644 --- 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 100755..100644 --- a/modules/packages/vim.nix +++ b/modules/packages/vim.nix diff --git a/modules/users/Rory.nix b/modules/users/Rory.nix index daafb15..94b702f 100755..100644 --- a/modules/users/Rory.nix +++ b/modules/users/Rory.nix @@ -30,7 +30,6 @@ }; }; - home.stateVersion = "22.11"; }; } diff --git a/modules/users/chris.nix b/modules/users/chris.nix index 86acee5..86acee5 100755..100644 --- 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 100755..100644 --- 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 100755..100644 --- a/modules/users/levi.nix +++ b/modules/users/levi.nix diff --git a/rebuild.sh b/rebuild.sh index 0e02eab..0e02eab 100755..100644 --- a/rebuild.sh +++ b/rebuild.sh diff --git a/update.sh b/update.sh index 6ce5622..6ce5622 100755..100644 --- a/update.sh +++ b/update.sh |