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 1910 additions and 1490 deletions
Showing only changes of commit 274d13acf1 - Show all commits

View file

@ -41,17 +41,18 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
outputs = { outputs =
{
self, self,
nixpkgs, nixpkgs,
pre-commit-hooks, pre-commit-hooks,
... ...
} @ inputs: let }@inputs:
let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs { pkgs = import nixpkgs { inherit system; };
inherit system; in
}; {
in {
checks = { checks = {
pre-commit-check = pre-commit-hooks.lib.${system}.run { pre-commit-check = pre-commit-hooks.lib.${system}.run {
src = ./.; src = ./.;
@ -79,6 +80,8 @@
sops sops
# alejandra # alejandra
nixfmt-rfc-style nixfmt-rfc-style
statix
deadnix
yaml-language-server yaml-language-server
lua-language-server lua-language-server
]; ];

View file

@ -1,13 +1,14 @@
{ { pkgs, config, ... }:
pkgs, let
config,
...
}: let
configDir = "/home/notoh/snowflake/home/ags/config"; configDir = "/home/notoh/snowflake/home/ags/config";
in { in
{
programs.ags = { programs.ags = {
enable = true; 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 = { xdg.configFile = {

View file

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

View file

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

View file

@ -1,4 +1,5 @@
{pkgs, ...}: { { pkgs, ... }:
{
programs.firefox = { programs.firefox = {
enable = true; enable = true;
policies = { policies = {

View file

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

View file

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

View file

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

View file

@ -1,8 +1,5 @@
{ pkgs, lib, ... }:
{ {
pkgs,
lib,
...
}: {
programs.helix.languages = { programs.helix.languages = {
language = with pkgs; [ language = with pkgs; [
{ {

View file

@ -1,6 +1,7 @@
_: { _: {
programs.helix = { programs.helix = {
themes.catppuccin_mocha = let themes.catppuccin_mocha =
let
rosewater = "#f5e0dc"; rosewater = "#f5e0dc";
flamingo = "#f2cdcd"; flamingo = "#f2cdcd";
pink = "#f5c2e7"; pink = "#f5c2e7";
@ -32,7 +33,8 @@ _: {
cursorline = "#2a2b3c"; cursorline = "#2a2b3c";
secondary_cursor = "#b5a6a8"; secondary_cursor = "#b5a6a8";
in { in
{
"type" = yellow; "type" = yellow;
"constructor" = sapphire; "constructor" = sapphire;
"constant" = peach; "constant" = peach;
@ -82,20 +84,33 @@ _: {
"markup.heading.5" = pink; "markup.heading.5" = pink;
"markup.heading.6" = teal; "markup.heading.6" = teal;
"markup.list" = mauve; "markup.list" = mauve;
"markup.bold" = {modifiers = ["bold"];}; "markup.bold" = {
"markup.italic" = {modifiers = ["italic"];}; modifiers = [ "bold" ];
};
"markup.italic" = {
modifiers = [ "italic" ];
};
"markup.link.url" = { "markup.link.url" = {
fg = rosewater; fg = rosewater;
modifiers = ["italic" "underlined"]; modifiers = [
"italic"
"underlined"
];
}; };
"markup.link.text" = blue; "markup.link.text" = blue;
"markup.raw" = flamingo; "markup.raw" = flamingo;
"diff.plus" = green; "diff.plus" = green;
"diff.minus" = red; "diff.minus" = red;
"diff.delta" = blue; "diff.delta" = blue;
"ui.background" = {fg = surface1;}; "ui.background" = {
"ui.linenr" = {fg = surface1;}; fg = surface1;
"ui.linenr.selected" = {fg = lavender;}; };
"ui.linenr" = {
fg = surface1;
};
"ui.linenr.selected" = {
fg = lavender;
};
"ui.statusline" = { "ui.statusline" = {
fg = subtext1; fg = subtext1;
bg = mantle; bg = mantle;
@ -123,7 +138,9 @@ _: {
fg = text; fg = text;
bg = surface0; bg = surface0;
}; };
"ui.window" = {fg = crust;}; "ui.window" = {
fg = crust;
};
"ui.help" = { "ui.help" = {
fg = overlay2; fg = overlay2;
bg = surface0; bg = surface0;
@ -140,22 +157,30 @@ _: {
style = "line"; style = "line";
}; };
}; };
"ui.bufferline.background" = {bg = crust;}; "ui.bufferline.background" = {
bg = crust;
};
"ui.text" = text; "ui.text" = text;
"ui.text.focus" = { "ui.text.focus" = {
fg = text; fg = text;
bg = surface0; bg = surface0;
modifiers = [ "bold" ]; modifiers = [ "bold" ];
}; };
"ui.text.inactive" = {fg = overlay1;}; "ui.text.inactive" = {
fg = overlay1;
};
"ui.virtual" = overlay0; "ui.virtual" = overlay0;
"ui.virtual.ruler" = {bg = surface0;}; "ui.virtual.ruler" = {
bg = surface0;
};
"ui.virtual.indent-guide" = surface0; "ui.virtual.indent-guide" = surface0;
"ui.virtual.inlay-hint" = { "ui.virtual.inlay-hint" = {
fg = surface1; fg = surface1;
bg = mantle; bg = mantle;
}; };
"ui.selection" = {bg = surface1;}; "ui.selection" = {
bg = surface1;
};
"ui.cursor" = { "ui.cursor" = {
fg = base; fg = base;
bg = secondary_cursor; bg = secondary_cursor;
@ -168,7 +193,9 @@ _: {
fg = peach; fg = peach;
modifiers = [ "bold" ]; modifiers = [ "bold" ];
}; };
"ui.cursorline.primary" = {bg = cursorline;}; "ui.cursorline.primary" = {
bg = cursorline;
};
"ui.highlight" = { "ui.highlight" = {
bg = surface1; bg = surface1;
modifiers = [ "bold" ]; modifiers = [ "bold" ];

View file

@ -1,6 +1,7 @@
_: { _: {
programs.helix = { programs.helix = {
themes.tokyonight = let themes.tokyonight =
let
red = "#f7768e"; red = "#f7768e";
orange = "#ff9e64"; orange = "#ff9e64";
yellow = "#e0af68"; yellow = "#e0af68";
@ -19,74 +20,131 @@ _: {
foreground_gutter = "#363b54"; foreground_gutter = "#363b54";
background_highlight = "#30374b"; background_highlight = "#30374b";
background_menu = "#16161e"; background_menu = "#16161e";
in { in
{
"comment" = { "comment" = {
fg = comment; fg = comment;
modifiers = [ "italic" ]; modifiers = [ "italic" ];
}; };
"constant" = {fg = orange;}; "constant" = {
"constant.character.escape" = {fg = magenta;}; fg = orange;
};
"constant.character.escape" = {
fg = magenta;
};
"function" = { "function" = {
fg = blue; fg = blue;
modifiers = [ "italic" ]; modifiers = [ "italic" ];
}; };
"function.macro" = {fg = cyan;}; "function.macro" = {
fg = cyan;
};
"keyword" = { "keyword" = {
fg = cyan; fg = cyan;
modifiers = [ "italic" ]; modifiers = [ "italic" ];
}; };
"keyword.control" = {fg = magenta;}; "keyword.control" = {
"keyword.control.import" = {fg = cyan;}; fg = magenta;
"keyword.operator" = {fg = turquoise;}; };
"keyword.control.import" = {
fg = cyan;
};
"keyword.operator" = {
fg = turquoise;
};
"keyword.function" = { "keyword.function" = {
fg = magenta; fg = magenta;
modifiers = [ "italic" ]; modifiers = [ "italic" ];
}; };
"operator" = {fg = turquoise;}; "operator" = {
"punctuation" = {fg = turquoise;}; fg = turquoise;
"string" = {fg = light-green;}; };
"string.regexp" = {fg = "light-blue";}; "punctuation" = {
"tag" = {fg = red;}; fg = turquoise;
"type" = {fg = teal;}; };
"namespace" = {fg = blue;}; "string" = {
"variable" = {fg = white;}; fg = light-green;
"variable.builtin" = {fg = red;}; };
"variable.other.member" = {fg = 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" = { "variable.parameter" = {
fg = yellow; fg = yellow;
modifiers = [ "italic" ]; modifiers = [ "italic" ];
}; };
"diff.plus" = {fg = green;}; "diff.plus" = {
"diff.delta" = {fg = orange;}; fg = green;
"diff.minus" = {fg = red;}; };
"diff.delta" = {
fg = orange;
};
"diff.minus" = {
fg = red;
};
"ui.background" = {fg = foreground;}; "ui.background" = {
fg = foreground;
};
"ui.cursor" = {modifiers = ["reversed"];}; "ui.cursor" = {
modifiers = [ "reversed" ];
};
"ui.cursor.match" = { "ui.cursor.match" = {
fg = orange; fg = orange;
modifiers = [ "bold" ]; modifiers = [ "bold" ];
}; };
"ui.cursor.primary" = {modifiers = ["reversed"];}; "ui.cursor.primary" = {
"ui.cursorline.primary" = {bg = background_menu;}; modifiers = [ "reversed" ];
};
"ui.cursorline.primary" = {
bg = background_menu;
};
"ui.help" = { "ui.help" = {
fg = foreground; fg = foreground;
bg = background_menu; bg = background_menu;
}; };
"ui.linenr" = {fg = foreground_gutter;}; "ui.linenr" = {
"ui.linenr.selected" = {fg = foreground;}; fg = foreground_gutter;
};
"ui.linenr.selected" = {
fg = foreground;
};
"ui.menu" = { "ui.menu" = {
fg = foreground; fg = foreground;
bg = background_menu; bg = background_menu;
}; };
"ui.menu.selected" = {bg = background_highlight;}; "ui.menu.selected" = {
bg = background_highlight;
};
"ui.popup" = { "ui.popup" = {
fg = foreground; fg = foreground;
bg = background_menu; bg = background_menu;
}; };
"ui.selection" = {bg = background_highlight;}; "ui.selection" = {
"ui.selection.primary" = {bg = background_highlight;}; bg = background_highlight;
};
"ui.selection.primary" = {
bg = background_highlight;
};
"ui.statusline" = { "ui.statusline" = {
fg = foreground; fg = foreground;
bg = background_menu; bg = background_menu;
@ -107,17 +165,37 @@ _: {
fg = black; fg = black;
bg = magenta; bg = magenta;
}; };
"ui.text" = {fg = foreground;}; "ui.text" = {
"ui.text.focus" = {fg = cyan;}; fg = foreground;
"ui.virtual.ruler" = {bg = foreground_gutter;}; };
"ui.virtual.whitespace" = {fg = foreground_gutter;}; "ui.text.focus" = {
"ui.virtual.inlay-hint" = {fg = comment;}; fg = cyan;
"ui.window" = {fg = black;}; };
"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;}; "error" = {
"warning" = {fg = yellow;}; fg = red;
"info" = {fg = blue;}; };
"hint" = {fg = teal;}; "warning" = {
fg = yellow;
};
"info" = {
fg = blue;
};
"hint" = {
fg = teal;
};
"diagnostic.error" = { "diagnostic.error" = {
underline = { underline = {
style = "curl"; style = "curl";
@ -142,13 +220,17 @@ _: {
color = teal; color = teal;
}; };
}; };
"special" = {fg = orange;}; "special" = {
fg = orange;
};
"markup.heading" = { "markup.heading" = {
fg = cyan; fg = cyan;
modifiers = [ "bold" ]; modifiers = [ "bold" ];
}; };
"markup.list" = {fg = cyan;}; "markup.list" = {
fg = cyan;
};
"markup.bold" = { "markup.bold" = {
fg = orange; fg = orange;
modifiers = [ "bold" ]; modifiers = [ "bold" ];
@ -157,14 +239,22 @@ _: {
fg = yellow; fg = yellow;
modifiers = [ "italic" ]; modifiers = [ "italic" ];
}; };
"markup.strikethrough" = {modifiers = ["crossed_out"];}; "markup.strikethrough" = {
"markup.link.url" = {fg = green;}; modifiers = [ "crossed_out" ];
"markup.link.text" = {fg = light-gray;}; };
"markup.link.url" = {
fg = green;
};
"markup.link.text" = {
fg = light-gray;
};
"markup.quote" = { "markup.quote" = {
fg = yellow; fg = yellow;
modifiers = [ "italic" ]; modifiers = [ "italic" ];
}; };
"markup.raw" = {fg = cyan;}; "markup.raw" = {
fg = cyan;
};
}; };
}; };
} }

View file

@ -5,7 +5,10 @@ _: {
windowSize = "normal"; windowSize = "normal";
gui.theme = { gui.theme = {
lightTheme = false; lightTheme = false;
activeBorderColor = ["#2ac3de" "bold"]; activeBorderColor = [
"#2ac3de"
"bold"
];
inactiveBorderColor = [ "#f7768e" ]; inactiveBorderColor = [ "#f7768e" ];
optionsTextColor = [ " #c0caf5" ]; optionsTextColor = [ " #c0caf5" ];
selectedLineBgColor = [ "#24283b" ]; selectedLineBgColor = [ "#24283b" ];

View file

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

View file

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

View file

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

View file

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

View file

@ -1,4 +1,5 @@
{pkgs, ...}: { { pkgs, ... }:
{
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
settings = { settings = {
monitor = [ monitor = [

View file

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

View file

@ -40,7 +40,10 @@ _: {
desc = "Enter the child directory"; desc = "Enter the child directory";
} }
{ {
on = ["g" "g"]; on = [
"g"
"g"
];
exec = "arrow -99999999"; exec = "arrow -99999999";
desc = "Move cursor to the top"; desc = "Move cursor to the top";
} }
@ -53,7 +56,10 @@ _: {
# Selection # Selection
{ {
on = [ "<Space>" ]; on = [ "<Space>" ];
exec = ["select --state=none" "arrow 1"]; exec = [
"select --state=none"
"arrow 1"
];
desc = "Toggle the current selection state"; desc = "Toggle the current selection state";
} }
{ {
@ -148,17 +154,26 @@ _: {
# Copy # Copy
{ {
on = ["c" "c"]; on = [
"c"
"c"
];
exec = "copy path"; exec = "copy path";
desc = "copy the absolute path"; desc = "copy the absolute path";
} }
{ {
on = ["c" "d"]; on = [
"c"
"d"
];
exec = "copy dirname"; exec = "copy dirname";
desc = "copy parent directory path"; desc = "copy parent directory path";
} }
{ {
on = ["c" "f"]; on = [
"c"
"f"
];
exec = "copy filename"; exec = "copy filename";
desc = "copy file name"; desc = "copy file name";
} }

View file

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

View file

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

View file

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

View file

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

View file

@ -1,4 +1,5 @@
{pkgs, ...}: { { pkgs, ... }:
{
imports = [ imports = [
../../home ../../home
../../home/anyrun ../../home/anyrun

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1,5 +1,9 @@
{pkgs, ...}: { { pkgs, ... }:
networking.firewall.allowedTCPPorts = [53 4000]; {
networking.firewall.allowedTCPPorts = [
53
4000
];
networking.firewall.allowedUDPPorts = [ 53 ]; networking.firewall.allowedUDPPorts = [ 53 ];
environment.systemPackages = [ pkgs.blocky ]; environment.systemPackages = [ pkgs.blocky ];
@ -72,11 +76,10 @@
"https://zerodot1.gitlab.io/CoinBlockerLists/hosts_browser" "https://zerodot1.gitlab.io/CoinBlockerLists/hosts_browser"
"https://raw.githubusercontent.com/StevenBlack/hosts/master/alternates/fakenews-only/hosts" "https://raw.githubusercontent.com/StevenBlack/hosts/master/alternates/fakenews-only/hosts"
]; ];
catchall = [ catchall = [ "https://big.oisd.nl/domainswild" ];
"https://big.oisd.nl/domainswild"
];
}; };
whiteLists = let whiteLists =
let
customWhitelist = pkgs.writeText "misc.txt" '' customWhitelist = pkgs.writeText "misc.txt" ''
ax.phobos.apple.com.edgesuite.net ax.phobos.apple.com.edgesuite.net
amp-api-edge.apps.apple.com amp-api-edge.apps.apple.com
@ -84,7 +87,8 @@
(\.|^)wac\.phicdn\.net$ (\.|^)wac\.phicdn\.net$
*.flake.sh *.flake.sh
''; '';
in { in
{
ads = [ ads = [
"https://raw.githubusercontent.com/anudeepND/whitelist/master/domains/whitelist.txt" "https://raw.githubusercontent.com/anudeepND/whitelist/master/domains/whitelist.txt"
"https://raw.githubusercontent.com/anudeepND/whitelist/master/domains/optional-list.txt" "https://raw.githubusercontent.com/anudeepND/whitelist/master/domains/optional-list.txt"
@ -103,9 +107,11 @@
}; };
customDNS = { customDNS = {
customTTL = "1h"; customTTL = "1h";
mapping = let mapping =
let
yukiIp = "192.168.1.98"; yukiIp = "192.168.1.98";
in { in
{
# infra # infra
"truenas.internal.flake.sh" = "192.168.1.199"; "truenas.internal.flake.sh" = "192.168.1.199";

View file

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

View file

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

View file

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

View file

@ -1,4 +1,5 @@
{pkgs, ...}: { { pkgs, ... }:
{
networking.firewall.allowedTCPPorts = [ 9292 ]; networking.firewall.allowedTCPPorts = [ 9292 ];
imports = [ imports = [

View file

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

View file

@ -1,4 +1,5 @@
{config, ...}: { { config, ... }:
{
sops.secrets.gluetun = { }; sops.secrets.gluetun = { };
virtualisation.oci-containers.containers = { virtualisation.oci-containers.containers = {
gluetun = { gluetun = {

View file

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

View file

@ -1,11 +1,6 @@
{ lib, modulesPath, ... }:
{ {
lib, imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
modulesPath,
...
}: {
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
];
boot = { boot = {
kernelModules = [ "kvm-amd" ]; kernelModules = [ "kvm-amd" ];
@ -17,7 +12,15 @@
useOSProber = true; useOSProber = true;
}; };
initrd = { initrd = {
availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" "virtio_blk"]; availableKernelModules = [
"ata_piix"
"uhci_hcd"
"virtio_pci"
"virtio_scsi"
"sd_mod"
"sr_mod"
"virtio_blk"
];
kernelModules = [ ]; kernelModules = [ ];
}; };
}; };
@ -33,9 +36,7 @@
}; };
}; };
swapDevices = [ swapDevices = [ { device = "/dev/disk/by-uuid/100a4262-ce57-47a7-b99a-f124a8e369de"; } ];
{device = "/dev/disk/by-uuid/100a4262-ce57-47a7-b99a-f124a8e369de";}
];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # 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 # (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"; systemd.user.startServices = "sd-switch";
programs.home-manager.enable = true; programs.home-manager.enable = true;

View file

@ -1,11 +1,10 @@
{ 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 = { sops.secrets.minio = {
owner = "minio"; owner = "minio";
@ -13,9 +12,11 @@
mode = "0600"; mode = "0600";
restartUnits = [ "minio.service" ]; restartUnits = [ "minio.service" ];
}; };
services.minio = let services.minio =
let
dataDir = "/var/lib/slab/minio"; dataDir = "/var/lib/slab/minio";
in { in
{
enable = true; enable = true;
region = "us-east-1"; region = "us-east-1";
consoleAddress = "0.0.0.0:9006"; consoleAddress = "0.0.0.0:9006";

View file

@ -3,9 +3,15 @@
lib, lib,
pkgs, 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 = { services.tailscale = {
useRoutingFeatures = lib.mkDefault "client"; useRoutingFeatures = lib.mkDefault "client";
}; };
@ -16,8 +22,14 @@
description = "Automatic connection to Tailscale"; description = "Automatic connection to Tailscale";
# make sure tailscale is running before trying to connect to tailscale # make sure tailscale is running before trying to connect to tailscale
after = ["network-pre.target" "tailscale.service"]; after = [
wants = ["network-pre.target" "tailscale.service"]; "network-pre.target"
"tailscale.service"
];
wants = [
"network-pre.target"
"tailscale.service"
];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
# set this service as a oneshot job # set this service as a oneshot job

View file

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

View file

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

View file

@ -1,16 +1,23 @@
{config, ...}: { { config, ... }:
{
networking.firewall.allowedTCPPorts = [ 9091 ]; networking.firewall.allowedTCPPorts = [ 9091 ];
sops.secrets.authelia-jwt = {owner = config.systemd.services.authelia-default.serviceConfig.User;}; sops.secrets.authelia-jwt = {
sops.secrets.authelia-sek = {owner = config.systemd.services.authelia-default.serviceConfig.User;}; owner = config.systemd.services.authelia-default.serviceConfig.User;
};
sops.secrets.authelia-sek = {
owner = config.systemd.services.authelia-default.serviceConfig.User;
};
services.authelia.instances.default = { services.authelia.instances.default = {
enable = true; enable = true;
secrets = { secrets = {
jwtSecretFile = config.sops.secrets.authelia-jwt.path; jwtSecretFile = config.sops.secrets.authelia-jwt.path;
storageEncryptionKeyFile = config.sops.secrets.authelia-sek.path; storageEncryptionKeyFile = config.sops.secrets.authelia-sek.path;
}; };
settings = let settings =
let
pqdn = "notohh.dev"; pqdn = "notohh.dev";
in { in
{
log.level = "debug"; log.level = "debug";
theme = "dark"; theme = "dark";
default_2fa_method = "totp"; default_2fa_method = "totp";
@ -53,9 +60,11 @@
notifier.filesystem = { notifier.filesystem = {
filename = "/var/lib/authelia-default/notif.txt"; filename = "/var/lib/authelia-default/notif.txt";
}; };
storage.postgres = let storage.postgres =
let
dbInfo = "authelia"; dbInfo = "authelia";
in { in
{
host = "192.168.1.211"; host = "192.168.1.211";
port = 5432; port = 5432;
database = dbInfo; database = dbInfo;

View file

@ -1,5 +1,8 @@
_: { _: {
networking.firewall.allowedTCPPorts = [6167 8448]; networking.firewall.allowedTCPPorts = [
6167
8448
];
services.matrix-conduit = { services.matrix-conduit = {
enable = true; enable = true;
settings = { settings = {

View file

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

View file

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

View file

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

View file

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

View file

@ -1,4 +1,5 @@
{pkgs, ...}: { { pkgs, ... }:
{
environment.systemPackages = with pkgs; [ rustypaste ]; environment.systemPackages = with pkgs; [ rustypaste ];
systemd.services.rustypaste = { systemd.services.rustypaste = {

View file

@ -3,9 +3,15 @@
lib, lib,
pkgs, 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 = { services.tailscale = {
useRoutingFeatures = lib.mkDefault "client"; useRoutingFeatures = lib.mkDefault "client";
}; };
@ -16,8 +22,14 @@
description = "Automatic connection to Tailscale"; description = "Automatic connection to Tailscale";
# make sure tailscale is running before trying to connect to tailscale # make sure tailscale is running before trying to connect to tailscale
after = ["network-pre.target" "tailscale.service"]; after = [
wants = ["network-pre.target" "tailscale.service"]; "network-pre.target"
"tailscale.service"
];
wants = [
"network-pre.target"
"tailscale.service"
];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
# set this service as a oneshot job # set this service as a oneshot job

View file

@ -1,8 +1,5 @@
{ pkgs, config, ... }:
{ {
pkgs,
config,
...
}: {
sops.secrets.vaultwarden-env = { }; sops.secrets.vaultwarden-env = { };
services.vaultwarden = { services.vaultwarden = {
enable = true; enable = true;

View file

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

View file

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

View file

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

View file

@ -1,8 +1,5 @@
{ config, pkgs, ... }:
{ {
config,
pkgs,
...
}: {
sops.secrets.attic = { }; sops.secrets.attic = { };
environment.systemPackages = [ pkgs.attic ]; environment.systemPackages = [ pkgs.attic ];

View file

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

View file

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

View file

@ -3,7 +3,10 @@ _: {
networking.firewall.allowedUDPPorts = [ 24454 ]; networking.firewall.allowedUDPPorts = [ 24454 ];
virtualisation.oci-containers.containers.minecraft = { virtualisation.oci-containers.containers.minecraft = {
image = "itzg/minecraft-server"; image = "itzg/minecraft-server";
ports = ["25565:25565" "24454:24454/udp"]; ports = [
"25565:25565"
"24454:24454/udp"
];
environment = { environment = {
EULA = "TRUE"; EULA = "TRUE";
VERSION = "1.19.2"; VERSION = "1.19.2";

View file

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

View file

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

View file

@ -3,9 +3,15 @@
lib, lib,
pkgs, 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 = { services.tailscale = {
useRoutingFeatures = lib.mkDefault "server"; # important to make it a server, it sets sysctl for ip forwarding without intervention and reboot useRoutingFeatures = lib.mkDefault "server"; # important to make it a server, it sets sysctl for ip forwarding without intervention and reboot
}; };
@ -16,8 +22,14 @@
description = "Automatic connection to Tailscale"; description = "Automatic connection to Tailscale";
# make sure tailscale is running before trying to connect to tailscale # make sure tailscale is running before trying to connect to tailscale
after = ["network-pre.target" "tailscale.service"]; after = [
wants = ["network-pre.target" "tailscale.service"]; "network-pre.target"
"tailscale.service"
];
wants = [
"network-pre.target"
"tailscale.service"
];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
# set this service as a oneshot job # set this service as a oneshot job

View file

@ -1,6 +1,12 @@
{config, ...}: { { config, ... }:
{
sops.secrets.cloudflare-api-key = { }; sops.secrets.cloudflare-api-key = { };
networking.firewall.allowedTCPPorts = [80 443 2222 8080]; networking.firewall.allowedTCPPorts = [
80
443
2222
8080
];
systemd.services.traefik = { systemd.services.traefik = {
environment = { environment = {
CLOUDFLARE_EMAIL = "jch0tm2e@notohh.dev"; CLOUDFLARE_EMAIL = "jch0tm2e@notohh.dev";
@ -47,9 +53,11 @@
}; };
}; };
}; };
routers = let routers =
let
pqdn = "flake.sh"; pqdn = "flake.sh";
in { in
{
api = { api = {
rule = "PathPrefix(`/api/`)"; rule = "PathPrefix(`/api/`)";
entrypoints = [ "websecure" ]; entrypoints = [ "websecure" ];
@ -163,10 +171,12 @@
tls.certresolver = "production"; tls.certresolver = "production";
}; };
}; };
services = let services =
let
sakuraIp = "100.121.201.47:"; sakuraIp = "100.121.201.47:";
soraIp = "100.104.42.96:"; soraIp = "100.104.42.96:";
in { in
{
# sora # sora
uptime-kuma.loadBalancer.servers = [ { url = "http://${soraIp}4000"; } ]; uptime-kuma.loadBalancer.servers = [ { url = "http://${soraIp}4000"; } ];
foundryvtt.loadBalancer.servers = [ { url = "http://${soraIp}30000"; } ]; foundryvtt.loadBalancer.servers = [ { url = "http://${soraIp}30000"; } ];
@ -227,7 +237,10 @@
caServer = "https://acme-staging-v02.api.letsencrypt.org/directory"; caServer = "https://acme-staging-v02.api.letsencrypt.org/directory";
dnsChallenge = { dnsChallenge = {
provider = "cloudflare"; 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"; delayBeforeCheck = "0";
}; };
}; };
@ -237,7 +250,10 @@
caServer = "https://acme-v02.api.letsencrypt.org/directory"; caServer = "https://acme-v02.api.letsencrypt.org/directory";
dnsChallenge = { dnsChallenge = {
provider = "cloudflare"; 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"; delayBeforeCheck = "0";
}; };
}; };

View file

@ -3,7 +3,8 @@
config, config,
pkgs, pkgs,
... ...
}: { }:
{
imports = [ imports = [
inputs.nix-gaming.nixosModules.steamCompat inputs.nix-gaming.nixosModules.steamCompat
inputs.nix-gaming.nixosModules.pipewireLowLatency inputs.nix-gaming.nixosModules.pipewireLowLatency
@ -56,9 +57,7 @@
gamemode.enable = true; gamemode.enable = true;
steam = { steam = {
enable = true; enable = true;
extraCompatPackages = [ extraCompatPackages = [ inputs.nix-gaming.packages.${pkgs.system}.proton-ge ];
inputs.nix-gaming.packages.${pkgs.system}.proton-ge
];
}; };
}; };

View file

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

View file

@ -1,8 +1,5 @@
{ inputs, pkgs, ... }:
{ {
inputs,
pkgs,
...
}: {
imports = [ imports = [
./services/swayidle.nix ./services/swayidle.nix
../../home ../../home

View file

@ -1,4 +1,5 @@
{pkgs, ...}: { { pkgs, ... }:
{
environment.systemPackages = [ pkgs.attic ]; environment.systemPackages = [ pkgs.attic ];
systemd.services.atticd = { systemd.services.atticd = {

View file

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

View file

@ -1,6 +1,10 @@
{pkgs, ...}: { { pkgs, ... }:
{
environment.systemPackages = [ pkgs.hydroxide ]; environment.systemPackages = [ pkgs.hydroxide ];
networking.firewall.allowedTCPPorts = [1025 1143]; networking.firewall.allowedTCPPorts = [
1025
1143
];
systemd.services.hydroxide = { systemd.services.hydroxide = {
enable = true; enable = true;

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -3,9 +3,15 @@
lib, lib,
pkgs, 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 = { services.tailscale = {
useRoutingFeatures = lib.mkDefault "client"; useRoutingFeatures = lib.mkDefault "client";
}; };
@ -16,8 +22,14 @@
description = "Automatic connection to Tailscale"; description = "Automatic connection to Tailscale";
# make sure tailscale is running before trying to connect to tailscale # make sure tailscale is running before trying to connect to tailscale
after = ["network-pre.target" "tailscale.service"]; after = [
wants = ["network-pre.target" "tailscale.service"]; "network-pre.target"
"tailscale.service"
];
wants = [
"network-pre.target"
"tailscale.service"
];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
# set this service as a oneshot job # set this service as a oneshot job

View file

@ -1,4 +1,5 @@
{config, ...}: { { config, ... }:
{
sops.secrets.woodpecker-server = { }; sops.secrets.woodpecker-server = { };
sops.secrets.woodpecker-agent-secret = { }; sops.secrets.woodpecker-agent-secret = { };
services.woodpecker-server = { services.woodpecker-server = {

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1,6 +1,10 @@
{pkgs, ...}: { { pkgs, ... }:
{
environment.systemPackages = [ pkgs.hydroxide ]; environment.systemPackages = [ pkgs.hydroxide ];
networking.firewall.allowedTCPPorts = [1025 1143]; networking.firewall.allowedTCPPorts = [
1025
1143
];
systemd.services.hydroxide = { systemd.services.hydroxide = {
enable = true; enable = true;

View file

@ -1,8 +1,5 @@
{ config, lib, ... }:
{ {
config,
lib,
...
}: {
sops.secrets.miniflux = { }; sops.secrets.miniflux = { };
services.miniflux = { services.miniflux = {

View file

@ -3,20 +3,27 @@
config, config,
lib, lib,
... ...
}: { }:
{
sops.secrets.paperless-pwd = { sops.secrets.paperless-pwd = {
owner = "paperless"; owner = "paperless";
group = "paperless"; group = "paperless";
}; };
systemd.services = { systemd.services = {
paperless-task-queue.serviceConfig = {PrivateNetwork = false;}; paperless-task-queue.serviceConfig = {
paperless-scheduler.serviceConfig = {PrivateNetwork = lib.mkForce false;}; PrivateNetwork = false;
};
paperless-scheduler.serviceConfig = {
PrivateNetwork = lib.mkForce false;
};
}; };
services.paperless = let services.paperless =
let
dataDir = "/var/lib/paperless-ngx"; dataDir = "/var/lib/paperless-ngx";
in { in
{
package = pkgs.paperless-ngx; package = pkgs.paperless-ngx;
enable = true; enable = true;
address = "0.0.0.0"; address = "0.0.0.0";

View file

@ -1,9 +1,8 @@
{ pkgs, config, ... }:
{ {
pkgs, sops.secrets.restic-yuki = {
config, sopsFile = ../../../secrets/restic/secrets.yaml;
... };
}: {
sops.secrets.restic-yuki = {sopsFile = ../../../secrets/restic/secrets.yaml;};
environment.systemPackages = [ pkgs.restic ]; environment.systemPackages = [ pkgs.restic ];
services.restic = { services.restic = {
backups = { backups = {
@ -15,9 +14,7 @@
"/var/lib/private/jellyseerr" "/var/lib/private/jellyseerr"
"/var/lib/private/homepage-dashboard" "/var/lib/private/homepage-dashboard"
]; ];
exclude = [ exclude = [ "/home/notoh/docker/stash/data" ];
"/home/notoh/docker/stash/data"
];
pruneOpts = [ pruneOpts = [
"--keep-daily=7" "--keep-daily=7"
"--keep-weekly=6" "--keep-weekly=6"

View file

@ -1,8 +1,5 @@
{ pkgs, config, ... }:
{ {
pkgs,
config,
...
}: {
sops.secrets.searxng-secret = { }; sops.secrets.searxng-secret = { };
networking.firewall.allowedTCPPorts = [ 8100 ]; networking.firewall.allowedTCPPorts = [ 8100 ];
services.searx = { services.searx = {

View file

@ -1,6 +1,8 @@
_: let _:
let
storagePath = "/home/notoh/docker/stash"; storagePath = "/home/notoh/docker/stash";
in { in
{
virtualisation.oci-containers.containers.stash = { virtualisation.oci-containers.containers.stash = {
image = "stashapp/stash@sha256:b3b59809d5be1d82467253ec9e2ee98628a0db7527d27a6c7daa75e1fcda7deb"; # v0.24.3 image = "stashapp/stash@sha256:b3b59809d5be1d82467253ec9e2ee98628a0db7527d27a6c7daa75e1fcda7deb"; # v0.24.3
ports = [ "9999:9999" ]; ports = [ "9999:9999" ];

View file

@ -1,5 +1,10 @@
{config, ...}: { { config, ... }:
networking.firewall.allowedTCPPorts = [80 443 8080]; {
networking.firewall.allowedTCPPorts = [
80
443
8080
];
sops.secrets.cloudflare-api-key = { }; sops.secrets.cloudflare-api-key = { };
systemd.services.traefik = { systemd.services.traefik = {
environment = { environment = {
@ -13,9 +18,11 @@
enable = true; enable = true;
dynamicConfigOptions = { dynamicConfigOptions = {
http = { http = {
routers = let routers =
let
fqdn = "internal.flake.sh"; fqdn = "internal.flake.sh";
in { in
{
# local # local
api = { api = {
rule = "PathPrefix(`/api/`)"; rule = "PathPrefix(`/api/`)";
@ -129,9 +136,11 @@
tls.certresolver = "production"; tls.certresolver = "production";
}; };
}; };
services = let services =
let
kariruHost = "192.168.1.54:"; kariruHost = "192.168.1.54:";
in { in
{
# local # local
stash.loadBalancer.servers = [ { url = "http://localhost:9999"; } ]; stash.loadBalancer.servers = [ { url = "http://localhost:9999"; } ];
homepage.loadBalancer.servers = [ { url = "http://localhost:7676"; } ]; homepage.loadBalancer.servers = [ { url = "http://localhost:7676"; } ];
@ -177,7 +186,10 @@
caServer = "https://acme-v02.api.letsencrypt.org/directory"; caServer = "https://acme-v02.api.letsencrypt.org/directory";
dnsChallenge = { dnsChallenge = {
provider = "cloudflare"; 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"; delayBeforeCheck = "0";
}; };
}; };

View file

@ -6,6 +6,8 @@ _: {
"/home/notoh/docker/wallos/db:/var/www/html/db" "/home/notoh/docker/wallos/db:/var/www/html/db"
"/home/notoh/docker/wallos/logos:/var/www/html/images/uploads/logos" "/home/notoh/docker/wallos/logos:/var/www/html/images/uploads/logos"
]; ];
environment = {TZ = "America/New_York";}; environment = {
TZ = "America/New_York";
};
}; };
} }

View file

@ -1,4 +1,5 @@
{inputs, ...}: { { inputs, ... }:
{
imports = [ imports = [
inputs.nh.nixosModules.default inputs.nh.nixosModules.default
./prometheus.nix ./prometheus.nix

View file

@ -1,4 +1,5 @@
{pkgs, ...}: { { pkgs, ... }:
{
fonts = { fonts = {
enableDefaultPackages = false; enableDefaultPackages = false;
fontDir.enable = true; fontDir.enable = true;
@ -14,9 +15,18 @@
enable = true; enable = true;
allowBitmaps = true; allowBitmaps = true;
defaultFonts = { defaultFonts = {
monospace = ["JetBrainsMono NF Medium" "Twitter Color Emoji"]; monospace = [
serif = ["Noto Serif" "Twitter Color Emoji"]; "JetBrainsMono NF Medium"
sansSerif = ["Noto Sans" "Twitter Color Emoji"]; "Twitter Color Emoji"
];
serif = [
"Noto Serif"
"Twitter Color Emoji"
];
sansSerif = [
"Noto Sans"
"Twitter Color Emoji"
];
emoji = [ "Twitter Color Emoji" ]; emoji = [ "Twitter Color Emoji" ];
}; };
hinting = { hinting = {

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