mirror of
https://github.com/Nickiel12/nicks-nix-config.git
synced 2024-11-24 13:45:29 -08:00
Compare commits
No commits in common. "ab4faa2f7e127cca18ebdb2ffcc89e1d25178cfa" and "8b3c0c24456ee41959d74d7e5d7b6ad4f59bb3eb" have entirely different histories.
ab4faa2f7e
...
8b3c0c2445
7 changed files with 129 additions and 141 deletions
75
flake.lock
75
flake.lock
|
|
@ -10,11 +10,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720713779,
|
"lastModified": 1719991445,
|
||||||
"narHash": "sha256-0De2TpilkMce0HRmy6l9YwbTtCx6cj/fVZcw/s+un6E=",
|
"narHash": "sha256-0zSXPres0wlhS9n6h44ZzV0TOeWdMsICMlHAGjqkWGE=",
|
||||||
"owner": "atuinsh",
|
"owner": "atuinsh",
|
||||||
"repo": "atuin",
|
"repo": "atuin",
|
||||||
"rev": "8f5af526d31794e3bdf3f4787347f449aa13294f",
|
"rev": "a67cfc82fe0dc907a01f07a0fd625701e062a33b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -132,6 +132,22 @@
|
||||||
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
|
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"flake-compat_4": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1696426674,
|
||||||
|
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||||
|
"owner": "edolstra",
|
||||||
|
"repo": "flake-compat",
|
||||||
|
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "edolstra",
|
||||||
|
"repo": "flake-compat",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"flake-parts": {
|
"flake-parts": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs-lib": [
|
"nixpkgs-lib": [
|
||||||
|
|
@ -245,10 +261,7 @@
|
||||||
},
|
},
|
||||||
"git-hooks": {
|
"git-hooks": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": [
|
"flake-compat": "flake-compat_4",
|
||||||
"nixvim",
|
|
||||||
"flake-compat"
|
|
||||||
],
|
|
||||||
"gitignore": "gitignore",
|
"gitignore": "gitignore",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixvim",
|
"nixvim",
|
||||||
|
|
@ -326,11 +339,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720734513,
|
"lastModified": 1720135141,
|
||||||
"narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=",
|
"narHash": "sha256-1GHh1/WO+f42TXxb1WiZFMuepM7ITA9iT+6yJBbBNsY=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "90ae324e2c56af10f20549ab72014804a3064c7f",
|
"rev": "c514e862cd5705e51edb6fe8d01146fdeec661f2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -366,11 +379,11 @@
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "nix",
|
"dir": "nix",
|
||||||
"lastModified": 1720421296,
|
"lastModified": 1717741147,
|
||||||
"narHash": "sha256-Pl8n7CkrurvRFGyWV6oi9jmxRHDcsrcM4AlUMYG0rwU=",
|
"narHash": "sha256-Zz1xi6Fy8QrYkaC7WuKjUt8sxJmP9xd7+kHlkdjQ7qE=",
|
||||||
"owner": "kmonad",
|
"owner": "kmonad",
|
||||||
"repo": "kmonad",
|
"repo": "kmonad",
|
||||||
"rev": "97a3dea051a3565e97f2bdde60473a2d78182b07",
|
"rev": "235b42610758355a664c153999c1ff03b4d918e6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -427,11 +440,11 @@
|
||||||
"nixpkgs": "nixpkgs_6"
|
"nixpkgs": "nixpkgs_6"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720428387,
|
"lastModified": 1719220171,
|
||||||
"narHash": "sha256-0vHxVNWTql555MZLb2kngrcjfNtsJKoYdyUivTibgnc=",
|
"narHash": "sha256-xywM6JoGT8AwfoOFJBTv8GRlvNu8LYqqqMS/OQ6uCgE=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NixOS-WSL",
|
"repo": "NixOS-WSL",
|
||||||
"rev": "30ebd0beb2ed26e09bcd245d757504029f807cce",
|
"rev": "269411cfed6aab694e46f719277c972de96177bb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -459,11 +472,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720535198,
|
"lastModified": 1719957072,
|
||||||
"narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=",
|
"narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5",
|
"rev": "7144d6241f02d171d25fba3edeaf15e0f2592105",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -491,11 +504,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720368505,
|
"lastModified": 1705242415,
|
||||||
"narHash": "sha256-5r0pInVo5d6Enti0YwUSQK4TebITypB42bWy5su3MrQ=",
|
"narHash": "sha256-a8DRYrNrzTudvO7XHUPNJD89Wbf1ZZT0VbwCsPnHWaE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ab82a9612aa45284d4adf69ee81871a389669a9e",
|
"rev": "ea780f3de2d169f982564128804841500e85e373",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -539,11 +552,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_6": {
|
"nixpkgs_6": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720244366,
|
"lastModified": 1718835956,
|
||||||
"narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=",
|
"narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40",
|
"rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -555,11 +568,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_7": {
|
"nixpkgs_7": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720542800,
|
"lastModified": 1720031269,
|
||||||
"narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=",
|
"narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "feb2849fdeb70028c70d73b848214b00d324a497",
|
"rev": "9f4128e00b0ae8ec65918efeba59db998750ead6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -597,11 +610,11 @@
|
||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1720735595,
|
"lastModified": 1720126856,
|
||||||
"narHash": "sha256-TX7PZY80h22+i01d2M1/50gfdzbvqYpmE7+s13FJnJ4=",
|
"narHash": "sha256-xtRwIUKv7EpuyGtvq+rO7PoZZIpD55AYe6rl+plEhY8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"rev": "53e85da2409ddfeef27e8cdc9c020433614329f9",
|
"rev": "92e9f5466dcfd51e8e2e7627e992c1c9d5fc6fd6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,6 @@
|
||||||
./modules/nginx.nix
|
./modules/nginx.nix
|
||||||
./modules/nextcloud.nix
|
./modules/nextcloud.nix
|
||||||
./modules/nicks_nextcould_integrations.nix
|
./modules/nicks_nextcould_integrations.nix
|
||||||
./modules/postgres.nix
|
|
||||||
./modules/protonvpn.nix
|
./modules/protonvpn.nix
|
||||||
./modules/tailscale.nix
|
./modules/tailscale.nix
|
||||||
./modules/vaultwarden.nix
|
./modules/vaultwarden.nix
|
||||||
|
|
|
||||||
|
|
@ -1,78 +1,97 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
services.nextcloud = {
|
services.nextcloud = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.nextcloud29;
|
package = pkgs.nextcloud29;
|
||||||
enableImagemagick = true;
|
enableImagemagick = true;
|
||||||
nginx.recommendedHttpHeaders = true;
|
nginx.recommendedHttpHeaders = true;
|
||||||
https = true;
|
https = true;
|
||||||
hostName = "files.nickiel.net";
|
hostName = "files.nickiel.net";
|
||||||
home = "/Aurora/nextcloud";
|
home = "/Aurora/nextcloud";
|
||||||
|
|
||||||
autoUpdateApps.enable = true;
|
autoUpdateApps.enable = true;
|
||||||
|
|
||||||
phpOptions = {
|
phpOptions = {
|
||||||
"opcache.interned_strings_buffer" = "64";
|
"opcache.interned_strings_buffer" = "64";
|
||||||
};
|
};
|
||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
preview_max_x = 2048;
|
preview_max_x = 2048;
|
||||||
preview_max_y = 2048;
|
preview_max_y = 2048;
|
||||||
jpeg_quality = 50;
|
jpeg_quality = 50;
|
||||||
enable_previews = true;
|
enable_previews = true;
|
||||||
enabledPreviewProviders = [
|
enabledPreviewProviders = [
|
||||||
"OC\\Preview\\HEIC"
|
"OC\\Preview\\HEIC"
|
||||||
"OC\\Preview\\JPEG"
|
"OC\\Preview\\JPEG"
|
||||||
"OC\\Preview\\JPG"
|
"OC\\Preview\\JPG"
|
||||||
"OC\\Preview\\PNG"
|
"OC\\Preview\\PNG"
|
||||||
"OC\\Preview\\MP4"
|
"OC\\Preview\\MP4"
|
||||||
"OC\\Preview\\MOVIE"
|
"OC\\Preview\\MOVIE"
|
||||||
];
|
];
|
||||||
|
|
||||||
log_type = "file";
|
log_type = "file";
|
||||||
maintenance_window_start = "10"; # 3 AM PDT
|
maintenance_window_start = "10"; # 3 AM PDT
|
||||||
|
|
||||||
default_phone_region = "US";
|
default_phone_region = "US";
|
||||||
overwriteProtocol = "https";
|
overwriteProtocol = "https";
|
||||||
extraTrustedDomains = [
|
extraTrustedDomains = [
|
||||||
"10.0.0.183"
|
"10.0.0.183"
|
||||||
"files.nickiel.net"
|
"files.nickiel.net"
|
||||||
];
|
];
|
||||||
trustedProxies = [
|
trustedProxies = [
|
||||||
"files.nickiel.net"
|
"files.nickiel.net"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
database.createLocally = false;
|
database.createLocally = false;
|
||||||
config = {
|
config = {
|
||||||
dbtype = "pgsql";
|
dbtype = "pgsql";
|
||||||
dbuser = "nextcloud";
|
dbuser = "nextcloud";
|
||||||
dbhost = "/run/postgresql";
|
dbhost = "/run/postgresql";
|
||||||
dbname = "nextcloud";
|
dbname = "nextcloud";
|
||||||
#dbpassFile = "/Aurora/nextcloud/nextcloud-db-password";
|
#dbpassFile = "/Aurora/nextcloud/nextcloud-db-password";
|
||||||
|
|
||||||
# This doesn't seem to be working, see this documation:
|
# This doesn't seem to be working, see this documation:
|
||||||
# https://docs.nextcloud.com/server/latest/admin_manual/configuration_user/reset_admin_password.html
|
# https://docs.nextcloud.com/server/latest/admin_manual/configuration_user/reset_admin_password.html
|
||||||
adminpassFile = "/Aurora/nextcloud/nextcloud-admin-password";
|
adminpassFile = "/Aurora/nextcloud/nextcloud-admin-password";
|
||||||
adminuser = "admin";
|
adminuser = "admin";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# Make sure PostSQL is running before nextcloud
|
services.postgresql = {
|
||||||
systemd.services."nextcloud-setup" = {
|
enable = true;
|
||||||
requires = ["postgresql.service"];
|
enableTCPIP = true;
|
||||||
after = ["postgresql.service"];
|
ensureDatabases = [ "nextcloud" ];
|
||||||
};
|
ensureUsers = [
|
||||||
|
{
|
||||||
|
name = "nextcloud";
|
||||||
|
ensureDBOwnership = true;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
authentication = lib.mkForce ''
|
||||||
|
# TYPE DATABASE USER ADDRESS METHOD
|
||||||
|
local all all trust
|
||||||
|
host all all 127.0.0.1/32 trust
|
||||||
|
host all all ::1/128 trust
|
||||||
|
host all all 0.0.0.0/0 md5
|
||||||
|
''; # address is the computer you are connecting from
|
||||||
|
};
|
||||||
|
|
||||||
systemd.services.nextcloud-preview = {
|
# Make sure PostSQL is running before nextcloud
|
||||||
description = "Generate previews for all images that haven't been rendered";
|
systemd.services."nextcloud-setup" = {
|
||||||
path = with pkgs; [
|
requires = ["postgresql.service"];
|
||||||
config.services.nextcloud.occ
|
after = ["postgresql.service"];
|
||||||
];
|
};
|
||||||
script = ''
|
|
||||||
nextcloud-occ preview:pre-generate
|
systemd.services.nextcloud-preview = {
|
||||||
'';
|
description = "Generate previews for all images that haven't been rendered";
|
||||||
startAt = "01:00:00";
|
path = with pkgs; [
|
||||||
};
|
config.services.nextcloud.occ
|
||||||
|
];
|
||||||
|
script = ''
|
||||||
|
nextcloud-occ preview:pre-generate
|
||||||
|
'';
|
||||||
|
startAt = "01:00:00";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -56,10 +56,6 @@
|
||||||
"files.nickiel.net" = {
|
"files.nickiel.net" = {
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
locations."/".extraConfig = ''
|
|
||||||
allow 100.64.0.0/24;
|
|
||||||
deny all;
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
|
|
||||||
"git.nickiel.net" = {
|
"git.nickiel.net" = {
|
||||||
|
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
services.postgresql = {
|
|
||||||
enable = true;
|
|
||||||
enableTCPIP = true;
|
|
||||||
ensureDatabases = [ "nextcloud" ];
|
|
||||||
ensureUsers = [
|
|
||||||
{
|
|
||||||
name = "nextcloud";
|
|
||||||
ensureDBOwnership = true;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
authentication = lib.mkForce ''
|
|
||||||
# TYPE DATABASE USER ADDRESS METHOD
|
|
||||||
local all all trust
|
|
||||||
host all all 127.0.0.1/32 trust
|
|
||||||
host all all ::1/128 trust
|
|
||||||
host all all 0.0.0.0/0 md5
|
|
||||||
''; # address is the computer you are connecting from
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
# See https://nix-community.github.io/NixOS-WSL/how-to/change-username.html
|
# See https://nix-community.github.io/NixOS-WSL/how-to/change-username.html
|
||||||
|
|
@ -31,16 +31,4 @@
|
||||||
package = pkgs.nixVersions.stable;
|
package = pkgs.nixVersions.stable;
|
||||||
extraOptions = "experimental-features = nix-command flakes";
|
extraOptions = "experimental-features = nix-command flakes";
|
||||||
};
|
};
|
||||||
|
|
||||||
services.postgresql = {
|
|
||||||
enable = true;
|
|
||||||
enableTCPIP = true;
|
|
||||||
authentication = lib.mkForce ''
|
|
||||||
# TYPE DATABASE USER ADDRESS METHOD
|
|
||||||
local all all trust
|
|
||||||
host all all 127.0.0.1/32 trust
|
|
||||||
host all all ::1/128 trust
|
|
||||||
host all all 0.0.0.0/0 md5
|
|
||||||
''; # address is the computer you are connecting from
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -11,11 +11,6 @@ in
|
||||||
shellIntegration.enableZshIntegration = true;
|
shellIntegration.enableZshIntegration = true;
|
||||||
# theme = "colbalt-neon";
|
# theme = "colbalt-neon";
|
||||||
|
|
||||||
keybindings = {
|
|
||||||
"ctrl+shift+l" = "next_tab";
|
|
||||||
"ctrl+shift+h" = "previous_tab";
|
|
||||||
};
|
|
||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
allow_remote_control = true;
|
allow_remote_control = true;
|
||||||
shell = "zsh";
|
shell = "zsh";
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue