Compare commits
2
Commits
master
..
7c9ff5bed2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7c9ff5bed2 | ||
|
|
d82d964382 |
+8
-3
@@ -262,6 +262,7 @@
|
|||||||
|
|
||||||
#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
|
||||||
@@ -274,17 +275,21 @@
|
|||||||
|
|
||||||
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."sonarr.centraldogma.site:".extraConfig = ''
|
virtualHosts."jellyfin2.centraldogma.site:".extraConfig = ''
|
||||||
redir /sonarr /sonarr/
|
redir /jellyfin /jellyfin/
|
||||||
reverse_proxy /sonarr/* 127.0.0.1:8989
|
reverse_proxy /jellyfin/* 127.0.0.1:8096
|
||||||
'';
|
'';
|
||||||
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
|
||||||
|
|||||||
@@ -211,7 +211,7 @@ hl.config({
|
|||||||
kb_layout = "us",
|
kb_layout = "us",
|
||||||
kb_variant = "",
|
kb_variant = "",
|
||||||
kb_model = "",
|
kb_model = "",
|
||||||
kb_options = "",
|
kb_options = "caps:swapescape",
|
||||||
kb_rules = "",
|
kb_rules = "",
|
||||||
|
|
||||||
follow_mouse = 1,
|
follow_mouse = 1,
|
||||||
|
|||||||
@@ -18,13 +18,6 @@ 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" },
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
-- 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"
|
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
return {
|
||||||
|
"stevearc/conform.nvim",
|
||||||
|
opts = {
|
||||||
|
formatters_by_ft = {
|
||||||
|
nix = {
|
||||||
|
"alejandra",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
return {
|
|
||||||
"neovim/nvim-lspconfig",
|
|
||||||
opts = {
|
|
||||||
servers = {
|
|
||||||
lua_ls = {
|
|
||||||
settings = {
|
|
||||||
Lua = {
|
|
||||||
diagnostics = {
|
|
||||||
globals = { "hl", "vim" },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
return {
|
|
||||||
{ "williamboman/mason-lspconfig", enabled = false },
|
|
||||||
{ "williamboman/mason", enabled = false },
|
|
||||||
}
|
|
||||||
Generated
+13
-99
@@ -23,27 +23,6 @@
|
|||||||
"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": [
|
||||||
@@ -82,27 +61,9 @@
|
|||||||
"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_2"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731533236,
|
"lastModified": 1731533236,
|
||||||
@@ -141,11 +102,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1791227480,
|
"lastModified": 1790110821,
|
||||||
"narHash": "sha256-+lrD+sxc2RKUWXRBAcggn7uBCFeJgnV75jD/cz7gJRA=",
|
"narHash": "sha256-4vgPxAtYGryB/9SZVFMrcRKmNcOqcN3+MwRJPTVpb1o=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "aa23f720d022187228bc264f759aef6b80233bcf",
|
"rev": "a5768f1a46942657352e58037b7891bdcbc0741f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -157,7 +118,7 @@
|
|||||||
"lazyvim": {
|
"lazyvim": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils",
|
"flake-utils": "flake-utils",
|
||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1788971242,
|
"lastModified": 1788971242,
|
||||||
@@ -196,37 +157,6 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"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=",
|
||||||
@@ -242,13 +172,13 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1791260994,
|
"lastModified": 1790046670,
|
||||||
"narHash": "sha256-Miqqk/ammqnTUxaoCyvtwoPeLbI1ksFyLxi/CazZpWY=",
|
"narHash": "sha256-MYiI+CzL0tuWgRPjGsKCDHqYs2T3OzMlMQWOYWG0qso=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "151fa4e8ddfdd8dd25d945ad94ed54a13de9f6e4",
|
"rev": "6774f7bc253789b113a4f39285dc0fa100abeacc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -261,11 +191,10 @@
|
|||||||
"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_3",
|
"nixpkgs": "nixpkgs_2",
|
||||||
"sops-nix": "sops-nix"
|
"sops-nix": "sops-nix"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -293,11 +222,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1791103873,
|
"lastModified": 1789890976,
|
||||||
"narHash": "sha256-nFxM+pKoZ8LJAEnUXARyCaOAloWgaW9kZQOSjWzKcTE=",
|
"narHash": "sha256-GKwH3zpy7tartuJMG0Rv/xUsdetG1QLmTVv8UKgJLmA=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "dcd241ba97088c22569d1573286e1b9daad340c0",
|
"rev": "7214124c20c1542c90deb54af50e2f53ae02711f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -320,21 +249,6 @@
|
|||||||
"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",
|
||||||
|
|||||||
@@ -19,10 +19,6 @@
|
|||||||
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";
|
||||||
|
|
||||||
@@ -33,7 +29,6 @@
|
|||||||
self,
|
self,
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
sops-nix,
|
sops-nix,
|
||||||
configarr,
|
|
||||||
lazyvim,
|
lazyvim,
|
||||||
alejandra,
|
alejandra,
|
||||||
...
|
...
|
||||||
@@ -54,8 +49,6 @@
|
|||||||
{
|
{
|
||||||
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;
|
||||||
@@ -66,7 +59,6 @@
|
|||||||
];
|
];
|
||||||
home-manager.users.mask = homeFile;
|
home-manager.users.mask = homeFile;
|
||||||
}
|
}
|
||||||
|
|
||||||
inputs.sops-nix.nixosModules.sops
|
inputs.sops-nix.nixosModules.sops
|
||||||
]
|
]
|
||||||
++ extraModules;
|
++ extraModules;
|
||||||
|
|||||||
+2
-10
@@ -23,8 +23,6 @@
|
|||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
fish
|
fish
|
||||||
alacritty
|
alacritty
|
||||||
starship
|
|
||||||
yazi
|
|
||||||
# # 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
|
||||||
@@ -43,10 +41,6 @@
|
|||||||
# plain files is through 'home.file'.
|
# plain files is through 'home.file'.
|
||||||
home.file = {
|
home.file = {
|
||||||
".config/nvim".source = ../dotfiles/nvim;
|
".config/nvim".source = ../dotfiles/nvim;
|
||||||
".config/nvim/lazy-lock.json" = {
|
|
||||||
text = "{}";
|
|
||||||
onChange = "";
|
|
||||||
};
|
|
||||||
".config/hypr".source = ../dotfiles/hypr;
|
".config/hypr".source = ../dotfiles/hypr;
|
||||||
# # 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
|
||||||
@@ -84,6 +78,7 @@
|
|||||||
dogma-rebuild-rtx = "sudo nixos-rebuild switch --flake ${config.home.homeDirectory}#dogma-nixos-rtx";
|
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";
|
dogma-rebuild-wsl = "sudo nixos-rebuild switch --flake ${config.home.homeDirectory}#dogma-wsl";
|
||||||
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
|
||||||
@@ -174,14 +169,11 @@
|
|||||||
gnumake
|
gnumake
|
||||||
unzip
|
unzip
|
||||||
wget
|
wget
|
||||||
|
nil
|
||||||
statix
|
statix
|
||||||
lazygit
|
lazygit
|
||||||
luarocks
|
luarocks
|
||||||
nil
|
nil
|
||||||
fzf
|
|
||||||
basedpyright
|
|
||||||
ruff
|
|
||||||
vtsls
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -34,10 +34,6 @@
|
|||||||
"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"];
|
||||||
@@ -53,11 +49,6 @@
|
|||||||
};
|
};
|
||||||
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";
|
||||||
mode = "0600";
|
mode = "0600";
|
||||||
@@ -93,8 +84,6 @@
|
|||||||
zstd
|
zstd
|
||||||
stdenv.cc.cc
|
stdenv.cc.cc
|
||||||
curl
|
curl
|
||||||
SDL2
|
|
||||||
wayland
|
|
||||||
openssl
|
openssl
|
||||||
libssh
|
libssh
|
||||||
bzip2
|
bzip2
|
||||||
@@ -109,7 +98,6 @@
|
|||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
inotify-tools
|
inotify-tools
|
||||||
uv
|
|
||||||
opencode
|
opencode
|
||||||
steam
|
steam
|
||||||
nnn
|
nnn
|
||||||
@@ -173,23 +161,5 @@
|
|||||||
|
|
||||||
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";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,26 +9,12 @@
|
|||||||
|
|
||||||
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;
|
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 = {
|
||||||
@@ -38,20 +24,7 @@
|
|||||||
openFirewall = true;
|
openFirewall = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.hyprland = {
|
programs.hyprland.enable = true;
|
||||||
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;
|
||||||
|
|||||||
+10
-97
@@ -3,8 +3,6 @@
|
|||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
inputs,
|
|
||||||
options,
|
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
boot.kernel.sysctl = {
|
boot.kernel.sysctl = {
|
||||||
@@ -26,35 +24,28 @@
|
|||||||
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 = ''
|
||||||
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."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
|
||||||
@@ -63,90 +54,12 @@
|
|||||||
|
|
||||||
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;
|
||||||
@@ -186,7 +99,7 @@
|
|||||||
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.0.91";
|
rpc-whitelist = "127.0.0.1,192.168.1.86";
|
||||||
download-dir = "/mnt/media/Downloads";
|
download-dir = "/mnt/media/Downloads";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -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,7 +10,6 @@
|
|||||||
"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";
|
||||||
@@ -44,15 +43,6 @@
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# "/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,8 +1,4 @@
|
|||||||
{
|
{pkgs, ...}: {
|
||||||
pkgs,
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
services.samba = {
|
services.samba = {
|
||||||
enable = true;
|
enable = true;
|
||||||
openFirewall = true;
|
openFirewall = true;
|
||||||
@@ -15,7 +11,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.0.1/24 127.0.0.1 localhost";
|
"hosts allow" = "192.168.1.1/24 127.0.0.1 localhost";
|
||||||
"guest account" = "nobody";
|
"guest account" = "nobody";
|
||||||
"map to guest" = "bad user";
|
"map to guest" = "bad user";
|
||||||
};
|
};
|
||||||
|
|||||||
+2
-12
@@ -31,18 +31,11 @@ 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:
|
||||||
@@ -52,9 +45,6 @@ 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: |
|
||||||
@@ -66,7 +56,7 @@ sops:
|
|||||||
OXJfnqQIRsiwQJFNLDjB4hNZ5r9iupVj66BAbadO3pwlHWOFt6+PaQ==
|
OXJfnqQIRsiwQJFNLDjB4hNZ5r9iupVj66BAbadO3pwlHWOFt6+PaQ==
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
recipient: age1xgfxwt7488dkpksgjawc53ewsc4p94jy6kdvnpd5r0jv5a5yr9tqzxy8x2
|
recipient: age1xgfxwt7488dkpksgjawc53ewsc4p94jy6kdvnpd5r0jv5a5yr9tqzxy8x2
|
||||||
lastmodified: "2026-09-29T07:40:28Z"
|
lastmodified: "2026-09-15T04:02:30Z"
|
||||||
mac: ENC[AES256_GCM,data:Le4QJ3G8+TkFthecp8MnngmUJUajjbsXt3WZxdbVUlt8hwAYJYDk889y8GQjvJn+dCZCf+sNMPQUwNF/CQd/GcAUN84PV8kAR+x3W+OJP2/6SrWl8Bz/asWViQvD6mj0xSeXTe3VgJM/MQwHGIV6XHBSjIOOTg6hSkwIC0fCHBU=,iv:anrJYiSw8CZ0d8M6zh1VR6u4mUl1y0wltE85WKv7uLg=,tag:KOP2ON70vmF3EBg4vICgDQ==,type:str]
|
mac: ENC[AES256_GCM,data:h92G5tOeUaD/nsx273vrh8INpS/S9mwQxrW3G0y26J+DC6in9GDYewbHrA5menlRWUCuiz6pomI75WZ2dAh7+YyWFyAOaxhNhF7GES355vMK5sEr+xn41yP6QXUcFBvU6p76Lv67QijtJIwQZuaycM2jNo7XXJtz7QDpr9T4Kcg=,iv:oLqFCAgLpPK/lq6NUE7ZtEoNY1GfaB5otJIrygdyOXs=,tag:+OwJRctOx7I1Rof3+MIutQ==,type:str]
|
||||||
unencrypted_suffix: _unencrypted
|
unencrypted_suffix: _unencrypted
|
||||||
version: 3.13.3
|
version: 3.13.3
|
||||||
|
|||||||
Reference in New Issue
Block a user