NixOS 24.11 fixes

This commit is contained in:
Jordan Holt 2024-11-21 23:53:16 +00:00
parent 3c00b0ebd8
commit b8056c578c
Signed by: jordan
GPG Key ID: B8CFFF61F1CCF520
13 changed files with 23 additions and 52 deletions

View File

@ -54,7 +54,7 @@
programs.zsh.enable = true; programs.zsh.enable = true;
nix = { nix = {
package = pkgs.nixFlakes; package = pkgs.nixVersions.stable;
extraOptions = '' extraOptions = ''
experimental-features = nix-command flakes experimental-features = nix-command flakes
''; '';

View File

@ -12,7 +12,6 @@
services.printing.enable = false; services.printing.enable = false;
services.openssh.startWhenNeeded = true; services.openssh.startWhenNeeded = true;
sound.enable = true;
hardware.pulseaudio.enable = false; hardware.pulseaudio.enable = false;
security.rtkit.enable = true; security.rtkit.enable = true;
services.pipewire = { services.pipewire = {

View File

@ -29,13 +29,12 @@
modesetting.enable = true; modesetting.enable = true;
powerManagement.enable = true; powerManagement.enable = true;
}; };
opengl = { graphics = {
enable = true; enable = true;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
libvdpau-va-gl libvdpau-va-gl
]; ];
driSupport = true; enable32Bit = true;
driSupport32Bit = true;
}; };
}; };
} }

View File

@ -156,12 +156,11 @@
}; };
}; };
hardware.opengl = { hardware.graphics = {
enable = true; enable = true;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
vaapiVdpau vaapiVdpau
]; ];
driSupport = true;
}; };
users.users.jellyfin.extraGroups = [ "video" "render" ]; users.users.jellyfin.extraGroups = [ "video" "render" ];
services.jellyfin = { services.jellyfin = {

View File

@ -19,6 +19,7 @@
cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
nvidia = { nvidia = {
modesetting.enable = true; modesetting.enable = true;
open = true;
package = config.boot.kernelPackages.nvidiaPackages.beta; package = config.boot.kernelPackages.nvidiaPackages.beta;
powerManagement.enable = true; powerManagement.enable = true;
}; };

View File

@ -100,8 +100,6 @@
networking.hostId = "731d1660"; networking.hostId = "731d1660";
sound.enable = true;
security.rtkit.enable = true; security.rtkit.enable = true;
services.pipewire = { services.pipewire = {
enable = true; enable = true;

View File

@ -104,7 +104,6 @@
whatsapp = true; whatsapp = true;
}; };
usePostgresql = databases.postgresql.enable; usePostgresql = databases.postgresql.enable;
slidingSync.enable = true;
}; };
nginx.enable = true; nginx.enable = true;
photoprism.enable = true; photoprism.enable = true;

View File

@ -21,10 +21,9 @@ in {
vulkan-tools vulkan-tools
]; ];
hardware.opengl = { hardware.graphics = {
enable = true; enable = true;
driSupport = true; enable32Bit = true;
driSupport32Bit = true;
}; };
}; };
} }

View File

