stuff and things
This commit is contained in:
parent
fe357582a6
commit
b5542e492f
36 changed files with 1059 additions and 1069 deletions
|
|
@ -22,100 +22,6 @@ in {
|
|||
pulse.enable = true;
|
||||
wireplumber.enable = true;
|
||||
jack.enable = true;
|
||||
|
||||
# extraConfig.pipewire.adjust-sample-rate = {
|
||||
# "context.properties" = {
|
||||
# "default.clock.rate" = 41000;
|
||||
# "default.clock.allowed-rates" = [44100];
|
||||
# };
|
||||
# };
|
||||
|
||||
# wireplumber.extraConfig = {
|
||||
# "custom" = {
|
||||
# "monitor.alsa.rules" = [
|
||||
# {
|
||||
# matches = [
|
||||
# {
|
||||
# "node.name" = "alsa_output.usb-Focusrite_Scarlett_Solo_USB_Y76P5M4160A866-00.HiFi__Line1__sink";
|
||||
# }
|
||||
# ];
|
||||
# actions = {
|
||||
# update-props = {
|
||||
# "audio.format" = "S32LE";
|
||||
# "audio.rate" = 192000;
|
||||
# "api.alsa.period-size" = 1024;
|
||||
# };
|
||||
# };
|
||||
# }
|
||||
# {
|
||||
# matches = [
|
||||
# {
|
||||
# "node.name" = "alsa_input.pci-0000_0d_00.4.analog-stereo";
|
||||
# }
|
||||
# ];
|
||||
# actions = {
|
||||
# update-props = {
|
||||
# "audio.format" = "S32LE";
|
||||
# "audio.rate" = 192000;
|
||||
# "api.alsa.period-size" = 1024;
|
||||
# };
|
||||
# };
|
||||
# }
|
||||
# {
|
||||
# matches = [
|
||||
# {
|
||||
# "node.name" = "~alsa_output.*";
|
||||
# }
|
||||
# ];
|
||||
# actions = {
|
||||
# update-props = {
|
||||
# "api.alsa.period-size" = 1024;
|
||||
# "api.alsa.headroom" = 8192;
|
||||
# };
|
||||
# };
|
||||
# }
|
||||
# ];
|
||||
# };
|
||||
#
|
||||
# "99-connect-tt" = {
|
||||
# "wireplumber.components" = [
|
||||
# {
|
||||
# name = "auto-connect-tt.lua";
|
||||
# type = "script/lua";
|
||||
# provides = "custom.connect-tt";
|
||||
# }
|
||||
# ];
|
||||
#
|
||||
# "wireplumber.profiles" = {
|
||||
# main = {
|
||||
# "custom.connect-tt" = "required";
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
|
||||
# wireplumber.extraScripts = {
|
||||
# "auto-connect-tt.lua" = builtins.readFile ./auto-connect-tt.lua;
|
||||
# };
|
||||
# };
|
||||
#
|
||||
# # PulseAudio compatibility layer configuration for 44.1kHz
|
||||
# services.pipewire.extraConfig.pipewire-pulse."92-steam-config" = {
|
||||
# context.modules = [
|
||||
# {
|
||||
# name = "libpipewire-module-protocol-pulse";
|
||||
# args = {
|
||||
# pulse.min.req = "32/44100";
|
||||
# pulse.default.req = "32/44100";
|
||||
# pulse.min.quantum = "32/44100";
|
||||
# pulse.max.quantum = "8192/44100";
|
||||
# };
|
||||
# }
|
||||
# ];
|
||||
# };
|
||||
#
|
||||
# environment.sessionVariables = {
|
||||
# PIPEWIRE_LATENCY = "1024/44100";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -141,6 +141,8 @@ in {
|
|||
# Stop display manager
|
||||
systemctl stop display-manager.service
|
||||
killall gdm-wayland-session
|
||||
killall niri
|
||||
killall niri-session
|
||||
|
||||
# Unbind VTconsoles
|
||||
echo 0 > /sys/class/vtconsole/vtcon0/bind
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ in {
|
|||
# https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
|
||||
# Only available from driver 515.43.04+
|
||||
# Currently alpha-quality/buggy, so false is currently the recommended setting.
|
||||
open = true;
|
||||
open = false;
|
||||
|
||||
# Enable the Nvidia settings menu,
|
||||
# accessible via `nvidia-settings`.
|
||||
|
|
|
|||
|
|
@ -36,14 +36,19 @@ in {
|
|||
services.xserver.displayManager.gdm.enable = true;
|
||||
|
||||
programs.uwsm = {
|
||||
enable = true;
|
||||
# waylandCompositors = {
|
||||
# "mwc" = {
|
||||
# prettyName = "MWC";
|
||||
# binPath = "/run/current-system/sw/bin/mwc";
|
||||
# comment = "previously owl";
|
||||
# };
|
||||
# };
|
||||
enable = false;
|
||||
waylandCompositors = {
|
||||
# "mwc" = {
|
||||
# prettyName = "MWC";
|
||||
# binPath = "/run/current-system/sw/bin/mwc";
|
||||
# comment = "previously owl";
|
||||
# };
|
||||
# niri = {
|
||||
# prettyName = "niri";
|
||||
# binPath = "/run/current-system/sw/bin/niri";
|
||||
# comment = "niri";
|
||||
# };
|
||||
};
|
||||
};
|
||||
|
||||
# environment.systemPackages = [
|
||||
|
|
@ -52,13 +57,14 @@ in {
|
|||
|
||||
programs.hyprland = {
|
||||
withUWSM = true;
|
||||
enable = true;
|
||||
enable = false;
|
||||
xwayland.enable = true;
|
||||
package = inputs.hyprland.packages.${pkgs.system}.hyprland;
|
||||
portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
|
||||
};
|
||||
|
||||
programs.niri.enable = false;
|
||||
programs.niri.enable = true;
|
||||
programs.niri.package = pkgs.niri-unstable;
|
||||
|
||||
environment = {
|
||||
variables = {
|
||||
|
|
@ -78,26 +84,18 @@ in {
|
|||
WLR_BACKEND = "wayland";
|
||||
WLR_RENDERER = "wayland";
|
||||
XDG_SESSION_TYPE = "wayland";
|
||||
SDL_VIDEODRIVER = "wayland";
|
||||
SDL_VIDEODRIVER = "wayland,x11";
|
||||
XDG_CACHE_HOME = "/home/zoey/.cache";
|
||||
CLUTTER_BACKEND = "wayland";
|
||||
DEFAULT_BROWSER = "${pkgs.firefox}/bin/firefox";
|
||||
};
|
||||
loginShellInit = ''
|
||||
dbus-update-activation-environment --systemd DISPLAY
|
||||
eval $(gnome-keyring-daemon --start --components=ssh,secrets)
|
||||
eval $(ssh-agent)
|
||||
'';
|
||||
};
|
||||
|
||||
hardware.pulseaudio.support32Bit = true;
|
||||
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
wlr.enable = false;
|
||||
config.common.default = "*";
|
||||
extraPortals = [
|
||||
pkgs.xdg-desktop-portal-gtk
|
||||
# pkgs.xwaylandvideobridge
|
||||
];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -27,6 +27,8 @@ in {
|
|||
};
|
||||
zach-pw.file = ./sec/zach-pw.age;
|
||||
emily-pw.file = ./sec/emily-piccat.age;
|
||||
|
||||
gitlab-email-pw-hashed.file = ./sec/gitlab-email-pw-hashed.age;
|
||||
};
|
||||
|
||||
mailserver = {
|
||||
|
|
@ -51,6 +53,10 @@ in {
|
|||
hashedPasswordFile = sec.emily-pw.path;
|
||||
aliases = ["emily@pictureofcat.com"];
|
||||
};
|
||||
"gitlab@zoeys.cloud" = {
|
||||
hashedPasswordFile = sec.gitlab-email-pw-hashed.path;
|
||||
aliases = ["noreply@zoeys.cloud"];
|
||||
};
|
||||
};
|
||||
|
||||
certificateScheme = "acme-nginx";
|
||||
|
|
|
|||
BIN
modules/nixos/services/mail/sec/gitlab-email-pw-hashed.age
Normal file
BIN
modules/nixos/services/mail/sec/gitlab-email-pw-hashed.age
Normal file
Binary file not shown.
|
|
@ -48,6 +48,11 @@ in {
|
|||
gitlab_runner = {
|
||||
file = ./sec/gitlab_runner.age;
|
||||
};
|
||||
gitlab_email_pw = {
|
||||
file = ./sec/gitlab-email-pw.age;
|
||||
owner = user;
|
||||
group = group;
|
||||
};
|
||||
};
|
||||
|
||||
boot.kernel.sysctl."net.ipv4.ip_forward" = true; # 1
|
||||
|
|
@ -97,6 +102,15 @@ in {
|
|||
port = 443;
|
||||
https = true;
|
||||
host = cfg.domain;
|
||||
|
||||
smtp = {
|
||||
enable = true;
|
||||
address = "mail.zoeys.cloud";
|
||||
username = "gitlab@zoeys.cloud";
|
||||
passwordFile = sec.gitlab_email_pw.path;
|
||||
port = 465;
|
||||
};
|
||||
|
||||
secrets = {
|
||||
secretFile = sec.gitlab_sec.path;
|
||||
otpFile = sec.gitlab_otp.path;
|
||||
|
|
|
|||
8
modules/nixos/sites/gitlab/sec/gitlab-email-pw.age
Normal file
8
modules/nixos/sites/gitlab/sec/gitlab-email-pw.age
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
age-encryption.org/v1
|
||||
-> ssh-ed25519 CtmR6w wfPgH83/+qjITFELir/Q/zjH+wjlgrU+HNC5eOsFhg8
|
||||
orHZwCQOmlK9TFHOEOb/K2FszXoMbQfwHdYAbKIOnR0
|
||||
-> ssh-ed25519 RMNffg E7mah8eqt9cDw2SKQTah25M4j/iIWhPHtrtmJpSPDgo
|
||||
eeoo3cfoiVh8xF9TVy9cKUlAw6NBhMg1iFs8JlpquPA
|
||||
--- NB2RNduULAMPoBmfRByWGL1hdK5/b5kDe4vnzdW1Hb0
|
||||
±¶Hú"y£“«=Ùúñ,”î«ÐµÎè5|›V0âý’´1›´²qA³sNIÜÉ—R£qè¤NY!§Œl×®bÚ\LG·®e{En'™£ó<C2A3>Í”ØFh<B+sŽ¥ÌŽ¯š£‚v»ñ›c©Œèeˆ¶Ø4Û+ K÷…].<2E>¦9éü<1D>k\ý(ž’ÿÈ?¯çPÎk~Yy¤
|
||||
¥ˆ•!€‹w®ùÉ
|
||||
|
|
@ -42,13 +42,31 @@ in {
|
|||
# noCvSs = true
|
||||
# exportGlyphNames = true
|
||||
#
|
||||
# [buildPlans.IosevkaCustom.variants]
|
||||
# inherits = "ss08"
|
||||
# [buildPlans.IosevkaCustom.variants]
|
||||
# inherits = "ss05"
|
||||
#
|
||||
# [buildPlans.IosevkaCustom.variants.design]
|
||||
# l = "hooky"
|
||||
#
|
||||
# [buildPlans.IosevkaCustom.widths.Normal]
|
||||
# shape = 500
|
||||
# menu = 5
|
||||
# css = "normal"
|
||||
#
|
||||
# [buildPlans.IosevkaCustom.widths.Extended]
|
||||
# shape = 600
|
||||
# menu = 7
|
||||
# css = "expanded"
|
||||
#
|
||||
# [buildPlans.IosevkaCustom.widths.SemiCondensed]
|
||||
# shape = 456
|
||||
# menu = 4
|
||||
# css = "semi-condensed"
|
||||
#
|
||||
# [buildPlans.IosevkaCustom.widths.SemiExtended]
|
||||
# shape = 548
|
||||
# menu = 6
|
||||
# css = "semi-expanded"
|
||||
# '';
|
||||
# })
|
||||
noto-fonts
|
||||
|
|
@ -58,6 +76,8 @@ in {
|
|||
nerd-fonts.iosevka
|
||||
nerd-fonts.zed-mono
|
||||
adwaita-fonts
|
||||
cozette
|
||||
scientifica
|
||||
# (nerdfonts.override {fonts = ["ZedMono" "Iosevka"];})
|
||||
];
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue