common/generic-desktop.nix

@@ -7,7 +7,6 @@
     enable = true;
     openFirewall = true;
   };
-  users.users.ash.extraGroups = [ "networkmanager" ];
 
   time.timeZone = "Europe/London";
   i18n.defaultLocale = "en_GB.utf8";

flake.nix

@@ -8,14 +8,8 @@
       url = "github:NixOS/nixpkgs/nixos-unstable";
     };
 
-    lix-module-stable = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz";
-      inputs.nixpkgs.follows = "nixpkgs-stable";
-    };
-
-    lix-module-unstable = {
-      url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz";
-      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    nixpkgs-zed = {
+      url = "github:GaetanLepage/nixpkgs/zed";
     };
 
     home-manager-stable = {
@@ -44,31 +38,20 @@
     };
 
     agenix.url = "github:ryantm/agenix";
-
-    niri-flake = {
-      url = "github:sodiboo/niri-flake";
-      inputs.nixpkgs.follows = "nixpkgs-unstable";
-      inputs.nixpkgs-stable.follows = "nixpkgs-stable";
-    };
   };
 
-  outputs = {
-    self,
-    nixpkgs-stable, nixpkgs-unstable,
-    lix-module-stable, lix-module-unstable,
-    home-manager-stable, home-manager-unstable,
-    nixos-generators,
-    fsh,
-    vscode-extensions,
-    agenix,
-    niri-flake,
-    ...
-  }:
+  outputs = { self, nixpkgs-stable, nixpkgs-unstable, nixpkgs-zed, fsh, home-manager-stable, home-manager-unstable, nixos-generators, vscode-extensions, agenix, ... }:
   let
     home-manager = home-manager-unstable;
+    zed-overlay = final: prev: {
+      # Inherit the changes into the overlay
+      inherit (nixpkgs-zed.legacyPackages.${prev.system})
+        zed-editor;
+    };
     overlays = [
       fsh.overlays.default
       vscode-extensions.overlays.default
+      zed-overlay
     ];
     overlays-module = ({ nixpkgs, ... }: {
       nixpkgs.overlays = overlays;
@@ -125,10 +108,8 @@
       system = "x86_64-linux";
       modules = [
         overlays-module
-        niri-flake.nixosModules.niri
         ./hosts/loona/configuration.nix
-        home-manager.nixosModules.home-manager
-        lix-module-unstable.nixosModules.default
+         home-manager.nixosModules.home-manager
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;

home/ash/niri.nix

@@ -1,5 +0,0 @@
-{ config, pkgs, ... }: {
-  programs.niri = {
-    # enable = true;
-  };
-}

home/ash/vscodium.nix

@@ -4,7 +4,6 @@
       vscode = vscodium;
       vscodeExtensions = with pkgs.vscode-extensions; [
         ms-python.python
-        ms-python.debugpy
         ms-vscode.hexeditor
         ms-dotnettools.csharp
       ] ++ (with pkgs.vscode-marketplace; [
@@ -29,9 +28,6 @@
         catppuccin.catppuccin-vsc-icons
         ziglang.vscode-zig
         redhat.java
-        vue.volar
-        editorconfig.editorconfig
-        arcanis.vscode-zipfs
       ]);
     })
   ];

hosts/alex/configuration.nix

@@ -6,7 +6,6 @@
     ../../common/tailscale.nix
     ../../common/tpm.nix
     ../../roles/kodi.nix
-    ../../roles/libvirt.nix
     ../../roles/podman.nix
     ./hardware-config.nix
   ];

hosts/loona/configuration.nix

@@ -14,7 +14,7 @@
   networking.hostId = "df9469a3";
   networking.firewall.enable = false;
 
-  boot.kernelPackages = pkgs.linuxPackages_6_8;
+  sound.enable = true;
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {

roles/niri.nix

@@ -1,14 +0,0 @@
-{ lib, pkgs, ... }: {
-  services = {
-    xserver = {
-      enable = true;
-      xkb.layout = "gb";
-    };
-    displayManager.sddm = {
-      enable = true;
-      theme = "catppuccin-mocha";
-    };
-  };
-  programs.niri.enable = true;
-  hardware.graphics.enable = true;
-}