treewide: adhere to official nix formatting style #28

Closed
notohh wants to merge 4 commits from nixfmt-rfc-style into master
118 changed files with 1895 additions and 1489 deletions

View file

@ -41,49 +41,52 @@
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = {
self,
nixpkgs,
pre-commit-hooks,
...
} @ inputs: let
system = "x86_64-linux";
pkgs = import nixpkgs {
inherit system;
};
in {
checks = {
pre-commit-check = pre-commit-hooks.lib.${system}.run {
src = ./.;
hooks = {
stylua.enable = true;
eslint.enable = true;
statix.enable = true;
alejandra.enable = true;
deadnix = {
enable = true;
excludes = ["overlays.nix"];
};
prettier = {
enable = true;
files = "\\.(js|ts|md|json)$";
outputs =
{
self,
nixpkgs,
pre-commit-hooks,
...
}@inputs:
let
system = "x86_64-linux";
pkgs = import nixpkgs { inherit system; };
in
{
checks = {
pre-commit-check = pre-commit-hooks.lib.${system}.run {
src = ./.;
hooks = {
stylua.enable = true;
eslint.enable = true;
statix.enable = true;
alejandra.enable = false;
deadnix = {
enable = true;
excludes = [ "overlays.nix" ];
};
prettier = {
enable = true;
files = "\\.(js|ts|md|json)$";
};
};
};
};
devShells.${system}.default = pkgs.mkShell {
name = "snowflake";
inherit (self.checks.pre-commit-check) shellHook;
packages = with pkgs; [
git
sops
# alejandra
statix
deadnix
yaml-language-server
lua-language-server
];
};
# formatter.${system} = pkgs.alejandra;
deploy = import ./hosts/deploy.nix inputs;
nixosConfigurations = import ./hosts inputs;
};
devShells.${system}.default = pkgs.mkShell {
name = "snowflake";
inherit (self.checks.pre-commit-check) shellHook;
packages = with pkgs; [
git
sops
alejandra
yaml-language-server
lua-language-server
];
};
formatter.${system} = pkgs.alejandra;
deploy = import ./hosts/deploy.nix inputs;
nixosConfigurations = import ./hosts inputs;
};
}

View file

@ -1,15 +1,16 @@
{
pkgs,
config,
...
}: let
{ pkgs, config, ... }:
let
configDir = "/home/notoh/snowflake/home/ags/config";
in {
in
{
programs.ags = {
enable = true;
extraPackages = with pkgs; [libsoup_3 libdbusmenu-gtk3];
extraPackages = with pkgs; [
libsoup_3
libdbusmenu-gtk3
];
};
home.packages = with pkgs; [dart-sass];
home.packages = with pkgs; [ dart-sass ];
xdg.configFile = {
"ags".source = config.lib.file.mkOutOfStoreSymlink "${configDir}";
};

View file

@ -3,12 +3,18 @@
pkgs,
lib,
...
}: let
compileSCSS = name: source: "${pkgs.runCommandLocal name {} ''
mkdir -p $out
${lib.getExe pkgs.sassc} -t expanded '${source}' > $out/${name}.css
''}/${name}.css";
in {
}:
let
compileSCSS =
name: source:
"${
pkgs.runCommandLocal name { } ''
mkdir -p $out
${lib.getExe pkgs.sassc} -t expanded '${source}' > $out/${name}.css
''
}/${name}.css";
in
{
programs.anyrun = {
enable = true;
config = {
@ -17,7 +23,9 @@ in {
dictionary
websearch
];
width = {fraction = 0.3;};
width = {
fraction = 0.3;
};
hideIcons = false;
ignoreExclusiveZones = false;
layer = "overlay";

View file

@ -1,4 +1,5 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
imports = [
./helix
./neofetch
@ -63,7 +64,11 @@
key = "BD47506D475EE86D";
signByDefault = true;
};
ignores = ["*result*" ".direnv" "node_modules"];
ignores = [
"*result*"
".direnv"
"node_modules"
];
};
gh = {
enable = true;
@ -81,7 +86,7 @@
zoxide = {
enable = true;
enableNushellIntegration = true;
options = ["--cmd cdd"];
options = [ "--cmd cdd" ];
};
};
}

View file

@ -1,4 +1,5 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
programs.firefox = {
enable = true;
policies = {
@ -42,7 +43,7 @@
];
}
];
definedAliases = ["@g"];
definedAliases = [ "@g" ];
};
"SearXNG" = {
urls = [
@ -56,7 +57,7 @@
];
}
];
definedAliases = ["@sx"];
definedAliases = [ "@sx" ];
};
"Nix Packages" = {
urls = [
@ -75,7 +76,7 @@
}
];
icon = "''${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
definedAliases = ["@np"];
definedAliases = [ "@np" ];
};
"Bing".metaData.hidden = true;
"Google".metaData.hidden = true;
@ -108,19 +109,19 @@
xdg.mimeApps = {
enable = true;
defaultApplications = {
"x-scheme-handler/discord-409416265891971072" = ["discord-409416265891971072.desktop"];
"x-scheme-handler/discord-402572971681644545" = ["discord-402572971681644545.desktop"];
"x-scheme-handler/discord-696343075731144724" = ["discord-696343075731144724.desktop"];
"x-scheme-handler/http" = ["firefox.desktop"];
"x-scheme-handler/https" = ["firefox.desktop"];
"x-scheme-handler/chrome" = ["firefox.desktop"];
"text/html" = ["firefox.desktop"];
"application/x-extension-htm" = ["firefox.desktop"];
"application/x-extension-html" = ["firefox.desktop"];
"application/x-extension-shtml" = ["firefox.desktop"];
"application/xhtml+xml" = ["firefox.desktop"];
"application/x-extension-xhtml" = ["firefox.desktop"];
"application/x-extension-xht" = ["firefox.desktop"];
"x-scheme-handler/discord-409416265891971072" = [ "discord-409416265891971072.desktop" ];
"x-scheme-handler/discord-402572971681644545" = [ "discord-402572971681644545.desktop" ];
"x-scheme-handler/discord-696343075731144724" = [ "discord-696343075731144724.desktop" ];
"x-scheme-handler/http" = [ "firefox.desktop" ];
"x-scheme-handler/https" = [ "firefox.desktop" ];
"x-scheme-handler/chrome" = [ "firefox.desktop" ];
"text/html" = [ "firefox.desktop" ];
"application/x-extension-htm" = [ "firefox.desktop" ];
"application/x-extension-html" = [ "firefox.desktop" ];
"application/x-extension-shtml" = [ "firefox.desktop" ];
"application/xhtml+xml" = [ "firefox.desktop" ];
"application/x-extension-xhtml" = [ "firefox.desktop" ];
"application/x-extension-xht" = [ "firefox.desktop" ];
};
};
}

View file

