updates
This commit is contained in:
parent
6198cf14d4
commit
1506941c66
GPG key ID:
81FB9FECDD6A33E2
49 changed files with 1963 additions and 1822 deletions
|
|
@ -81,7 +81,7 @@ in {
|
|||
passthrough = false;
|
||||
"fixed-center" = true;
|
||||
"modules-left" = ["hyprland/workspaces" "hyprland/window" "niri/workspaces" "niri/window" "network#speed" "custom/cava-system" "custom/cava-tt"];
|
||||
"modules-center" = ["custom/spotify"];
|
||||
"modules-center" = ["mpris"];
|
||||
"modules-right" = [
|
||||
"cpu"
|
||||
"memory"
|
||||
|
|
@ -99,15 +99,6 @@ in {
|
|||
"custom/power"
|
||||
];
|
||||
|
||||
"custom/spotify" = {
|
||||
format = "{}";
|
||||
"return-type" = "json";
|
||||
"on-click" = "${lib.getExe inputs.ciderd.packages.${pkgs.system}.default} play-pause";
|
||||
"on-click-right" = "${lib.getExe inputs.ciderd.packages.${pkgs.system}.default} like";
|
||||
"on-click-middle" = "${lib.getExe inputs.ciderd.packages.${pkgs.system}.default} skip";
|
||||
exec = "${lib.getExe inputs.ciderd.packages.${pkgs.system}.default} monitor";
|
||||
};
|
||||
|
||||
"custom/mullvad" = {
|
||||
format = "{}";
|
||||
return-type = "json";
|
||||
|
|
@ -145,7 +136,7 @@ in {
|
|||
};
|
||||
|
||||
mpris = {
|
||||
player = "spotify";
|
||||
player = "chromium";
|
||||
"dynamic-order" = ["artist" "title"];
|
||||
format = "{player_icon} {dynamic}";
|
||||
"format-paused" = "{status_icon} <i>{dynamic}</i>";
|
||||
|
|
|
|||
|
|
@ -66,9 +66,10 @@ in {
|
|||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
catppuccin.alacritty.enable = true;
|
||||
|
||||
programs.alacritty = {
|
||||
enable = true;
|
||||
catppuccin.enable = true;
|
||||
|
||||
settings = {
|
||||
colors = {
|
||||
|
|
|
|||
|
|
@ -14,20 +14,20 @@ in {
|
|||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
catppuccin.kitty.enable = true;
|
||||
|
||||
programs.kitty = {
|
||||
enable = true;
|
||||
extraConfig = ''
|
||||
font_family family='Berkeley Mono' style='Regular ExtraCondensed'
|
||||
bold_font family='Berkeley Mono' style='Retina ExtraCondensed'
|
||||
italic_font family='Berkeley Mono' style='Regular ExtraCondensed'
|
||||
bold_italic_font family='Berkeley Mono' style='Retina ExtraCondensed'
|
||||
font_family family='Berkeley Mono' style='Retina ExtraCondensed'
|
||||
bold_font family='Berkeley Mono' style='SemiBold ExtraCondensed'
|
||||
italic_font family='Berkeley Mono' style='Retina ExtraCondensed'
|
||||
bold_italic_font family='Berkeley Mono' style='SemiBold ExtraCondensed'
|
||||
'';
|
||||
|
||||
catppuccin.enable = true;
|
||||
|
||||
settings = {
|
||||
window_padding_width = 20;
|
||||
background_opacity = "0.9";
|
||||
# background_opacity = "0.9";
|
||||
|
||||
font_hinting = "slight";
|
||||
|
||||
|
|
|
|||
|
|
@ -14,11 +14,11 @@ in {
|
|||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
catppuccin.bat.enable = true;
|
||||
|
||||
programs.bat = {
|
||||
enable = true;
|
||||
|
||||
catppuccin.enable = true;
|
||||
|
||||
config = {
|
||||
pager = "less -FR";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -17,11 +17,18 @@ in {
|
|||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; [zsh-forgit gitflow];
|
||||
home.packages = with pkgs; [
|
||||
zsh-forgit
|
||||
gitflow
|
||||
];
|
||||
|
||||
programs.delta = {
|
||||
enable = true;
|
||||
enableGitIntegration = true;
|
||||
};
|
||||
|
||||
programs.git = {
|
||||
enable = true;
|
||||
userName = "zack";
|
||||
userEmail = "hi@zoeys.computer";
|
||||
ignores = [
|
||||
".cache/"
|
||||
".DS_Store"
|
||||
|
|
@ -38,8 +45,15 @@ in {
|
|||
key = cfg.signingKey;
|
||||
signByDefault = cfg.signByDefault;
|
||||
};
|
||||
extraConfig = {
|
||||
init = {defaultBranch = "main";};
|
||||
lfs.enable = true;
|
||||
settings = {
|
||||
user = {
|
||||
name = "zack";
|
||||
email = "hi@zoeys.computer";
|
||||
};
|
||||
init = {
|
||||
defaultBranch = "main";
|
||||
};
|
||||
delta = {
|
||||
options.map-styles = "bold purple => syntax #ca9ee6, bold cyan => syntax #8caaee";
|
||||
line-numbers = true;
|
||||
|
|
@ -64,34 +78,30 @@ in {
|
|||
smtpencryption = "ssl";
|
||||
smtpserverport = 465;
|
||||
};
|
||||
};
|
||||
lfs.enable = true;
|
||||
delta.enable = true;
|
||||
aliases = {
|
||||
essa = "push --force";
|
||||
co = "checkout";
|
||||
fuck = "commit --amend -m";
|
||||
c = "commit -m";
|
||||
ca = "commit -am";
|
||||
forgor = "commit --amend --no-edit";
|
||||
graph = "log --all --decorate --graph --oneline";
|
||||
oops = "checkout --";
|
||||
l = "log";
|
||||
r = "rebase";
|
||||
s = "status --short";
|
||||
ss = "status";
|
||||
d = "diff";
|
||||
ps = "!git push origin $(git rev-parse --abbrev-ref HEAD)";
|
||||
pl = "!git pull origin $(git rev-parse --abbrev-ref HEAD)";
|
||||
af = "!git add $(git ls-files -m -o --exclude-standard | sk -m)";
|
||||
st = "status";
|
||||
br = "branch";
|
||||
df = "!git hist | peco | awk '{print $2}' | xargs -I {} git diff {}^ {}";
|
||||
hist = ''
|
||||
log --pretty=format:"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)" --graph --date=relative --decorate --all'';
|
||||
llog = ''
|
||||
log --graph --name-status --pretty=format:"%C(red)%h %C(reset)(%cd) %C(green)%an %Creset%s %C(yellow)%d%Creset" --date=relative'';
|
||||
edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; hx `f`";
|
||||
alias = {
|
||||
essa = "push --force";
|
||||
co = "checkout";
|
||||
fuck = "commit --amend -m";
|
||||
c = "commit -m";
|
||||
ca = "commit -am";
|
||||
forgor = "commit --amend --no-edit";
|
||||
graph = "log --all --decorate --graph --oneline";
|
||||
oops = "checkout --";
|
||||
l = "log";
|
||||
r = "rebase";
|
||||
s = "status --short";
|
||||
ss = "status";
|
||||
d = "diff";
|
||||
ps = "!git push origin $(git rev-parse --abbrev-ref HEAD)";
|
||||
pl = "!git pull origin $(git rev-parse --abbrev-ref HEAD)";
|
||||
af = "!git add $(git ls-files -m -o --exclude-standard | sk -m)";
|
||||
st = "status";
|
||||
br = "branch";
|
||||
df = "!git hist | peco | awk '{print $2}' | xargs -I {} git diff {}^ {}";
|
||||
hist = ''log --pretty=format:"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)" --graph --date=relative --decorate --all'';
|
||||
llog = ''log --graph --name-status --pretty=format:"%C(red)%h %C(reset)(%cd) %C(green)%an %Creset%s %C(yellow)%d%Creset" --date=relative'';
|
||||
edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; hx `f`";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
"lazyvim.plugins.extras.lang.svelte",
|
||||
"lazyvim.plugins.extras.lang.tailwind",
|
||||
"lazyvim.plugins.extras.lang.go",
|
||||
"lazyvim.plugins.extras.lang.php",
|
||||
"lazyvim.plugins.extras.lang.typescript",
|
||||
"lazyvim.plugins.extras.test.core",
|
||||
"lazyvim.plugins.extras.util.rest",
|
||||
|
|
|
|||
|
|
@ -3,12 +3,9 @@
|
|||
-- Add any additional options here
|
||||
|
||||
if vim.g.neovide then
|
||||
-- Put anything you want to happen only in Neovide here
|
||||
vim.o.guifont = "Iosevka,Noto_Color_Emoji:h14:b"
|
||||
end
|
||||
|
||||
-- in this case.
|
||||
vim.g.lazyvim_blink_main = true
|
||||
vim.g.snacks_animate = false
|
||||
vim.o.termguicolors = true
|
||||
|
||||
|
|
@ -18,7 +15,6 @@ vim.diagnostic.config({
|
|||
float = { border = "none" },
|
||||
})
|
||||
|
||||
-- Use crisp single-line borders in LSP handlers
|
||||
local border = "none"
|
||||
local handlers = vim.lsp.handlers
|
||||
handlers["textDocument/hover"] = vim.lsp.with(handlers.hover, { border = border })
|
||||
|
|
|
|||
|
|
@ -2,17 +2,13 @@ return {
|
|||
{
|
||||
"LazyVim/LazyVim",
|
||||
opts = {
|
||||
colorscheme = "catppuccin-mocha",
|
||||
colorscheme = "catppuccin",
|
||||
news = { lazyvim = false },
|
||||
},
|
||||
},
|
||||
{
|
||||
"catppuccin",
|
||||
opts = function(_, opts)
|
||||
local module = require("catppuccin.groups.integrations.bufferline")
|
||||
if module then
|
||||
module.get = module.get_theme
|
||||
end
|
||||
opts.transparent_background = true
|
||||
opts.flavour = "mocha"
|
||||
opts.no_bold = true
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
return {
|
||||
"echasnovski/mini.ai",
|
||||
"nvim-mini/mini.ai",
|
||||
version = false,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,15 +27,20 @@ with lib.custom; let
|
|||
in
|
||||
result;
|
||||
|
||||
pluginList = plugins: strings.concatMapStrings (plugin: " [\"${sanitizePluginName plugin.name}\"] = \"${plugin.outPath}\",\n") plugins;
|
||||
pluginList = plugins:
|
||||
strings.concatMapStrings (
|
||||
plugin: " [\"${sanitizePluginName plugin.name}\"] = \"${plugin.outPath}\",\n"
|
||||
)
|
||||
plugins;
|
||||
in {
|
||||
options.apps.tools.neovim = with types; {
|
||||
enable = mkBoolOpt false "Enable Neovim";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
catppuccin.nvim.enable = false;
|
||||
|
||||
programs.neovim = {
|
||||
catppuccin.enable = false;
|
||||
enable = true;
|
||||
defaultEditor = true;
|
||||
package = inputs.neovim-nightly-overlay.packages.${pkgs.system}.default;
|
||||
|
|
@ -55,22 +60,21 @@ in {
|
|||
# LSP
|
||||
lua-language-server
|
||||
nixd
|
||||
(pkgs.rust-bin.selectLatestNightlyWith
|
||||
(toolchain: toolchain.default))
|
||||
rust-analyzer
|
||||
nodePackages.typescript-language-server
|
||||
#nodePackages.astro-language-server
|
||||
nodePackages.bash-language-server
|
||||
nodePackages.svelte-language-server
|
||||
tailwindcss-language-server
|
||||
vtsls
|
||||
taplo
|
||||
docker-compose-language-service
|
||||
dockerfile-language-server-nodejs
|
||||
dockerfile-language-server
|
||||
haskellPackages.hadolint
|
||||
shellcheck
|
||||
markdownlint-cli2
|
||||
shfmt
|
||||
sqlfluff
|
||||
# sqlfluff
|
||||
go
|
||||
|
||||
tailwindcss-language-server
|
||||
|
|
@ -88,7 +92,6 @@ in {
|
|||
fswatch # File watcher utility, replacing libuv.fs_event for neovim 10.0
|
||||
sqlite
|
||||
postgresql
|
||||
mongosh
|
||||
# vscode-extensions.vadimcn.vscode-lldb.adapter
|
||||
];
|
||||
plugins = with pkgs.vimPlugins; [
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@ with lib.custom; let
|
|||
natsumi = pkgs.fetchFromGitHub {
|
||||
owner = "greeeen-dev";
|
||||
repo = "natsumi-browser";
|
||||
rev = "c99affebd8c095c5416e248605557c32636c6476";
|
||||
hash = "sha256-5x/XLMEUb9go9Qh2E9E9UR+tSwAfR4SlvWHKq+S9A7E=";
|
||||
rev = "v5.7.1";
|
||||
hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
|
||||
};
|
||||
in {
|
||||
options.apps.web.floorp = with types; {
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ with lib.custom; let
|
|||
natsumi = pkgs.fetchFromGitHub {
|
||||
owner = "greeeen-dev";
|
||||
repo = "natsumi-browser";
|
||||
rev = "1300fd5751f4b366b0c8ec668e99ce55b1593d7b";
|
||||
hash = "sha256-08oflxcLAYoQV4O4JeWhG4JRIYcNROKdbEDNSxzK4JU=";
|
||||
rev = "v5.7.1";
|
||||
hash = "sha256-t5xVpFRV2qq5uJRGk7V50EiPnsxbd2cyeKPJYqg/LF0=";
|
||||
};
|
||||
in {
|
||||
options.apps.web.librewolf = with types; {
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ in {
|
|||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
catppuccin.pointerCursor.enable = true;
|
||||
catppuccin.cursors.enable = true;
|
||||
|
||||
home.pointerCursor = {
|
||||
gtk.enable = true;
|
||||
|
|
|
|||
|
|
@ -15,9 +15,10 @@ in {
|
|||
};
|
||||
|
||||
config = mkIf (cfg.enable && !pkgs.stdenv.isDarwin) {
|
||||
catppuccin.swaylock.enable = false;
|
||||
|
||||
programs.swaylock = {
|
||||
enable = true;
|
||||
catppuccin.enable = false;
|
||||
package = pkgs.swaylock-effects;
|
||||
settings = with colors; {
|
||||
clock = true;
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ with pkgs; {
|
|||
untar = "tar -xvf";
|
||||
untargz = "tar -xzf";
|
||||
MANPAGER = "sh -c 'col -bx | bat -l man -p'";
|
||||
du = getExe du-dust;
|
||||
du = getExe dust;
|
||||
ps = getExe procs;
|
||||
lb = "pw-loopback -C \"alsa_input.pci-0000_0d_00.4.analog-stereo\" -P \"Scarlett Solo (3rd Gen.) Headphones / Line 1-2\"";
|
||||
deploy = "nixos-rebuild switch --flake ~/nixos#pluto --target-host zoeys.computer --use-remote-sudo";
|
||||
|
|
@ -28,6 +28,8 @@ with pkgs; {
|
|||
la = "${getExe eza} -lah --tree";
|
||||
ls = "${getExe eza} -h --git --icons --color=auto --group-directories-first -s extension";
|
||||
tree = "${getExe eza} --tree --icons --tree";
|
||||
ns = "nh os switch -- --cores 8 --max-jobs 1";
|
||||
nsu = "nh os switch --update -- --cores 8 --max-jobs 1";
|
||||
kys = "shutdown now";
|
||||
# w = ''| nvim -c "setlocal buftype=nofile bufhidden=wipe" -c "nnoremap <buffer> q :q!<CR>" -'';
|
||||
lv = "nvim -c \"normal '\''0\"";
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ in {
|
|||
fzf
|
||||
|
||||
# dns client
|
||||
dogdns
|
||||
doggo
|
||||
|
||||
# neofetch but for git repos
|
||||
onefetch
|
||||
|
|
@ -114,9 +114,6 @@ in {
|
|||
imagemagick
|
||||
ffmpeg-full
|
||||
|
||||
# preview images in terminal
|
||||
catimg
|
||||
|
||||
# networking stuff
|
||||
nmap
|
||||
wget
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ with pkgs; {
|
|||
untar = "tar -xvf";
|
||||
untargz = "tar -xzf";
|
||||
MANPAGER = "sh -c 'col -bx | bat -l man -p'";
|
||||
du = getExe du-dust;
|
||||
du = getExe dust;
|
||||
lb = "pw-loopback -C \"alsa_input.pci-0000_0d_00.4.analog-stereo\" -P \"Scarlett Solo (3rd Gen.) Headphones / Line 1-2\"";
|
||||
deploy = "nixos-rebuild switch --flake ~/nixos#pluto --target-host zoeys.computer --use-remote-sudo";
|
||||
m = "mkdir";
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ in {
|
|||
ripgrep
|
||||
gping
|
||||
fzf
|
||||
dogdns
|
||||
doggo
|
||||
onefetch
|
||||
cpufetch
|
||||
yt-dlp
|
||||
|
|
@ -62,7 +62,6 @@ in {
|
|||
hyperfine
|
||||
imagemagick
|
||||
ffmpeg-full
|
||||
catimg
|
||||
nmap
|
||||
wget
|
||||
fd
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ in {
|
|||
gping
|
||||
|
||||
# dns client
|
||||
dogdns
|
||||
doggo
|
||||
|
||||
# neofetch but for git repos
|
||||
onefetch
|
||||
|
|
@ -115,9 +115,6 @@ in {
|
|||
imagemagick
|
||||
ffmpeg-full
|
||||
|
||||
# preview images in terminal
|
||||
catimg
|
||||
|
||||
# networking stuff
|
||||
nmap
|
||||
wget
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -24,39 +24,9 @@ in {
|
|||
jack.enable = true;
|
||||
};
|
||||
|
||||
systemd.user.services.cava-combine-inputs = {
|
||||
description = "Combine MOTU M4 Line Inputs L/R for Cava";
|
||||
|
||||
# Ensure this runs after pipewire-pulse is started
|
||||
after = ["pipewire-pulse.service"];
|
||||
wants = ["pipewire-pulse.service"]; # Start pipewire-pulse if not already running
|
||||
|
||||
# Make it part of the default user session target
|
||||
wantedBy = ["default.target"];
|
||||
|
||||
# Service configuration details
|
||||
serviceConfig = {
|
||||
Type = "oneshot"; # Run the command once and exit
|
||||
# Use RemainAfterExit if you want the service to show as 'active' after running
|
||||
# RemainAfterExit = true;
|
||||
|
||||
# Command to execute. Use full paths for robustness.
|
||||
# We use sh -c to run multiple commands sequentially.
|
||||
# pactl is provided by the pulseaudio package.
|
||||
ExecStart = "${pkgs.writeShellScriptBin "cava-start" ''
|
||||
echo "Attempting to load Cava combine modules..."
|
||||
# Load null sink (returns non-zero if it fails AND module doesn't exist)
|
||||
${pkgs.pulseaudio}/bin/pactl load-module module-null-sink sink_name=cava-line-in sink_properties=device.description="Cava_Combined_LineIn"
|
||||
# Load loopbacks (returns non-zero on failure)
|
||||
${pkgs.pulseaudio}/bin/pactl load-module module-loopback source="alsa_input.usb-MOTU_M4_M4MA03F7DV-00.HiFi__Line3__source" sink=cava-line-in latency_msec=10
|
||||
${pkgs.pulseaudio}/bin/pactl load-module module-loopback source="alsa_input.usb-MOTU_M4_M4MA03F7DV-00.HiFi__Line4__source" sink=cava-line-in latency_msec=10
|
||||
echo "Finished loading Cava combine modules (ignore errors if already loaded)."
|
||||
# Exit successfully even if modules were already loaded (pactl might return 0)
|
||||
exit 0
|
||||
''}/bin/cava-start";
|
||||
|
||||
# Prevent service from restarting automatically
|
||||
Restart = "no";
|
||||
services.pipewire.extraConfig.pipewire."92-low-latency" = {
|
||||
"context.properties" = {
|
||||
"default.clock.rate" = 192000;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -110,14 +110,6 @@ with lib.custom; let
|
|||
libvirtd-cfg = config.virtualisation.libvirtd;
|
||||
|
||||
qemuConfigFile = pkgs.writeText "qemu.conf" ''
|
||||
${optionalString libvirtd-cfg.qemu.ovmf.enable ''
|
||||
nvram = [
|
||||
"/run/libvirt/nix-ovmf/AAVMF_CODE.fd:/run/libvirt/nix-ovmf/AAVMF_VARS.fd",
|
||||
"/run/libvirt/nix-ovmf/AAVMF_CODE.ms.fd:/run/libvirt/nix-ovmf/AAVMF_VARS.ms.fd",
|
||||
"/run/libvirt/nix-ovmf/OVMF_CODE.fd:/run/libvirt/nix-ovmf/OVMF_VARS.fd",
|
||||
"/run/libvirt/nix-ovmf/OVMF_CODE.ms.fd:/run/libvirt/nix-ovmf/OVMF_VARS.ms.fd"
|
||||
]
|
||||
''}
|
||||
${optionalString (!libvirtd-cfg.qemu.runAsRoot) ''
|
||||
user = "qemu-libvirtd"
|
||||
group = "qemu-libvirtd"
|
||||
|
|
@ -162,16 +154,6 @@ in {
|
|||
package = pkgs.qemu_kvm;
|
||||
runAsRoot = true;
|
||||
swtpm.enable = true;
|
||||
ovmf = {
|
||||
enable = true;
|
||||
packages = [
|
||||
(pkgs.OVMF.override {
|
||||
secureBoot = true;
|
||||
tpmSupport = true;
|
||||
})
|
||||
.fd
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -217,20 +199,6 @@ in {
|
|||
done
|
||||
|
||||
ln -s --force ${libvirtd-cfg.qemu.package}/bin/qemu-pr-helper /run/${dirName}/nix-helpers/
|
||||
|
||||
${optionalString libvirtd-cfg.qemu.ovmf.enable (
|
||||
let
|
||||
ovmfpackage = pkgs.buildEnv {
|
||||
name = "qemu-ovmf";
|
||||
paths = libvirtd-cfg.qemu.ovmf.packages;
|
||||
};
|
||||
in ''
|
||||
ln -s --force ${ovmfpackage}/FV/AAVMF_CODE{,.ms}.fd /run/${dirName}/nix-ovmf/
|
||||
ln -s --force ${ovmfpackage}/FV/OVMF_CODE{,.ms}.fd /run/${dirName}/nix-ovmf/
|
||||
ln -s --force ${ovmfpackage}/FV/AAVMF_VARS{,.ms}.fd /run/${dirName}/nix-ovmf/
|
||||
ln -s --force ${ovmfpackage}/FV/OVMF_VARS{,.ms}.fd /run/${dirName}/nix-ovmf/
|
||||
''
|
||||
)}
|
||||
'';
|
||||
|
||||
system.activationScripts.libvirt-hooks.text = ''
|
||||
|
|
|
|||
|
|
@ -44,12 +44,12 @@ in {
|
|||
|
||||
# Optionally, you may need to select the appropriate driver version for your specific GPU.
|
||||
package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
|
||||
version = "580.82.07";
|
||||
sha256_64bit = "sha256-Bh5I4R/lUiMglYEdCxzqm3GLolQNYFB0/yJ/zgYoeYw=";
|
||||
sha256_aarch64 = "sha256-or3//aV4TQcPDgcLxFB75H/kB8n+3RzwTO1C2ZbJAJI=";
|
||||
openSha256 = "sha256-8/7ZrcwBMgrBtxebYtCcH5A51u3lAxXTCY00LElZz08=";
|
||||
settingsSha256 = "sha256-lx1WZHsW7eKFXvi03dAML6BoC5glEn63Tuiz3T867nY=";
|
||||
persistencedSha256 = "sha256-1JCk2T3H5NNFQum0gA9cnio31jc0pGvfGIn2KkAz9kA=";
|
||||
version = "580.82.09";
|
||||
sha256_64bit = "sha256-Puz4MtouFeDgmsNMKdLHoDgDGC+QRXh6NVysvltWlbc=";
|
||||
sha256_aarch64 = "sha256-6tHiAci9iDTKqKrDIjObeFdtrlEwjxOHJpHfX4GMEGQ=";
|
||||
openSha256 = "sha256-YB+mQD+oEDIIDa+e8KX1/qOlQvZMNKFrI5z3CoVKUjs=";
|
||||
settingsSha256 = "sha256-um53cr2Xo90VhZM1bM2CH4q9b/1W2YOqUcvXPV6uw2s=";
|
||||
persistencedSha256 = "sha256-lbYSa97aZ+k0CISoSxOMLyyMX//Zg2Raym6BC4COipU=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -27,8 +27,8 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
services.xserver.displayManager.gdm.enable = false;
|
||||
services.xserver.displayManager.gdm.wayland = true;
|
||||
services.displayManager.gdm.enable = false;
|
||||
services.displayManager.gdm.wayland = true;
|
||||
|
||||
# services.displayManager.sddm.enable = true;
|
||||
# services.displayManager.sddm.package = lib.mkForce pkgs.kdePackages.sddm;
|
||||
|
|
|
|||
|
|
@ -14,18 +14,18 @@ in {
|
|||
config = mkIf cfg.enable {
|
||||
services.wg-container.enable = true;
|
||||
|
||||
systemd.services.monero.vpnConfinement = {
|
||||
enable = true;
|
||||
vpnNamespace = "wg";
|
||||
};
|
||||
|
||||
services.monero = {
|
||||
enable = true;
|
||||
mining.enable = false;
|
||||
rpc = {address = "192.168.15.1";};
|
||||
extraConfig = ''
|
||||
confirm-external-bind=1
|
||||
'';
|
||||
};
|
||||
# systemd.services.monero.vpnConfinement = {
|
||||
# enable = true;
|
||||
# vpnNamespace = "wg";
|
||||
# };
|
||||
#
|
||||
# services.monero = {
|
||||
# enable = true;
|
||||
# mining.enable = false;
|
||||
# rpc = {address = "192.168.15.1";};
|
||||
# extraConfig = ''
|
||||
# confirm-external-bind=1
|
||||
# '';
|
||||
# };
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ in {
|
|||
gitlab-email-pw-hashed.file = ./sec/gitlab-email-pw-hashed.age;
|
||||
};
|
||||
|
||||
mailserver = {
|
||||
mailserver = rec {
|
||||
enable = true;
|
||||
fqdn = "mail.zoeys.email";
|
||||
domains = ["zoeys.email" "zoeys.cloud" "zoeys.computer" "zackmyers.io" "zacharymyers.com" "pictureofcat.com"];
|
||||
|
|
@ -64,27 +64,23 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
certificateScheme = "acme-nginx";
|
||||
enableManageSieve = true;
|
||||
|
||||
dmarcReporting.enable = true;
|
||||
|
||||
x509.useACMEHost = fqdn;
|
||||
virusScanning = true;
|
||||
stateVersion = 3;
|
||||
};
|
||||
|
||||
# services.nginx = {
|
||||
# virtualHosts = {
|
||||
# "cal.zoeys.cloud" = {
|
||||
# forceSSL = true;
|
||||
# enableACME = true;
|
||||
# locations."/" = {
|
||||
# proxyPass = "http://localhost:5232/";
|
||||
# extraConfig = ''
|
||||
# proxy_set_header X-Script-Name /;
|
||||
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
# proxy_pass_header Authorization;
|
||||
# '';
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
services.nginx = {
|
||||
virtualHosts = {
|
||||
"${config.mailserver.fqdn}" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
services.roundcube = {
|
||||
enable = true;
|
||||
|
|
|
|||
146
modules/nixos/services/matrix/default.nix
Normal file
146
modules/nixos/services/matrix/default.nix
Normal file
|
|
@ -0,0 +1,146 @@
|
|||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.custom; let
|
||||
cfg = config.services.matrix;
|
||||
in {
|
||||
options.services.matrix = with types; {
|
||||
enable = mkBoolOpt false "Matrix Web Server";
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
sops = {
|
||||
defaultSopsFile = ../../../.sops.yaml;
|
||||
gnupg.home = "/var/lib/sops";
|
||||
gnupg.sshKeyPaths = [];
|
||||
|
||||
secrets = {
|
||||
"password" = {
|
||||
sopsFile = ../../../../secrets/matrix-db.yaml;
|
||||
owner = "root";
|
||||
group = "root";
|
||||
mode = "0444";
|
||||
neededForUsers = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
services.matrix-synapse-next = {
|
||||
enable = true;
|
||||
|
||||
workers.federationSenders = 2;
|
||||
workers.federationReceivers = 2;
|
||||
workers.initialSyncers = 2;
|
||||
workers.normalSyncers = 2;
|
||||
workers.eventPersisters = 2;
|
||||
workers.useUserDirectoryWorker = true;
|
||||
|
||||
enableNginx = true;
|
||||
|
||||
settings = {
|
||||
server_name = "zoeys.cloud";
|
||||
|
||||
recaptcha_public_key = "6LdcENQrAAAAAKFi-gTzPnf6Q2xq7yTmIYv6Xw5o";
|
||||
recaptcha_private_key = "6LdcENQrAAAAABfnE6TVkMWtRrw0OZqZEfYaGm7m";
|
||||
|
||||
enable_registration = true;
|
||||
enable_registration_captcha = true;
|
||||
|
||||
database = {
|
||||
name = "psycopg2";
|
||||
args = {
|
||||
host = "localhost";
|
||||
user = "synapse";
|
||||
password = "synapse";
|
||||
dbname = "synapse";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
services.redis.servers."".enable = true;
|
||||
|
||||
services.coturn = rec {
|
||||
enable = true;
|
||||
no-cli = true;
|
||||
no-tcp-relay = true;
|
||||
min-port = 49000;
|
||||
max-port = 50000;
|
||||
use-auth-secret = true;
|
||||
static-auth-secret = "will be world readable for local users :(";
|
||||
realm = "turn.zoeys.cloud";
|
||||
cert = "${config.security.acme.certs.${realm}.directory}/full.pem";
|
||||
pkey = "${config.security.acme.certs.${realm}.directory}/key.pem";
|
||||
extraConfig = ''
|
||||
verbose
|
||||
|
||||
no-multicast-peers
|
||||
denied-peer-ip=0.0.0.0-0.255.255.255
|
||||
denied-peer-ip=10.0.0.0-10.255.255.255
|
||||
denied-peer-ip=100.64.0.0-100.127.255.255
|
||||
denied-peer-ip=127.0.0.0-127.255.255.255
|
||||
denied-peer-ip=169.254.0.0-169.254.255.255
|
||||
denied-peer-ip=172.16.0.0-172.31.255.255
|
||||
denied-peer-ip=192.0.0.0-192.0.0.255
|
||||
denied-peer-ip=192.0.2.0-192.0.2.255
|
||||
denied-peer-ip=192.88.99.0-192.88.99.255
|
||||
denied-peer-ip=192.168.0.0-192.168.255.255
|
||||
denied-peer-ip=198.18.0.0-198.19.255.255
|
||||
denied-peer-ip=198.51.100.0-198.51.100.255
|
||||
denied-peer-ip=203.0.113.0-203.0.113.255
|
||||
denied-peer-ip=240.0.0.0-255.255.255.255
|
||||
denied-peer-ip=::1
|
||||
denied-peer-ip=64:ff9b::-64:ff9b::ffff:ffff
|
||||
denied-peer-ip=::ffff:0.0.0.0-::ffff:255.255.255.255
|
||||
denied-peer-ip=100::-100::ffff:ffff:ffff:ffff
|
||||
denied-peer-ip=2001::-2001:1ff:ffff:ffff:ffff:ffff:ffff:ffff
|
||||
denied-peer-ip=2002::-2002:ffff:ffff:ffff:ffff:ffff:ffff:ffff
|
||||
denied-peer-ip=fc00::-fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
|
||||
denied-peer-ip=fe80::-febf:ffff:ffff:ffff:ffff:ffff:ffff:ffff
|
||||
'';
|
||||
};
|
||||
|
||||
networking.firewall = {
|
||||
interfaces.ens3 = let
|
||||
range = with config.services.coturn; [
|
||||
{
|
||||
from = min-port;
|
||||
to = max-port;
|
||||
}
|
||||
];
|
||||
in {
|
||||
allowedUDPPortRanges = range;
|
||||
allowedUDPPorts = [3478 5349];
|
||||
allowedTCPPortRanges = [];
|
||||
allowedTCPPorts = [3478 5349];
|
||||
};
|
||||
};
|
||||
|
||||
services.nginx.virtualHosts.${config.services.coturn.realm} = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/" = {
|
||||
return = "200 '<html><body>Hai :3</body></html>'";
|
||||
};
|
||||
};
|
||||
|
||||
users.groups.turnserver.members = ["nginx"];
|
||||
|
||||
security.acme.certs.${config.services.coturn.realm} = {
|
||||
/*
|
||||
insert here the right configuration to obtain a certificate
|
||||
*/
|
||||
postRun = "systemctl restart coturn.service";
|
||||
group = "turnserver";
|
||||
};
|
||||
# configure synapse to point users to coturn
|
||||
services.matrix-synapse.settings = with config.services.coturn; {
|
||||
turn_uris = ["turn:${realm}:3478?transport=udp" "turn:${realm}:3478?transport=tcp"];
|
||||
turn_shared_secret = static-auth-secret;
|
||||
turn_user_lifetime = "1h";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -20,7 +20,7 @@ in {
|
|||
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
package = pkgs.nginxStable.override {openssl = pkgs.libressl;};
|
||||
# package = pkgs.nginxStable.override {openssl = pkgs.libressl;};
|
||||
recommendedProxySettings = true;
|
||||
recommendedGzipSettings = true;
|
||||
recommendedOptimisation = true;
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ in {
|
|||
catppuccin.forgejo.enable = false;
|
||||
|
||||
services.gitea-actions-runner = {
|
||||
package = pkgs.forgejo-actions-runner;
|
||||
package = pkgs.forgejo-runner;
|
||||
instances.default = {
|
||||
enable = true;
|
||||
name = "monolith";
|
||||
|
|
|
|||
|
|
@ -148,6 +148,8 @@ in {
|
|||
'';
|
||||
};
|
||||
|
||||
security.acme.certs."node.nyc.zackmyers.io".keyType = "rsa4096";
|
||||
|
||||
services.phpfpm = {
|
||||
phpOptions = ''
|
||||
extension=${pkgs.php83Extensions.openssl}/lib/php/extensions/openssl.so
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ in {
|
|||
# })
|
||||
noto-fonts
|
||||
noto-fonts-cjk-sans
|
||||
noto-fonts-emoji
|
||||
noto-fonts-color-emoji
|
||||
jetbrains-mono
|
||||
nerd-fonts.iosevka
|
||||
nerd-fonts.zed-mono
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue