From 70f1c0059e03c6c5061dd3ae4991469e908e7693 Mon Sep 17 00:00:00 2001 From: Jimbo Date: Tue, 27 Aug 2024 14:52:05 -0400 Subject: [PATCH] Comment out nextcloud for now and Jimbo --- configuration.nix | 65 ++++++++++++++++++++++++----------------------- freecorn.nix | 2 ++ jimbo.nix | 25 ++++++++++++++++++ 3 files changed, 60 insertions(+), 32 deletions(-) create mode 100644 jimbo.nix diff --git a/configuration.nix b/configuration.nix index 1bbbeef..d808fff 100644 --- a/configuration.nix +++ b/configuration.nix @@ -12,6 +12,7 @@ in imports = [ ./hardware-configuration.nix ./freecorn.nix + ./jimbo.nix "${homeManager}/nixos" ]; @@ -136,21 +137,21 @@ in }; }; - # Nextcloud Proxy - "cloud.${secrets.cornDomain}" = { - enableACME = true; - addSSL = true; - locations."/" = { - proxyWebsockets = true; - extraConfig = '' - location /.well-known/carddav { - return 301 $scheme://$host/remote.php/dav; - } - location /.well-known/caldav { - return 301 $scheme://$host/remote.php/dav; - ''; - }; - }; +# # Nextcloud Proxy +# "cloud.${secrets.cornDomain}" = { +# enableACME = true; +# addSSL = true; +# locations."/" = { +# proxyWebsockets = true; +# extraConfig = '' +# location /.well-known/carddav { +# return 301 $scheme://$host/remote.php/dav; +# } +# location /.well-known/caldav { +# return 301 $scheme://$host/remote.php/dav; +# ''; +# }; +# }; }; appendConfig = '' rtmp { @@ -168,23 +169,23 @@ in ''; }; - # Nextcloud server - services.nextcloud = { - enable = true; - package = pkgs.nextcloud29; - hostName = "cloud.${secrets.cornDomain}"; - datadir = "/nextcloud"; - https = true; - config = { - adminuser = "freecorn"; - adminpassFile = "/nextcloud/password.txt"; - }; - settings = { - trusted_proxies = [ "127.0.0.1" ]; - trusted_domains = [ "cloud.${secrets.cornDomain}" ]; - overwriteprotocol = "https"; - }; - }; +# # Nextcloud server +# services.nextcloud = { +# enable = true; +# package = pkgs.nextcloud29; +# hostName = "cloud.${secrets.cornDomain}"; +# datadir = "/nextcloud"; +# https = true; +# config = { +# adminuser = "freecorn"; +# adminpassFile = "/nextcloud/password.txt"; +# }; +# settings = { +# trusted_proxies = [ "127.0.0.1" ]; +# trusted_domains = [ "cloud.${secrets.cornDomain}" ]; +# overwriteprotocol = "https"; +# }; +# }; # Get certificates for Coturn security.acme = { diff --git a/freecorn.nix b/freecorn.nix index 906d1d5..fc53adc 100644 --- a/freecorn.nix +++ b/freecorn.nix @@ -10,6 +10,8 @@ "scanner" "lp" "plugdev" + "nginx" + "nfsShare" ]; }; diff --git a/jimbo.nix b/jimbo.nix new file mode 100644 index 0000000..8a657ce --- /dev/null +++ b/jimbo.nix @@ -0,0 +1,25 @@ +{ + # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.jimbo = { + description = "Jimbo"; + isNormalUser = true; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJPjBdQrL23pDbcsNCLMvJhcNF7+u95ZV7o1QemOmegf jimbo@JimDesktop" + ]; + extraGroups = [ + "networkmanager" + "wheel" + "nginx" + ]; + }; + + # Define home manager programs and configs + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + users.jimbo = { config, pkgs, ... }: { + # Don't change this + home.stateVersion = "24.05"; + }; + }; +}