@ -216,8 +216,8 @@ in {
# d-spy # d-spy
# drawing # drawing
# fragments # fragments
gnome.dconf-editor dconf-editor
gnome.ghex ghex
# gnome-builder # gnome-builder
gnome-decoder gnome-decoder
gnome-firmware gnome-firmware
@ -225,7 +225,7 @@ in {
# gnome-obfuscate # gnome-obfuscate
gnome-podcasts gnome-podcasts
identity identity
mission-center # mission-center
mousam mousam
newsflash newsflash
# schemes # schemes

View File

@ -11,7 +11,7 @@ in {
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
home.programs.nixvim = { home.programs.nixvim.config = {
enable = true; enable = true;
defaultEditor = true; defaultEditor = true;
@ -59,15 +59,15 @@ in {
eslint.enable = true; eslint.enable = true;
gopls.enable = true; gopls.enable = true;
html.enable = true; html.enable = true;
lua-ls.enable = true; lua_ls.enable = true;
pylsp.enable = true; pylsp.enable = true;
nixd.enable = true; nixd.enable = true;
rust-analyzer = { rust_analyzer = {
enable = true; enable = true;
installCargo = true; installCargo = true;
installRustc = true; installRustc = true;
}; };
tsserver.enable = true; ts_ls.enable = true;
}; };
}; };
@ -108,7 +108,7 @@ in {
nixvimInjections = true; nixvimInjections = true;
folding = true; folding = true;
indent = true; settings.indent.enable = true;
}; };
plugins.treesitter-refactor = { plugins.treesitter-refactor = {
@ -121,6 +121,8 @@ in {
plugins.undotree.enable = true; plugins.undotree.enable = true;
plugins.web-devicons.enable = true;
# plugins.gitsigns.enable = true; # plugins.gitsigns.enable = true;
# plugins.gitgutter.enable = true; # plugins.gitgutter.enable = true;
# plugins.goyo.enable = true; # plugins.goyo.enable = true;

View File

@ -26,9 +26,9 @@ in {
wireless = { wireless = {
enable = true; enable = true;
interfaces = cfg.interfaces; interfaces = cfg.interfaces;
environmentFile = config.age.secrets."passwords/networks".path; secretsFile = config.age.secrets."passwords/networks".path;
networks = { networks = {
"Apollo 600 Mbps".psk = "@PSK_APOLLO@"; "Apollo 600 Mbps".pskRaw = "ext:PSK_APOLLO";
}; };
}; };
networkmanager.ensureProfiles.profiles = { networkmanager.ensureProfiles.profiles = {

View File

@ -20,7 +20,7 @@ in {
port = 8080; port = 8080;
settings = { settings = {
acl_policy_path = null; policy.path = null;
ip_prefixes = [ ip_prefixes = [
"100.64.0.0/10" "100.64.0.0/10"
]; ];
@ -30,8 +30,8 @@ in {
update_frequency = "24h"; update_frequency = "24h";
urls = []; urls = [];
}; };
dns_config = { dns = {
base_domain = "vimium.net"; base_domain = "mesh.vimium.net";
extra_records = [ extra_records = [
{ {
name = "grafana.mesh.vimium.net"; name = "grafana.mesh.vimium.net";
@ -45,7 +45,7 @@ in {
} }
]; ];
magic_dns = true; magic_dns = true;
nameservers = [ nameservers.global = [
"9.9.9.9" "9.9.9.9"
]; ];
}; };

View File

@ -28,9 +28,6 @@ in {
default = "vimium.com"; default = "vimium.com";
example = "vimium.com"; example = "vimium.com";
}; };
slidingSync = {
enable = lib.mkEnableOption "sliding-sync";
};
usePostgresql = lib.mkEnableOption "postgresql"; usePostgresql = lib.mkEnableOption "postgresql";
}; };
@ -45,9 +42,6 @@ in {
"m.identity_server" = { "m.identity_server" = {
"base_url" = "https://vector.im"; "base_url" = "https://vector.im";
}; };
"org.matrix.msc3575.proxy" = if cfg.slidingSync.enable then {
"url" = "https://${matrixSubdomain}";
} else { };
}; };
matrixServerConfig."m.server" = "${matrixSubdomain}:443"; matrixServerConfig."m.server" = "${matrixSubdomain}:443";
commonBridgeSettings = bridge: { commonBridgeSettings = bridge: {
@ -136,13 +130,6 @@ in {
''; '';
}; };
"/_synapse/client".proxyPass = "http://localhost:8008"; "/_synapse/client".proxyPass = "http://localhost:8008";
"~ ^/(client/|_matrix/client/unstable/org.matrix.msc3575/sync)" = lib.mkIf cfg.slidingSync.enable {
priority = 100;
proxyPass = "http://${config.services.matrix-sliding-sync.settings.SYNCV3_BINDADDR}";
extraConfig = ''
proxy_set_header X-Forwarded-For $remote_addr;
'';
};
}; };
}; };
"${cfg.serverName}" = let "${cfg.serverName}" = let
@ -196,18 +183,6 @@ in {
(lib.optional cfg.bridges.whatsapp (lib.optional cfg.bridges.whatsapp
config.systemd.services.mautrix-whatsapp.serviceConfig.Group); config.systemd.services.mautrix-whatsapp.serviceConfig.Group);
age.secrets = if cfg.slidingSync.enable then {
"files/services/matrix/sliding-sync" = {
file = "${self.inputs.secrets}/files/services/matrix/sliding-sync.age";
};
} else {};
services.matrix-sliding-sync = lib.mkIf cfg.slidingSync.enable {
enable = true;
environmentFile = config.age.secrets."files/services/matrix/sliding-sync".path;
settings = { SYNCV3_SERVER = "https://${matrixSubdomain}"; };
};
services.postgresql = lib.mkIf cfg.usePostgresql { services.postgresql = lib.mkIf cfg.usePostgresql {
ensureUsers = [ ensureUsers = [
{ {