Compare commits
5 commits
master
...
bootstrap/
| Author | SHA1 | Date | |
|---|---|---|---|
| 86bfff26f7 | |||
| 211a9417f8 | |||
| 30ba40e2ac | |||
| 0198191f38 | |||
| 0f64a9ff0c |
6 changed files with 47 additions and 3 deletions
39
flake.lock
generated
39
flake.lock
generated
|
|
@ -287,6 +287,27 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"home-manager-stable": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs-stable"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1706981411,
|
||||||
|
"narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "home-manager",
|
||||||
|
"rev": "652fda4ca6dafeb090943422c34ae9145787af37",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"ref": "release-23.11",
|
||||||
|
"repo": "home-manager",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"home-manager_2": {
|
"home-manager_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
|
@ -507,6 +528,22 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs-stable": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1710283656,
|
||||||
|
"narHash": "sha256-nI+AOy4uK6jLGBi9nsbHjL1EdSIzoo8oa+9oeVhbyFc=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "51063ed4f2343a59fdeebb279bb81d87d453942b",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixos-23.11",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1705133751,
|
"lastModified": 1705133751,
|
||||||
|
|
@ -579,6 +616,7 @@
|
||||||
"fast-syntax-highlighting": "fast-syntax-highlighting",
|
"fast-syntax-highlighting": "fast-syntax-highlighting",
|
||||||
"home-manager": "home-manager_2",
|
"home-manager": "home-manager_2",
|
||||||
"home-manager-raccoon": "home-manager-raccoon",
|
"home-manager-raccoon": "home-manager-raccoon",
|
||||||
|
"home-manager-stable": "home-manager-stable",
|
||||||
"hosts-blocklists": "hosts-blocklists",
|
"hosts-blocklists": "hosts-blocklists",
|
||||||
"linux-tkg": "linux-tkg",
|
"linux-tkg": "linux-tkg",
|
||||||
"neovim-nightly": "neovim-nightly",
|
"neovim-nightly": "neovim-nightly",
|
||||||
|
|
@ -587,6 +625,7 @@
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nixpkgs": "nixpkgs_2",
|
"nixpkgs": "nixpkgs_2",
|
||||||
"nixpkgs-raccoon": "nixpkgs-raccoon",
|
"nixpkgs-raccoon": "nixpkgs-raccoon",
|
||||||
|
"nixpkgs-stable": "nixpkgs-stable",
|
||||||
"nvim-treesitter": "nvim-treesitter",
|
"nvim-treesitter": "nvim-treesitter",
|
||||||
"packwiz": "packwiz",
|
"packwiz": "packwiz",
|
||||||
"pure": "pure",
|
"pure": "pure",
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,8 @@
|
||||||
security
|
security
|
||||||
#wireguard
|
#wireguard
|
||||||
|
|
||||||
|
modules.services.postgres
|
||||||
|
|
||||||
./filesystem.nix
|
./filesystem.nix
|
||||||
./kernel.nix
|
./kernel.nix
|
||||||
./networking.nix
|
./networking.nix
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, ... }:
|
{ config, lib, ... }:
|
||||||
let
|
let
|
||||||
bind = src: {
|
bind = src: {
|
||||||
depends = [ "/nix" ];
|
depends = [ "/nix" ];
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, lib, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
let
|
let
|
||||||
dir = "/persist/postgresql/${config.services.postgresql.package.psqlSchema}";
|
dir = "/persist/postgresql/${config.services.postgresql.package.psqlSchema}";
|
||||||
uid = toString config.ids.uids.postgres;
|
uid = toString config.ids.uids.postgres;
|
||||||
|
|
@ -8,6 +8,7 @@ in {
|
||||||
services.postgresql = {
|
services.postgresql = {
|
||||||
enable = true;
|
enable = true;
|
||||||
dataDir = dir;
|
dataDir = dir;
|
||||||
|
package = pkgs.postgresql_13;
|
||||||
authentication = lib.mkOverride 10 ''
|
authentication = lib.mkOverride 10 ''
|
||||||
#type database DBuser origin-address auth-method
|
#type database DBuser origin-address auth-method
|
||||||
local all all trust
|
local all all trust
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,7 @@
|
||||||
allowedUDPPortRanges = [ { from = 20000; to = 20100; } ];
|
allowedUDPPortRanges = [ { from = 20000; to = 20100; } ];
|
||||||
allowedTCPPortRanges = [ { from = 20000; to = 20100; } ];
|
allowedTCPPortRanges = [ { from = 20000; to = 20100; } ];
|
||||||
trustedInterfaces = [ "wg0" ];
|
trustedInterfaces = [ "wg0" ];
|
||||||
|
logRefusedConnections = false;
|
||||||
|
|
||||||
extraCommands = genCmds "I";
|
extraCommands = genCmds "I";
|
||||||
extraStopCommands = genCmds "D";
|
extraStopCommands = genCmds "D";
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,11 @@
|
||||||
{ config, lib, modules, pkgs, ... }: {
|
{ config, lib, modules, pkgs, ... }: {
|
||||||
|
programs.zsh.enable = true;
|
||||||
users.users.hana = {
|
users.users.hana = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
extraGroups = [ "wheel" ];
|
extraGroups = [ "wheel" ];
|
||||||
shell = pkgs.zsh;
|
shell = pkgs.zsh;
|
||||||
uid = 1002;
|
uid = 1002;
|
||||||
hashedPassword = "$y$j9T$BxnsFaGwBfSKe4jAJaaxI.$cpFtu8fzFhKalIV3WGuA2jz4//KJBwhiybpnlmoZPy.";
|
hashedPassword = "$y$j9T$3xCNDudmfrIu5VfQQoDkj/$ugzJWq0gORN9jnhDsREu31CkL3zwniQu6KoLbmg6Wr/";
|
||||||
openssh.authorizedKeys.keys = [
|
openssh.authorizedKeys.keys = [
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPru5eTBvHJ4ZmrrzPRHCGM09wQP/ZHSaKYalDuBVO15 rin@blossom"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPru5eTBvHJ4ZmrrzPRHCGM09wQP/ZHSaKYalDuBVO15 rin@blossom"
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ5l9t8dc6mPsKKYqZlPKvhOdyqz+DS5UOcvHuh3uVGt @strawberry"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ5l9t8dc6mPsKKYqZlPKvhOdyqz+DS5UOcvHuh3uVGt @strawberry"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue