removed empty lines
This commit is contained in:
parent
8053fc7843
commit
cd9e738c3c
@ -134,23 +134,19 @@
|
||||
inherit XDG_DATA_HOME XDG_CONFIG_HOME XDG_CACHE_HOME;
|
||||
XDG_BIN_HOME = "\${HOME}/.local/bin";
|
||||
XDG_STATE_HOME = "\${HOME}/.local/state";
|
||||
|
||||
# DEV PATH
|
||||
PSQL_HISTORY = "${XDG_DATA_HOME}/psql_history";
|
||||
REDISCLI_HISTFILE = "${XDG_DATA_HOME}/redis/rediscli_history";
|
||||
WINEPREFIX = "${XDG_DATA_HOME}/wine";
|
||||
|
||||
# OPTIONS
|
||||
ELECTRUMDIR = "${XDG_DATA_HOME}/electrum";
|
||||
WGETRC = "${XDG_CONFIG_HOME}/wgetrc";
|
||||
XCOMPOSECACHE = "${XDG_CACHE_HOME}/X11/xcompose";
|
||||
"_JAVA_OPTIONS" = "-Djava.util.prefs.userRoot=${XDG_CONFIG_HOME}/java";
|
||||
ORG_DEVICE = "workstation";
|
||||
|
||||
# WAYLAND
|
||||
WLR_NO_HARDWARE_CURSORS = 1;
|
||||
NIXOS_OZONE_WL = 1;
|
||||
|
||||
PATH = [ "\${HOME}/.local/bin" ];
|
||||
NH_USE_DOAS = 1;
|
||||
};
|
||||
|
||||
@ -17,7 +17,6 @@
|
||||
userName = "Danilo Reyes";
|
||||
userEmail = "CaptainJawZ@protonmail.com";
|
||||
};
|
||||
|
||||
bash =
|
||||
let
|
||||
inherit (pkgs) fd fzf;
|
||||
@ -58,7 +57,6 @@
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
xdg = {
|
||||
enable = true;
|
||||
userDirs = {
|
||||
|
||||
@ -69,7 +69,6 @@ in
|
||||
base05 = "#a9ae8a"; # dry fern or lichen dust
|
||||
base06 = "#dfe1d2"; # pale sage
|
||||
base07 = "#f5f7f0"; # slightly sunlit leaf white
|
||||
|
||||
base08 = "#4c7c4a"; # deep fern green
|
||||
base09 = "#6b8f3c"; # olive bark
|
||||
base0A = "#b5b938"; # lichen gold
|
||||
|
||||
@ -46,7 +46,6 @@
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
outputs =
|
||||
{ self, jawz-scripts, ... }@inputs:
|
||||
let
|
||||
@ -63,7 +62,6 @@
|
||||
builtins.attrNames (builtins.readDir ./modules/dev)
|
||||
)
|
||||
);
|
||||
|
||||
commonModules = name: [
|
||||
{
|
||||
nixpkgs.overlays = [
|
||||
@ -83,7 +81,6 @@
|
||||
inputs.stylix.nixosModules.stylix
|
||||
inputs.nixtendo-switch.nixosModules.nixtendo-switch
|
||||
];
|
||||
|
||||
createConfig =
|
||||
name: local-nixpkgs:
|
||||
let
|
||||
|
||||
@ -7,7 +7,6 @@
|
||||
../../config/base.nix
|
||||
../../config/stylix.nix
|
||||
];
|
||||
|
||||
virtualisation.vmVariant.virtualisation = {
|
||||
memorySize = 4096;
|
||||
cores = 4;
|
||||
@ -17,7 +16,6 @@
|
||||
y = 1080;
|
||||
};
|
||||
};
|
||||
|
||||
my = {
|
||||
secureHost = false;
|
||||
stylix.enable = true;
|
||||
@ -45,9 +43,7 @@
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
networking.hostName = "emacs";
|
||||
|
||||
services.xserver = {
|
||||
enable = true;
|
||||
displayManager.lightdm.enable = true;
|
||||
|
||||
@ -26,7 +26,6 @@
|
||||
xdotool
|
||||
xclip
|
||||
wl-clipboard-rs
|
||||
|
||||
fd # modern find, faster searches
|
||||
fzf # fuzzy finder! super cool and useful
|
||||
ripgrep # modern grep
|
||||
@ -34,7 +33,6 @@
|
||||
graphviz # graphs
|
||||
tetex # export pdf
|
||||
languagetool # proofreader for English
|
||||
|
||||
# lsps
|
||||
yaml-language-server
|
||||
markdownlint-cli
|
||||
|
||||
@ -33,7 +33,6 @@ in
|
||||
description = "Go development shell with Emacs tooling, REPL, formatter, and linter";
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkMerge [
|
||||
{
|
||||
environment.variables = { inherit GOPATH; };
|
||||
|
||||
@ -14,14 +14,12 @@ let
|
||||
"ombi"
|
||||
"flaresolverr"
|
||||
];
|
||||
|
||||
servicesConfig = lib.listToAttrs (
|
||||
map (serviceName: {
|
||||
name = serviceName;
|
||||
value.openFirewall = config.my.servers.${serviceName}.enable or false;
|
||||
}) nativeServicesWithOpenFirewall
|
||||
);
|
||||
|
||||
in
|
||||
{
|
||||
options.my.network.firewall = {
|
||||
@ -37,10 +35,8 @@ in
|
||||
description = "Additional ports to open (like syncthing, gitea, etc.)";
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf config.my.network.firewall.enabledServicePorts {
|
||||
services = servicesConfig;
|
||||
|
||||
networking.firewall.allowedTCPPorts =
|
||||
config.my.network.firewall.staticPorts
|
||||
++ config.my.network.firewall.additionalPorts
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib, config, ... }:
|
||||
let
|
||||
setup = import ../servers/setup.nix { inherit lib config; };
|
||||
|
||||
standardProxyServices = {
|
||||
"firefox-syncserver" = {
|
||||
type = "proxyReverse";
|
||||
@ -73,7 +72,6 @@ let
|
||||
type = "proxyReversePrivate";
|
||||
};
|
||||
};
|
||||
|
||||
generateProxyConfig =
|
||||
serviceName: serviceConfig:
|
||||
let
|
||||
@ -89,9 +87,7 @@ let
|
||||
throw "Unknown proxy type: ${serviceConfig.type}";
|
||||
in
|
||||
lib.nameValuePair cfg.host (lib.mkIf cfg.enableProxy (proxyFunc cfg));
|
||||
|
||||
standardProxyConfigs = lib.mapAttrs' generateProxyConfig standardProxyServices;
|
||||
|
||||
in
|
||||
{
|
||||
config = lib.mkIf config.my.enableProxy {
|
||||
|
||||
@ -14,26 +14,22 @@
|
||||
];
|
||||
description = "List of supported nix build features for this system";
|
||||
};
|
||||
|
||||
buildMachines = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.attrs;
|
||||
default = [ ];
|
||||
description = "List of remote build machines configuration";
|
||||
};
|
||||
|
||||
cores = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.int;
|
||||
default = null;
|
||||
description = "Number of cores to use for builds (null = auto-detect)";
|
||||
};
|
||||
|
||||
maxJobs = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.int;
|
||||
default = null;
|
||||
description = "Maximum number of parallel jobs (null = auto-detect)";
|
||||
};
|
||||
};
|
||||
|
||||
config = {
|
||||
nix.settings = lib.mkMerge [
|
||||
{
|
||||
@ -46,7 +42,6 @@
|
||||
max-jobs = config.my.nix.maxJobs;
|
||||
})
|
||||
];
|
||||
|
||||
nix.buildMachines = lib.mkIf (config.my.nix.buildMachines != [ ]) config.my.nix.buildMachines;
|
||||
};
|
||||
}
|
||||
|
||||
@ -35,13 +35,11 @@
|
||||
default = { };
|
||||
description = "Configuration for multiple scripts.";
|
||||
};
|
||||
|
||||
config = lib.mkIf (lib.any (s: s.enable) (lib.attrValues config.my.scripts)) {
|
||||
users.users.jawz.packages =
|
||||
config.my.scripts
|
||||
|> lib.mapAttrsToList (_name: script: lib.optional (script.enable && script.install) script.package)
|
||||
|> lib.flatten;
|
||||
|
||||
systemd.user.services =
|
||||
config.my.scripts
|
||||
|> lib.mapAttrs' (
|
||||
@ -63,7 +61,6 @@
|
||||
}
|
||||
)
|
||||
);
|
||||
|
||||
systemd.user.timers =
|
||||
config.my.scripts
|
||||
|> lib.mapAttrs' (
|
||||
|
||||
@ -30,7 +30,6 @@
|
||||
export LC=$list_root/comic.txt
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
systemd.user = {
|
||||
services =
|
||||
|
||||
@ -13,7 +13,6 @@ in
|
||||
./gitea-actions-runners/ryujinx.nix
|
||||
./gitea-actions-runners/nixos.nix
|
||||
];
|
||||
|
||||
options.my.servers.gitea = setup.mkOptions "gitea" "git" 9083;
|
||||
config = {
|
||||
sops.secrets = lib.mkIf cfg.enable { gitea.sopsFile = ../../secrets/env.yaml; };
|
||||
|
||||
@ -51,12 +51,10 @@ in
|
||||
# in this example we are using a hostname which is resolved via DNS
|
||||
# (if you aren't using DNS remove the resolver line and change the variable to point to an IP address
|
||||
resolver ${cfg.ip} valid=30;
|
||||
|
||||
location = / {
|
||||
return 302 http://$host/web/;
|
||||
#return 302 https://$host/web/;
|
||||
}
|
||||
|
||||
location = /web/ {
|
||||
# Proxy main Jellyfin traffic
|
||||
proxy_pass ${cfg.local}/web/index.html;
|
||||
|
||||
@ -213,7 +213,6 @@ in
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
};
|
||||
virtualisation.oci-containers.containers = {
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
{
|
||||
options.my.users.nixremote = {
|
||||
enable = lib.mkEnableOption "nixremote user for distributed builds";
|
||||
|
||||
authorizedKeys = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.path;
|
||||
default = [
|
||||
@ -12,20 +11,17 @@
|
||||
];
|
||||
description = "List of SSH public key files to authorize for nixremote user";
|
||||
};
|
||||
|
||||
gid = lib.mkOption {
|
||||
type = lib.types.int;
|
||||
default = 555;
|
||||
description = "Group ID for the nixremote group";
|
||||
};
|
||||
|
||||
home = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "/var/nixremote/";
|
||||
description = "Home directory for the nixremote user";
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf config.my.users.nixremote.enable {
|
||||
users = {
|
||||
groups.nixremote.gid = config.my.users.nixremote.gid;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user