Compare commits

47 Commits
Author SHA1 Message Date
Jordan Ashurst 2d97936dbb Adding globals 2026-10-06 20:19:11 -07:00
Jordan Ashurst 65aa448896 Adding basedpyright 2026-10-06 20:19:06 -07:00
Jordan Ashurst 6f4bfefd72 Changing path 2026-10-06 20:18:58 -07:00
Jordan Ashurst 9edba85b1d Deleting comform settings 2026-10-06 20:18:31 -07:00
Jordan Ashurst 5bf4d98da2 modifying lsp 2026-10-06 20:18:20 -07:00
Jordan Ashurst ca139ded2f Adding packages 2026-10-06 20:18:12 -07:00
Jordan Ashurst 0b41100bc2 fixing typo 2026-10-06 04:59:19 -07:00
Jordan Ashurst 042634b75a adding extra packages 2026-10-06 04:58:21 -07:00
Jordan Ashurst 8e4968b947 Adding support for extra langs 2026-10-06 04:57:07 -07:00
Jordan Ashurst 468eae711c adding configarr 2026-10-06 04:56:43 -07:00
Jordan Ashurst 5be7c14640 Updating lock 2026-10-06 04:56:31 -07:00
Jordan Ashurst aba378e3c1 Enabling pipewire 2026-10-06 04:56:20 -07:00
Jordan Ashurst e9b3caebdc Commenting network mount 2026-10-06 04:55:57 -07:00
Jordan Ashurst 294d6816e7 New secrets 2026-10-06 04:55:45 -07:00
Jordan Ashurst c6cc36e28f Allowing new subnet 2026-10-06 04:55:35 -07:00
Jordan Ashurst 28acea2eb1 reverting swapcaps 2026-10-06 04:55:17 -07:00
Jordan Ashurst 14cb1b2b4b adding lsp.lua 2026-10-06 04:13:35 -07:00
Jordan Ashurst e6ed692174 adding disable mason 2026-10-06 03:55:34 -07:00
Jordan Ashurst 1713298915 enabling lazy 2026-10-06 03:54:42 -07:00
Jordan Ashurst f153e57190 Adding sevice 2026-09-28 17:41:59 -07:00
Jordan Ashurst 8ac2555aac Adding configarr 2026-09-28 17:39:51 -07:00
Jordan Ashurst 68f780c62c Moving Sonarr 2026-09-27 05:47:13 -07:00
Jordan Ashurst 583a10eeec Moving sonnar service 2026-09-27 05:44:52 -07:00
Jordan Ashurst f769522ad2 Updating flake 2026-09-26 23:03:11 -07:00
Jordan Ashurst f35cf0c684 Updating flake 2026-09-26 01:43:01 -07:00
Jordan Ashurst 9a67769a58 Updating. 2026-09-22 23:00:57 -07:00
Jordan Ashurst b946f4d7ae Adding code 2026-09-22 18:44:03 -07:00
Jordan Ashurst e816281497 Adding timeout 2026-09-22 18:37:24 -07:00
Jordan Ashurst 50daa6dc1d Adding nix LSP 2026-09-22 18:37:17 -07:00
Jordan Ashurst 3bf0c1aedf Updating hashes 2026-09-22 18:37:06 -07:00
Jordan Ashurst 76cfc4f130 Enblaing hardware acceleration 2026-09-22 18:13:34 -07:00
Jordan Ashurst fb98f18ae6 Refactoring config 2026-09-22 18:13:20 -07:00
Jordan Ashurst 28b1427de2 Changing aliases 2026-09-22 18:12:58 -07:00
Jordan Ashurst 588fc2da2d Changing root file server 2026-09-22 18:12:34 -07:00
Jordan Ashurst a98f8437a6 changing default terminal 2026-09-22 18:11:53 -07:00
Jordan Ashurst bb0e885ce4 Adding utill packages and Steam 2026-09-22 18:11:20 -07:00
Jordan Ashurst 8c0953390d Adding fish and alacritty packages 2026-09-22 18:06:06 -07:00
Jordan Ashurst 00446ffcde adding network module (empty) 2026-09-22 01:40:49 -07:00
Jordan Ashurst fcb1e76707 Adding propietary driver nvidia 2026-09-21 15:11:19 -07:00
Jordan Ashurst fdf9663aba Adding dependencies 2026-09-21 14:17:22 -07:00
Jordan Ashurst a9e52c9857 Changing for legacy packages 2026-09-21 06:28:02 -07:00
Jordan Ashurst e9ec2199d5 flake: add home-manager.backupFileExtension for hypr/nvim clobber
- hm-activate failed Existing file /home/mask/.config/hypr would be clobbered, set backupFileExtension=backup to auto-rename
2026-09-18 06:51:33 -07:00
Jordan Ashurst 84fadc9373 modules: remove mounts.nix and samba.nix (moved to hosts/dogma-nixos)
- mounts/samba now exclusive to dogma-nixos per request, RTX/WSL without
2026-09-18 04:23:42 -07:00
Jordan Ashurst 2a09b73a9a home: add dogma-wsl headless shim
- imports common.nix, disables kitty
2026-09-18 04:23:36 -07:00
Jordan Ashurst 835c534e58 home: add dogma-nixos-rtx shim
- imports common.nix
2026-09-18 04:23:34 -07:00
Jordan Ashurst 48ccdf5d53 home: add dogma-nixos shim
- imports common.nix
2026-09-18 04:23:32 -07:00
Jordan Ashurst b7bea57e2c home: add common.nix base
- extracted from home.nix, fix ../dotfiles + ../secrets paths, add dogma-nixos rebuild aliases
2026-09-18 04:23:30 -07:00
25 changed files with 753 additions and 372 deletions
+10 -10
View File
@@ -68,6 +68,10 @@
# Enable the X11 windowing system. # Enable the X11 windowing system.
services.xserver.enable = true; services.xserver.enable = true;
hardware.graphics = {
enable = true;
enable32bit = true;
};
services.xserver.xkb.layout = "us"; services.xserver.xkb.layout = "us";
services.xserver.xkb.options = "caps:escape"; services.xserver.xkb.options = "caps:escape";
@@ -182,7 +186,7 @@
telegram-desktop telegram-desktop
btop btop
# ungoogled-chromium # ungoogled-chromium
# opencode opencode
doas doas
lan-mouse lan-mouse
stylua stylua
@@ -213,6 +217,7 @@
wofi wofi
wayvnc wayvnc
pcmanfm pcmanfm
nnn
htop htop
rsync rsync
tmux tmux
@@ -257,7 +262,6 @@
#tls ${config.sops.secrets.zerossl_cert.path} ${config.sops.secrets.zerossl_private_key.path} #tls ${config.sops.secrets.zerossl_cert.path} ${config.sops.secrets.zerossl_private_key.path}
virtualHosts."centraldogma.site:".extraConfig = '' virtualHosts."centraldogma.site:".extraConfig = ''
root * /srv/root/ root * /srv/root/
file_server file_server
encode zstd gzip encode zstd gzip
@@ -270,21 +274,17 @@
redir /radarr /radarr/ redir /radarr /radarr/
reverse_proxy /radarr/* 127.0.0.1:7878 reverse_proxy /radarr/* 127.0.0.1:7878
''; '';
virtualHosts."jellyfin.centraldogma.site:".extraConfig = '' virtualHosts."jellyfin.centraldogma.site:".extraConfig = ''
reverse_proxy /* 127.0.0.1:8096 reverse_proxy /* 127.0.0.1:8096
''; '';
virtualHosts."jellyfin2.centraldogma.site:".extraConfig = '' virtualHosts."sonarr.centraldogma.site:".extraConfig = ''
redir /jellyfin /jellyfin/ redir /sonarr /sonarr/
reverse_proxy /jellyfin/* 127.0.0.1:8096 reverse_proxy /sonarr/* 127.0.0.1:8989
''; '';
virtualHosts."git.centraldogma.site:".extraConfig = '' virtualHosts."git.centraldogma.site:".extraConfig = ''
reverse_proxy /* 127.0.0.1:3000 reverse_proxy /* 127.0.0.1:3000
''; '';
virtualHosts."spy.centraldogma.site:".extraConfig = ''
reverse_proxy /* 192.168.1.78:4444
'';
# virtualHosts."blog.centraldogma.dedyn.io:".extraConfig = '' # virtualHosts."blog.centraldogma.dedyn.io:".extraConfig = ''
# root * /srv/root/ # root * /srv/root/
# file_server # file_server
@@ -357,7 +357,7 @@
server = "dynamicdns.park-your-domain.com"; server = "dynamicdns.park-your-domain.com";
ssl = true; ssl = true;
username = "centraldogma.site"; username = "centraldogma.site";
domains = ["@" "www"]; domains = ["@" "www", "*"];
usev4 = "webv4, webv4=ipify-ipv4"; usev4 = "webv4, webv4=ipify-ipv4";
passwordFile = config.sops.secrets."namecheap/ddyn_password".path; passwordFile = config.sops.secrets."namecheap/ddyn_password".path;
interval = "5mins"; interval = "5mins";
+41 -33
View File
@@ -9,7 +9,6 @@
-- Create your files separately and then require them like this: -- Create your files separately and then require them like this:
-- require("myColors") -- require("myColors")
------------------ ------------------
---- MONITORS ---- ---- MONITORS ----
------------------ ------------------
@@ -17,22 +16,20 @@
-- See https://wiki.hypr.land/configuring/core/monitors/ -- See https://wiki.hypr.land/configuring/core/monitors/
hl.monitor({ hl.monitor({
output = "", output = "",
mode = "preferred", mode = "highrr",
position = "auto", position = "auto",
scale = "auto", scale = "auto",
}) })
--------------------- ---------------------
---- MY PROGRAMS ---- ---- MY PROGRAMS ----
--------------------- ---------------------
-- Set programs that you use -- Set programs that you use
local terminal = "kitty" local terminal = "alacritty"
local fileManager = "dolphin" local fileManager = "dolphin"
local menu = "hyprlauncher" local menu = "hyprlauncher"
------------------- -------------------
---- AUTOSTART ---- ---- AUTOSTART ----
------------------- -------------------
@@ -42,12 +39,9 @@ local menu = "hyprlauncher"
-- Autostart necessary processes (like notifications daemons, status bars, etc.) -- Autostart necessary processes (like notifications daemons, status bars, etc.)
-- Or execute your favorite apps at launch like this: -- Or execute your favorite apps at launch like this:
-- --
-- hl.on("hyprland.start", function () hl.on("hyprland.start", function()
-- hl.exec_cmd(terminal) hl.exec_cmd("lan-mouse daemon")
-- hl.exec_cmd("nm-applet") end)
-- hl.exec_cmd("waybar & hyprpaper & firefox")
-- end)
------------------------------- -------------------------------
---- ENVIRONMENT VARIABLES ---- ---- ENVIRONMENT VARIABLES ----
@@ -58,7 +52,6 @@ local menu = "hyprlauncher"
hl.env("XCURSOR_SIZE", "24") hl.env("XCURSOR_SIZE", "24")
hl.env("HYPRCURSOR_SIZE", "24") hl.env("HYPRCURSOR_SIZE", "24")
----------------------- -----------------------
----- PERMISSIONS ----- ----- PERMISSIONS -----
----------------------- -----------------------
@@ -77,7 +70,6 @@ hl.env("HYPRCURSOR_SIZE", "24")
-- hl.permission("/usr/(lib|libexec|lib64)/xdg-desktop-portal-hyprland", "screencopy", "allow") -- hl.permission("/usr/(lib|libexec|lib64)/xdg-desktop-portal-hyprland", "screencopy", "allow")
-- hl.permission("/usr/(bin|local/bin)/hyprpm", "plugin", "allow") -- hl.permission("/usr/(bin|local/bin)/hyprpm", "plugin", "allow")
----------------------- -----------------------
---- LOOK AND FEEL ---- ---- LOOK AND FEEL ----
----------------------- -----------------------
@@ -85,13 +77,13 @@ hl.env("HYPRCURSOR_SIZE", "24")
-- Refer to https://wiki.hypr.land/configuring/core/config-options/ -- Refer to https://wiki.hypr.land/configuring/core/config-options/
hl.config({ hl.config({
general = { general = {
gaps_in = 5, gaps_in = 4,
gaps_out = 20, gaps_out = 20,
border_size = 2, border_size = 2,
col = { col = {
active_border = { colors = {"rgba(33ccffee)", "rgba(00ff99ee)"}, angle = 45 }, active_border = { colors = { "rgba(33ccffee)", "rgba(00ff99ee)" }, angle = 45 },
inactive_border = "rgba(595959aa)", inactive_border = "rgba(595959aa)",
}, },
@@ -133,14 +125,14 @@ hl.config({
}) })
-- Default curves and animations, see https://wiki.hypr.land/configuring/core/animations/ -- Default curves and animations, see https://wiki.hypr.land/configuring/core/animations/
hl.curve("easeOutQuint", { type = "bezier", points = { {0.23, 1}, {0.32, 1} } }) hl.curve("easeOutQuint", { type = "bezier", points = { { 0.23, 1 }, { 0.32, 1 } } })
hl.curve("easeInOutCubic", { type = "bezier", points = { {0.65, 0.05}, {0.36, 1} } }) hl.curve("easeInOutCubic", { type = "bezier", points = { { 0.65, 0.05 }, { 0.36, 1 } } })
hl.curve("linear", { type = "bezier", points = { {0, 0}, {1, 1} } }) hl.curve("linear", { type = "bezier", points = { { 0, 0 }, { 1, 1 } } })
hl.curve("almostLinear", { type = "bezier", points = { {0.5, 0.5}, {0.75, 1} } }) hl.curve("almostLinear", { type = "bezier", points = { { 0.5, 0.5 }, { 0.75, 1 } } })
hl.curve("quick", { type = "bezier", points = { {0.15, 0}, {0.1, 1} } }) hl.curve("quick", { type = "bezier", points = { { 0.15, 0 }, { 0.1, 1 } } })
-- Default springs -- Default springs
hl.curve("easy", { type = "spring", mass = 1, stiffness = 238.1191, damping = 24.21279333 }) hl.curve("easy", { type = "spring", mass = 1, stiffness = 238.1191, dampening = 24.21279333 })
hl.animation({ leaf = "global", enabled = true, speed = 10, bezier = "default" }) hl.animation({ leaf = "global", enabled = true, speed = 10, bezier = "default" })
hl.animation({ leaf = "border", enabled = true, speed = 5.39, bezier = "easeOutQuint" }) hl.animation({ leaf = "border", enabled = true, speed = 5.39, bezier = "easeOutQuint" })
@@ -210,7 +202,6 @@ hl.config({
}, },
}) })
--------------- ---------------
---- INPUT ---- ---- INPUT ----
--------------- ---------------
@@ -236,7 +227,7 @@ hl.config({
hl.gesture({ hl.gesture({
fingers = 3, fingers = 3,
direction = "horizontal", direction = "horizontal",
action = "workspace" action = "workspace",
}) })
-- Example per-device config -- Example per-device config
@@ -246,7 +237,6 @@ hl.device({
sensitivity = -0.5, sensitivity = -0.5,
}) })
--------------------- ---------------------
---- KEYBINDINGS ---- ---- KEYBINDINGS ----
--------------------- ---------------------
@@ -257,11 +247,14 @@ local mainMod = "SUPER" -- Sets "Windows" key as main modifier
hl.bind(mainMod .. " + Q", hl.dsp.exec_cmd(terminal)) hl.bind(mainMod .. " + Q", hl.dsp.exec_cmd(terminal))
local closeWindowBind = hl.bind(mainMod .. " + C", hl.dsp.window.close()) local closeWindowBind = hl.bind(mainMod .. " + C", hl.dsp.window.close())
-- closeWindowBind:set_enabled(false) -- closeWindowBind:set_enabled(false)
hl.bind(mainMod .. " + M", hl.dsp.exec_cmd("command -v hyprshutdown >/dev/null 2>&1 && hyprshutdown || hyprctl dispatch 'hl.dsp.exit()'")) hl.bind(
mainMod .. " + M",
hl.dsp.exec_cmd("command -v hyprshutdown >/dev/null 2>&1 && hyprshutdown || hyprctl dispatch 'hl.dsp.exit()'")
)
hl.bind(mainMod .. " + E", hl.dsp.exec_cmd(fileManager)) hl.bind(mainMod .. " + E", hl.dsp.exec_cmd(fileManager))
hl.bind(mainMod .. " + V", hl.dsp.window.float({ action = "toggle" })) hl.bind(mainMod .. " + V", hl.dsp.window.float({ action = "toggle" }))
hl.bind(mainMod .. " + R", hl.dsp.exec_cmd(menu))
hl.bind(mainMod .. " + P", hl.dsp.window.pseudo()) hl.bind(mainMod .. " + P", hl.dsp.window.pseudo())
hl.bind(mainMod .. " + R", hl.dsp.exec_cmd(menu))
hl.bind(mainMod .. " + J", hl.dsp.layout("togglesplit")) -- dwindle only hl.bind(mainMod .. " + J", hl.dsp.layout("togglesplit")) -- dwindle only
-- Move focus with mainMod + arrow keys -- Move focus with mainMod + arrow keys
@@ -274,7 +267,7 @@ hl.bind(mainMod .. " + down", hl.dsp.focus({ direction = "down" }))
-- Move active window to a workspace with mainMod + SHIFT + [0-9] -- Move active window to a workspace with mainMod + SHIFT + [0-9]
for i = 1, 10 do for i = 1, 10 do
local key = i % 10 -- 10 maps to key 0 local key = i % 10 -- 10 maps to key 0
hl.bind(mainMod .. " + " .. key, hl.dsp.focus({ workspace = i})) hl.bind(mainMod .. " + " .. key, hl.dsp.focus({ workspace = i }))
hl.bind(mainMod .. " + SHIFT + " .. key, hl.dsp.window.move({ workspace = i })) hl.bind(mainMod .. " + SHIFT + " .. key, hl.dsp.window.move({ workspace = i }))
end end
@@ -291,12 +284,28 @@ hl.bind(mainMod .. " + mouse:272", hl.dsp.window.drag(), { mouse = true })
hl.bind(mainMod .. " + mouse:273", hl.dsp.window.resize(), { mouse = true }) hl.bind(mainMod .. " + mouse:273", hl.dsp.window.resize(), { mouse = true })
-- Laptop multimedia keys for volume and LCD brightness -- Laptop multimedia keys for volume and LCD brightness
hl.bind("XF86AudioRaiseVolume", hl.dsp.exec_cmd("wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+"), { locked = true, repeating = true }) hl.bind(
hl.bind("XF86AudioLowerVolume", hl.dsp.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"), { locked = true, repeating = true }) "XF86AudioRaiseVolume",
hl.bind("XF86AudioMute", hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"), { locked = true, repeating = true }) hl.dsp.exec_cmd("wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+"),
hl.bind("XF86AudioMicMute", hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"), { locked = true, repeating = true }) { locked = true, repeating = true }
)
hl.bind(
"XF86AudioLowerVolume",
hl.dsp.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"),
{ locked = true, repeating = true }
)
hl.bind(
"XF86AudioMute",
hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"),
{ locked = true, repeating = true }
)
hl.bind(
"XF86AudioMicMute",
hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"),
{ locked = true, repeating = true }
)
hl.bind("XF86MonBrightnessUp", hl.dsp.exec_cmd("brightnessctl -e4 -n2 set 5%+"), { locked = true, repeating = true }) hl.bind("XF86MonBrightnessUp", hl.dsp.exec_cmd("brightnessctl -e4 -n2 set 5%+"), { locked = true, repeating = true })
hl.bind("XF86MonBrightnessDown",hl.dsp.exec_cmd("brightnessctl -e4 -n2 set 5%-"), { locked = true, repeating = true }) hl.bind("XF86MonBrightnessDown", hl.dsp.exec_cmd("brightnessctl -e4 -n2 set 5%-"), { locked = true, repeating = true })
-- Requires playerctl -- Requires playerctl
hl.bind("XF86AudioNext", hl.dsp.exec_cmd("playerctl next"), { locked = true }) hl.bind("XF86AudioNext", hl.dsp.exec_cmd("playerctl next"), { locked = true })
@@ -304,7 +313,6 @@ hl.bind("XF86AudioPause", hl.dsp.exec_cmd("playerctl play-pause"), { locked = tr
hl.bind("XF86AudioPlay", hl.dsp.exec_cmd("playerctl play-pause"), { locked = true }) hl.bind("XF86AudioPlay", hl.dsp.exec_cmd("playerctl play-pause"), { locked = true })
hl.bind("XF86AudioPrev", hl.dsp.exec_cmd("playerctl previous"), { locked = true }) hl.bind("XF86AudioPrev", hl.dsp.exec_cmd("playerctl previous"), { locked = true })
-------------------------------- --------------------------------
---- WINDOWS AND WORKSPACES ---- ---- WINDOWS AND WORKSPACES ----
-------------------------------- --------------------------------
+7
View File
@@ -18,6 +18,13 @@ require("lazy").setup({
spec = { spec = {
-- add LazyVim and import its plugins -- add LazyVim and import its plugins
{ "LazyVim/LazyVim", import = "lazyvim.plugins" }, { "LazyVim/LazyVim", import = "lazyvim.plugins" },
{ import = "lazyvim.plugins.extras.lang.python" },
{ import = "lazyvim.plugins.extras.lang.typescript" },
{ import = "lazyvim.plugins.extras.lang.php" },
{ import = "lazyvim.plugins.extras.lang.rust" },
{ import = "lazyvim.plugins.extras.lang.nix" },
{ import = "lazyvim.plugins.extras.lang.json" },
{ import = "lazyvim.plugins.extras.lang.docker" },
-- import/override with your plugins -- import/override with your plugins
{ import = "plugins" }, { import = "plugins" },
}, },
+2
View File
@@ -1,3 +1,5 @@
-- Options are automatically loaded before lazy.nvim startup -- Options are automatically loaded before lazy.nvim startup
-- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua -- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua
-- Add any additional options here -- Add any additional options here
--
vim.g.lazyvim_python_lsp = "basedpyright"
-14
View File
@@ -1,14 +0,0 @@
return {
"stevearc/conform.nvim",
opts = {
formatters_by_ft = {
nix = {
"alejandra",
},
},
format_on_save = {
timeout_ms = 1000,
lsp_format = "fallback",
},
},
}
+16
View File
@@ -0,0 +1,16 @@
return {
"neovim/nvim-lspconfig",
opts = {
servers = {
lua_ls = {
settings = {
Lua = {
diagnostics = {
globals = { "hl", "vim" },
},
},
},
},
},
},
}
@@ -0,0 +1,4 @@
return {
{ "williamboman/mason-lspconfig", enabled = false },
{ "williamboman/mason", enabled = false },
}
Generated
+99 -13
View File
@@ -23,6 +23,27 @@
"type": "github" "type": "github"
} }
}, },
"configarr": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs",
"systems": "systems"
},
"locked": {
"lastModified": 1789645849,
"narHash": "sha256-cK6OX+BjeT2cl7NEi+cL8qBWtPEKtfV4IZyIIUWtYII=",
"owner": "raydak-labs",
"repo": "configarr",
"rev": "44fef304c1abd63cc28b32bec6bcb42950a51586",
"type": "github"
},
"original": {
"owner": "raydak-labs",
"repo": "configarr",
"rev": "44fef304c1abd63cc28b32bec6bcb42950a51586",
"type": "github"
}
},
"fenix": { "fenix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -61,9 +82,27 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1782949081,
"narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@@ -102,11 +141,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1789386765, "lastModified": 1791227480,
"narHash": "sha256-4hyLFBhzQC7+qPMELWc7J/sbdA6ckXZxXU9CYRsGhsc=", "narHash": "sha256-+lrD+sxc2RKUWXRBAcggn7uBCFeJgnV75jD/cz7gJRA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "87c391f49a34660de6010f35bb50fb1bf811be9f", "rev": "aa23f720d022187228bc264f759aef6b80233bcf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -118,7 +157,7 @@
"lazyvim": { "lazyvim": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1788971242, "lastModified": 1788971242,
@@ -157,6 +196,37 @@
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": {
"lastModified": 1784783405,
"narHash": "sha256-4IHyyLgLBdKefkljdKod4IMn023pQiDXAWJA187cmdY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7525d999cd850b9a488817abc89c75dc733acf17",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1782614948,
"narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "db3f255737b94216eb71cce308e2912cf6bc2d7c",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1752480373, "lastModified": 1752480373,
"narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=",
@@ -172,13 +242,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1789286504, "lastModified": 1791260994,
"narHash": "sha256-eiEK7cKZORNEvX0GeF3RtNEF/JXhgf2RqSp3230q13E=", "narHash": "sha256-Miqqk/ammqnTUxaoCyvtwoPeLbI1ksFyLxi/CazZpWY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ef34387ddd751e1ab8857adf4676492d32eb24ec", "rev": "151fa4e8ddfdd8dd25d945ad94ed54a13de9f6e4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -191,10 +261,11 @@
"root": { "root": {
"inputs": { "inputs": {
"alejandra": "alejandra", "alejandra": "alejandra",
"configarr": "configarr",
"home-manager": "home-manager", "home-manager": "home-manager",
"lazyvim": "lazyvim", "lazyvim": "lazyvim",
"nixos-wsl": "nixos-wsl", "nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_3",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
} }
}, },
@@ -222,11 +293,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1788914643, "lastModified": 1791103873,
"narHash": "sha256-4GuMPW90JSxXWDPUB9M+1m7fYbe3H0apOd86/zBQ2Kw=", "narHash": "sha256-nFxM+pKoZ8LJAEnUXARyCaOAloWgaW9kZQOSjWzKcTE=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "13616fff713a9f94055c66f15687ebdc17a335df", "rev": "dcd241ba97088c22569d1573286e1b9daad340c0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -249,6 +320,21 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",
+9
View File
@@ -19,6 +19,10 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
configarr = {
url = "github:raydak-labs/configarr/44fef304c1abd63cc28b32bec6bcb42950a51586";
};
alejandra.url = "github:kamadorueda/alejandra/4.0.0"; alejandra.url = "github:kamadorueda/alejandra/4.0.0";
alejandra.inputs.nixpkgs.follows = "nixpkgs"; alejandra.inputs.nixpkgs.follows = "nixpkgs";
@@ -29,6 +33,7 @@
self, self,
nixpkgs, nixpkgs,
sops-nix, sops-nix,
configarr,
lazyvim, lazyvim,
alejandra, alejandra,
... ...
@@ -49,15 +54,19 @@
{ {
environment.systemPackages = [alejandra.defaultPackage.${system}]; environment.systemPackages = [alejandra.defaultPackage.${system}];
} }
configarr.nixosModules.default
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.backupFileExtension = "backup";
home-manager.extraSpecialArgs = {inherit inputs;}; home-manager.extraSpecialArgs = {inherit inputs;};
home-manager.sharedModules = [ home-manager.sharedModules = [
inputs.sops-nix.homeManagerModules.sops inputs.sops-nix.homeManagerModules.sops
]; ];
home-manager.users.mask = homeFile; home-manager.users.mask = homeFile;
} }
inputs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops
] ]
++ extraModules; ++ extraModules;
+3 -2
View File
@@ -21,6 +21,7 @@
# The home.packages option allows you to install Nix packages into your # The home.packages option allows you to install Nix packages into your
# environment. # environment.
home.packages = with pkgs; [ home.packages = with pkgs; [
fish
# # It is sometimes useful to fine-tune packages, for example, by applying # # It is sometimes useful to fine-tune packages, for example, by applying
# # overrides. You can do that directly here, just don't forget the # # overrides. You can do that directly here, just don't forget the
# # parentheses. Maybe you want to install Nerd Fonts with a limited number of # # parentheses. Maybe you want to install Nerd Fonts with a limited number of
@@ -40,6 +41,7 @@
home.file = { home.file = {
".config/nvim".source = ./dotfiles/nvim; ".config/nvim".source = ./dotfiles/nvim;
".config/hypr".source = ./dotfiles/hypr; ".config/hypr".source = ./dotfiles/hypr;
".config/lan-mouse".source = ./dotfiles/lan-mouse;
# # Building this configuration will create a copy of 'dotfiles/screenrc' in # # Building this configuration will create a copy of 'dotfiles/screenrc' in
# # the Nix store. Activating the configuration will then make '~/.screenrc' a # # the Nix store. Activating the configuration will then make '~/.screenrc' a
# # symlink to the Nix store copy. # # symlink to the Nix store copy.
@@ -68,9 +70,8 @@
}; };
home.shellAliases = { home.shellAliases = {
dogma-rebuild = "sudo nixos-rebuild switch --flake ${config.home.homeDirectory}#dogma-nixos"; dogma-rebuild = "sudo nixos-rebuild switch --flake ${config.home.homeDirectory}/nixos/#dogma-nixos";
cdproj = "cd ${config.home.homeDirectory}/projects/nixos-dogma"; cdproj = "cd ${config.home.homeDirectory}/projects/nixos-dogma";
working = "echo aaa";
}; };
# Home Manager can also manage your environment variables through # Home Manager can also manage your environment variables through
+189
View File
@@ -0,0 +1,189 @@
{
config,
pkgs,
...
}: {
# Home Manager needs a bit of information about you and the paths it should
# manage.
imports = [
];
home.username = "mask";
home.homeDirectory = "/home/mask";
# This value determines the Home Manager release that your configuration is
# compatible with. This helps avoid breakage when a new Home Manager release
# introduces backwards incompatible changes.
#
# You should not change this value, even if you update Home Manager. If you do
# want to update the value, then make sure to first check the Home Manager
# release notes.
home.stateVersion = "25.11"; # Please read the comment before changing.
# The home.packages option allows you to install Nix packages into your
# environment.
home.packages = with pkgs; [
fish
alacritty
starship
yazi
# # It is sometimes useful to fine-tune packages, for example, by applying
# # overrides. You can do that directly here, just don't forget the
# # parentheses. Maybe you want to install Nerd Fonts with a limited number of
# # fonts?
# (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
# # You can also create simple shell scripts directly inside your
# # configuration. For example, this adds a command 'my-hello' to your
# # environment:
# (pkgs.writeShellScriptBin "my-hello" ''
# echo "Hello, ${config.home.username}!"
# '')
];
# Home Manager is pretty good at managing dotfiles. The primary way to manage
# plain files is through 'home.file'.
home.file = {
".config/nvim".source = ../dotfiles/nvim;
".config/nvim/lazy-lock.json" = {
text = "{}";
onChange = "";
};
".config/hypr".source = ../dotfiles/hypr;
# # Building this configuration will create a copy of 'dotfiles/screenrc' in
# # the Nix store. Activating the configuration will then make '~/.screenrc' a
# # symlink to the Nix store copy.
# ".screenrc".source = dotfiles/screenrc;
# # You can also set the file content immediately.
# ".gradle/gradle.properties".text = ''
# org.gradle.console=verbose
# org.gradle.daemon.idletimeout=3600000
# '';
};
programs.alacritty = {
enable = true;
};
programs.tmux = {
enable = true;
shell = "${pkgs.zsh}/bin/zsh";
};
programs.kitty = {
enable = true;
settings = {
font_family = "Hack Nerd Font Mono";
font_size = "";
bold_font = "auto";
italic_font = "auto";
bold_italic_font = "auto";
};
};
home.shellAliases = {
dogma-rebuild = "sudo nixos-rebuild switch --flake ${config.home.homeDirectory}#$(hostname)";
dogma-rebuild-nixos = "sudo nixos-rebuild switch --flake ${config.home.homeDirectory}#dogma-nixos";
dogma-rebuild-rtx = "sudo nixos-rebuild switch --flake ${config.home.homeDirectory}#dogma-nixos-rtx";
dogma-rebuild-wsl = "sudo nixos-rebuild switch --flake ${config.home.homeDirectory}#dogma-wsl";
cdproj = "cd ${config.home.homeDirectory}/projects/nixos-dogma";
};
# Home Manager can also manage your environment variables through
# 'home.sessionVariables'. These will be explicitly sourced when using a
# shell provided by Home Manager. If you don't want to manage your shell
# through Home Manager then you have to manually source 'hm-session-vars.sh'
# located at either
#
# ~/.nix-profile/etc/profile.d/hm-session-vars.sh
#
# or
#
# ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
#
# or
#
# /etc/profiles/per-user/mask/etc/profile.d/hm-session-vars.sh
#
home.sessionVariables = {
SOPS_EDITOR = "nvim";
EDITOR = "nvim";
VISUAL = "nvim";
};
# Let Home Manager install and manage itself.
programs.zsh = {
enable = true;
autosuggestion.enable = true;
syntaxHighlighting.enable = true;
};
sops = {
age.keyFile = "/home/mask/.config/sops/age/keys.txt";
defaultSopsFile = ../secrets/secrets.yaml;
secrets = {
"github/token" = {};
"github/username" = {};
"gitlab/token" = {};
"gitea/token" = {};
"gitea/password" = {};
"gitea/username" = {};
};
templates = {
".git-credentials" = {
path = "${config.home.homeDirectory}/.git-credentials";
mode = "0600";
content = ''
https://${config.sops.placeholder."gitea/username"}:${config.sops.placeholder."gitea/token"}@git.centraldogma.site
https://${config.sops.placeholder."github/username"}:${config.sops.placeholder."github/token"}@github.com
'';
};
};
};
programs.git = {
enable = true;
settings = {
user = {
name = "Jordan Ashurst";
email = "ashurstdev@proton.me";
};
alias = {
#Add and commit
ac = ''!f() {git add -A && git commit "$@";}; f'';
cm = "commit";
};
credential.helper = "store --file=${config.sops.templates.".git-credentials".path}";
# credential-helper = {
#
# };
};
};
programs.neovim = {
enable = true;
defaultEditor = true;
viAlias = true;
vimAlias = true;
extraPackages = with pkgs; [
git
curl
ripgrep
fd
gcc
gnumake
unzip
wget
statix
lazygit
luarocks
nil
fzf
basedpyright
ruff
vtsls
];
};
programs.home-manager.enable = true;
}
+3
View File
@@ -0,0 +1,3 @@
{...}: {
imports = [./common.nix];
}
+3
View File
@@ -0,0 +1,3 @@
{...}: {
imports = [./common.nix];
}
+6
View File
@@ -0,0 +1,6 @@
{ config, lib, pkgs, ... }: {
imports = [./common.nix];
# Headless WSL overrides: disable GUI apps
programs.kitty.enable = lib.mkForce false;
}
+37 -1
View File
@@ -34,19 +34,29 @@
"dedyn/dnsuser" = {}; "dedyn/dnsuser" = {};
"github/token" = {}; "github/token" = {};
"gitlab/token" = {}; "gitlab/token" = {};
"sonarr/apikey" = {};
"cifs/user" = {};
"cifs/password" = {};
"radarr/apikey" = {};
"mongodb/initial_password" = {}; "mongodb/initial_password" = {};
"namecheap/ddyn_password" = { "namecheap/ddyn_password" = {
restartUnits = ["ddclient.service"]; restartUnits = ["ddclient.service"];
}; };
}; };
programs.steam.enable = true;
sops.templates."factorio.json".content = builtins.toJSON { sops.templates."factorio.json".content = builtins.toJSON {
service_username = config.sops.placeholder."factorio/service_username"; service_username = config.sops.placeholder."factorio/service_username";
service_token = config.sops.placeholder."factorio/service_token"; service_token = config.sops.placeholder."factorio/service_token";
gamepassword = config.sops.placeholder."factorio/gamepassword"; gamepassword = config.sops.placeholder."factorio/gamepassword";
}; };
sops.templates."duplicity.env".content = builtins.toJSON {};
sops.templates."duplicity.env".content = builtins.toJSON { }; sops.templates."cifs-credentials".content = ''
username=${config.sops.placeholder."cifs/user"};
password=${config.sops.placeholder."cifs/password"};
'';
sops.templates."caddy.env" = { sops.templates."caddy.env" = {
owner = "root"; owner = "root";
@@ -83,6 +93,8 @@
zstd zstd
stdenv.cc.cc stdenv.cc.cc
curl curl
SDL2
wayland
openssl openssl
libssh libssh
bzip2 bzip2
@@ -96,6 +108,12 @@
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
inotify-tools
uv
opencode
steam
nnn
hyprlauncher
qbittorrent qbittorrent
pinentry-qt pinentry-qt
ddclient ddclient
@@ -155,5 +173,23 @@
services.openssh.enable = true; services.openssh.enable = true;
services.keyd = {
enable = true;
keyboards = {
default = {
ids = ["*"];
settings = {
main = {
# Tap for Escape, hold for Control
capslock = "overload(control, escape)";
# OR Tap for Escape, hold for Super/Meta:
# capslock = "overload(meta, escape)";
};
};
};
};
};
system.stateVersion = "25.11"; system.stateVersion = "25.11";
} }
+31 -3
View File
@@ -1,6 +1,6 @@
# Desktop stack for baremetal hosts (dogma-nixos, dogma-nixos-rtx) # Desktop stack for baremetal hosts (dogma-nixos, dogma-nixos-rtx)
# Headless WSL does NOT import this. # Headless WSL does NOT import this.
{ pkgs, ... }: { {pkgs, ...}: {
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
fira-code fira-code
fira-code-symbols fira-code-symbols
@@ -9,11 +9,26 @@
services.xserver.enable = true; services.xserver.enable = true;
services.xserver.xkb.layout = "us"; services.xserver.xkb.layout = "us";
services.xserver.xkb.options = "caps:escape"; services.xserver.displayManager.lightdm.autoLogin.timeout = 1;
hardware.graphics = {
enable = true;
extraPackages = [pkgs.mesa];
};
hardware.opengl = {
enable = true;
};
environment.sessionVariables = {
NIXOS_OZONE_WL = "1";
};
services.pipewire = { services.pipewire = {
enable = true; enable = true;
alsa.enable = true;
pulse.enable = true; pulse.enable = true;
wireplumber.enable = true;
}; };
services.sunshine = { services.sunshine = {
@@ -23,7 +38,20 @@
openFirewall = true; openFirewall = true;
}; };
programs.hyprland.enable = true; programs.hyprland = {
enable = true;
xwayland.enable = true;
};
xdg.portal = {
enable = true;
extraPortals = with pkgs; [
xdg-desktop-portal
xdg-desktop-portal-gtk
xdg-desktop-portal-hyprland
];
};
services.getty.autologinUser = "mask";
virtualisation.libvirtd = { virtualisation.libvirtd = {
enable = true; enable = true;
+128 -43
View File
@@ -3,6 +3,8 @@
config, config,
lib, lib,
pkgs, pkgs,
inputs,
options,
... ...
}: { }: {
boot.kernel.sysctl = { boot.kernel.sysctl = {
@@ -24,46 +26,127 @@
services.caddy = { services.caddy = {
enable = true; enable = true;
environmentFile = config.sops.templates."caddy.env".path; environmentFile = config.sops.templates."caddy.env".path;
virtualHosts."centraldogma.site:".extraConfig = '' virtualHosts."centraldogma.site:".extraConfig = ''
root * /srv/root/ root /srv/root/
file_server file_server
encode zstd gzip encode zstd gzip
redir /jellyfin /jellyfin/
reverse_proxy /jellyfin/* 127.0.0.1:8096
redir /sonarr /sonarr/
reverse_proxy /sonarr/* 127.0.0.1:8989
redir /radarr /radarr/ redir /radarr /radarr/
reverse_proxy /radarr/* 127.0.0.1:7878 reverse_proxy /radarr/* 127.0.0.1:7878
''; '';
virtualHosts."http://dogma.lan:".extraConfig = ''
root * /srv/root/
file_server browse
encode zstd gzip
'';
virtualHosts."jellyfin.centraldogma.site:".extraConfig = '' virtualHosts."jellyfin.centraldogma.site:".extraConfig = ''
reverse_proxy /* 127.0.0.1:8096 reverse_proxy /* 127.0.0.1:8096
''; '';
virtualHosts."jellyfin2.centraldogma.site:".extraConfig = ''
redir /jellyfin /jellyfin/ virtualHosts."sonarr.centraldogma.site:".extraConfig = ''
reverse_proxy /jellyfin/* 127.0.0.1:8096 redir /sonarr /sonarr/
reverse_proxy /sonarr/* 127.0.0.1:8989
'';
virtualHosts."radarr.centraldogma.site:".extraConfig = ''
redir /radarr /radarr/
reverse_proxy /radarr/* 127.0.0.1:7878
''; '';
virtualHosts."git.centraldogma.site:".extraConfig = '' virtualHosts."git.centraldogma.site:".extraConfig = ''
reverse_proxy /* 127.0.0.1:3000 reverse_proxy /* 127.0.0.1:3000
''; '';
virtualHosts."spy.centraldogma.site:".extraConfig = ''
reverse_proxy /* 192.168.1.78:4444
'';
}; };
services.flaresolverr.enable = true; services.flaresolverr.enable = true;
sops.templates.configarr-ev = {
content = ''
LOG_LEVEL=debug
LOG_STACKTRACE=true
CONFIGARR_ENABLE_MERGE=true
RADARR_API_KEY=${config.sops.placeholder."radarr/apikey"}
SONARR_API_KEY=${config.sops.placeholder."sonarr/apikey"}
'';
inherit (config.services.configarr) group;
owner = config.services.configarr.user;
};
services.configarr = {
package =
options.services.configarr.package.default.overrideAttrs
(old: {
pnpmDeps = old.pnpmDeps.overrideAttrs (_: {
outputHash = "sha256-auz4JyfHJAOF+baLfV391HgBTua4AJFfX4CtTPh+0Sw=";
});
});
enable = true;
config =
#yaml
''
x-download-clients:
# Define an anchor for shared instance
qb_base: &qb_base
name: "qBit"
type: qbittorrent
enable: true
priority: 1
remove_completed_downloads: true
remove_failed_downloads: true
# YAML does a shallow merge, thus we must declare another anchor for the nested dictionary if we plan to override values in it
fields: &qb_fields
host: qbittorrent
port: 8080
use_ssl: false
username: admin
password: changeme
radarr:
radarr_instance:
api_key: !env RADARR_API_KEY
base_url: http://localhost:${toString config.services.radarr.settings.server.port}
sonarr:
sonarr_instance:
api_key: !env SONARR_API_KEY
base_url: http://localhost:${toString config.services.sonarr.settings.server.port}
download_clients:
data:
- <<: *qb_base
fields:
<<: *qb_fields
tv_category: series
tags: ["sonarr"]
# Reuse same base, override name and fields
- <<: *qb_base
name: "qBit 4K"
fields:
<<: *qb_fields
tv_category: series-4k
tags: ["4K"]
update_password: false
delete_unmanaged:
enabled: true
ignore: ["Manual Test Client"]
config:
enable_completed_download_handling: true
auto_redownload_failed: false
'';
environmentFile = config.sops.templates."configarr-ev".path;
};
services.mongodb = { services.mongodb = {
enable = true; enable = true;
package = pkgs.mongodb-ce; package = pkgs.mongodb-ce;
initialRootPasswordFile = config.sops.secrets."mongodb/initial_password".path; initialRootPasswordFile = config.sops.secrets."mongodb/initial_password".path;
}; };
services.jackett.enable = true; services.jackett.enable = true;
services.prowlarr.enable = true;
services.factorio = { services.factorio = {
enable = true; enable = true;
@@ -71,9 +154,9 @@
requireUserVerification = true; requireUserVerification = true;
username = "TheMaskedMan95"; username = "TheMaskedMan95";
admins = ["TheMaskedMan95"]; admins = ["TheMaskedMan95"];
extraSettingsFile = config.sops.templates."factorio.json".path;
game-name = "Realm of the Masked Men"; game-name = "Realm of the Masked Men";
description = "No Dogs allowed"; description = "No Dogs allowed";
extraSettingsFile = config.sops.templates."factorio.json".path;
saveName = "SPACExxxx"; saveName = "SPACExxxx";
openFirewall = true; openFirewall = true;
}; };
@@ -89,6 +172,7 @@
domains = [ domains = [
"@" "@"
"www" "www"
"*"
]; ];
usev4 = "webv4, webv4=ipify-ipv4"; usev4 = "webv4, webv4=ipify-ipv4";
passwordFile = config.sops.secrets."namecheap/ddyn_password".path; passwordFile = config.sops.secrets."namecheap/ddyn_password".path;
@@ -102,36 +186,37 @@
openRPCPort = true; openRPCPort = true;
settings = { settings = {
rpc-bind-address = "0.0.0.0"; rpc-bind-address = "0.0.0.0";
rpc-whitelist = "127.0.0.1,192.168.1.86"; rpc-whitelist = "127.0.0.1,192.168.0.91";
download-dir = "/mnt/media/Downloads"; download-dir = "/mnt/media/Downloads";
}; };
}; };
services.adguardhome = { # services.adguardhome = {
enable = true; # enable = true;
host = "0.0.0.0"; # host = "0.0.0.0";
port = 3003; # port = 3003;
settings = { # settings = {
allowDHCP = true; # allowDHCP = true;
dns = { # dns = {
upstream_dns = [ # upstream_dns = [
"9.9.9.9#dns.quad9.net" # "9.9.9.9#dns.quad9.net"
"149.112.112.112#dns.quad9.net" # "149.112.112.112#dns.quad9.net"
]; # ];
}; # };
filtering = { # filtering = {
protection_enabled = true; # protection_enabled = true;
filtering_enabled = true; # filtering_enabled = true;
parental_enabled = true; # parental_enabled = true;
safe_search.enabled = false; # safe_search.enabled = false;
}; # };
filters = map (url: { # filters =
enabled = true; # map (url: {
url = url; # enabled = true;
}) [ # url = url;
"https://adguardteam.github.io/HostlistsRegistry/assets/filter_9.txt" # }) [
"https://adguardteam.github.io/HostlistsRegistry/assets/filter_11.txt" # "https://adguardteam.github.io/HostlistsRegistry/assets/filter_9.txt"
]; # "https://adguardteam.github.io/HostlistsRegistry/assets/filter_11.txt"
}; # ];
}; # };
# };
} }
+12 -1
View File
@@ -1,8 +1,14 @@
{ config, lib, pkgs, ... }: { {
config,
lib,
pkgs,
...
}: {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
./mounts.nix ./mounts.nix
./samba.nix ./samba.nix
./network.nix
../common/default.nix ../common/default.nix
../common/desktop.nix ../common/desktop.nix
../common/server.nix ../common/server.nix
@@ -14,4 +20,9 @@
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.loader.systemd-boot.configurationLimit = 30; boot.loader.systemd-boot.configurationLimit = 30;
boot.kernelModules = ["kvm-intel"]; boot.kernelModules = ["kvm-intel"];
# hardware.nvidia = {
# modesetting.enable = true;
# nvidiaSettings = true;
# package = config.boot.kernelPackages.nvidiaPackages.legacy_580;
# };
} }
+11 -1
View File
@@ -1,4 +1,4 @@
{ {config, ...}: {
fileSystems = { fileSystems = {
"/mnt/games" = { "/mnt/games" = {
device = "/dev/disk/by-uuid/969eb1a0-fb99-46d1-96cf-57a8644ee2d1"; device = "/dev/disk/by-uuid/969eb1a0-fb99-46d1-96cf-57a8644ee2d1";
@@ -10,6 +10,7 @@
"nofail" "nofail"
]; ];
}; };
"/mnt/photo" = { "/mnt/photo" = {
device = "/dev/disk/by-uuid/969eb1a0-fb99-46d1-96cf-57a8644ee2d1"; device = "/dev/disk/by-uuid/969eb1a0-fb99-46d1-96cf-57a8644ee2d1";
fsType = "btrfs"; fsType = "btrfs";
@@ -43,6 +44,15 @@
]; ];
}; };
# "/mnt/dogma-rtx-public" = {
# device = "//192.168.0.93/Users/Public";
# fsType = "cifs";
# options = let
# # Prevent system hangs if the network drops or the NAS is offline
# automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s";
# in ["${automount_opts},credentials=${config.sops.templates."cifs-credentials".path},uid=1000,gid=100" "nofail"];
# };
"/mnt/winhdd" = { "/mnt/winhdd" = {
device = "/dev/sdb1"; device = "/dev/sdb1";
fsType = "ntfs"; fsType = "ntfs";
+1
View File
@@ -0,0 +1 @@
{}
+6 -2
View File
@@ -1,4 +1,8 @@
{pkgs, ...}: { {
pkgs,
config,
...
}: {
services.samba = { services.samba = {
enable = true; enable = true;
openFirewall = true; openFirewall = true;
@@ -11,7 +15,7 @@
#"use sendfile" = "yes"; #"use sendfile" = "yes";
#"max protocol" = "smb2"; #"max protocol" = "smb2";
# note: localhost is the ipv6 localhost ::1 # note: localhost is the ipv6 localhost ::1
"hosts allow" = "192.168.1.1/24 127.0.0.1 localhost"; "hosts allow" = "192.168.0.1/24 127.0.0.1 localhost";
"guest account" = "nobody"; "guest account" = "nobody";
"map to guest" = "bad user"; "map to guest" = "bad user";
}; };
-57
View File
@@ -1,57 +0,0 @@
{
fileSystems = {
"/mnt/games" = {
device = "/dev/disk/by-uuid/969eb1a0-fb99-46d1-96cf-57a8644ee2d1";
fsType = "btrfs";
options = [
"users"
"compress=zstd"
"subvol=@games"
"nofail"
];
};
"/mnt/photo" = {
device = "/dev/disk/by-uuid/969eb1a0-fb99-46d1-96cf-57a8644ee2d1";
fsType = "btrfs";
options = [
"users"
"compress=zstd"
"subvol=@Pictures"
"nofail"
];
};
"/mnt/media" = {
device = "/dev/disk/by-uuid/969eb1a0-fb99-46d1-96cf-57a8644ee2d1";
fsType = "btrfs";
options = [
"users"
"compress=zstd"
"subvol=@media"
"nofail"
];
};
"/mnt/winbackup" = {
device = "/dev/disk/by-uuid/969eb1a0-fb99-46d1-96cf-57a8644ee2d1";
fsType = "btrfs";
options = [
"users"
"compress=zstd"
"subvol=@winbackup"
"nofail"
];
};
"/mnt/winhdd" = {
device = "/dev/sdb1";
fsType = "ntfs";
options = [
"users"
"windows_names"
"noatime"
"nofail"
];
};
};
}
+7 -2
View File
@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: { {
config,
lib,
pkgs,
...
}: {
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
hardware.graphics.enable = true; hardware.graphics.enable = true;
hardware.nvidia = { hardware.nvidia = {
@@ -7,7 +12,7 @@
powerManagement.finegrained = false; powerManagement.finegrained = false;
open = false; # Pascal (GTX 1060) requires closed driver open = false; # Pascal (GTX 1060) requires closed driver
nvidiaSettings = true; nvidiaSettings = true;
package = config.boot.kernelPackages.nvidiaPackages.stable; package = config.boot.kernelPackages.nvidiaPackages.legacy_580;
}; };
services.xserver.videoDrivers = ["nvidia"]; services.xserver.videoDrivers = ["nvidia"];
} }
-72
View File
@@ -1,72 +0,0 @@
{pkgs, ...}: {
services.samba = {
enable = true;
openFirewall = true;
settings = {
global = {
"security" = "user";
"workgroup" = "WORKGROUP";
"server string" = "smbnix";
"netbios name" = "smbnix";
#"use sendfile" = "yes";
#"max protocol" = "smb2";
# note: localhost is the ipv6 localhost ::1
"hosts allow" = "192.168.1.1/24 127.0.0.1 localhost";
"guest account" = "nobody";
"map to guest" = "bad user";
};
"games" = {
"path" = "/mnt/games";
"browseable" = "yes";
"read only" = "no";
"guest ok" = "no";
"create mask" = "0644";
"directory mask" = "0755";
};
"media" = {
"path" = "/mnt/media";
"browseable" = "yes";
"read only" = "no";
"guest ok" = "no";
"create mask" = "0644";
"directory mask" = "0755";
};
"photos" = {
"path" = "/mnt/photo";
"browseable" = "yes";
"read only" = "no";
"guest ok" = "no";
"create mask" = "0644";
"directory mask" = "0755";
};
"winhdd" = {
"path" = "/mnt/winhdd";
"browseable" = "yes";
"read only" = "no";
"guest ok" = "no";
"create mask" = "0644";
"directory mask" = "0755";
};
"winback" = {
"path" = "/mnt/winbackup";
"browseable" = "yes";
"read only" = "no";
"guest ok" = "no";
"create mask" = "0644";
"directory mask" = "0755";
};
};
};
services.samba-wsdd = {
enable = true;
openFirewall = true;
};
environment.systemPackages = [pkgs.samba];
}
+12 -2
View File
@@ -31,11 +31,18 @@ gitea:
caddy: caddy:
acme_email: ENC[AES256_GCM,data:TpXEvreBkq2gqpq3OTokke/Zues=,iv:iO8jIMEzBpk5DOksQqnT87Nq8vFTG28qELvfIscOqWc=,tag:poK3Kl1bkePLetSF5DPb9A==,type:str] acme_email: ENC[AES256_GCM,data:TpXEvreBkq2gqpq3OTokke/Zues=,iv:iO8jIMEzBpk5DOksQqnT87Nq8vFTG28qELvfIscOqWc=,tag:poK3Kl1bkePLetSF5DPb9A==,type:str]
gitea_password: ENC[AES256_GCM,data:Qtp9wKXS5EwcK9vZOb8unc98Ptif6ox5xClNxKy7/rhdE0kU6sjRpMq675w=,iv:1QmjDt/89zuWAtkTqzApJ8/VW//i4h/+SlAfhguYN88=,tag:vzSA5PEjuad2QO8w1qcigA==,type:str] gitea_password: ENC[AES256_GCM,data:Qtp9wKXS5EwcK9vZOb8unc98Ptif6ox5xClNxKy7/rhdE0kU6sjRpMq675w=,iv:1QmjDt/89zuWAtkTqzApJ8/VW//i4h/+SlAfhguYN88=,tag:vzSA5PEjuad2QO8w1qcigA==,type:str]
realname: ENC[AES256_GCM,data:5EtmFg2ZbM6fPwyK1X/+aF1Z4UGL,iv:a8v05Gt+eABECBxmh7quVYgDrMmDrj/3fhfGdHZPC+k=,tag:Ip9csJr85k5RQcadccn81w==,type:str]
google: google:
gmail: ENC[AES256_GCM,data:WwDdjZx5TuJcsVdasWaEw0c=,iv:3HftLdrT12DB/DyPy4g20FbYRAhNPyPrTkDlK6F5Keo=,tag:gCNJi09B7JCBHPNHy5uMVA==,type:str] gmail: ENC[AES256_GCM,data:WwDdjZx5TuJcsVdasWaEw0c=,iv:3HftLdrT12DB/DyPy4g20FbYRAhNPyPrTkDlK6F5Keo=,tag:gCNJi09B7JCBHPNHy5uMVA==,type:str]
proton:
email: ENC[AES256_GCM,data:H4Byh+a+PQ0TinXNcQpMMEgUTac=,iv:PWkxiPVLJn0uXI9m1Ijh266z1WAwUB7vjA7BQzueIG4=,tag:uB6t5Qi08QSkIo3lZhRA3g==,type:str]
backblaze: backblaze:
apikey: ENC[AES256_GCM,data:WglELVuGMc4tt7Zap9W50iUk2XX/Ijz0E43P7cWMcYpEOGfI7rvqsb+Q,iv:xVv/8u0qLfxxxv7i6M65cz4gi8qO6ng2j30SY/1pnw8=,tag:FzipD8kV0D3eMrDwEsfLuA==,type:str] apikey: ENC[AES256_GCM,data:WglELVuGMc4tt7Zap9W50iUk2XX/Ijz0E43P7cWMcYpEOGfI7rvqsb+Q,iv:xVv/8u0qLfxxxv7i6M65cz4gi8qO6ng2j30SY/1pnw8=,tag:FzipD8kV0D3eMrDwEsfLuA==,type:str]
backblaze_apikey: ENC[AES256_GCM,data:q5rVZBV3GQdY6ySOBVMFOPQDJGJmtMNdNi2zyMu6jjzQx7/AaQCbZxqT,iv:Mb2qoy6j+libJoNUFSPCw2EuE8pJEaMsW2ozWCEf2Ew=,tag:CmBFEDTwKi7EDT67C8Y4/A==,type:str] backblaze_apikey: ENC[AES256_GCM,data:q5rVZBV3GQdY6ySOBVMFOPQDJGJmtMNdNi2zyMu6jjzQx7/AaQCbZxqT,iv:Mb2qoy6j+libJoNUFSPCw2EuE8pJEaMsW2ozWCEf2Ew=,tag:CmBFEDTwKi7EDT67C8Y4/A==,type:str]
radarr:
apikey: ENC[AES256_GCM,data:NINmhtjhAuQ266Z+VxY4qsjk/q2DJAecUST3XnwFDqo=,iv:+OlHR2QduPYNJQdoN3dAhNUEDr+Meaonp058tyangHM=,tag:OkAIyFuekFHqo41Fkmt2MQ==,type:str]
sonarr:
apikey: ENC[AES256_GCM,data:TBxluw9aCRHAZIP+01wejCk/amqzGnafOqPuYSnwHDU=,iv:xX5J+BpxtIGUFob6vxU2/n+xK8K6hIFdGCNNip795IU=,tag:h+bfbnepRmpS252xhYyj0g==,type:str]
steam: steam:
recovery: ENC[AES256_GCM,data:pmKEJTIL,iv:WvH1jj0Q7PIYzsrMgpqkvdnUFL+zdbDzG5+3N+8DuWY=,tag:B7y1mbISbNCzFaicYodsXA==,type:str] recovery: ENC[AES256_GCM,data:pmKEJTIL,iv:WvH1jj0Q7PIYzsrMgpqkvdnUFL+zdbDzG5+3N+8DuWY=,tag:B7y1mbISbNCzFaicYodsXA==,type:str]
dedyn: dedyn:
@@ -45,6 +52,9 @@ namecheap:
ddyn_password: ENC[AES256_GCM,data:kWYdgXnwdmAErHLpEU7CSbUYoIipv+F8rTCAxR2gAuk=,iv:4O5ngC/au+mTMXrzd+x8Jn+OB608QqE7Y4sRTDPvvCY=,tag:NxsK+LrZi6nYjRVvv+PRlQ==,type:str] ddyn_password: ENC[AES256_GCM,data:kWYdgXnwdmAErHLpEU7CSbUYoIipv+F8rTCAxR2gAuk=,iv:4O5ngC/au+mTMXrzd+x8Jn+OB608QqE7Y4sRTDPvvCY=,tag:NxsK+LrZi6nYjRVvv+PRlQ==,type:str]
mongodb: mongodb:
initial_password: ENC[AES256_GCM,data:3Jih05JKK9BbKVl1qAFJFCtfX3qUpnwO01Xxi1ZlydbbyPtiT0ROVCZPUa0qN0M=,iv:TsGNGxpFIOpRaUGSYY7KO6/zvM20rTswpKIq/4QaPwg=,tag:tbA6Q6O7TI+S7uA1iRyOow==,type:str] initial_password: ENC[AES256_GCM,data:3Jih05JKK9BbKVl1qAFJFCtfX3qUpnwO01Xxi1ZlydbbyPtiT0ROVCZPUa0qN0M=,iv:TsGNGxpFIOpRaUGSYY7KO6/zvM20rTswpKIq/4QaPwg=,tag:tbA6Q6O7TI+S7uA1iRyOow==,type:str]
cifs:
user: ENC[AES256_GCM,data:gLlxFg==,iv:g4OChKmju3sQZNNxRpw4zF+OmLszJBk4eUY4pE3s4Sk=,tag:HwFe6YI5SPziY+3Z95kLLw==,type:str]
password: ENC[AES256_GCM,data:jPOpy+wKKYVyuDjeFA==,iv:jjukqSLaJ7rynZt8Xe5SabqJ+a2CUuBlul1IGrN2z1E=,tag:0+i4GBTCWYpD3wq43xHBAQ==,type:str]
sops: sops:
age: age:
- enc: | - enc: |
@@ -56,7 +66,7 @@ sops:
OXJfnqQIRsiwQJFNLDjB4hNZ5r9iupVj66BAbadO3pwlHWOFt6+PaQ== OXJfnqQIRsiwQJFNLDjB4hNZ5r9iupVj66BAbadO3pwlHWOFt6+PaQ==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
recipient: age1xgfxwt7488dkpksgjawc53ewsc4p94jy6kdvnpd5r0jv5a5yr9tqzxy8x2 recipient: age1xgfxwt7488dkpksgjawc53ewsc4p94jy6kdvnpd5r0jv5a5yr9tqzxy8x2
lastmodified: "2026-09-15T04:02:30Z" lastmodified: "2026-09-29T07:40:28Z"
mac: ENC[AES256_GCM,data:h92G5tOeUaD/nsx273vrh8INpS/S9mwQxrW3G0y26J+DC6in9GDYewbHrA5menlRWUCuiz6pomI75WZ2dAh7+YyWFyAOaxhNhF7GES355vMK5sEr+xn41yP6QXUcFBvU6p76Lv67QijtJIwQZuaycM2jNo7XXJtz7QDpr9T4Kcg=,iv:oLqFCAgLpPK/lq6NUE7ZtEoNY1GfaB5otJIrygdyOXs=,tag:+OwJRctOx7I1Rof3+MIutQ==,type:str] mac: ENC[AES256_GCM,data:Le4QJ3G8+TkFthecp8MnngmUJUajjbsXt3WZxdbVUlt8hwAYJYDk889y8GQjvJn+dCZCf+sNMPQUwNF/CQd/GcAUN84PV8kAR+x3W+OJP2/6SrWl8Bz/asWViQvD6mj0xSeXTe3VgJM/MQwHGIV6XHBSjIOOTg6hSkwIC0fCHBU=,iv:anrJYiSw8CZ0d8M6zh1VR6u4mUl1y0wltE85WKv7uLg=,tag:KOP2ON70vmF3EBg4vICgDQ==,type:str]
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.13.3 version: 3.13.3