NixOS 24.11 fixes

2024-11-21 23:53:16 +00:00 · 2024-11-21 23:53:16 +00:00 · b8056c578c
commit b8056c578c
parent 3c00b0ebd8
13 changed files with 23 additions and 52 deletions
--- a/hosts/common.nix
+++ b/hosts/common.nix
@ -54,7 +54,7 @@
  programs.zsh.enable = true;

  nix = {
-    package = pkgs.nixFlakes;
+    package = pkgs.nixVersions.stable;
    extraOptions = ''
      experimental-features = nix-command flakes
    '';
--- a/hosts/desktop.nix
+++ b/hosts/desktop.nix
@ -12,7 +12,6 @@
  services.printing.enable = false;
  services.openssh.startWhenNeeded = true;

-  sound.enable = true;
  hardware.pulseaudio.enable = false;
  security.rtkit.enable = true;
  services.pipewire = {
--- a/hosts/hypnos/hardware-configuration.nix
+++ b/hosts/hypnos/hardware-configuration.nix
@ -29,13 +29,12 @@
      modesetting.enable = true;
      powerManagement.enable = true;
    };
-    opengl = {
+    graphics = {
      enable = true;
      extraPackages = with pkgs; [
        libvdpau-va-gl
      ];
-      driSupport = true;
-      driSupport32Bit = true;
+      enable32Bit = true;
    };
  };
 }
--- a/hosts/library/default.nix
+++ b/hosts/library/default.nix
@ -156,12 +156,11 @@
    };
  };

-  hardware.opengl = {
+  hardware.graphics = {
    enable = true;
    extraPackages = with pkgs; [
      vaapiVdpau
    ];
-    driSupport = true;
  };
  users.users.jellyfin.extraGroups = [ "video" "render" ];
  services.jellyfin = {
--- a/hosts/odyssey/hardware-configuration.nix
+++ b/hosts/odyssey/hardware-configuration.nix
@ -19,6 +19,7 @@
    cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
    nvidia = {
      modesetting.enable = true;
+      open = true;
      package = config.boot.kernelPackages.nvidiaPackages.beta;
      powerManagement.enable = true;
    };
--- a/hosts/pi/default.nix
+++ b/hosts/pi/default.nix
@ -100,8 +100,6 @@

  networking.hostId = "731d1660";

-  sound.enable = true;
-
  security.rtkit.enable = true;
  services.pipewire = {
    enable = true;
--- a/hosts/vps1/default.nix
+++ b/hosts/vps1/default.nix
@ -104,7 +104,6 @@
          whatsapp = true;
        };
        usePostgresql = databases.postgresql.enable;
-        slidingSync.enable = true;
      };
      nginx.enable = true;
      photoprism.enable = true;
--- a/modules/desktop/gaming/lutris.nix
+++ b/modules/desktop/gaming/lutris.nix
@ -21,10 +21,9 @@ in {
      vulkan-tools
    ];

-    hardware.opengl = {
+    hardware.graphics = {
      enable = true;
-      driSupport = true;
-      driSupport32Bit = true;
+      enable32Bit = true;
    };
  };
 }
--- a/modules/desktop/gnome.nix
+++ b/modules/desktop/gnome.nix
@ -216,8 +216,8 @@ in {
      # d-spy
      # drawing
      # fragments
-      gnome.dconf-editor
-      gnome.ghex
+      dconf-editor
+      ghex
      # gnome-builder
      gnome-decoder
      gnome-firmware
@ -225,7 +225,7 @@ in {
      # gnome-obfuscate
      gnome-podcasts
      identity
-      mission-center
+      # mission-center
      mousam
      newsflash
      # schemes
--- a/modules/editors/neovim/default.nix
+++ b/modules/editors/neovim/default.nix
@ -11,7 +11,7 @@ in {
  };

  config = lib.mkIf cfg.enable {
-    home.programs.nixvim = {
+    home.programs.nixvim.config = {
      enable = true;
      defaultEditor = true;

@ -59,15 +59,15 @@ in {
          eslint.enable = true;
          gopls.enable = true;
          html.enable = true;
-          lua-ls.enable = true;
+          lua_ls.enable = true;
          pylsp.enable = true;
          nixd.enable = true;
-          rust-analyzer = {
+          rust_analyzer = {
            enable = true;
            installCargo = true;
            installRustc = true;
          };
-          tsserver.enable = true;
+          ts_ls.enable = true;
        };
      };

@ -108,7 +108,7 @@ in {
        nixvimInjections = true;

        folding = true;
-        indent = true;
+        settings.indent.enable = true;
      };

      plugins.treesitter-refactor = {
@ -121,6 +121,8 @@ in {

      plugins.undotree.enable = true;

+      plugins.web-devicons.enable = true;
+
      # plugins.gitsigns.enable = true;
      # plugins.gitgutter.enable = true;
      # plugins.goyo.enable = true;
--- a/modules/networking/wireless.nix
+++ b/modules/networking/wireless.nix
@ -26,9 +26,9 @@ in {
      wireless = {
        enable = true;
        interfaces = cfg.interfaces;
-        environmentFile = config.age.secrets."passwords/networks".path;
+        secretsFile = config.age.secrets."passwords/networks".path;
        networks = {
-          "Apollo 600 Mbps".psk = "@PSK_APOLLO@";
+          "Apollo 600 Mbps".pskRaw = "ext:PSK_APOLLO";
        };
      };
      networkmanager.ensureProfiles.profiles = {
--- a/modules/services/headscale/default.nix
+++ b/modules/services/headscale/default.nix
@ -20,7 +20,7 @@ in {
      port = 8080;

      settings = {
-        acl_policy_path = null;
+        policy.path = null;
        ip_prefixes = [
          "100.64.0.0/10"
        ];
@ -30,8 +30,8 @@ in {
          update_frequency = "24h";
          urls = [];
        };
-        dns_config = {
-          base_domain = "vimium.net";
+        dns = {
+          base_domain = "mesh.vimium.net";
          extra_records = [
            {
              name = "grafana.mesh.vimium.net";
@ -45,7 +45,7 @@ in {
            }
          ];
          magic_dns = true;
-          nameservers = [
+          nameservers.global = [
            "9.9.9.9"
          ];
        };
--- a/modules/services/matrix/default.nix
+++ b/modules/services/matrix/default.nix
@ -28,9 +28,6 @@ in {
      default = "vimium.com";
      example = "vimium.com";
    };
-    slidingSync = {
-      enable = lib.mkEnableOption "sliding-sync";
-    };
    usePostgresql = lib.mkEnableOption "postgresql";
  };

@ -45,9 +42,6 @@ in {
      "m.identity_server" = {
        "base_url" = "https://vector.im";
      };
-      "org.matrix.msc3575.proxy" = if cfg.slidingSync.enable then {
-        "url" = "https://${matrixSubdomain}";
-      } else { };
    };
    matrixServerConfig."m.server" = "${matrixSubdomain}:443";
    commonBridgeSettings = bridge: {
@ -136,13 +130,6 @@ in {
            '';
          };
          "/_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
@ -196,18 +183,6 @@ in {
      (lib.optional cfg.bridges.whatsapp
        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 {
      ensureUsers = [
        {