v/infrastructure
1
0
Fork 0
Code Issues 13 Pull requests 1 Projects Releases Packages Activity Actions

fix lint

Browse source
This commit is contained in:
Vivian 2023-11-10 23:41:30 +01:00
parent 2713f04a9e
commit 99c5b9d802
3 changed files with 114 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
nixos/common/desktop/home.nix
View file

@ -5,8 +5,7 @@ let
dnd-5e-latex-template = { pkgs = [ pkgs.v.dnd-5e-latex-template ]; }; dnd-5e-latex-template = { pkgs = [ pkgs.v.dnd-5e-latex-template ]; };
}; };
my-python-packages = ps: with ps; [ pandas requests numpy ]; my-python-packages = ps: with ps; [ pandas requests numpy ];
in in {
{
home.packages = with pkgs; [ home.packages = with pkgs; [
(python3.withPackages my-python-packages) (python3.withPackages my-python-packages)
btop btop
@ -44,9 +43,11 @@ in
# Enable my own hm modules # Enable my own hm modules
themes.v.catppuccin.enable = true; themes.v.catppuccin.enable = true;
programs = { programs = {
v.vscode.enable = true; v = {
v.nvim.enable = true; vscode.enable = true;
v.rust.enable = true; nvim.enable = true;
rust.enable = true;
};
riff = { riff = {
enable = true; enable = true;
@ -72,16 +73,13 @@ in
thunderbird = { thunderbird = {
enable = true; enable = true;
profiles.default = { profiles.default = { isDefault = true; };
isDefault = true;
};
}; };
}; };
# Syncthing # Syncthing
services.syncthing.enable = true; services.syncthing.enable = true;
xdg.userDirs = xdg.userDirs = let home = config.home.homeDirectory;
let home = config.home.homeDirectory;
in { in {
enable = true; enable = true;
createDirectories = true; createDirectories = true;

8
nixos/common/hm-modules/rust.nix
View file

@ -4,9 +4,10 @@ let cfg = config.programs.v.rust;
in { in {
options.programs.v.rust = { enable = mkEnableOption "rust"; }; options.programs.v.rust = { enable = mkEnableOption "rust"; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = with pkgs; [ rustup ]; home = {
packages = with pkgs; [ rustup ];
home.file = { file = {
".cargo/config.toml".text = '' ".cargo/config.toml".text = ''
[registries.crates-io] [registries.crates-io]
protocol = "sparse" protocol = "sparse"
@ -16,6 +17,7 @@ in {
''; '';
}; };
home.sessionPath = [ "$HOME/.cargo/bin" ]; sessionPath = [ "$HOME/.cargo/bin" ];
};
}; };
} }

15
nixos/hosts/olympus/dex/configuration.nix
View file

@ -9,8 +9,7 @@ let
db_name = "dex"; db_name = "dex";
inherit (config.meta.exposes.dex) port; inherit (config.meta.exposes.dex) port;
metricsPort = 5558; metricsPort = 5558;
in in {
{
imports = [ ]; imports = [ ];
# This value determines the NixOS release from which the default # This value determines the NixOS release from which the default
@ -23,7 +22,10 @@ in
networking.firewall.allowedTCPPorts = [ port metricsPort ]; networking.firewall.allowedTCPPorts = [ port metricsPort ];
services.postgresql = { vault-secrets.secrets.dex = { };
services = {
postgresql = {
enable = true; enable = true;
package = pkgs.postgresql_15; package = pkgs.postgresql_15;
ensureDatabases = [ db_name ]; ensureDatabases = [ db_name ];
@ -36,9 +38,7 @@ in
}]; }];
}; };
vault-secrets.secrets.dex = { }; dex = {
services.dex = {
enable = true; enable = true;
settings = { settings = {
issuer = "https://dex.0x76.dev"; issuer = "https://dex.0x76.dev";
@ -102,7 +102,7 @@ in
environmentFile = "${vs.dex}/environment"; environmentFile = "${vs.dex}/environment";
}; };
services.oauth2_proxy = { oauth2_proxy = {
enable = true; enable = true;
provider = "oidc"; provider = "oidc";
redirectURL = "https://o2p.0x76.dev/oauth2/callback"; redirectURL = "https://o2p.0x76.dev/oauth2/callback";
@ -110,4 +110,5 @@ in
httpAddress = "0.0.0.0:4180"; httpAddress = "0.0.0.0:4180";
keyFile = ""; keyFile = "";
}; };
};
} }