@ -1,4 +1,5 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
home.pointerCursor = {
package = pkgs.bibata-cursors;
name = "Bibata-Modern-Classic";
@ -12,7 +13,7 @@
theme = {
name = "Catppuccin-Mocha-Standard-Red-Dark";
package = pkgs.catppuccin-gtk.override {
accents = ["red"];
accents = [ "red" ];
size = "standard";
variant = "mocha";
};

View file

@ -1,4 +1,5 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
home.pointerCursor = {
package = pkgs.bibata-cursors;
name = "Bibata-Modern-Classic";

View file

@ -1,4 +1,5 @@
{...}: {
{ ... }:
{
imports = [
./languages.nix
./themes/catppuccin_mocha.nix
@ -16,11 +17,26 @@
completion-replace = true;
soft-wrap.enable = true;
idle-timeout = 1;
gutters = ["diff" "diagnostics" "line-numbers" "spacer"];
gutters = [
"diff"
"diagnostics"
"line-numbers"
"spacer"
];
statusline = {
left = ["mode" "spinner"];
center = ["file-name"];
right = ["diagnostics" "selections" "position" "file-line-ending" "file-type" "version-control"];
left = [
"mode"
"spinner"
];
center = [ "file-name" ];
right = [
"diagnostics"
"selections"
"position"
"file-line-ending"
"file-type"
"version-control"
];
separator = "|";
mode = {
normal = "NORMAL";

View file

@ -1,8 +1,5 @@
{ pkgs, lib, ... }:
{
pkgs,
lib,
...
}: {
programs.helix.languages = {
language = with pkgs; [
{
@ -10,7 +7,7 @@
auto-format = true;
formatter = {
command = lib.getExe alejandra;
args = ["-q"];
args = [ "-q" ];
};
}
{
@ -34,7 +31,7 @@
};
vscode-css-language-server = {
command = "${nodePackages.vscode-css-languageserver-bin}/bin/css-languageserver";
args = ["--stdio"];
args = [ "--stdio" ];
};
};
};

View file

@ -1,216 +1,243 @@
_: {
programs.helix = {
themes.catppuccin_mocha = let
rosewater = "#f5e0dc";
flamingo = "#f2cdcd";
pink = "#f5c2e7";
mauve = "#cba6f7";
red = "#f38ba8";
maroon = "#eba0ac";
peach = "#fab387";
yellow = "#f9e2af";
green = "#a6e3a1";
teal = "#94e2d5";
sky = "#89dceb";
sapphire = "#74c7ec";
blue = "#89b4fa";
lavender = "#b4befe";
themes.catppuccin_mocha =
let
rosewater = "#f5e0dc";
flamingo = "#f2cdcd";
pink = "#f5c2e7";
mauve = "#cba6f7";
red = "#f38ba8";
maroon = "#eba0ac";
peach = "#fab387";
yellow = "#f9e2af";
green = "#a6e3a1";
teal = "#94e2d5";
sky = "#89dceb";
sapphire = "#74c7ec";
blue = "#89b4fa";
lavender = "#b4befe";
text = "#cdd6f4";
subtext1 = "#bac2de";
subtext0 = "#a6adc8";
overlay2 = "#9399b2";
overlay1 = "#7f849c";
overlay0 = "#6c7086";
surface2 = "#585b70";
surface1 = "#45475a";
surface0 = "#313244";
text = "#cdd6f4";
subtext1 = "#bac2de";
subtext0 = "#a6adc8";
overlay2 = "#9399b2";
overlay1 = "#7f849c";
overlay0 = "#6c7086";
surface2 = "#585b70";
surface1 = "#45475a";
surface0 = "#313244";
base = "#1e1e2e";
mantle = "#181825";
crust = "#11111b";
base = "#1e1e2e";
mantle = "#181825";
crust = "#11111b";
cursorline = "#2a2b3c";
secondary_cursor = "#b5a6a8";
in {
"type" = yellow;
"constructor" = sapphire;
"constant" = peach;
"constant.builtin" = peach;
"constant.character" = teal;
"constant.character.escape" = pink;
"string" = green;
"string.regexp" = peach;
"string.special" = blue;
"comment" = {
fg = maroon;
modifiers = ["italic"];
};
"variable" = "text";
"variable.parameter" = {
fg = maroon;
modifiers = ["italic"];
};
"variable.builtin" = red;
"variable.other.member" = teal;
"label" = sapphire;
"punctuation" = overlay2;
"punctuation.special" = sky;
"keyword" = mauve;
"keyword.control.conditional" = {
fg = mauve;
modifiers = ["italic"];
};
"operator" = sky;
"function" = blue;
"function.macro" = mauve;
"tag" = mauve;
"attribute" = blue;
"namespace" = {
fg = blue;
modifiers = ["italic"];
};
"special" = blue;
"markup.heading.marker" = {
fg = peach;
modifiers = ["bold"];
};
"markup.heading.1" = lavender;
"markup.heading.2" = mauve;
"markup.heading.3" = green;
"markup.heading.4" = yellow;
"markup.heading.5" = pink;
"markup.heading.6" = teal;
"markup.list" = mauve;
"markup.bold" = {modifiers = ["bold"];};
"markup.italic" = {modifiers = ["italic"];};
"markup.link.url" = {
fg = rosewater;
modifiers = ["italic" "underlined"];
};
"markup.link.text" = blue;
"markup.raw" = flamingo;
"diff.plus" = green;
"diff.minus" = red;
"diff.delta" = blue;
"ui.background" = {fg = surface1;};
"ui.linenr" = {fg = surface1;};
"ui.linenr.selected" = {fg = lavender;};
"ui.statusline" = {
fg = subtext1;
bg = mantle;
};
"ui.statusline.inactive" = {
fg = surface2;
bg = mantle;
};
"ui.statusline.normal" = {
fg = base;
bg = lavender;
modifiers = ["bold"];
};
"ui.statusline.insert" = {
fg = base;
bg = green;
modifiers = ["bold"];
};
"ui.statusline.select" = {
fg = base;
bg = flamingo;
modifiers = ["bold"];
};
"ui.popup" = {
fg = text;
bg = surface0;
};
"ui.window" = {fg = crust;};
"ui.help" = {
fg = overlay2;
bg = surface0;
};
"ui.bufferline" = {
fg = subtext0;
bg = mantle;
};
"ui.bufferline.active" = {
fg = mauve;
bg = base;
underline = {
color = mauve;
style = "line";
cursorline = "#2a2b3c";
secondary_cursor = "#b5a6a8";
in
{
"type" = yellow;
"constructor" = sapphire;
"constant" = peach;
"constant.builtin" = peach;
"constant.character" = teal;
"constant.character.escape" = pink;
"string" = green;
"string.regexp" = peach;
"string.special" = blue;
"comment" = {
fg = maroon;
modifiers = [ "italic" ];
};
};
"ui.bufferline.background" = {bg = crust;};
"ui.text" = text;
"ui.text.focus" = {
fg = text;
bg = surface0;
modifiers = ["bold"];
};
"ui.text.inactive" = {fg = overlay1;};
"ui.virtual" = overlay0;
"ui.virtual.ruler" = {bg = surface0;};
"ui.virtual.indent-guide" = surface0;
"ui.virtual.inlay-hint" = {
fg = surface1;
bg = mantle;
};
"ui.selection" = {bg = surface1;};
"ui.cursor" = {
fg = base;
bg = secondary_cursor;
};
"ui.cursor.primary" = {
fg = base;
bg = rosewater;
};
"ui.cursor.match" = {
fg = peach;
modifiers = ["bold"];
};
"ui.cursorline.primary" = {bg = cursorline;};
"ui.highlight" = {
bg = surface1;
modifiers = ["bold"];
};
"ui.menu" = {
fg = overlay2;
bg = surface0;
};
"ui.menu.selected" = {
fg = text;
bg = surface1;
modifiers = ["bold"];
};
"diagnostic.error" = {
underline = {
color = red;
style = "curl";
"variable" = "text";
"variable.parameter" = {
fg = maroon;
modifiers = [ "italic" ];
};
};
"diagnostic.warning" = {
underline = {
color = yellow;
style = "curl";
"variable.builtin" = red;
"variable.other.member" = teal;
"label" = sapphire;
"punctuation" = overlay2;
"punctuation.special" = sky;
"keyword" = mauve;
"keyword.control.conditional" = {
fg = mauve;
modifiers = [ "italic" ];
};
};
"diagnostic.info" = {
underline = {
color = sky;
style = "curl";
"operator" = sky;
"function" = blue;
"function.macro" = mauve;
"tag" = mauve;
"attribute" = blue;
"namespace" = {
fg = blue;
modifiers = [ "italic" ];
};
};
"diagnostic.hint" = {
underline = {
color = teal;
style = "curl";
"special" = blue;
"markup.heading.marker" = {
fg = peach;
modifiers = [ "bold" ];
};
"markup.heading.1" = lavender;
"markup.heading.2" = mauve;
"markup.heading.3" = green;
"markup.heading.4" = yellow;
"markup.heading.5" = pink;
"markup.heading.6" = teal;
"markup.list" = mauve;
"markup.bold" = {
modifiers = [ "bold" ];
};
"markup.italic" = {
modifiers = [ "italic" ];
};
"markup.link.url" = {
fg = rosewater;
modifiers = [
"italic"
"underlined"
];
};
"markup.link.text" = blue;
"markup.raw" = flamingo;
"diff.plus" = green;
"diff.minus" = red;
"diff.delta" = blue;
"ui.background" = {
fg = surface1;
};
"ui.linenr" = {
fg = surface1;
};
"ui.linenr.selected" = {
fg = lavender;
};
"ui.statusline" = {
fg = subtext1;
bg = mantle;
};
"ui.statusline.inactive" = {
fg = surface2;
bg = mantle;
};
"ui.statusline.normal" = {
fg = base;
bg = lavender;
modifiers = [ "bold" ];
};
"ui.statusline.insert" = {
fg = base;
bg = green;
modifiers = [ "bold" ];
};
"ui.statusline.select" = {
fg = base;
bg = flamingo;
modifiers = [ "bold" ];
};
"ui.popup" = {
fg = text;
bg = surface0;
};
"ui.window" = {
fg = crust;
};
"ui.help" = {
fg = overlay2;
bg = surface0;
};
"ui.bufferline" = {
fg = subtext0;
bg = mantle;
};
"ui.bufferline.active" = {
fg = mauve;
bg = base;
underline = {
color = mauve;
style = "line";
};
};
"ui.bufferline.background" = {
bg = crust;
};
"ui.text" = text;
"ui.text.focus" = {
fg = text;
bg = surface0;
modifiers = [ "bold" ];
};
"ui.text.inactive" = {
fg = overlay1;
};
"ui.virtual" = overlay0;
"ui.virtual.ruler" = {
bg = surface0;
};
"ui.virtual.indent-guide" = surface0;
"ui.virtual.inlay-hint" = {
fg = surface1;
bg = mantle;
};
"ui.selection" = {
bg = surface1;
};
"ui.cursor" = {
fg = base;
bg = secondary_cursor;
};
"ui.cursor.primary" = {
fg = base;
bg = rosewater;
};
"ui.cursor.match" = {
fg = peach;
modifiers = [ "bold" ];
};
"ui.cursorline.primary" = {
bg = cursorline;
};
"ui.highlight" = {
bg = surface1;
modifiers = [ "bold" ];
};
"ui.menu" = {
fg = overlay2;
bg = surface0;
};
"ui.menu.selected" = {
fg = text;
bg = surface1;
modifiers = [ "bold" ];
};
"diagnostic.error" = {
underline = {
color = red;
style = "curl";
};
};
"diagnostic.warning" = {
underline = {
color = yellow;
style = "curl";
};
};
"diagnostic.info" = {
underline = {
color = sky;
style = "curl";
};
};
"diagnostic.hint" = {
underline = {
color = teal;
style = "curl";
};
};
};
"error" = red;
"warning" = yellow;
"info" = sky;
"hint" = teal;
};
"error" = red;
"warning" = yellow;
"info" = sky;
"hint" = teal;
};
};
}

View file

@ -1,170 +1,260 @@
_: {
programs.helix = {
themes.tokyonight = let
red = "#f7768e";
orange = "#ff9e64";
yellow = "#e0af68";
light-green = "#9ece6a";
green = "#73daca";
turquoise = "#89ddff";
teal = "#2ac3de";
cyan = "#7dcfff";
blue = "#7aa2f7";
magenta = "#bb9af7";
white = "#c0caf5";
light-gray = "#9aa5ce";
comment = "#565f89";
black = "#414868";
foreground = "#a9b1d6";
foreground_gutter = "#363b54";
background_highlight = "#30374b";
background_menu = "#16161e";
in {
"comment" = {
fg = comment;
modifiers = ["italic"];
};
"constant" = {fg = orange;};
"constant.character.escape" = {fg = magenta;};
"function" = {
fg = blue;
modifiers = ["italic"];
};
"function.macro" = {fg = cyan;};
"keyword" = {
fg = cyan;
modifiers = ["italic"];
};
"keyword.control" = {fg = magenta;};
"keyword.control.import" = {fg = cyan;};
"keyword.operator" = {fg = turquoise;};
"keyword.function" = {
fg = magenta;
modifiers = ["italic"];
};
"operator" = {fg = turquoise;};
"punctuation" = {fg = turquoise;};
"string" = {fg = light-green;};
"string.regexp" = {fg = "light-blue";};
"tag" = {fg = red;};
"type" = {fg = teal;};
"namespace" = {fg = blue;};
"variable" = {fg = white;};
"variable.builtin" = {fg = red;};
"variable.other.member" = {fg = green;};
"variable.parameter" = {
fg = yellow;
modifiers = ["italic"];
};
themes.tokyonight =
let
red = "#f7768e";
orange = "#ff9e64";
yellow = "#e0af68";
light-green = "#9ece6a";
green = "#73daca";
turquoise = "#89ddff";
teal = "#2ac3de";
cyan = "#7dcfff";
blue = "#7aa2f7";
magenta = "#bb9af7";
white = "#c0caf5";
light-gray = "#9aa5ce";
comment = "#565f89";
black = "#414868";
foreground = "#a9b1d6";
foreground_gutter = "#363b54";
background_highlight = "#30374b";
background_menu = "#16161e";
in
{
"comment" = {
fg = comment;
modifiers = [ "italic" ];
};
"constant" = {
fg = orange;
};
"constant.character.escape" = {
fg = magenta;
};
"function" = {
fg = blue;
modifiers = [ "italic" ];
};
"function.macro" = {
fg = cyan;
};
"keyword" = {
fg = cyan;
modifiers = [ "italic" ];
};
"keyword.control" = {
fg = magenta;
};
"keyword.control.import" = {
fg = cyan;
};
"keyword.operator" = {
fg = turquoise;
};
"keyword.function" = {
fg = magenta;
modifiers = [ "italic" ];
};
"operator" = {
fg = turquoise;
};
"punctuation" = {
fg = turquoise;
};
"string" = {
fg = light-green;
};
"string.regexp" = {
fg = "light-blue";
};
"tag" = {
fg = red;
};
"type" = {
fg = teal;
};
"namespace" = {
fg = blue;
};
"variable" = {
fg = white;
};
"variable.builtin" = {
fg = red;
};
"variable.other.member" = {
fg = green;
};
"variable.parameter" = {
fg = yellow;
modifiers = [ "italic" ];
};
"diff.plus" = {fg = green;};
"diff.delta" = {fg = orange;};
"diff.minus" = {fg = red;};
"diff.plus" = {
fg = green;
};
"diff.delta" = {
fg = orange;
};
"diff.minus" = {
fg = red;
};
"ui.background" = {fg = foreground;};
"ui.background" = {
fg = foreground;
};
"ui.cursor" = {modifiers = ["reversed"];};
"ui.cursor.match" = {
fg = orange;
modifiers = ["bold"];
};
"ui.cursor.primary" = {modifiers = ["reversed"];};
"ui.cursorline.primary" = {bg = background_menu;};
"ui.help" = {
fg = foreground;
bg = background_menu;
};
"ui.linenr" = {fg = foreground_gutter;};
"ui.linenr.selected" = {fg = foreground;};
"ui.menu" = {
fg = foreground;
bg = background_menu;
};
"ui.menu.selected" = {bg = background_highlight;};
"ui.popup" = {
fg = foreground;
bg = background_menu;
};
"ui.selection" = {bg = background_highlight;};
"ui.selection.primary" = {bg = background_highlight;};
"ui.statusline" = {
fg = foreground;
bg = background_menu;
};
"ui.statusline.inactive" = {
fg = foreground_gutter;
bg = background_menu;
};
"ui.statusline.normal" = {
fg = black;
bg = blue;
};
"ui.statusline.insert" = {
fg = black;
bg = green;
};
"ui.statusline.select" = {
fg = black;
bg = magenta;
};
"ui.text" = {fg = foreground;};
"ui.text.focus" = {fg = cyan;};
"ui.virtual.ruler" = {bg = foreground_gutter;};
"ui.virtual.whitespace" = {fg = foreground_gutter;};
"ui.virtual.inlay-hint" = {fg = comment;};
"ui.window" = {fg = black;};
"ui.cursor" = {
modifiers = [ "reversed" ];
};
"ui.cursor.match" = {
fg = orange;
modifiers = [ "bold" ];
};
"ui.cursor.primary" = {
modifiers = [ "reversed" ];
};
"ui.cursorline.primary" = {
bg = background_menu;
};
"ui.help" = {
fg = foreground;
bg = background_menu;
};
"ui.linenr" = {
fg = foreground_gutter;
};
"ui.linenr.selected" = {
fg = foreground;
};
"ui.menu" = {
fg = foreground;
bg = background_menu;
};
"ui.menu.selected" = {
bg = background_highlight;
};
"ui.popup" = {
fg = foreground;
bg = background_menu;
};
"ui.selection" = {
bg = background_highlight;
};
"ui.selection.primary" = {
bg = background_highlight;
};
"ui.statusline" = {
fg = foreground;
bg = background_menu;
};
"ui.statusline.inactive" = {
fg = foreground_gutter;
bg = background_menu;
};
"ui.statusline.normal" = {
fg = black;
bg = blue;
};
"ui.statusline.insert" = {
fg = black;
bg = green;
};
"ui.statusline.select" = {
fg = black;
bg = magenta;
};
"ui.text" = {
fg = foreground;
};
"ui.text.focus" = {
fg = cyan;
};
"ui.virtual.ruler" = {
bg = foreground_gutter;
};
"ui.virtual.whitespace" = {
fg = foreground_gutter;
};
"ui.virtual.inlay-hint" = {
fg = comment;
};
"ui.window" = {
fg = black;
};
"error" = {fg = red;};
"warning" = {fg = yellow;};
"info" = {fg = blue;};
"hint" = {fg = teal;};
"diagnostic.error" = {
underline = {
style = "curl";
color = red;
"error" = {
fg = red;
};
"warning" = {
fg = yellow;
};
"info" = {
fg = blue;
};
"hint" = {
fg = teal;
};
"diagnostic.error" = {
underline = {
style = "curl";
color = red;
};
};
"diagnostic.warning" = {
underline = {
style = "curl";
color = yellow;
};
};
"diagnostic.info" = {
underline = {
style = "curl";
color = blue;
};
};
"diagnostic.hint" = {
underline = {
style = "curl";
color = teal;
};
};
"special" = {
fg = orange;
};
"markup.heading" = {
fg = cyan;
modifiers = [ "bold" ];
};
"markup.list" = {
fg = cyan;
};
"markup.bold" = {
fg = orange;
modifiers = [ "bold" ];
};
"markup.italic" = {
fg = yellow;
modifiers = [ "italic" ];
};
"markup.strikethrough" = {
modifiers = [ "crossed_out" ];
};
"markup.link.url" = {
fg = green;
};
"markup.link.text" = {
fg = light-gray;
};
"markup.quote" = {
fg = yellow;
modifiers = [ "italic" ];
};
"markup.raw" = {
fg = cyan;
};
};
"diagnostic.warning" = {
underline = {
style = "curl";
color = yellow;
};
};
"diagnostic.info" = {
underline = {
style = "curl";
color = blue;
};
};
"diagnostic.hint" = {
underline = {
style = "curl";
color = teal;
};
};
"special" = {fg = orange;};
"markup.heading" = {
fg = cyan;
modifiers = ["bold"];
};
"markup.list" = {fg = cyan;};
"markup.bold" = {
fg = orange;
modifiers = ["bold"];
};
"markup.italic" = {
fg = yellow;
modifiers = ["italic"];
};
"markup.strikethrough" = {modifiers = ["crossed_out"];};
"markup.link.url" = {fg = green;};
"markup.link.text" = {fg = light-gray;};
"markup.quote" = {
fg = yellow;
modifiers = ["italic"];
};
"markup.raw" = {fg = cyan;};
};
};
}

View file

@ -5,14 +5,17 @@ _: {
windowSize = "normal";
gui.theme = {
lightTheme = false;
activeBorderColor = ["#2ac3de" "bold"];
inactiveBorderColor = ["#f7768e"];
optionsTextColor = [" #c0caf5"];
selectedLineBgColor = ["#24283b"];
selectedRangeByColor = ["#24283b"];
cherryPickedCommitBgColor = ["#94e2d5"];
cherryPickedCommitFgColor = ["#89b4fa"];
unstagedChangesColor = ["red"];
activeBorderColor = [
"#2ac3de"
"bold"
];
inactiveBorderColor = [ "#f7768e" ];
optionsTextColor = [ " #c0caf5" ];
selectedLineBgColor = [ "#24283b" ];
selectedRangeByColor = [ "#24283b" ];
cherryPickedCommitBgColor = [ "#94e2d5" ];
cherryPickedCommitFgColor = [ "#89b4fa" ];
unstagedChangesColor = [ "red" ];
showRandomTip = false;
animateExplosion = true;
};

View file

@ -1,4 +1,5 @@
{pkgs, ...}: {
home.packages = [pkgs.neofetch];
{ pkgs, ... }:
{
home.packages = [ pkgs.neofetch ];
xdg.configFile."neofetch/config.conf".source = ./config.conf;
}

View file

@ -1,5 +1,6 @@
{pkgs, ...}: {
home.packages = [pkgs.spotify-player];
{ pkgs, ... }:
{
home.packages = [ pkgs.spotify-player ];
xdg.configFile."spotify-player/app.toml" = {
text = ''
theme = "tokyonight"

View file

@ -1,8 +1,5 @@
{ config, lib, ... }:
{
config,
lib,
...
}: {
home.sessionVariables.STARSHIP_CACHE = "${config.xdg.cacheHome}/starship";
programs.starship = {
@ -40,9 +37,7 @@
"$rust"
"$golang"
];
right_format = lib.concatStrings [
"$nix_shell"
];
right_format = lib.concatStrings [ "$nix_shell" ];
character = {
error_symbol = "[](bold red)";
success_symbol = "[](bold teal)";
@ -77,7 +72,7 @@
impure_msg = "[impure shell](bold red)";
pure_msg = "[pure shell](bold green)";
unknown_msg = "[unknown shell](bold yellow)";
format = "via [ $state( \($name\))](bold teal)";
format = "via [ $state( ($name))](bold teal)";
};
git_branch = {
symbol = "";

View file

@ -1,8 +1,5 @@
{
pkgs,
inputs,
...
}: let
{ pkgs, inputs, ... }:
let
dbus-hyprland-environment = pkgs.writeTextFile {
name = "dbus-hyprland-environment";
destination = "/bin/dbus-hyprland-environment";
@ -13,8 +10,9 @@
systemctl --user start pipewire wireplumber pipewire-media-session xdg-desktop-portal xdg-desktop-portal-hyprland
'';
};
in {
imports = [./greetd.nix];
in
{
imports = [ ./greetd.nix ];
environment = {
systemPackages = with pkgs; [
dbus-hyprland-environment

View file

@ -1,11 +1,12 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
wayland.windowManager.hyprland = {
settings = {
monitor = [
"HDMI-A-1,1920x1080@60, 3640x560, auto, transform, 3" #right
"DP-1,1920x1080@60, 0x560, auto, transform, 1" #left
"DP-2,2560x1440@144, 1080x1080, auto" #middle
"DP-3,1920x1080@144, 1400x0, auto" #top
"HDMI-A-1,1920x1080@60, 3640x560, auto, transform, 3" # right
"DP-1,1920x1080@60, 0x560, auto, transform, 1" # left
"DP-2,2560x1440@144, 1080x1080, auto" # middle
"DP-3,1920x1080@144, 1400x0, auto" # top
];
exec-once = [
"ags"

View file

@ -1,10 +1,10 @@
{ config, pkgs, ... }:
{
config,
pkgs,
...
}: {
xdg.configFile."yazi/init.lua".source = ./init.lua;
imports = [./keymap.nix ./openers.nix];
imports = [
./keymap.nix
./openers.nix
];
programs.yazi = {
enable = true;
@ -12,7 +12,11 @@
enableNushellIntegration = true;
settings = {
manager = {
ratio = [1 3 3];
ratio = [
1
3
3
];
sort_by = "natural";
sort_reverse = false;
sort_dir_first = true;

View file

@ -2,17 +2,17 @@ _: {
programs.yazi.keymap = {
manager.keymap = [
{
on = ["<Esc>"];
on = [ "<Esc>" ];
exec = "escape";
desc = "Exit visual mode; clear selected; or cancel search";
}
{
on = ["q"];
on = [ "q" ];
exec = "quit";
desc = "Exit the process";
}
{
on = ["<C-q>"];
on = [ "<C-q>" ];
exec = "close";
desc = "Close the current tab; or quit if it is last tab";
}
@ -20,59 +20,65 @@ _: {
# Navigation
{
on = ["<Up>"];
on = [ "<Up>" ];
exec = "arrow -1";
desc = "Move cursor up";
}
{
on = ["<Down>"];
on = [ "<Down>" ];
exec = "arrow 1";
desc = "Move cursor down";
}
{
on = ["<Left>"];
on = [ "<Left>" ];
exec = "leave";
desc = "Go back to the parent directory";
}
{
on = ["<Right>"];
on = [ "<Right>" ];
exec = "enter";
desc = "Enter the child directory";
}
{
on = ["g" "g"];
on = [
"g"
"g"
];
exec = "arrow -99999999";
desc = "Move cursor to the top";
}
{
on = ["G"];
on = [ "G" ];
exec = "arrow 99999999";
desc = "Move cursor to the bottom";
}
# Selection
{
on = ["<Space>"];
exec = ["select --state=none" "arrow 1"];
on = [ "<Space>" ];
exec = [
"select --state=none"
"arrow 1"
];
desc = "Toggle the current selection state";
}
{
on = ["i"];
on = [ "i" ];
exec = "visual_mode";
desc = "Enter visual mode (selection mode)";
}
{
on = ["I"];
on = [ "I" ];
exec = "visual_mode --unset";
desc = "Enter visual mode (unset mode)";
}
{
on = ["<C-a>"];
on = [ "<C-a>" ];
exec = "select_all --state=true";
desc = "Select all files";
}
{
on = ["<C-r>"];
on = [ "<C-r>" ];
exec = "select_all --state=none";
desc = "Inverse selection of all files";
}
@ -80,67 +86,67 @@ _: {
# Operations
{
on = ["<Enter>"];
on = [ "<Enter>" ];
exec = "open";
desc = "Open selected file(s)";
}
{
on = ["y"];
on = [ "y" ];
exec = "yank";
desc = "Copy selected file(s)";
}
{
on = ["x"];
on = [ "x" ];
exec = "yank --cut";
desc = "Cut selected file(s)";
}
{
on = ["p"];
on = [ "p" ];
exec = "paste";
desc = "Paste the file(s)";
}
{
on = ["P"];
on = [ "P" ];
exec = "paste --force";
desc = "Paste the files (overwrite)";
}
{
on = ["d"];
on = [ "d" ];
exec = "remove --permanently";
desc = "Permanently delete the file(s)";
}
{
on = ["D"];
on = [ "D" ];
exec = "remove --permanently";
desc = "Permanently delete the files(s)";
}
{
on = ["a"];
on = [ "a" ];
exec = "create";
desc = "create a file or directory (ends with / for directories)";
}
{
on = ["r"];
on = [ "r" ];
exec = "rename";
desc = "rename a file or directory";
}
{
on = [":"];
on = [ ":" ];
exec = "shell --block";
desc = "run a blocking shell command";
}
{
on = ["."];
on = [ "." ];
exec = "hidden toggle";
desc = "toggle hidden files";
}
{
on = ["z"];
on = [ "z" ];
exec = "jump zoxide";
desc = "jump to a directory using zoxide";
}
{
on = ["Z"];
on = [ "Z" ];
exec = "jump fzf";
desc = "reveal files with fzf";
}
@ -148,17 +154,26 @@ _: {
# Copy
{
on = ["c" "c"];
on = [
"c"
"c"
];
exec = "copy path";
desc = "copy the absolute path";
}
{
on = ["c" "d"];
on = [
"c"
"d"
];
exec = "copy dirname";
desc = "copy parent directory path";
}
{
on = ["c" "f"];
on = [
"c"
"f"
];
exec = "copy filename";
desc = "copy file name";
}
@ -166,105 +181,105 @@ _: {
# Find
{
on = ["/"];
on = [ "/" ];
exec = "find";
}
{
on = ["?"];
on = [ "?" ];
exec = "find --previous";
}
{
on = ["n"];
on = [ "n" ];
exec = "find_arrow";
}
{
on = ["N"];
on = [ "N" ];
exec = "find_arrow --previous";
}
{
on = ["s"];
on = [ "s" ];
exec = "search fd";
}
{
on = ["S"];
on = [ "S" ];
exec = "search rg";
}
{
on = ["<C-s>"];
on = [ "<C-s>" ];
exec = "search none";
}
# Tabs
{
on = ["t"];
on = [ "t" ];
exec = "tab_create --current";
desc = "Create a new tab using the current path";
}
{
on = ["1"];
on = [ "1" ];
exec = "tab_switch 0";
desc = "Switch to the first tab";
}
{
on = ["2"];
on = [ "2" ];
exec = "tab_switch 1";
desc = "Switch to the second tab";
}
{
on = ["3"];
on = [ "3" ];
exec = "tab_switch 2";
desc = "Switch to the third tab";
}
{
on = ["4"];
on = [ "4" ];
exec = "tab_switch 3";
desc = "Switch to the fourth tab";
}
{
on = ["5"];
on = [ "5" ];
exec = "tab_switch 4";
desc = "Switch to the fifth tab";
}
{
on = ["6"];
on = [ "6" ];
exec = "tab_switch 5";
desc = "Switch to the sixth tab";
}
{
on = ["7"];
on = [ "7" ];
exec = "tab_switch 6";
desc = "Switch to the seventh tab";
}
{
on = ["8"];
on = [ "8" ];
exec = "tab_switch 7";
desc = "Switch to the eighth tab";
}
{
on = ["9"];
on = [ "9" ];
exec = "tab_switch 8";
desc = "Switch to the ninth tab";
}
{
on = ["["];
on = [ "[" ];
exec = "tab_switch -1 --relative";
desc = "Switch to the previous tab";
}
{
on = ["]"];
on = [ "]" ];
exec = "tab_switch 1 --relative";
desc = "Switch to the next tab";
}
{
on = ["{"];
on = [ "{" ];
exec = "tab_swap -1";
desc = "Swap the current tab with the previous tab";
}
{
on = ["}"];
on = [ "}" ];
exec = "tab_swap 1";
desc = "Swap the current tab with the next tab";
}
@ -272,7 +287,7 @@ _: {
# Tasks
{
on = ["w"];
on = [ "w" ];
exec = "tasks_show";
desc = "Show the tasks manager";
}
@ -280,7 +295,7 @@ _: {
# Help
{
on = ["~"];
on = [ "~" ];
exec = "help";
desc = "Open help";
}

View file

@ -1,25 +1,42 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
programs.yazi.settings = {
open.rules = [
{
mime = "text/*";
use = ["edit" "reveal"];
use = [
"edit"
"reveal"
];
}
{
mime = "image/*";
use = ["image" "reveal"];
use = [
"image"
"reveal"
];
}
{
mime = "video/*";
use = ["play" "reveal"];
use = [
"play"
"reveal"
];
}
{
mime = "application/json";
use = ["edit" "reveal"];
use = [
"edit"
"reveal"
];
}
{
mime = "*";
use = ["edit" "open" "reveal"];
use = [
"edit"
"open"
"reveal"
];
}
];
opener = {

View file

@ -1,7 +1,5 @@
_: {
imports = [
./layouts.nix
];
imports = [ ./layouts.nix ];
programs.zellij = {
enable = true;

View file

@ -1,4 +1,4 @@
{...}: {
_: {
imports = [
./hardware.nix
./services

View file

@ -3,14 +3,13 @@
lib,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
}:
{
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot = {
kernelModules = ["kvm-intel"];
extraModulePackages = [];
kernelModules = [ "kvm-intel" ];
extraModulePackages = [ ];
loader = {
systemd-boot = {
enable = true;
@ -22,8 +21,13 @@
};
};
initrd = {
availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "sd_mod"];
kernelModules = [];
availableKernelModules = [
"xhci_pci"
"ahci"
"usb_storage"
"sd_mod"
];
kernelModules = [ ];
};
};
@ -42,9 +46,7 @@
};
};
swapDevices = [
{device = "/dev/disk/by-uuid/4f69ab31-f6a9-4799-92f1-5abbe0dc9180";}
];
swapDevices = [ { device = "/dev/disk/by-uuid/4f69ab31-f6a9-4799-92f1-5abbe0dc9180"; } ];
networking.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";

View file

@ -1,4 +1,5 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
imports = [
../../home
../../home/anyrun
@ -35,7 +36,7 @@
wl-clipboard
swww
hyprpicker
(libsForQt5.callPackage ../../pkgs/chatterino7 {})
(libsForQt5.callPackage ../../pkgs/chatterino7 { })
];
stateVersion = "23.05";
};

View file

@ -1,5 +1,4 @@
{...}: {
imports = [
./restic.nix
];
{ ... }:
{
imports = [ ./restic.nix ];
}

View file

@ -1,17 +1,16 @@
{ pkgs, config, ... }:
{
pkgs,
config,
...
}: {
sops.secrets.restic-ame = {sopsFile = ../../../secrets/restic/secrets.yaml;};
sops.secrets.ame-s3 = {sopsFile = ../../../secrets/s3/secrets.yaml;};
environment.systemPackages = [pkgs.restic];
sops.secrets.restic-ame = {
sopsFile = ../../../secrets/restic/secrets.yaml;
};
sops.secrets.ame-s3 = {
sopsFile = ../../../secrets/s3/secrets.yaml;
};
environment.systemPackages = [ pkgs.restic ];
services.restic = {
backups = {
ame = {
paths = [
"/home"
];
paths = [ "/home" ];
exclude = [
"*.qcow2"
"*.iso"

View file

@ -1,4 +1,4 @@
{...}: {
_: {
imports = [
./hardware.nix
./services

View file

@ -1,16 +1,13 @@
{ lib, modulesPath, ... }:
{
lib,
modulesPath,
...
}: {
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
];
imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
boot = {
kernelModules = [];
kernel.sysctl = {"kernel.shmmax" = 100663296;};
extraModulePackages = [];
kernelModules = [ ];
kernel.sysctl = {
"kernel.shmmax" = 100663296;
};
extraModulePackages = [ ];
loader.grub = {
enable = true;
configurationLimit = 5;
@ -18,8 +15,15 @@
useOSProber = false;
};
initrd = {
availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];
kernelModules = [];
availableKernelModules = [
"ata_piix"
"uhci_hcd"
"virtio_pci"
"virtio_scsi"
"sd_mod"
"sr_mod"
];
kernelModules = [ ];
};
};
@ -34,9 +38,7 @@
};
};
swapDevices = [
{device = "/dev/disk/by-uuid/e9eb4b6a-e9a1-4616-8c82-349d2f38d140";}
];
swapDevices = [ { device = "/dev/disk/by-uuid/e9eb4b6a-e9a1-4616-8c82-349d2f38d140"; } ];
networking.useDHCP = lib.mkDefault true;

View file

@ -1,7 +1,5 @@
{...}: {
imports = [
../../home
];
_: {
imports = [ ../../home ];
systemd.user.startServices = "sd-switch";
programs.home-manager.enable = true;

View file

@ -1,9 +1,6 @@
{ pkgs, lib, ... }:
{
pkgs,
lib,
...
}: {
networking.firewall.allowedTCPPorts = [5432];
networking.firewall.allowedTCPPorts = [ 5432 ];
services.postgresql = {
enable = true;
enableTCPIP = true;

View file

@ -1,5 +1,6 @@
{pkgs, ...}: {
environment.systemPackages = [pkgs.redis-dump];
{ pkgs, ... }:
{
environment.systemPackages = [ pkgs.redis-dump ];
services.redis.servers = {
forgejo = {
enable = true;

View file

@ -1,17 +1,14 @@
{ pkgs, config, ... }:
{
pkgs,
config,
...
}: {
sops.secrets.restic-arashi = {sopsFile = ../../../secrets/restic/secrets.yaml;};
environment.systemPackages = [pkgs.restic];
sops.secrets.restic-arashi = {
sopsFile = ../../../secrets/restic/secrets.yaml;
};
environment.systemPackages = [ pkgs.restic ];
services.restic = {
backups = {
arashi = {
user = "root";
paths = [
"/var/backup/"
];
paths = [ "/var/backup/" ];
pruneOpts = [
"--keep-daily=7"
"--keep-weekly=6"

View file

@ -1,4 +1,5 @@
inputs: let
inputs:
let
system = "x86_64-linux";
sopsModule = inputs.sops-nix.nixosModules.sops;
hmModule = inputs.home-manager.nixosModules.home-manager;
@ -9,10 +10,13 @@ inputs: let
atticModule = inputs.attic.nixosModules.atticd;
nurModule = inputs.nur.nixosModules.nur;
inherit (inputs.nixpkgs.lib) nixosSystem;
in {
in
{
tsuki = nixosSystem {
inherit system;
specialArgs = {inherit inputs;};
specialArgs = {
inherit inputs;
};
modules = [
./tsuki
sopsModule
@ -23,7 +27,9 @@ in {
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = {inherit inputs;};
extraSpecialArgs = {
inherit inputs;
};
users.notoh = {
imports = [
./tsuki/home.nix
@ -39,7 +45,9 @@ in {
};
sakura = nixosSystem {
inherit system;
specialArgs = {inherit inputs;};
specialArgs = {
inherit inputs;
};
modules = [
./sakura
sopsModule
@ -48,11 +56,11 @@ in {
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = {inherit inputs;};
extraSpecialArgs = {
inherit inputs;
};
users.notoh = {
imports = [
./sakura/home.nix
];
imports = [ ./sakura/home.nix ];
};
};
}
@ -60,7 +68,9 @@ in {
};
kariru = nixosSystem {
inherit system;
specialArgs = {inherit inputs;};
specialArgs = {
inherit inputs;
};
modules = [
./kariru
sopsModule
@ -69,11 +79,11 @@ in {
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = {inherit inputs;};
extraSpecialArgs = {
inherit inputs;
};
users.notoh = {
imports = [
./kariru/home.nix
];
imports = [ ./kariru/home.nix ];
};
};
}
@ -81,7 +91,9 @@ in {
};
yuki = nixosSystem {
inherit system;
specialArgs = {inherit inputs;};
specialArgs = {
inherit inputs;
};
modules = [
./yuki
sopsModule
@ -90,11 +102,11 @@ in {
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = {inherit inputs;};
extraSpecialArgs = {
inherit inputs;
};
users.notoh = {
imports = [
./yuki/home.nix
];
imports = [ ./yuki/home.nix ];
};
};
}
@ -102,7 +114,9 @@ in {
};
ame = nixosSystem {
inherit system;
specialArgs = {inherit inputs;};
specialArgs = {
inherit inputs;
};
modules = [
./ame
sopsModule
@ -111,7 +125,9 @@ in {
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = {inherit inputs;};
extraSpecialArgs = {
inherit inputs;
};
users.notoh = {
imports = [
./ame/home.nix
@ -125,7 +141,9 @@ in {
};
arashi = nixosSystem {
inherit system;
specialArgs = {inherit inputs;};
specialArgs = {
inherit inputs;
};
modules = [
./arashi
sopsModule
@ -134,11 +152,11 @@ in {
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = {inherit inputs;};
extraSpecialArgs = {
inherit inputs;
};
users.notoh = {
imports = [
./arashi/home.nix
];
imports = [ ./arashi/home.nix ];
};
};
}
@ -146,7 +164,9 @@ in {
};
sora = nixosSystem {
inherit system;
specialArgs = {inherit inputs;};
specialArgs = {
inherit inputs;
};
modules = [
./sora
sopsModule
@ -156,11 +176,11 @@ in {
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = {inherit inputs;};
extraSpecialArgs = {
inherit inputs;
};
users.notoh = {
imports = [
./sora/home.nix
];
imports = [ ./sora/home.nix ];
};
};
}
@ -168,7 +188,9 @@ in {
};
tsuru = nixosSystem {
inherit system;
specialArgs = {inherit inputs;};
specialArgs = {
inherit inputs;
};
modules = [
./tsuru
sopsModule
@ -177,11 +199,11 @@ in {
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = {inherit inputs;};
extraSpecialArgs = {
inherit inputs;
};
users.notoh = {
imports = [
./tsuru/home.nix
];
imports = [ ./tsuru/home.nix ];
};
};
}
@ -189,7 +211,9 @@ in {
};
haru = nixosSystem {
inherit system;
specialArgs = {inherit inputs;};
specialArgs = {
inherit inputs;
};
modules = [
./haru
sopsModule
@ -198,11 +222,11 @@ in {
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = {inherit inputs;};
extraSpecialArgs = {
inherit inputs;
};
users.notoh = {
imports = [
./haru/home.nix
];
imports = [ ./haru/home.nix ];
};
};
}
@ -210,7 +234,9 @@ in {
};
kaze = nixosSystem {
inherit system;
specialArgs = {inherit inputs;};
specialArgs = {
inherit inputs;
};
modules = [
./kaze
sopsModule
@ -219,11 +245,11 @@ in {
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = {inherit inputs;};
extraSpecialArgs = {
inherit inputs;
};
users.notoh = {
imports = [
./kaze/home.nix
];
imports = [ ./kaze/home.nix ];
};
};
}

View file

@ -7,7 +7,11 @@ inputs: {
path = activate.nixos inputs.self.nixosConfigurations.sakura;
};
sshUser = "root";
sshOpts = ["-t" "-i" "~/.ssh/forgejo"];
sshOpts = [
"-t"
"-i"
"~/.ssh/forgejo"
];
magicRollback = true;
};
kariru = {
@ -17,7 +21,11 @@ inputs: {
path = activate.nixos inputs.self.nixosConfigurations.kariru;
};
sshUser = "root";
sshOpts = ["-t" "-i" "~/.ssh/forgejo"];
sshOpts = [
"-t"
"-i"
"~/.ssh/forgejo"
];
magicRollback = true;
};
yuki = {
@ -27,7 +35,11 @@ inputs: {
path = activate.nixos inputs.self.nixosConfigurations.yuki;
};
sshUser = "root";
sshOpts = ["-t" "-i" "~/.ssh/forgejo"];
sshOpts = [
"-t"
"-i"
"~/.ssh/forgejo"
];
magicRollback = true;
};
arashi = {
@ -37,7 +49,11 @@ inputs: {
path = activate.nixos inputs.self.nixosConfigurations.arashi;
};
sshUser = "root";
sshOpts = ["-t" "-i" "~/.ssh/forgejo"];
sshOpts = [
"-t"
"-i"
"~/.ssh/forgejo"
];
magicRollback = true;
};
sora = {
@ -47,7 +63,11 @@ inputs: {
path = activate.nixos inputs.self.nixosConfigurations.sora;
};
sshUser = "root";
sshOpts = ["-t" "-i" "~/.ssh/forgejo"];
sshOpts = [
"-t"
"-i"
"~/.ssh/forgejo"
];
magicRollback = true;
};
tsuru = {
@ -57,7 +77,11 @@ inputs: {
path = activate.nixos inputs.self.nixosConfigurations.tsuru;
};
sshUser = "root";
sshOpts = ["-t" "-i" "~/.ssh/forgejo"];
sshOpts = [
"-t"
"-i"
"~/.ssh/forgejo"
];
magicRollback = true;
};
haru = {
@ -67,7 +91,11 @@ inputs: {
path = activate.nixos inputs.self.nixosConfigurations.haru;
};
sshUser = "root";
sshOpts = ["-t" "-i" "~/.ssh/forgejo"];
sshOpts = [
"-t"
"-i"
"~/.ssh/forgejo"
];
magicRollback = true;
};
kaze = {
@ -77,7 +105,11 @@ inputs: {
path = activate.nixos inputs.self.nixosConfigurations.kaze;
};
sshUser = "root";
sshOpts = ["-t" "-i" "~/.ssh/forgejo"];
sshOpts = [
"-t"
"-i"
"~/.ssh/forgejo"
];
magicRollback = true;
};
};

View file

@ -1,4 +1,4 @@
{...}: {
_: {
imports = [
./hardware.nix
./services

View file

@ -1,15 +1,10 @@
{ lib, modulesPath, ... }:
{
lib,
modulesPath,
...
}: {
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
];
imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
boot = {
kernelModules = [];
extraModulePackages = [];
kernelModules = [ ];
extraModulePackages = [ ];
loader.grub = {
enable = true;
configurationLimit = 5;
@ -17,8 +12,15 @@
useOSProber = false;
};
initrd = {
availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];
kernelModules = [];
availableKernelModules = [
"ata_piix"
"uhci_hcd"
"virtio_pci"
"virtio_scsi"
"sd_mod"
"sr_mod"
];
kernelModules = [ ];
};
};
@ -29,9 +31,7 @@
};
};
swapDevices = [
{device = "/dev/disk/by-uuid/c879fa21-fd80-422c-9aef-0becce5ff19c";}
];
swapDevices = [ { device = "/dev/disk/by-uuid/c879fa21-fd80-422c-9aef-0becce5ff19c"; } ];
networking.useDHCP = lib.mkDefault true;

View file

@ -1,7 +1,5 @@
{...}: {
imports = [
../../home
];
_: {
imports = [ ../../home ];
systemd.user.startServices = "sd-switch";
programs.home-manager.enable = true;

View file

@ -1,8 +1,12 @@
{pkgs, ...}: {
networking.firewall.allowedTCPPorts = [53 4000];
networking.firewall.allowedUDPPorts = [53];
{ pkgs, ... }:
{
networking.firewall.allowedTCPPorts = [
53
4000
];
networking.firewall.allowedUDPPorts = [ 53 ];
environment.systemPackages = [pkgs.blocky];
environment.systemPackages = [ pkgs.blocky ];
services.blocky = {
enable = true;
@ -72,25 +76,25 @@
"https://zerodot1.gitlab.io/CoinBlockerLists/hosts_browser"
"https://raw.githubusercontent.com/StevenBlack/hosts/master/alternates/fakenews-only/hosts"
];
catchall = [
"https://big.oisd.nl/domainswild"
];
};
whiteLists = let
customWhitelist = pkgs.writeText "misc.txt" ''
ax.phobos.apple.com.edgesuite.net
amp-api-edge.apps.apple.com
(\.|^)dscx\.akamaiedge\.net$
(\.|^)wac\.phicdn\.net$
*.flake.sh
'';
in {
ads = [
"https://raw.githubusercontent.com/anudeepND/whitelist/master/domains/whitelist.txt"
"https://raw.githubusercontent.com/anudeepND/whitelist/master/domains/optional-list.txt"
];
misc = [customWhitelist];
catchall = [ "https://big.oisd.nl/domainswild" ];
};
whiteLists =
let
customWhitelist = pkgs.writeText "misc.txt" ''
ax.phobos.apple.com.edgesuite.net
amp-api-edge.apps.apple.com
(\.|^)dscx\.akamaiedge\.net$
(\.|^)wac\.phicdn\.net$
*.flake.sh
'';
in
{
ads = [
"https://raw.githubusercontent.com/anudeepND/whitelist/master/domains/whitelist.txt"
"https://raw.githubusercontent.com/anudeepND/whitelist/master/domains/optional-list.txt"
];
misc = [ customWhitelist ];
};
clientGroupsBlock = {
default = [
"ads"
@ -103,39 +107,41 @@
};
customDNS = {
customTTL = "1h";
mapping = let
yukiIp = "192.168.1.98";
in {
# infra
mapping =
let
yukiIp = "192.168.1.98";
in
{
# infra
"truenas.internal.flake.sh" = "192.168.1.199";
"hass.internal.flake.sh" = "${yukiIp}";
"dashboard.internal.flake.sh" = "${yukiIp}";
"udm.internal.flake.sh" = "192.168.1.1";
"pve.internal.flake.sh" = "192.168.1.37";
"pbs.internal.flake.sh" = "192.168.1.38";
"truenas.internal.flake.sh" = "192.168.1.199";
"hass.internal.flake.sh" = "${yukiIp}";
"dashboard.internal.flake.sh" = "${yukiIp}";
"udm.internal.flake.sh" = "192.168.1.1";
"pve.internal.flake.sh" = "192.168.1.37";
"pbs.internal.flake.sh" = "192.168.1.38";
# media
# media
"jellyfin.internal.flake.sh" = "${yukiIp}";
"jellyseerr.internal.flake.sh" = "${yukiIp}";
"sonarr.internal.flake.sh" = "${yukiIp}";
"radarr.internal.flake.sh" = "${yukiIp}";
"readarr.internal.flake.sh" = "${yukiIp}";
"lidarr.internal.flake.sh" = "${yukiIp}";
"whisparr.internal.flake.sh" = "${yukiIp}";
"bazarr.internal.flake.sh" = "${yukiIp}";
"prowlarr.internal.flake.sh" = "${yukiIp}";
"stash.internal.flake.sh" = "${yukiIp}";
"nextcloud.internal.flake.sh" = "192.168.1.199";
"jellyfin.internal.flake.sh" = "${yukiIp}";
"jellyseerr.internal.flake.sh" = "${yukiIp}";
"sonarr.internal.flake.sh" = "${yukiIp}";
"radarr.internal.flake.sh" = "${yukiIp}";
"readarr.internal.flake.sh" = "${yukiIp}";
"lidarr.internal.flake.sh" = "${yukiIp}";
"whisparr.internal.flake.sh" = "${yukiIp}";
"bazarr.internal.flake.sh" = "${yukiIp}";
"prowlarr.internal.flake.sh" = "${yukiIp}";
"stash.internal.flake.sh" = "${yukiIp}";
"nextcloud.internal.flake.sh" = "192.168.1.199";
# misc
# misc
"wallos.internal.flake.sh" = "${yukiIp}";
"synology.internal.flake.sh" = "192.168.1.71";
"paperless.internal.flake.sh" = "${yukiIp}";
"rss.internal.flake.sh" = "${yukiIp}";
};
"wallos.internal.flake.sh" = "${yukiIp}";
"synology.internal.flake.sh" = "192.168.1.71";
"paperless.internal.flake.sh" = "${yukiIp}";
"rss.internal.flake.sh" = "${yukiIp}";
};
};
redis = {
address = "192.168.1.211:6381";

View file

@ -1,4 +1,4 @@
{...}: {
_: {
imports = [
./hardware.nix
./services

View file

@ -1,15 +1,10 @@
{ lib, modulesPath, ... }:
{
lib,
modulesPath,
...
}: {
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
];
imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
boot = {
kernelModules = [];
extraModulePackages = [];
kernelModules = [ ];
extraModulePackages = [ ];
loader.grub = {
enable = true;
configurationLimit = 5;
@ -17,8 +12,15 @@
useOSProber = false;
};
initrd = {
availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];
kernelModules = [];
availableKernelModules = [
"ata_piix"
"uhci_hcd"
"virtio_pci"
"virtio_scsi"
"sd_mod"
"sr_mod"
];
kernelModules = [ ];
};
};
@ -41,9 +43,7 @@
};
};
swapDevices = [
{device = "/dev/disk/by-uuid/f28bad28-ae14-4aa7-85c5-47abe46bae56";}
];
swapDevices = [ { device = "/dev/disk/by-uuid/f28bad28-ae14-4aa7-85c5-47abe46bae56"; } ];
networking.useDHCP = lib.mkDefault true;

View file

@ -1,7 +1,5 @@
{...}: {
imports = [
../../home
];
_: {
imports = [ ../../home ];
systemd.user.startServices = "sd-switch";
programs.home-manager.enable = true;

View file

@ -1,12 +1,13 @@
{pkgs, ...}: {
networking.firewall.allowedTCPPorts = [9292];
{ pkgs, ... }:
{
networking.firewall.allowedTCPPorts = [ 9292 ];
imports = [
./restic.nix
./torrent.nix
];
environment.systemPackages = [pkgs.recyclarr];
environment.systemPackages = [ pkgs.recyclarr ];
services = {
radarr = {
enable = true;
@ -38,18 +39,18 @@
virtualisation.oci-containers.containers = {
whisparr = {
image = "ghcr.io/hotio/whisparr@sha256:88b91920b77339e2deda418960be28868df538413abea6cdddaf4013e43c4c0f"; # v3-3.0.0.425
ports = ["6969:6969"];
ports = [ "6969:6969" ];
volumes = [
"/var/lib/whisparr:/config"
"/stash:/media/stash"
"/media/downloads:/media/downloads"
];
extraOptions = ["--network=host"];
extraOptions = [ "--network=host" ];
};
flaresolverr = {
image = "ghcr.io/flaresolverr/flaresolverr@sha256:213bb58aa341a0188e64ce2c21e1c5748b167c719828bc61dd904eb0fb1aec63"; # v3.3.13
ports = ["8191:8191"];
extraOptions = ["--network=host"];
ports = [ "8191:8191" ];
extraOptions = [ "--network=host" ];
};
};
}

View file

@ -1,10 +1,9 @@
{ pkgs, config, ... }:
{
pkgs,
config,
...
}: {
sops.secrets.restic-kariru = {sopsFile = ../../../secrets/restic/secrets.yaml;};
environment.systemPackages = [pkgs.restic];
sops.secrets.restic-kariru = {
sopsFile = ../../../secrets/restic/secrets.yaml;
};
environment.systemPackages = [ pkgs.restic ];
services.restic = {
backups = {
kariru = {

View file

@ -1,24 +1,25 @@
{config, ...}: {
sops.secrets.gluetun = {};
{ config, ... }:
{
sops.secrets.gluetun = { };
virtualisation.oci-containers.containers = {
gluetun = {
image = "qmcgaw/gluetun@sha256:e15ede3ce007e3f6e3f6532c7d8d6051f4bb0dca4bb3c5edd7aa3316916e9990"; #v3.37.0
image = "qmcgaw/gluetun@sha256:e15ede3ce007e3f6e3f6532c7d8d6051f4bb0dca4bb3c5edd7aa3316916e9990"; # v3.37.0
hostname = "gluetun";
ports = [
"8000:8000/tcp" # HTTP control server
"8888:8888/tcp" # HTTP proxy
"8388:8388/tcp" # Shadowsocks
"8388:8388/udp" # Shadowsocks
"8080:8080" #qb
"6881:6881" #qb
"6881:6881/udp" #qb
"8080:8080" # qb
"6881:6881" # qb
"6881:6881/udp" # qb
];
environmentFiles = [config.sops.secrets.gluetun.path];
extraOptions = ["--cap-add=NET_ADMIN"];
environmentFiles = [ config.sops.secrets.gluetun.path ];
extraOptions = [ "--cap-add=NET_ADMIN" ];
};
qbittorrent = {
image = "linuxserver/qbittorrent@sha256:c388ef02586a7d37c708c63eef069025663f4ac99cd29c9480bc34018d8b4194"; # v4.6.3
dependsOn = ["gluetun"];
dependsOn = [ "gluetun" ];
environment = {
PUID = "1001";
PGID = "2001";
@ -30,7 +31,7 @@
"/media/downloads:/downloads"
"/media/incomplete-downloads:/incomplete-downloads"
];
extraOptions = ["--network=container:gluetun"];
extraOptions = [ "--network=container:gluetun" ];
};
};
}

View file

@ -1,4 +1,4 @@
{...}: {
_: {
imports = [
./hardware.nix
./services

View file

@ -1,15 +1,10 @@
{ lib, modulesPath, ... }:
{
lib,
modulesPath,
...
}: {
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
];
imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
boot = {
kernelModules = ["kvm-amd"];
extraModulePackages = [];
kernelModules = [ "kvm-amd" ];
extraModulePackages = [ ];
loader.grub = {
enable = true;
configurationLimit = 5;
@ -17,8 +12,16 @@
useOSProber = true;
};
initrd = {
availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" "virtio_blk"];
kernelModules = [];
availableKernelModules = [
"ata_piix"
"uhci_hcd"
"virtio_pci"
"virtio_scsi"
"sd_mod"
"sr_mod"
"virtio_blk"
];
kernelModules = [ ];
};
};
@ -33,9 +36,7 @@
};
};
swapDevices = [
{device = "/dev/disk/by-uuid/100a4262-ce57-47a7-b99a-f124a8e369de";}
];
swapDevices = [ { device = "/dev/disk/by-uuid/100a4262-ce57-47a7-b99a-f124a8e369de"; } ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's

View file

@ -1,7 +1,6 @@
{...}: {
imports = [
../../home
];
{ ... }:
{
imports = [ ../../home ];
systemd.user.startServices = "sd-switch";
programs.home-manager.enable = true;

View file

@ -1,27 +1,28 @@
{ config, pkgs, ... }:
{
config,
pkgs,
...
}: {
environment.systemPackages = [pkgs.minio-client];
environment.systemPackages = [ pkgs.minio-client ];
systemd.services.minio.environment = {MINIO_BROWSER_REDIRECT = "false";};
systemd.services.minio.environment = {
MINIO_BROWSER_REDIRECT = "false";
};
sops.secrets.minio = {
owner = "minio";
group = "minio";
mode = "0600";
restartUnits = ["minio.service"];
};
services.minio = let
dataDir = "/var/lib/slab/minio";
in {
enable = true;
region = "us-east-1";
consoleAddress = "0.0.0.0:9006";
listenAddress = "0.0.0.0:9005";
rootCredentialsFile = config.sops.secrets.minio.path;
dataDir = ["${dataDir}/data"];
configDir = "${dataDir}/config";
restartUnits = [ "minio.service" ];
};
services.minio =
let
dataDir = "/var/lib/slab/minio";
in
{
enable = true;
region = "us-east-1";
consoleAddress = "0.0.0.0:9006";
listenAddress = "0.0.0.0:9005";
rootCredentialsFile = config.sops.secrets.minio.path;
dataDir = [ "${dataDir}/data" ];
configDir = "${dataDir}/config";
};
}

View file

@ -3,22 +3,34 @@
lib,
pkgs,
...
}: {
sops.secrets.tsauth-kaze = {sopsFile = ../../../secrets/tailscale/secrets.yaml;};
environment.systemPackages = [pkgs.jq pkgs.tailscale];
}:
{
sops.secrets.tsauth-kaze = {
sopsFile = ../../../secrets/tailscale/secrets.yaml;
};
environment.systemPackages = [
pkgs.jq
pkgs.tailscale
];
services.tailscale = {
useRoutingFeatures = lib.mkDefault "client";
};
networking.firewall.allowedUDPPorts = [config.services.tailscale.port];
networking.firewall.trustedInterfaces = [config.services.tailscale.interfaceName];
networking.firewall.allowedUDPPorts = [ config.services.tailscale.port ];
networking.firewall.trustedInterfaces = [ config.services.tailscale.interfaceName ];
systemd.services.tailscale-autoconnect = {
description = "Automatic connection to Tailscale";
# make sure tailscale is running before trying to connect to tailscale
after = ["network-pre.target" "tailscale.service"];
wants = ["network-pre.target" "tailscale.service"];
wantedBy = ["multi-user.target"];
after = [
"network-pre.target"
"tailscale.service"
];
wants = [
"network-pre.target"
"tailscale.service"
];
wantedBy = [ "multi-user.target" ];
# set this service as a oneshot job
serviceConfig.Type = "oneshot";

View file

@ -1,15 +1,10 @@
{ lib, modulesPath, ... }:
{
lib,
modulesPath,
...
}: {
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
];
imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
boot = {
kernelModules = [];
extraModulePackages = [];
kernelModules = [ ];
extraModulePackages = [ ];
loader.grub = {
enable = true;
configurationLimit = 5;
@ -17,8 +12,15 @@
useOSProber = false;
};
initrd = {
availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];
kernelModules = [];
availableKernelModules = [
"ata_piix"
"uhci_hcd"
"virtio_pci"
"virtio_scsi"
"sd_mod"
"sr_mod"
];
kernelModules = [ ];
};
};
@ -37,9 +39,7 @@
};
};
swapDevices = [
{device = "/dev/disk/by-uuid/c5afba13-f1af-4e7f-994b-f565c52d92fc";}
];
swapDevices = [ { device = "/dev/disk/by-uuid/c5afba13-f1af-4e7f-994b-f565c52d92fc"; } ];
networking.useDHCP = lib.mkDefault true;

View file

@ -1,7 +1,5 @@
{...}: {
imports = [
../../home
];
_: {
imports = [ ../../home ];
systemd.user.startServices = "sd-switch";
programs.home-manager.enable = true;

View file

@ -1,68 +1,77 @@
{config, ...}: {
networking.firewall.allowedTCPPorts = [9091];
sops.secrets.authelia-jwt = {owner = config.systemd.services.authelia-default.serviceConfig.User;};
sops.secrets.authelia-sek = {owner = config.systemd.services.authelia-default.serviceConfig.User;};
{ config, ... }:
{
networking.firewall.allowedTCPPorts = [ 9091 ];
sops.secrets.authelia-jwt = {
owner = config.systemd.services.authelia-default.serviceConfig.User;
};
sops.secrets.authelia-sek = {
owner = config.systemd.services.authelia-default.serviceConfig.User;
};
services.authelia.instances.default = {
enable = true;
secrets = {
jwtSecretFile = config.sops.secrets.authelia-jwt.path;
storageEncryptionKeyFile = config.sops.secrets.authelia-sek.path;
};
settings = let
pqdn = "notohh.dev";
in {
log.level = "debug";
theme = "dark";
default_2fa_method = "totp";
default_redirection_url = "https://passport.${pqdn}/";
authentication_backend = {
file.path = "/var/lib/authelia-default/user.yml";
};
session = {
domain = pqdn;
expiration = 3600;
inactivity = 300;
};
totp = {
issuer = "authelia.com";
disable = false;
algorithm = "sha1";
digits = 6;
period = 30;
skew = 1;
secret_size = 32;
};
server = {
host = "0.0.0.0";
port = 9091;
};
access_control = {
default_policy = "deny";
rules = [
settings =
let
pqdn = "notohh.dev";
in
{
log.level = "debug";
theme = "dark";
default_2fa_method = "totp";
default_redirection_url = "https://passport.${pqdn}/";
authentication_backend = {
file.path = "/var/lib/authelia-default/user.yml";
};
session = {
domain = pqdn;
expiration = 3600;
inactivity = 300;
};
totp = {
issuer = "authelia.com";
disable = false;
algorithm = "sha1";
digits = 6;
period = 30;
skew = 1;
secret_size = 32;
};
server = {
host = "0.0.0.0";
port = 9091;
};
access_control = {
default_policy = "deny";
rules = [
{
domain = pqdn;
policy = "bypass";
}
];
};
regulation = {
max_retries = 3;
find_time = 120;
ban_time = 300;
};
notifier.filesystem = {
filename = "/var/lib/authelia-default/notif.txt";
};
storage.postgres =
let
dbInfo = "authelia";
in
{
domain = pqdn;
policy = "bypass";
}
];
host = "192.168.1.211";
port = 5432;
database = dbInfo;
schema = "public";
username = dbInfo;
password = dbInfo;
};
};
regulation = {
max_retries = 3;
find_time = 120;
ban_time = 300;
};
notifier.filesystem = {
filename = "/var/lib/authelia-default/notif.txt";
};
storage.postgres = let
dbInfo = "authelia";
in {
host = "192.168.1.211";
port = 5432;
database = dbInfo;
schema = "public";
username = dbInfo;
password = dbInfo;
};
};
};
}

View file

@ -1,5 +1,8 @@
_: {
networking.firewall.allowedTCPPorts = [6167 8448];
networking.firewall.allowedTCPPorts = [
6167
8448
];
services.matrix-conduit = {
enable = true;
settings = {
@ -14,7 +17,7 @@ _: {
max_request_size = 20000000;
database_backend = "rocksdb";
enable_lightning_bolt = false;
trusted_servers = ["matrix.org"];
trusted_servers = [ "matrix.org" ];
};
};
};

View file

@ -1,4 +1,5 @@
{...}: {
{ ... }:
{
imports = [
./restic.nix
./authelia.nix

View file

@ -1,14 +1,14 @@
{
lib,
config,
...
}: let
{ lib, config, ... }:
let
sshPort = 2222;
dbHost = "192.168.1.211";
dbLogin = "forgejo";
in {
sops.secrets.smtp2go-pwd = {owner = "forgejo";};
networking.firewall.allowedTCPPorts = [2222];
in
{
sops.secrets.smtp2go-pwd = {
owner = "forgejo";
};
networking.firewall.allowedTCPPorts = [ 2222 ];
services.forgejo = {
enable = true;
stateDir = "/var/lib/forgejo";
@ -78,7 +78,7 @@ in {
services.fail2ban.jails.forgejo = {
settings = {
filter = "forgejo";
action = ''iptables-allports'';
action = "iptables-allports";
mode = "aggressive";
maxretry = 3;
findtime = 3600;

View file

@ -1,7 +1,9 @@
_: let
_:
let
prometheusPort = "9090";
dbLogin = "grafana";
in {
in
{
services.grafana = {
enable = true;
settings = {

View file

@ -5,7 +5,7 @@ _: {
port = 3300;
domain = "scratch.flake.sh";
host = "100.121.201.47";
allowOrigin = ["scratch.flake.sh"];
allowOrigin = [ "scratch.flake.sh" ];
allowAnonymous = true;
allowFreeURL = true;
allowEmailRegister = false;

View file

@ -1,8 +1,8 @@
_: {
networking.firewall.allowedTCPPorts = [8025];
networking.firewall.allowedTCPPorts = [ 8025 ];
virtualisation.oci-containers.containers.justlog = {
image = "ghcr.io/gempir/justlog@sha256:44b2426c0057b44019b78b1daece13dac2356ff68f9f506f067c8c4c92f54f22";
ports = ["8025:8025"];
ports = [ "8025:8025" ];
volumes = [
"/home/notoh/justlog/config.json:/etc/justlog.json"
"/home/notoh/justlog/logs:/logs"

View file

@ -1,10 +1,9 @@
{ pkgs, config, ... }:
{
pkgs,
config,
...
}: {
sops.secrets.restic-sakura = {sopsFile = ../../../secrets/restic/secrets.yaml;};
environment.systemPackages = [pkgs.restic];
sops.secrets.restic-sakura = {
sopsFile = ../../../secrets/restic/secrets.yaml;
};
environment.systemPackages = [ pkgs.restic ];
services.restic = {
backups = {
sakura = {

View file

@ -1,9 +1,10 @@
{pkgs, ...}: {
environment.systemPackages = with pkgs; [rustypaste];
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [ rustypaste ];
systemd.services.rustypaste = {
enable = true;
wantedBy = ["multi-user.target"];
wantedBy = [ "multi-user.target" ];
description = "A minimal file upload/pastebin service.";
environment = {
CONFIG = "/var/lib/rustypaste/config.toml";

View file

@ -3,22 +3,34 @@
lib,
pkgs,
...
}: {
sops.secrets.tsauth-sakura = {sopsFile = ../../../secrets/tailscale/secrets.yaml;};
environment.systemPackages = [pkgs.jq pkgs.tailscale];
}:
{
sops.secrets.tsauth-sakura = {
sopsFile = ../../../secrets/tailscale/secrets.yaml;
};
environment.systemPackages = [
pkgs.jq
pkgs.tailscale
];
services.tailscale = {
useRoutingFeatures = lib.mkDefault "client";
};
networking.firewall.allowedUDPPorts = [config.services.tailscale.port];
networking.firewall.trustedInterfaces = [config.services.tailscale.interfaceName];
networking.firewall.allowedUDPPorts = [ config.services.tailscale.port ];
networking.firewall.trustedInterfaces = [ config.services.tailscale.interfaceName ];
systemd.services.tailscale-autoconnect = {
description = "Automatic connection to Tailscale";
# make sure tailscale is running before trying to connect to tailscale
after = ["network-pre.target" "tailscale.service"];
wants = ["network-pre.target" "tailscale.service"];
wantedBy = ["multi-user.target"];
after = [
"network-pre.target"
"tailscale.service"
];
wants = [
"network-pre.target"
"tailscale.service"
];
wantedBy = [ "multi-user.target" ];
# set this service as a oneshot job
serviceConfig.Type = "oneshot";

View file

@ -1,9 +1,6 @@
{ pkgs, config, ... }:
{
pkgs,
config,
...
}: {
sops.secrets.vaultwarden-env = {};
sops.secrets.vaultwarden-env = { };
services.vaultwarden = {
enable = true;
package = pkgs.vaultwarden-postgresql;

View file

@ -1,5 +1,6 @@
{modulesPath, ...}: {
imports = [(modulesPath + "/profiles/qemu-guest.nix")];
{ modulesPath, ... }:
{
imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
zramSwap.enable = true;
@ -11,8 +12,13 @@
device = "nodev";
};
initrd = {
availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"];
kernelModules = ["nvme"];
availableKernelModules = [
"ata_piix"
"uhci_hcd"
"xen_blkfront"
"vmw_pvscsi"
];
kernelModules = [ "nvme" ];
};
};

View file

@ -1,7 +1,5 @@
{...}: {
imports = [
../../home
];
_: {
imports = [ ../../home ];
systemd.user.startServices = "sd-switch";
programs.home-manager.enable = true;

View file

@ -1,4 +1,5 @@
{lib, ...}: {
{ lib, ... }:
{
networking = {
hostName = "sora";
nameservers = [

View file

@ -1,18 +1,15 @@
{ config, pkgs, ... }:
{
config,
pkgs,
...
}: {
sops.secrets.attic = {};
sops.secrets.attic = { };
environment.systemPackages = [pkgs.attic];
environment.systemPackages = [ pkgs.attic ];
services.atticd = {
enable = true;
credentialsFile = config.sops.secrets.attic.path;
settings = {
listen = "[::]:8200";
allowed-hosts = ["cache.flake.sh"];
allowed-hosts = [ "cache.flake.sh" ];
database.url = "postgres://attic:attic@100.94.214.100:5432/attic";
api-endpoint = "https://cache.flake.sh/";
require-proof-of-possession = false;

View file

@ -1,5 +1,6 @@
{lib, ...}: {
networking.firewall.allowedTCPPorts = [8888];
{ lib, ... }:
{
networking.firewall.allowedTCPPorts = [ 8888 ];
services.atuin = {
enable = true;
openRegistration = false;

View file

@ -1,4 +1,5 @@
{...}: {
{ ... }:
{
imports = [
./restic.nix
./traefik.nix

View file

@ -4,7 +4,7 @@ _: {
public = false;
lan = false;
openFirewall = true;
admins = ["notoh"];
admins = [ "notoh" ];
game-name = "forsen";
autosave-interval = 20;
};

View file

@ -1,9 +1,9 @@
_: {
sops.secrets.foundry-username = {};
sops.secrets.foundry-password = {};
sops.secrets.foundry-username = { };
sops.secrets.foundry-password = { };
virtualisation.oci-containers.containers.foundryvtt = {
image = "felddy/foundryvtt@sha256:d85dab9704d771f3a33f21439f1bf34748fb5bf1987668ff402b5b17d1973f5a";
volumes = ["/home/notoh/docker/foundryvtt:/data"];
volumes = [ "/home/notoh/docker/foundryvtt:/data" ];
environment = {
CONTAINER_PRESERVE_CONFIG = "true";
};
@ -11,6 +11,6 @@ _: {
/run/secrets/foundry-username
/run/secrets/foundry-password
];
ports = ["30000:30000"];
ports = [ "30000:30000" ];
};
}

View file

@ -1,8 +1,8 @@
_: {
virtualisation.oci-containers.containers.glances = {
image = "nicolargo/glances";
ports = ["61208-61209:61208-61209"];
volumes = ["/var/run/docker.sock:/var/run/docker.sock"];
ports = [ "61208-61209:61208-61209" ];
volumes = [ "/var/run/docker.sock:/var/run/docker.sock" ];
environment = {
GLANCES_OPT = "-w";
};

View file

@ -1,9 +1,12 @@
_: {
networking.firewall.allowedTCPPorts = [25565];
networking.firewall.allowedUDPPorts = [24454];
networking.firewall.allowedTCPPorts = [ 25565 ];
networking.firewall.allowedUDPPorts = [ 24454 ];
virtualisation.oci-containers.containers.minecraft = {
image = "itzg/minecraft-server";
ports = ["25565:25565" "24454:24454/udp"];
ports = [
"25565:25565"
"24454:24454/udp"
];
environment = {
EULA = "TRUE";
VERSION = "1.19.2";
@ -12,6 +15,6 @@ _: {
FABRIC_LOADER_VERSION = "0.14.23";
FABRIC_LAUNCHER_VERSION = "0.11.2";
};
volumes = ["/home/notoh/docker/modded-mc:/data:rw"];
volumes = [ "/home/notoh/docker/modded-mc:/data:rw" ];
};
}

View file

@ -1,5 +1,6 @@
{pkgs, ...}: {
environment.systemPackages = [pkgs.ntfy-sh];
{ pkgs, ... }:
{
environment.systemPackages = [ pkgs.ntfy-sh ];
services.ntfy-sh = {
enable = true;
settings = {

View file

@ -1,13 +1,14 @@
{ pkgs, config, ... }:
{
pkgs,
config,
...
}: {
sops.secrets = {
restic-sora = {sopsFile = ../../../secrets/restic/secrets.yaml;};
sora-s3 = {sopsFile = ../../../secrets/s3/secrets.yaml;};
restic-sora = {
sopsFile = ../../../secrets/restic/secrets.yaml;
};
sora-s3 = {
sopsFile = ../../../secrets/s3/secrets.yaml;
};
};
environment.systemPackages = [pkgs.restic];
environment.systemPackages = [ pkgs.restic ];
services.restic = {
backups = {
sora = {

View file

@ -3,22 +3,34 @@
lib,
pkgs,
...
}: {
sops.secrets.tsauth-sora = {sopsFile = ../../../secrets/tailscale/secrets.yaml;};
environment.systemPackages = [pkgs.jq pkgs.tailscale];
}:
{
sops.secrets.tsauth-sora = {
sopsFile = ../../../secrets/tailscale/secrets.yaml;
};
environment.systemPackages = [
pkgs.jq
pkgs.tailscale
];
services.tailscale = {
useRoutingFeatures = lib.mkDefault "server"; # important to make it a server, it sets sysctl for ip forwarding without intervention and reboot
};
networking.firewall.allowedUDPPorts = [config.services.tailscale.port];
networking.firewall.trustedInterfaces = [config.services.tailscale.interfaceName];
networking.firewall.allowedUDPPorts = [ config.services.tailscale.port ];
networking.firewall.trustedInterfaces = [ config.services.tailscale.interfaceName ];
systemd.services.tailscale-autoconnect = {
description = "Automatic connection to Tailscale";
# make sure tailscale is running before trying to connect to tailscale
after = ["network-pre.target" "tailscale.service"];
wants = ["network-pre.target" "tailscale.service"];
wantedBy = ["multi-user.target"];
after = [
"network-pre.target"
"tailscale.service"
];
wants = [
"network-pre.target"
"tailscale.service"
];
wantedBy = [ "multi-user.target" ];
# set this service as a oneshot job
serviceConfig.Type = "oneshot";

View file

@ -1,9 +1,9 @@
_: {
networking.firewall.allowedTCPPorts = [7777];
networking.firewall.allowedTCPPorts = [ 7777 ];
virtualisation.oci-containers.containers.terraria = {
image = "jacobsmile/tmodloader1.4:v2023.11.3.3";
ports = ["7777:7777"];
volumes = ["/var/lib/terraria/tmodloader:/data"];
ports = [ "7777:7777" ];
volumes = [ "/var/lib/terraria/tmodloader:/data" ];
environment = {
TMOD_MOTD = "forsen";
TMOD_PASS = "forsen";

View file

@ -1,12 +1,18 @@
{config, ...}: {
sops.secrets.cloudflare-api-key = {};
networking.firewall.allowedTCPPorts = [80 443 2222 8080];
{ config, ... }:
{
sops.secrets.cloudflare-api-key = { };
networking.firewall.allowedTCPPorts = [
80
443
2222
8080
];
systemd.services.traefik = {
environment = {
CLOUDFLARE_EMAIL = "jch0tm2e@notohh.dev";
};
serviceConfig = {
EnvironmentFile = [config.sops.secrets.cloudflare-api-key.path];
EnvironmentFile = [ config.sops.secrets.cloudflare-api-key.path ];
};
};
services.traefik = {
@ -16,12 +22,12 @@
routers = {
gitssh = {
rule = "HostSNI(`*`)";
entrypoints = ["ssh"];
entrypoints = [ "ssh" ];
service = "gitssh";
};
};
services = {
gitssh.loadBalancer.servers = [{address = "100.121.201.47:2222";}];
gitssh.loadBalancer.servers = [ { address = "100.121.201.47:2222"; } ];
};
};
http = {
@ -47,149 +53,153 @@
};
};
};
routers = let
pqdn = "flake.sh";
in {
api = {
rule = "PathPrefix(`/api/`)";
entrypoints = ["websecure"];
service = "api@internal";
routers =
let
pqdn = "flake.sh";
in
{
api = {
rule = "PathPrefix(`/api/`)";
entrypoints = [ "websecure" ];
service = "api@internal";
};
authelia = {
rule = "Host(`passport.notohh.dev`)";
entrypoints = [ "websecure" ];
service = "authelia";
tls.domains = [ { main = "*.notohh.dev"; } ];
tls.certresolver = "production";
};
uptime-kuma = {
rule = "Host(`status.${pqdn}`)";
entrypoints = [ "websecure" ];
service = "uptime-kuma";
tls.domains = [ { main = "*.${pqdn}"; } ];
tls.certresolver = "production";
};
conduit = {
rule = "Host(`matrix.${pqdn}`)";
entrypoints = [ "websecure" ];
service = "conduit";
tls.domains = [ { main = "*.${pqdn}"; } ];
tls.certresolver = "production";
};
foundryvtt = {
rule = "Host(`foundry.${pqdn}`)";
entrypoints = [ "websecure" ];
service = "foundryvtt";
tls.domains = [ { main = "*.${pqdn}"; } ];
tls.certresolver = "production";
};
forgejo = {
rule = "Host(`git.${pqdn}`)";
entrypoints = [ "websecure" ];
service = "forgejo";
tls.domains = [ { main = "*.${pqdn}"; } ];
tls.certresolver = "production";
middlewares = "cors";
};
rustypaste = {
rule = "Host(`i.${pqdn}`)";
entrypoints = [ "websecure" ];
service = "rustypaste";
tls.domains = [ { main = "*.${pqdn}"; } ];
tls.certresolver = "production";
};
grafana = {
rule = "Host(`metrics.${pqdn}`)";
entrypoints = [ "websecure" ];
service = "grafana";
tls.domains = [ { main = "*.${pqdn}"; } ];
tls.certresolver = "production";
};
hedgedoc = {
rule = "Host(`scratch.${pqdn}`)";
entrypoints = [ "websecure" ];
service = "hedgedoc";
tls.domains = [ { main = "*.${pqdn}"; } ];
tls.certresolver = "production";
};
vaultwarden = {
rule = "Host(`vault.${pqdn}`)";
entrypoints = [ "websecure" ];
service = "vaultwarden";
tls.domains = [ { main = "*.${pqdn}"; } ];
tls.certresolver = "production";
};
neko = {
rule = "Host(`neko.${pqdn}`)";
entrypoints = [ "websecure" ];
service = "neko";
tls.domains = [ { main = "*.${pqdn}"; } ];
tls.certresolver = "production";
};
justlog = {
rule = "Host(`logs.${pqdn}`)";
entrypoints = [ "websecure" ];
service = "justlog";
tls.domains = [ { main = "*.${pqdn}"; } ];
tls.certresolver = "production";
};
ntfy = {
rule = "Host(`ntfy.${pqdn}`)";
entrypoints = [ "websecure" ];
service = "ntfy-sh";
tls.domains = [ { main = "*.${pqdn}"; } ];
tls.certresolver = "production";
};
attic = {
rule = "Host(`cache.${pqdn}`)";
entrypoints = [ "websecure" ];
service = "attic";
tls.domains = [ { main = "*.${pqdn}"; } ];
tls.certresolver = "production";
};
minio = {
rule = "Host(`s3.${pqdn}`)";
entrypoints = [ "websecure" ];
service = "minio";
tls.domains = [ { main = "*.${pqdn}"; } ];
tls.certresolver = "production";
middlewares = "cors-allow-all";
};
woodpecker = {
rule = "Host(`ci.${pqdn}`)";
entrypoints = [ "websecure" ];
service = "woodpecker";
tls.domains = [ { main = "*.${pqdn}"; } ];
tls.certresolver = "production";
};
};
authelia = {
rule = "Host(`passport.notohh.dev`)";
entrypoints = ["websecure"];
service = "authelia";
tls.domains = [{main = "*.notohh.dev";}];
tls.certresolver = "production";
};
uptime-kuma = {
rule = "Host(`status.${pqdn}`)";
entrypoints = ["websecure"];
service = "uptime-kuma";
tls.domains = [{main = "*.${pqdn}";}];
tls.certresolver = "production";
};
conduit = {
rule = "Host(`matrix.${pqdn}`)";
entrypoints = ["websecure"];
service = "conduit";
tls.domains = [{main = "*.${pqdn}";}];
tls.certresolver = "production";
};
foundryvtt = {
rule = "Host(`foundry.${pqdn}`)";
entrypoints = ["websecure"];
service = "foundryvtt";
tls.domains = [{main = "*.${pqdn}";}];
tls.certresolver = "production";
};
forgejo = {
rule = "Host(`git.${pqdn}`)";
entrypoints = ["websecure"];
service = "forgejo";
tls.domains = [{main = "*.${pqdn}";}];
tls.certresolver = "production";
middlewares = "cors";
};
rustypaste = {
rule = "Host(`i.${pqdn}`)";
entrypoints = ["websecure"];
service = "rustypaste";
tls.domains = [{main = "*.${pqdn}";}];
tls.certresolver = "production";
};
grafana = {
rule = "Host(`metrics.${pqdn}`)";
entrypoints = ["websecure"];
service = "grafana";
tls.domains = [{main = "*.${pqdn}";}];
tls.certresolver = "production";
};
hedgedoc = {
rule = "Host(`scratch.${pqdn}`)";
entrypoints = ["websecure"];
service = "hedgedoc";
tls.domains = [{main = "*.${pqdn}";}];
tls.certresolver = "production";
};
vaultwarden = {
rule = "Host(`vault.${pqdn}`)";
entrypoints = ["websecure"];
service = "vaultwarden";
tls.domains = [{main = "*.${pqdn}";}];
tls.certresolver = "production";
};
neko = {
rule = "Host(`neko.${pqdn}`)";
entrypoints = ["websecure"];
service = "neko";
tls.domains = [{main = "*.${pqdn}";}];
tls.certresolver = "production";
};
justlog = {
rule = "Host(`logs.${pqdn}`)";
entrypoints = ["websecure"];
service = "justlog";
tls.domains = [{main = "*.${pqdn}";}];
tls.certresolver = "production";
};
ntfy = {
rule = "Host(`ntfy.${pqdn}`)";
entrypoints = ["websecure"];
service = "ntfy-sh";
tls.domains = [{main = "*.${pqdn}";}];
tls.certresolver = "production";
};
attic = {
rule = "Host(`cache.${pqdn}`)";
entrypoints = ["websecure"];
service = "attic";
tls.domains = [{main = "*.${pqdn}";}];
tls.certresolver = "production";
};
minio = {
rule = "Host(`s3.${pqdn}`)";
entrypoints = ["websecure"];
service = "minio";
tls.domains = [{main = "*.${pqdn}";}];
tls.certresolver = "production";
middlewares = "cors-allow-all";
};
woodpecker = {
rule = "Host(`ci.${pqdn}`)";
entrypoints = ["websecure"];
service = "woodpecker";
tls.domains = [{main = "*.${pqdn}";}];
tls.certresolver = "production";
};
};
services = let
sakuraIp = "100.121.201.47:";
soraIp = "100.104.42.96:";
in {
# sora
uptime-kuma.loadBalancer.servers = [{url = "http://${soraIp}4000";}];
foundryvtt.loadBalancer.servers = [{url = "http://${soraIp}30000";}];
ntfy-sh.loadBalancer.servers = [{url = "http://${soraIp}8090";}];
attic.loadBalancer.servers = [{url = "http://${soraIp}8200";}];
services =
let
sakuraIp = "100.121.201.47:";
soraIp = "100.104.42.96:";
in
{
# sora
uptime-kuma.loadBalancer.servers = [ { url = "http://${soraIp}4000"; } ];
foundryvtt.loadBalancer.servers = [ { url = "http://${soraIp}30000"; } ];
ntfy-sh.loadBalancer.servers = [ { url = "http://${soraIp}8090"; } ];
attic.loadBalancer.servers = [ { url = "http://${soraIp}8200"; } ];
# sakura
forgejo.loadBalancer.servers = [{url = "http://${sakuraIp}3200";}];
conduit.loadBalancer.servers = [{url = "http://${sakuraIp}6167";}];
authelia.loadBalancer.servers = [{url = "http://${sakuraIp}9091";}];
rustypaste.loadBalancer.servers = [{url = "http://${sakuraIp}8000";}];
grafana.loadBalancer.servers = [{url = "http://${sakuraIp}3100";}];
hedgedoc.loadBalancer.servers = [{url = "http://${sakuraIp}3300";}];
vaultwarden.loadBalancer.servers = [{url = "http://${sakuraIp}8222";}];
searxng.loadBalancer.servers = [{url = "http://${sakuraIp}8100";}];
justlog.loadBalancer.servers = [{url = "http://${sakuraIp}8025";}];
# sakura
forgejo.loadBalancer.servers = [ { url = "http://${sakuraIp}3200"; } ];
conduit.loadBalancer.servers = [ { url = "http://${sakuraIp}6167"; } ];
authelia.loadBalancer.servers = [ { url = "http://${sakuraIp}9091"; } ];
rustypaste.loadBalancer.servers = [ { url = "http://${sakuraIp}8000"; } ];
grafana.loadBalancer.servers = [ { url = "http://${sakuraIp}3100"; } ];
hedgedoc.loadBalancer.servers = [ { url = "http://${sakuraIp}3300"; } ];
vaultwarden.loadBalancer.servers = [ { url = "http://${sakuraIp}8222"; } ];
searxng.loadBalancer.servers = [ { url = "http://${sakuraIp}8100"; } ];
justlog.loadBalancer.servers = [ { url = "http://${sakuraIp}8025"; } ];
# kaze
minio.loadBalancer.servers = [{url = "http://100.69.79.81:9005";}];
# kaze
minio.loadBalancer.servers = [ { url = "http://100.69.79.81:9005"; } ];
# tsuru
woodpecker.loadBalancer.servers = [{url = "http://100.82.146.40:8200";}];
};
# tsuru
woodpecker.loadBalancer.servers = [ { url = "http://100.82.146.40:8200"; } ];
};
};
};
staticConfigOptions = {
@ -227,7 +237,10 @@
caServer = "https://acme-staging-v02.api.letsencrypt.org/directory";
dnsChallenge = {
provider = "cloudflare";
resolvers = ["1.1.1.1:53" "1.0.0.1:53"];
resolvers = [
"1.1.1.1:53"
"1.0.0.1:53"
];
delayBeforeCheck = "0";
};
};
@ -237,7 +250,10 @@
caServer = "https://acme-v02.api.letsencrypt.org/directory";
dnsChallenge = {
provider = "cloudflare";
resolvers = ["1.1.1.1:53" "1.0.0.1:53"];
resolvers = [
"1.1.1.1:53"
"1.0.0.1:53"
];
delayBeforeCheck = "0";
};
};

View file

@ -3,7 +3,8 @@
config,
pkgs,
...
}: {
}:
{
imports = [
inputs.nix-gaming.nixosModules.steamCompat
inputs.nix-gaming.nixosModules.pipewireLowLatency
@ -34,7 +35,7 @@
};
xserver = {
enable = true;
videoDrivers = ["nvidia"];
videoDrivers = [ "nvidia" ];
xkb = {
layout = "us";
variant = "";
@ -56,9 +57,7 @@
gamemode.enable = true;
steam = {
enable = true;
extraCompatPackages = [
inputs.nix-gaming.packages.${pkgs.system}.proton-ge
];
extraCompatPackages = [ inputs.nix-gaming.packages.${pkgs.system}.proton-ge ];
};
};
@ -71,7 +70,7 @@
};
opengl = {
enable = true;
extraPackages = [pkgs.nvidia-vaapi-driver];
extraPackages = [ pkgs.nvidia-vaapi-driver ];
};
opentabletdriver = {
enable = true;

View file

@ -3,14 +3,16 @@
lib,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
}:
{
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot = {
kernelModules = ["v4l2loopback" "kvm-intel"];
extraModulePackages = with config.boot.kernelPackages; [v4l2loopback.out];
kernelModules = [
"v4l2loopback"
"kvm-intel"
];
extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback.out ];
loader = {
systemd-boot = {
enable = true;
@ -22,8 +24,15 @@
};
};
initrd = {
availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod"];
kernelModules = [];
availableKernelModules = [
"xhci_pci"
"ahci"
"nvme"
"usb_storage"
"usbhid"
"sd_mod"
];
kernelModules = [ ];
};
};
@ -58,9 +67,7 @@
};
};
swapDevices = [
{device = "/dev/disk/by-uuid/2f5e2c64-99b8-4fa0-943c-c9dd45c84fdc";}
];
swapDevices = [ { device = "/dev/disk/by-uuid/2f5e2c64-99b8-4fa0-943c-c9dd45c84fdc"; } ];
networking.useDHCP = lib.mkDefault true;

View file

@ -1,8 +1,5 @@
{ inputs, pkgs, ... }:
{
inputs,
pkgs,
...
}: {
imports = [
./services/swayidle.nix
../../home
@ -54,8 +51,8 @@
prismlauncher
yuzu
inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin
(libsForQt5.callPackage ../../pkgs/chatterino7 {})
(callPackage ../../pkgs/jellyfin-rpc {})
(libsForQt5.callPackage ../../pkgs/chatterino7 { })
(callPackage ../../pkgs/jellyfin-rpc { })
];
stateVersion = "23.05";
};

View file

@ -1,9 +1,10 @@
{pkgs, ...}: {
environment.systemPackages = [pkgs.attic];
{ pkgs, ... }:
{
environment.systemPackages = [ pkgs.attic ];
systemd.services.atticd = {
enable = true;
wantedBy = ["multi-user.target"];
wantedBy = [ "multi-user.target" ];
description = "atticd";
serviceConfig = {

View file

@ -1,4 +1,5 @@
{...}: {
{ ... }:
{
imports = [
./restic.nix
./atticd.nix

View file

@ -1,10 +1,14 @@
{pkgs, ...}: {
environment.systemPackages = [pkgs.hydroxide];
networking.firewall.allowedTCPPorts = [1025 1143];
{ pkgs, ... }:
{
environment.systemPackages = [ pkgs.hydroxide ];
networking.firewall.allowedTCPPorts = [
1025
1143
];
systemd.services.hydroxide = {
enable = true;
wantedBy = ["multi-user.target"];
wantedBy = [ "multi-user.target" ];
description = "A third-party, open-source ProtonMail bridge";
serviceConfig = {

View file

@ -1,16 +1,17 @@
{ pkgs, config, ... }:
{
pkgs,
config,
...
}: {
sops.secrets.restic-tsuki = {sopsFile = ../../../secrets/restic/secrets.yaml;};
sops.secrets.restic-osu = {sopsFile = ../../../secrets/restic/secrets.yaml;};
environment.systemPackages = [pkgs.restic];
sops.secrets.restic-tsuki = {
sopsFile = ../../../secrets/restic/secrets.yaml;
};
sops.secrets.restic-osu = {
sopsFile = ../../../secrets/restic/secrets.yaml;
};
environment.systemPackages = [ pkgs.restic ];
services.restic = {
backups = {
tsuki = {
user = "root";
paths = ["/home"];
paths = [ "/home" ];
exclude = [
"*.qcow2"
"*.iso"
@ -47,8 +48,8 @@
};
osu = {
user = "root";
paths = ["/home/*/osu!"];
pruneOpts = ["--keep-last=2"];
paths = [ "/home/*/osu!" ];
pruneOpts = [ "--keep-last=2" ];
initialize = true;
repository = "/nas/osu-backups";
passwordFile = config.sops.secrets.restic-osu.path;

View file

@ -1,4 +1,4 @@
{...}: {
_: {
imports = [
./hardware.nix
./services

View file

@ -1,15 +1,10 @@
{ lib, modulesPath, ... }:
{
lib,
modulesPath,
...
}: {
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
];
imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
boot = {
kernelModules = [];
extraModulePackages = [];
kernelModules = [ ];
extraModulePackages = [ ];
loader.grub = {
enable = true;
configurationLimit = 5;
@ -17,8 +12,15 @@
useOSProber = false;
};
initrd = {
availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];
kernelModules = [];
availableKernelModules = [
"ata_piix"
"uhci_hcd"
"virtio_pci"
"virtio_scsi"
"sd_mod"
"sr_mod"
];
kernelModules = [ ];
};
};
@ -29,9 +31,7 @@
};
};
swapDevices = [
{device = "/dev/disk/by-uuid/5be1a83b-5b40-4068-ade3-fcf28ff07e35";}
];
swapDevices = [ { device = "/dev/disk/by-uuid/5be1a83b-5b40-4068-ade3-fcf28ff07e35"; } ];
networking.useDHCP = lib.mkDefault true;

View file

@ -1,7 +1,5 @@
{...}: {
imports = [
../../home
];
_: {
imports = [ ../../home ];
systemd.user.startServices = "sd-switch";
programs.home-manager.enable = true;

View file

@ -1,5 +1 @@
_: {
imports = [
./woodpecker.nix
];
}
_: { imports = [ ./woodpecker.nix ]; }

View file

@ -3,22 +3,34 @@
lib,
pkgs,
...
}: {
sops.secrets.tsauth-tsuru = {sopsFile = ../../../secrets/tailscale/secrets.yaml;};
environment.systemPackages = [pkgs.jq pkgs.tailscale];
}:
{
sops.secrets.tsauth-tsuru = {
sopsFile = ../../../secrets/tailscale/secrets.yaml;
};
environment.systemPackages = [
pkgs.jq
pkgs.tailscale
];
services.tailscale = {
useRoutingFeatures = lib.mkDefault "client";
};
networking.firewall.allowedUDPPorts = [config.services.tailscale.port];
networking.firewall.trustedInterfaces = [config.services.tailscale.interfaceName];
networking.firewall.allowedUDPPorts = [ config.services.tailscale.port ];
networking.firewall.trustedInterfaces = [ config.services.tailscale.interfaceName ];
systemd.services.tailscale-autoconnect = {
description = "Automatic connection to Tailscale";
# make sure tailscale is running before trying to connect to tailscale
after = ["network-pre.target" "tailscale.service"];
wants = ["network-pre.target" "tailscale.service"];
wantedBy = ["multi-user.target"];
after = [
"network-pre.target"
"tailscale.service"
];
wants = [
"network-pre.target"
"tailscale.service"
];
wantedBy = [ "multi-user.target" ];
# set this service as a oneshot job
serviceConfig.Type = "oneshot";

View file

@ -1,6 +1,7 @@
{config, ...}: {
sops.secrets.woodpecker-server = {};
sops.secrets.woodpecker-agent-secret = {};
{ config, ... }:
{
sops.secrets.woodpecker-server = { };
sops.secrets.woodpecker-agent-secret = { };
services.woodpecker-server = {
enable = true;
environment = {
@ -31,6 +32,6 @@
WOODPECKER_KEEPALIVE_MIN_TIME = "10s";
WOODPECKER_HEALTHCHECK = "true";
};
extraGroups = ["docker"];
extraGroups = [ "docker" ];
};
}

View file

@ -1,4 +1,4 @@
{...}: {
_: {
imports = [
./hardware.nix
./services

View file

@ -1,15 +1,10 @@
{ lib, modulesPath, ... }:
{
lib,
modulesPath,
...
}: {
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
];
imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
boot = {
kernelModules = [];
extraModulePackages = [];
kernelModules = [ ];
extraModulePackages = [ ];
loader.grub = {
enable = true;
configurationLimit = 5;
@ -17,8 +12,15 @@
useOSProber = false;
};
initrd = {
availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];
kernelModules = [];
availableKernelModules = [
"ata_piix"
"uhci_hcd"
"virtio_pci"
"virtio_scsi"
"sd_mod"
"sr_mod"
];
kernelModules = [ ];
};
};
@ -45,9 +47,7 @@
};
};
swapDevices = [
{device = "/dev/disk/by-uuid/bd7ccb73-6f85-4b3d-b37f-5cff58a6ab59";}
];
swapDevices = [ { device = "/dev/disk/by-uuid/bd7ccb73-6f85-4b3d-b37f-5cff58a6ab59"; } ];
networking.useDHCP = lib.mkDefault true;

View file

@ -1,7 +1,5 @@
{...}: {
imports = [
../../home
];
_: {
imports = [ ../../home ];
systemd.user.startServices = "sd-switch";
programs.home-manager.enable = true;

View file

@ -1,5 +1,6 @@
{config, ...}: {
sops.secrets.anki-pwd = {};
{ config, ... }:
{
sops.secrets.anki-pwd = { };
services.anki-sync-server = {
enable = true;
openFirewall = true;

View file

@ -1,4 +1,5 @@
{...}: {
{ ... }:
{
imports = [
./hass
./restic.nix

View file

@ -13,6 +13,6 @@ _: {
currency = "USD";
country = "US";
};
default_config = {};
default_config = { };
};
}

View file

@ -4,7 +4,7 @@ _: {
./config.nix
];
nixpkgs.config.permittedInsecurePackages = ["openssl-1.1.1w"];
nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" ];
services.home-assistant = {
enable = true;

View file

@ -24,8 +24,12 @@ _: {
{
type = "light";
entity = "light.living_room";
tap_action = {action = "toggle";};
hold_action = {action = "Default action";};
tap_action = {
action = "toggle";
};
hold_action = {
action = "Default action";
};
style = {
top = "72.8%";
left = "75.3%";
@ -34,8 +38,12 @@ _: {
{
type = "light";
entity = "light.hall_light";
tap_action = {action = "toggle";};
hold_action = {action = "Default action";};
tap_action = {
action = "toggle";
};
hold_action = {
action = "Default action";
};
style = {
top = "72.8%";
left = "75.3%";
@ -49,8 +57,12 @@ _: {
{
type = "light";
entity = "light.master_bedroom_lamp";
tap_action = {action = "toggle";};
hold_action = {action = "Default action";};
tap_action = {
action = "toggle";
};
hold_action = {
action = "Default action";
};
style = {
top = "72.8%";
left = "75.3%";
@ -66,8 +78,12 @@ _: {
entity = "light.bedroom_1";
show_state = true;
show_icon = true;
tap_action = {action = "toggle";};
hold_action = {action = "Default action";};
tap_action = {
action = "toggle";
};
hold_action = {
action = "Default action";
};
style = {
top = "72.8%";
left = "75.3%";
@ -78,8 +94,12 @@ _: {
entity = "light.light_panels_58_6c_84";
show_state = true;
show_icon = true;
tap_action = {action = "toggle";};
hold_action = {action = "Default action";};
tap_action = {
action = "toggle";
};
hold_action = {
action = "Default action";
};
style = {
top = "72.8%";
left = "75.3%";
@ -102,8 +122,7 @@ _: {
}
{
title = "Bedroom 2";
cards = [
];
cards = [ ];
}
];
};

View file

@ -1,10 +1,14 @@
{pkgs, ...}: {
environment.systemPackages = [pkgs.hydroxide];
networking.firewall.allowedTCPPorts = [1025 1143];
{ pkgs, ... }:
{
environment.systemPackages = [ pkgs.hydroxide ];
networking.firewall.allowedTCPPorts = [
1025
1143
];
systemd.services.hydroxide = {
enable = true;
wantedBy = ["multi-user.target"];
wantedBy = [ "multi-user.target" ];
description = "A third-party, open-source ProtonMail bridge";
serviceConfig = {

View file

@ -1,9 +1,6 @@
{ config, lib, ... }:
{
config,
lib,
...
}: {
sops.secrets.miniflux = {};
sops.secrets.miniflux = { };
services.miniflux = {
enable = true;

Some files were not shown because too many files have changed in this diff Show more