chore: Formatting
All checks were successful
Flake checker / Build Nix targets (push) Successful in 9m26s

This commit is contained in:
uttarayan21
2025-08-14 19:34:20 +05:30
parent 57832be28d
commit c959a3aea8
15 changed files with 164 additions and 177 deletions

View File

@@ -5,8 +5,7 @@
lib, lib,
device, device,
... ...
}: }: {
{
imports = [ imports = [
inputs.nix-index-database.homeModules.nix-index inputs.nix-index-database.homeModules.nix-index
../modules ../modules
@@ -34,7 +33,9 @@
home = { home = {
username = device.user; username = device.user;
homeDirectory = homeDirectory =
if device.isDarwin then lib.mkForce "/Users/${device.user}" else lib.mkForce "/home/${device.user}"; if device.isDarwin
then lib.mkForce "/Users/${device.user}"
else lib.mkForce "/home/${device.user}";
file = { file = {
".config/fish/themes".source = pkgs.catppuccinThemes.fish + "/themes"; ".config/fish/themes".source = pkgs.catppuccinThemes.fish + "/themes";
@@ -60,7 +61,10 @@
EDITOR = "nvim"; EDITOR = "nvim";
SHELL = "${pkgs.bash}/bin/bash"; SHELL = "${pkgs.bash}/bin/bash";
CARGO_TARGET_DIR = "${config.xdg.cacheHome}/cargo/target"; CARGO_TARGET_DIR = "${config.xdg.cacheHome}/cargo/target";
BROWSER = if device.isDarwin then "open" else "xdg-open"; BROWSER =
if device.isDarwin
then "open"
else "xdg-open";
}; };
sessionPath = [ sessionPath = [
"${config.home.homeDirectory}/.cargo/bin" "${config.home.homeDirectory}/.cargo/bin"

View File

@@ -2,8 +2,7 @@
pkgs, pkgs,
device, device,
... ...
}: }: {
{
imports = [ imports = [
../../modules ../../modules
./aichat.nix ./aichat.nix
@@ -48,8 +47,7 @@
# ./template.nix # ./template.nix
# ./zellij.nix # ./zellij.nix
]; ];
home.packages = home.packages = with pkgs;
with pkgs;
[ [
_1password-cli _1password-cli
alejandra alejandra
@@ -85,6 +83,6 @@
nerd-fonts.hasklug nerd-fonts.hasklug
nerd-fonts.symbols-only nerd-fonts.symbols-only
] ]
++ lib.optionals device.isLinux [ ] ++ lib.optionals device.isLinux []
++ lib.optionals device.isDarwin [ ]; ++ lib.optionals device.isDarwin [];
} }

View File

@@ -2,8 +2,7 @@
pkgs, pkgs,
lib, lib,
... ...
}: }: {
{
imports = [ imports = [
./goread.nix ./goread.nix
./hyprpaper.nix ./hyprpaper.nix

View File

@@ -2,23 +2,21 @@
pkgs, pkgs,
# config, # config,
... ...
}: }: let
let mkMappings = mappings:
mkMappings = []
mappings:
[ ]
++ (pkgs.lib.optionals (builtins.hasAttr "normal" mappings) (mkMode mappings.normal "n")) ++ (pkgs.lib.optionals (builtins.hasAttr "normal" mappings) (mkMode mappings.normal "n"))
++ (pkgs.lib.optionals (builtins.hasAttr "terminal" mappings) (mkMode mappings.terminal "t")) ++ (pkgs.lib.optionals (builtins.hasAttr "terminal" mappings) (mkMode mappings.terminal "t"))
++ (pkgs.lib.optionals (builtins.hasAttr "insert" mappings) (mkMode mappings.insert "i")) ++ (pkgs.lib.optionals (builtins.hasAttr "insert" mappings) (mkMode mappings.insert "i"))
++ (pkgs.lib.optionals (builtins.hasAttr "visual" mappings) (mkMode mappings.visual "v")) ++ (pkgs.lib.optionals (builtins.hasAttr "visual" mappings) (mkMode mappings.visual "v"))
++ (pkgs.lib.optionals (builtins.hasAttr "global" mappings) (mkMode mappings.global "")); ++ (pkgs.lib.optionals (builtins.hasAttr "global" mappings) (mkMode mappings.global ""));
mkMode = mkMode = mappings: mode:
mappings: mode:
pkgs.lib.mapAttrsToList (key: value: { pkgs.lib.mapAttrsToList (key: value: {
key = key; key = key;
action = rawLua value; action = rawLua value;
mode = mode; mode = mode;
}) mappings; })
mappings;
border = [ border = [
"" ""
"" ""
@@ -34,8 +32,7 @@ let
${lua} ${lua}
''; '';
}; };
in in {
{
opts = { opts = {
completeopt = "menu,menuone,popup,noselect"; completeopt = "menu,menuone,popup,noselect";
expandtab = true; expandtab = true;
@@ -137,12 +134,12 @@ in
# command = "nnoremap <buffer> F :Sqlfmt<cr>"; # command = "nnoremap <buffer> F :Sqlfmt<cr>";
# } # }
{ {
event = [ "BufWinLeave" ]; event = ["BufWinLeave"];
pattern = "?*"; pattern = "?*";
command = "mkview!"; command = "mkview!";
} }
{ {
event = [ "BufWinEnter" ]; event = ["BufWinEnter"];
pattern = "?*"; pattern = "?*";
command = "silent! loadview!"; command = "silent! loadview!";
} }
@@ -172,10 +169,10 @@ in
end end
''; '';
formatters_by_ft = { formatters_by_ft = {
d2 = [ "d2" ]; d2 = ["d2"];
sql = [ "sleek" ]; sql = ["sleek"];
toml = [ "taplo" ]; toml = ["taplo"];
nix = [ "alejandra" ]; nix = ["alejandra"];
}; };
}; };
}; };
@@ -217,8 +214,8 @@ in
mini = { mini = {
enable = true; enable = true;
modules = { modules = {
ai = { }; ai = {};
starter = { }; starter = {};
}; };
}; };
@@ -447,19 +444,16 @@ in
}; };
}; };
}; };
dap = dap = let
let
vscode-lldb = pkgs.vscode-extensions.vadimcn.vscode-lldb; vscode-lldb = pkgs.vscode-extensions.vadimcn.vscode-lldb;
liblldb = liblldb =
if pkgs.stdenv.isLinux then if pkgs.stdenv.isLinux
"${vscode-lldb.lldb}/lib/liblldb.so" then "${vscode-lldb.lldb}/lib/liblldb.so"
else if pkgs.stdenv.isDarwin then else if pkgs.stdenv.isDarwin
"${vscode-lldb.lldb}/lib/liblldb.dylib" then "${vscode-lldb.lldb}/lib/liblldb.dylib"
else else null;
null;
codelldb = "${vscode-lldb.adapter}/bin/codelldb"; codelldb = "${vscode-lldb.adapter}/bin/codelldb";
in in {
{
autoload_configurations = false; autoload_configurations = false;
# adapter = # adapter =
# /* # /*
@@ -516,7 +510,7 @@ in
typeHints.enable = false; typeHints.enable = false;
}; };
check = { check = {
features = [ "default" ]; features = ["default"];
}; };
files.exclude = [ files.exclude = [
".cargo/" ".cargo/"
@@ -575,26 +569,26 @@ in
settings = { settings = {
autoEnableSources = true; autoEnableSources = true;
sources = [ sources = [
{ name = "buffer"; } {name = "buffer";}
{ name = "buffer"; } {name = "buffer";}
{ name = "cmdline"; } {name = "cmdline";}
{ name = "cmp-clippy"; } {name = "cmp-clippy";}
{ name = "cmp-cmdline-history"; } {name = "cmp-cmdline-history";}
{ name = "crates"; } {name = "crates";}
{ name = "dap"; } {name = "dap";}
# {name = "dictionary";} # {name = "dictionary";}
{ name = "fish"; } {name = "fish";}
{ name = "git"; } {name = "git";}
{ name = "luasnip"; } {name = "luasnip";}
{ name = "nvim_lsp"; } {name = "nvim_lsp";}
{ name = "nvim_lua"; } {name = "nvim_lua";}
{ name = "nvim_lsp_signature_help"; } {name = "nvim_lsp_signature_help";}
{ name = "nvim_lsp_document_symbol"; } {name = "nvim_lsp_document_symbol";}
{ name = "path"; } {name = "path";}
{ name = "rg"; } {name = "rg";}
{ name = "spell"; } {name = "spell";}
{ name = "tmux"; } {name = "tmux";}
{ name = "treesitter"; } {name = "treesitter";}
]; ];
view = { view = {
entries = { entries = {
@@ -788,8 +782,8 @@ in
pkgs.tree-sitter-grammars.tree-sitter-norg-meta pkgs.tree-sitter-grammars.tree-sitter-norg-meta
pkgs.tree-sitter-grammars.tree-sitter-nu pkgs.tree-sitter-grammars.tree-sitter-nu
]; ];
extraLuaPackages = extraLuaPackages = luaPkgs:
luaPkgs: with luaPkgs; [ with luaPkgs; [
lua-utils-nvim lua-utils-nvim
nvim-nio nvim-nio
pathlib-nvim pathlib-nvim

View File

@@ -1,29 +1,33 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
imports = config,
[ (modulesPath + "/installer/scan/not-detected.nix") lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod"];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/1f72dde1-a713-4e69-a272-39a8324368c2"; device = "/dev/disk/by-uuid/1f72dde1-a713-4e69-a272-39a8324368c2";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/2CFD-2F25"; device = "/dev/disk/by-uuid/2CFD-2F25";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = [ ]; swapDevices = [];
# 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,5 +1,4 @@
{ ... }: {...}: {
{
imports = [ imports = [
./atuin.nix ./atuin.nix
./authelia.nix ./authelia.nix

View File

@@ -3,12 +3,11 @@
config, config,
pkgs, pkgs,
... ...
}: }: {
{
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
sops = { sops = {
# secrets."gitea/registration".owner = config.systemd.services.gitea-actions-mirai.serviceConfig.User; # secrets."gitea/registration".owner = config.systemd.services.gitea-actions-mirai.serviceConfig.User;
secrets."gitea/registration" = { }; secrets."gitea/registration" = {};
secrets."authelia/oidc/gitea/client_secret" = { secrets."authelia/oidc/gitea/client_secret" = {
owner = config.systemd.services.authelia-darksailor.serviceConfig.User; owner = config.systemd.services.authelia-darksailor.serviceConfig.User;
mode = "0440"; mode = "0440";
@@ -128,8 +127,8 @@
"email" "email"
"profile" "profile"
]; ];
response_types = [ "code" ]; response_types = ["code"];
grant_types = [ "authorization_code" ]; grant_types = ["authorization_code"];
userinfo_signed_response_alg = "none"; userinfo_signed_response_alg = "none";
token_endpoint_auth_method = "client_secret_post"; token_endpoint_auth_method = "client_secret_post";
} }
@@ -141,23 +140,21 @@
}; };
}; };
systemd.services.gitea-oauth-setup = systemd.services.gitea-oauth-setup = let
let
name = "authelia"; name = "authelia";
gitea_oauth_script = pkgs.writeShellApplication { gitea_oauth_script = pkgs.writeShellApplication {
name = "gitea_oauth2_script"; name = "gitea_oauth2_script";
runtimeInputs = [ config.services.gitea.package ]; runtimeInputs = [config.services.gitea.package];
text = '' text = ''
gitea admin auth delete --id "$(gitea admin auth list | grep "${name}" | cut -d "$(printf '\t')" -f1)" gitea admin auth delete --id "$(gitea admin auth list | grep "${name}" | cut -d "$(printf '\t')" -f1)"
gitea admin auth add-oauth --provider=openidConnect --name=${name} --key="$CLIENT_ID" --secret="$CLIENT_SECRET" --auto-discover-url=https://auth.darksailor.dev/.well-known/openid-configuration --scopes='openid email profile' gitea admin auth add-oauth --provider=openidConnect --name=${name} --key="$CLIENT_ID" --secret="$CLIENT_SECRET" --auto-discover-url=https://auth.darksailor.dev/.well-known/openid-configuration --scopes='openid email profile'
''; '';
}; };
in in {
{
description = "Configure Gitea OAuth with Authelia"; description = "Configure Gitea OAuth with Authelia";
after = [ "gitea.service" ]; after = ["gitea.service"];
wants = [ "gitea.service" ]; wants = ["gitea.service"];
wantedBy = [ "multi-user.target" ]; wantedBy = ["multi-user.target"];
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
User = config.services.gitea.user; User = config.services.gitea.user;

View File

@@ -1,5 +1,4 @@
{ config, ... }: {config, ...}: {
{
services = { services = {
grafana = { grafana = {
enable = true; enable = true;
@@ -112,7 +111,7 @@
settings.process_names = [ settings.process_names = [
{ {
name = "{{.Comm}}"; name = "{{.Comm}}";
cmdline = [ ".*" ]; cmdline = [".*"];
} }
]; ];
}; };
@@ -122,14 +121,14 @@
job_name = "node"; job_name = "node";
static_configs = [ static_configs = [
{ {
targets = [ "127.0.0.1:9100" ]; targets = ["127.0.0.1:9100"];
labels = { labels = {
device = "mirai"; device = "mirai";
type = "server"; type = "server";
}; };
} }
{ {
targets = [ "tsuba:9100" ]; targets = ["tsuba:9100"];
labels = { labels = {
device = "tsuba"; device = "tsuba";
type = "server"; type = "server";
@@ -137,7 +136,7 @@
}; };
} }
{ {
targets = [ "ryu:9100" ]; targets = ["ryu:9100"];
labels = { labels = {
device = "ryu"; device = "ryu";
type = "desktop"; type = "desktop";
@@ -150,14 +149,14 @@
job_name = "process"; job_name = "process";
static_configs = [ static_configs = [
{ {
targets = [ "127.0.0.1:9256" ]; targets = ["127.0.0.1:9256"];
labels = { labels = {
device = "mirai"; device = "mirai";
type = "server"; type = "server";
}; };
} }
{ {
targets = [ "tsuba:9256" ]; targets = ["tsuba:9256"];
labels = { labels = {
device = "tsuba"; device = "tsuba";
type = "server"; type = "server";
@@ -165,7 +164,7 @@
}; };
} }
{ {
targets = [ "ryu:9256" ]; targets = ["ryu:9256"];
labels = { labels = {
device = "ryu"; device = "ryu";
type = "desktop"; type = "desktop";
@@ -178,7 +177,7 @@
job_name = "prometheus"; job_name = "prometheus";
static_configs = [ static_configs = [
{ {
targets = [ "127.0.0.1:9090" ]; targets = ["127.0.0.1:9090"];
labels = { labels = {
device = "mirai"; device = "mirai";
}; };

View File

@@ -3,12 +3,11 @@
pkgs, pkgs,
inputs, inputs,
... ...
}: }: {
{
sops = { sops = {
secrets."llama/api_key".owner = config.services.caddy.user; secrets."llama/api_key".owner = config.services.caddy.user;
secrets."llama/user".owner = config.services.caddy.user; secrets."llama/user".owner = config.services.caddy.user;
secrets."openai/api_key" = { }; secrets."openai/api_key" = {};
templates = { templates = {
"LLAMA_API_KEY.env".content = '' "LLAMA_API_KEY.env".content = ''
LLAMA_API_KEY=${config.sops.placeholder."llama/api_key"} LLAMA_API_KEY=${config.sops.placeholder."llama/api_key"}

View File

@@ -1,5 +1,4 @@
{ ... }: {...}: {
{
imports = [ imports = [
# ./rsyncd.nix # ./rsyncd.nix
# ./sunshine.nix # ./sunshine.nix

View File

@@ -1,5 +1,4 @@
{ ... }: {...}: {
{
services = { services = {
prometheus = { prometheus = {
exporters = { exporters = {
@@ -24,7 +23,7 @@
settings.process_names = [ settings.process_names = [
{ {
name = "{{.Comm}}"; name = "{{.Comm}}";
cmdline = [ ".*" ]; cmdline = [".*"];
} }
]; ];
}; };

View File

@@ -1,5 +1,4 @@
{ ... }: {...}: {
{
services = { services = {
hardware.openrgb.enable = true; hardware.openrgb.enable = true;
}; };

View File

@@ -83,4 +83,3 @@
# Optional: Enable looking glass for low-latency VM display # Optional: Enable looking glass for low-latency VM display
} }

View File

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

View File

@@ -1,5 +1,4 @@
{ ... }: {...}: {
{
services = { services = {
prometheus = { prometheus = {
exporters = { exporters = {
@@ -24,7 +23,7 @@
settings.process_names = [ settings.process_names = [
{ {
name = "{{.Comm}}"; name = "{{.Comm}}";
cmdline = [ ".*" ]; cmdline = [".*"];
} }
]; ];
}; };