mirror of
https://codeberg.org/ultra/nixos-dotfiles.git
synced 2024-11-24 14:43:09 +02:00
Compare commits
4 commits
f9dc4a9b9b
...
3487c0cc97
Author | SHA1 | Date | |
---|---|---|---|
3487c0cc97 | |||
6b07d57679 | |||
0b60064e08 | |||
4c7c8fbf1f |
7 changed files with 128 additions and 54 deletions
109
flake.lock
109
flake.lock
|
@ -68,11 +68,11 @@
|
||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1702290399,
|
"lastModified": 1703102678,
|
||||||
"narHash": "sha256-hIP3l1a9Jm8HZx9TuV8IoqdvFzjI+SB5Npz08oC6ZU8=",
|
"narHash": "sha256-MR91Ytt9Jf63dshn7LX64LWAVygbZgQYkcTIKhfVNXI=",
|
||||||
"owner": "elkowar",
|
"owner": "elkowar",
|
||||||
"repo": "eww",
|
"repo": "eww",
|
||||||
"rev": "fff40ce1a78d4d75bf63a8ee33dd7d9be8dc289e",
|
"rev": "65d622c81f2e753f462d23121fa1939b0a84a3e0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -174,11 +174,11 @@
|
||||||
"rust-overlay": "rust-overlay_2"
|
"rust-overlay": "rust-overlay_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1702700966,
|
"lastModified": 1706079621,
|
||||||
"narHash": "sha256-KaSAZI12mhIcYHjFiARBclIl8CoxLpx5ZafrWZMsnw4=",
|
"narHash": "sha256-grxw04yyeod5OMujsQ+xXCLP/DYMrFzLW5NqIteTGhY=",
|
||||||
"owner": "helix-editor",
|
"owner": "helix-editor",
|
||||||
"repo": "helix",
|
"repo": "helix",
|
||||||
"rev": "c56cd6ee8b9312a620d4fc38eea90a49613f5d72",
|
"rev": "83f09ecbff5160e4350c8099be1ad4c64513f665",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -195,11 +195,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1702814335,
|
"lastModified": 1706080884,
|
||||||
"narHash": "sha256-Qck7BAMi3eydzT1WFOzp/SgECetyPpOn1dLgmxH2ebQ=",
|
"narHash": "sha256-qhxisCrSraN5YWVb0lNCFH8ovqnCw5W9ldac4Dzr0Nw=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "e4dba0bd01956170667458be7b45f68170a63651",
|
"rev": "6b28ab2d798c1c84e24053d95f4ee1dd9d81e2fb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -215,11 +215,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1702242899,
|
"lastModified": 1705671586,
|
||||||
"narHash": "sha256-p2FmwhHlIW3V8YzlRu/bWCiKa2a9fSardt9Eh22JlWE=",
|
"narHash": "sha256-JOwVlSgwo2nqQRcArelrx/lK9OUoUxaXUQThQw1q8oA=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "contrib",
|
"repo": "contrib",
|
||||||
"rev": "740dbac96354c076a76b7cf6fe70dad150d21659",
|
"rev": "72a67d0f58d0ed44a20341fddb2bdfa33c2a2558",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -239,11 +239,11 @@
|
||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1702759678,
|
"lastModified": 1706055301,
|
||||||
"narHash": "sha256-+UGyDbOEvKewPkDD1tj1M3rcBTkX7UgE4zh8N1Hh2+o=",
|
"narHash": "sha256-2djVaMM6n+2KAiptPB9dQ22g3X26yVO6WXrBUTwNv6I=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "Hyprland",
|
"repo": "Hyprland",
|
||||||
"rev": "9ca0c7d814d6039450ff0341556faa1ce9b37e82",
|
"rev": "df17991b1c3f9f5f8da546f2523e5092e266123a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -277,6 +277,28 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"hyprlang": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"hyprland",
|
||||||
|
"xdph",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1704287638,
|
||||||
|
"narHash": "sha256-TuRXJGwtK440AXQNl5eiqmQqY4LZ/9+z/R7xC0ie3iA=",
|
||||||
|
"owner": "hyprwm",
|
||||||
|
"repo": "hyprlang",
|
||||||
|
"rev": "6624f2bb66d4d27975766e81f77174adbe58ec97",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "hyprwm",
|
||||||
|
"repo": "hyprlang",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"mailserver": {
|
"mailserver": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"blobs": "blobs",
|
"blobs": "blobs",
|
||||||
|
@ -289,11 +311,11 @@
|
||||||
"utils": "utils"
|
"utils": "utils"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1700085753,
|
"lastModified": 1703666786,
|
||||||
"narHash": "sha256-qtib7f3eRwfaUF+VziJXiBcZFqpHCAXS4HlrFsnzzl4=",
|
"narHash": "sha256-SLPNpM/rI8XPyVJAxMYAe+n6NiYSpuXvdwPILHP4yZI=",
|
||||||
"owner": "simple-nixos-mailserver",
|
"owner": "simple-nixos-mailserver",
|
||||||
"repo": "nixos-mailserver",
|
"repo": "nixos-mailserver",
|
||||||
"rev": "008d78cc21959e33d0d31f375b88353a7d7121ae",
|
"rev": "b5023b36a1f6628865cb42b4353bd2ddde0ea9f4",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -309,11 +331,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1702567580,
|
"lastModified": 1705251288,
|
||||||
"narHash": "sha256-lmO5UWwCyFD1WhwHru6Xb0zSRBGcIyqhyX3vVSGNTR0=",
|
"narHash": "sha256-TwCR7tZvrjsvz6SmgjWYOne7Qz7J2jn4Cr4Er0Yj+LA=",
|
||||||
"owner": "viperML",
|
"owner": "viperML",
|
||||||
"repo": "nh",
|
"repo": "nh",
|
||||||
"rev": "bd225f25992098122d83b28579a710d4181e0008",
|
"rev": "36eba281576afe0f67e5aafb4e7a414f256dba31",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -344,11 +366,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1702782546,
|
"lastModified": 1705806513,
|
||||||
"narHash": "sha256-Y/y9Xpd8W2CSFIAXJExAvg72J8STmGk7CP2Vv91t930=",
|
"narHash": "sha256-FcOmNjhHFfPz2udZbRpZ1sfyhVMr+C2O8kOxPj+HDDk=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nix-index-database",
|
"repo": "nix-index-database",
|
||||||
"rev": "27edc98a32959b003e4bcef9719ad6f24e312343",
|
"rev": "f8e04fbcebcc24cebc91989981bd45f69b963ed7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -365,11 +387,11 @@
|
||||||
"utils": "utils_2"
|
"utils": "utils_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1693158194,
|
"lastModified": 1703105285,
|
||||||
"narHash": "sha256-jDTKAmei9UgwoVHAskalRilTunWYlWOESNGY4BKscuU=",
|
"narHash": "sha256-BHoW1RQMc2Auz8paBvTBriKv0F6FI99+3nnz/ELLawg=",
|
||||||
"owner": "vlinkz",
|
"owner": "vlinkz",
|
||||||
"repo": "nix-software-center",
|
"repo": "nix-software-center",
|
||||||
"rev": "8faa762f9b710520f8b7f81f4892a6e0aba749dc",
|
"rev": "68e87fb6e24fb3e6fe65449918d0cbda96622b65",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -380,11 +402,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1702453208,
|
"lastModified": 1706085157,
|
||||||
"narHash": "sha256-0wRi9SposfE2wHqjuKt8WO2izKB/ASDOV91URunIqgo=",
|
"narHash": "sha256-0pTbYwn9qubaZLtuN0Ouj0neEfrir1wSNyH8gL1BzB0=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "7763c6fd1f299cb9361ff2abf755ed9619ef01d6",
|
"rev": "e756ff62c2e9db4f7c197bc1849a02024a7bfb2e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -395,11 +417,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1702312524,
|
"lastModified": 1705856552,
|
||||||
"narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
|
"narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "a9bf124c46ef298113270b1f84a164865987a91c",
|
"rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -459,11 +481,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-master": {
|
"nixpkgs-master": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1702819843,
|
"lastModified": 1706086953,
|
||||||
"narHash": "sha256-bYZOBwiA3sKcGlltj/SjDLV+2y4raPKo2MvlqgjgtSo=",
|
"narHash": "sha256-NLEjBiYLquBDaezx5Fmtyf8hpI3aRzGJB9xc/SQiNm4=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "e9b7a386120656f13c4a2bab676e81056f97171d",
|
"rev": "d53d676060e2b6b803fa02290d77171aa4746fe4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -619,18 +641,18 @@
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"host": "gitlab.freedesktop.org",
|
"host": "gitlab.freedesktop.org",
|
||||||
"lastModified": 1701368958,
|
"lastModified": 1703963193,
|
||||||
"narHash": "sha256-7kvyoA91etzVEl9mkA/EJfB6z/PltxX7Xc4gcr7/xlo=",
|
"narHash": "sha256-ke8drv6PTrdQDruWbajrRJffP9A9PU6FRyjJGNZRTs4=",
|
||||||
"owner": "wlroots",
|
"owner": "wlroots",
|
||||||
"repo": "wlroots",
|
"repo": "wlroots",
|
||||||
"rev": "5d639394f3e83b01596dcd166a44a9a1a2583350",
|
"rev": "f81c3d93cd6f61b20ae784297679283438def8df",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"host": "gitlab.freedesktop.org",
|
"host": "gitlab.freedesktop.org",
|
||||||
"owner": "wlroots",
|
"owner": "wlroots",
|
||||||
"repo": "wlroots",
|
"repo": "wlroots",
|
||||||
"rev": "5d639394f3e83b01596dcd166a44a9a1a2583350",
|
"rev": "f81c3d93cd6f61b20ae784297679283438def8df",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -640,6 +662,7 @@
|
||||||
"hyprland",
|
"hyprland",
|
||||||
"hyprland-protocols"
|
"hyprland-protocols"
|
||||||
],
|
],
|
||||||
|
"hyprlang": "hyprlang",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"hyprland",
|
"hyprland",
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
|
@ -650,11 +673,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1702334919,
|
"lastModified": 1704659450,
|
||||||
"narHash": "sha256-ibOZ3TLjqndGMcj2f+07NFwDWoum4IbzF58byZuJJNg=",
|
"narHash": "sha256-3lyoUVtUWz1LuxbltAtkJSK2IlVXmKhxCRU2/0PYCms=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "xdg-desktop-portal-hyprland",
|
"repo": "xdg-desktop-portal-hyprland",
|
||||||
"rev": "f5c3576c3b6cb1c31a8dfa3e4113f59bfe40cd71",
|
"rev": "6a5de92769d5b7038134044053f90e7458f6a197",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -16,6 +16,7 @@ in {
|
||||||
( import ./services/forge.nix inputs )
|
( import ./services/forge.nix inputs )
|
||||||
( import ./services/cloud.nix inputs )
|
( import ./services/cloud.nix inputs )
|
||||||
( import ./services/vaultwarden.nix inputs )
|
( import ./services/vaultwarden.nix inputs )
|
||||||
|
( import ./services/matrix.nix inputs )
|
||||||
# ( import ./services/caddy.nix inputs ) # doesn't work
|
# ( import ./services/caddy.nix inputs ) # doesn't work
|
||||||
# ( import ./services/dnsmasq.nix inputs ) # borks my DNS
|
# ( import ./services/dnsmasq.nix inputs ) # borks my DNS
|
||||||
# ( import ./services/mail-server.nix inputs ) # needs a lot of DNS configs from cloudflaer, I only have 3 rules
|
# ( import ./services/mail-server.nix inputs ) # needs a lot of DNS configs from cloudflaer, I only have 3 rules
|
||||||
|
@ -62,17 +63,18 @@ in {
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
hostName = "titan"; # Define your hostname.
|
hostName = "titan"; # Define your hostname.
|
||||||
|
domain = "gra.phite.ro";
|
||||||
|
|
||||||
# Enable networking
|
# Enable networking
|
||||||
networkmanager.enable = true;
|
networkmanager.enable = true;
|
||||||
|
|
||||||
hosts = {
|
# hosts = {
|
||||||
"192.168.0.221" = [ "pi" "pi-master" ];
|
# "192.168.0.221" = [ "pi" "pi-master" ];
|
||||||
};
|
# };
|
||||||
|
|
||||||
nameservers = [
|
# nameservers = [
|
||||||
"192.168.1.221"
|
# "192.168.1.221"
|
||||||
];
|
# ];
|
||||||
};
|
};
|
||||||
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
||||||
|
|
||||||
|
@ -129,6 +131,7 @@ in {
|
||||||
"wheel"
|
"wheel"
|
||||||
"vboxusers"
|
"vboxusers"
|
||||||
"input"
|
"input"
|
||||||
|
"uinput"
|
||||||
];
|
];
|
||||||
shell = pkgs.fish;
|
shell = pkgs.fish;
|
||||||
hashedPassword = "$6$OBjnSQhhJgHsr5LE$jFtUz.2qv0l2viv86exXmfHWC0fDFXKD3rqH41NmqgkdoBrwY2rPkDBCPjdq7PSoeudYcQ0nXxJvh1N7EIUs90";
|
hashedPassword = "$6$OBjnSQhhJgHsr5LE$jFtUz.2qv0l2viv86exXmfHWC0fDFXKD3rqH41NmqgkdoBrwY2rPkDBCPjdq7PSoeudYcQ0nXxJvh1N7EIUs90";
|
||||||
|
@ -332,6 +335,10 @@ in {
|
||||||
tailscale = {
|
tailscale = {
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
|
avahi = {
|
||||||
|
enable = true;
|
||||||
|
nssmdns = true;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# create a oneshot job to authenticate to Tailscale
|
# create a oneshot job to authenticate to Tailscale
|
||||||
|
|
|
@ -23,10 +23,11 @@
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices = [ /* {
|
swapDevices = [
|
||||||
|
{
|
||||||
device = "/var/lib/swapfile";
|
device = "/var/lib/swapfile";
|
||||||
size = 64 * 1024;
|
size = 64 * 1024;
|
||||||
} */
|
}
|
||||||
{
|
{
|
||||||
device = "/dev/sda2";
|
device = "/dev/sda2";
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,9 +8,10 @@ inputs: { pkgs, config, ... }: {
|
||||||
extraTrustedDomains = [
|
extraTrustedDomains = [
|
||||||
"cloud.gra.phite.ro"
|
"cloud.gra.phite.ro"
|
||||||
];
|
];
|
||||||
|
overwriteProtocol = "https";
|
||||||
};
|
};
|
||||||
extraApps = with config.services.nextcloud.package.packages.apps; {
|
extraApps = with config.services.nextcloud.package.packages.apps; {
|
||||||
inherit news files_markdown files_texteditor forms maps memories music onlyoffice polls;
|
inherit news files_markdown files_texteditor forms maps memories music onlyoffice polls calendar tasks;
|
||||||
};
|
};
|
||||||
/*
|
/*
|
||||||
extraOptions = {
|
extraOptions = {
|
||||||
|
|
|
@ -17,6 +17,11 @@ inputs: { config, pkgs, ... }: {
|
||||||
appName = "Graphite's Forge";
|
appName = "Graphite's Forge";
|
||||||
domain = "git.gra.phite.ro";
|
domain = "git.gra.phite.ro";
|
||||||
rootUrl = "https://git.gra.phite.ro";
|
rootUrl = "https://git.gra.phite.ro";
|
||||||
|
settings = {
|
||||||
|
server = {
|
||||||
|
HTTP_PORT = 3004;
|
||||||
|
};
|
||||||
|
};
|
||||||
lfs.enable = true;
|
lfs.enable = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
36
hosts/titan/services/matrix.nix
Normal file
36
hosts/titan/services/matrix.nix
Normal file
|
@ -0,0 +1,36 @@
|
||||||
|
inputs: { pkgs, ... }: {
|
||||||
|
services.postgresql.enable = true;
|
||||||
|
services.postgresql.initialScript = pkgs.writeText "synapse-init.sql" ''
|
||||||
|
CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD 'synapse';
|
||||||
|
CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse"
|
||||||
|
TEMPLATE template0
|
||||||
|
LC_COLLATE = "C"
|
||||||
|
LC_CTYPE = "C";
|
||||||
|
'';
|
||||||
|
services.matrix-synapse = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
registration_shared_secret_path = "/var/synapse/.synapseregsec";
|
||||||
|
server_name = "gra.phite.ro";
|
||||||
|
public_baseurl = "https://matrix.gra.phite.ro";
|
||||||
|
listeners = [
|
||||||
|
{
|
||||||
|
port = 3003;
|
||||||
|
bind_addresses = [ "127.0.0.1" ];
|
||||||
|
|
||||||
|
# Caddy handles HTTPS and TLS
|
||||||
|
type = "http";
|
||||||
|
tls = false;
|
||||||
|
|
||||||
|
x_forwarded = true;
|
||||||
|
resources = [
|
||||||
|
{
|
||||||
|
names = [ "client" "federation" ];
|
||||||
|
compress = true;
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -186,6 +186,7 @@ in {
|
||||||
vesktop
|
vesktop
|
||||||
ktailctl
|
ktailctl
|
||||||
caddy
|
caddy
|
||||||
|
floorp
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue