feat: t510 updates

tcarrio · Aug 29, 2024 · 8839d62 · 8839d62
1 parent e0db0cc
commit 8839d62
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 9 deletions.
diff --git a/nixos/mixins/desktop/mate-apps.nix b/nixos/mixins/desktop/mate-apps.nix
@@ -1,9 +1,10 @@
 { pkgs, ... }: {
   imports = [
-    ../services/flatpak.nix
     ../services/sane.nix
   ];
 
+  oxc.services.flatpak.enable = true;
+
   # Add some packages to complete the MATE desktop
   environment.systemPackages = with pkgs; [
     celluloid

diff --git a/nixos/mixins/desktop/pantheon-apps.nix b/nixos/mixins/desktop/pantheon-apps.nix
@@ -1,9 +1,10 @@
 { pkgs, ... }: {
   imports = [
-    ../services/flatpak.nix
     ../services/sane.nix
   ];
 
+  oxc.services.flatpak.enable = true;
+
   # Add additional apps and include Yaru for syntax highlighting
   environment.systemPackages = with pkgs; [
     appeditor

diff --git a/nixos/mixins/services/sane.nix b/nixos/mixins/services/sane.nix
@@ -1,5 +1,5 @@
 { desktop, pkgs, ... }: {
-  config.oxc.desktop.simple-scan.enable = true;
+  oxc.desktop.simple-scan.enable = true;
 
   hardware = {
     sane = {

diff --git a/nixos/mixins/users/tcarrio/desktop.nix b/nixos/mixins/users/tcarrio/desktop.nix
@@ -12,7 +12,6 @@
     spotify.enable = true;
     tilix.enable = true;
     vscode.enable = true;
-    zed.enable = false;
   };
 
   environment.systemPackages = with pkgs; [

diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix
@@ -2,5 +2,6 @@
   imports = [
     ./hardware
     ./services
+    ./virt
   ] ++ lib.optionals (desktop != null) [ ./desktop ];
 }
diff --git a/nixos/modules/desktop/vscode.nix b/nixos/modules/desktop/vscode.nix
@@ -101,6 +101,11 @@ in
         default = true;
         description = "Whether to enable VS Code support for CPP development";
       };
+      deno = mkOption {
+        type = types.bool;
+        default = true;
+        description = "Whether to enable VS Code support for Deno development";
+      };
       diff = mkOption {
         type = types.bool;
         default = true;
@@ -230,6 +235,7 @@ in
           vscodeExtensions = with vscode-extensions;
             # globally enabled extensions
             lib.optionals vscode.support.cpp [ ms-vscode.cpptools ]
+            ++ lib.optionals vscode.support.deno [ denoland.vscode-deno ]
             ++ lib.optionals vscode.support.diff [ ryu1kn.partial-diff ]
             ++ lib.optionals vscode.support.docker [ ms-azuretools.vscode-docker ]
             ++ lib.optionals vscode.support.editorconfig [ editorconfig.editorconfig ]

diff --git a/nixos/modules/hardware/network-wait-online.nix b/nixos/modules/hardware/network-wait-online.nix
@@ -3,7 +3,7 @@
     enable = lib.mkOption {
       type = lib.types.bool;
       default = true;
-      description = "Disable the wait-online service";
+      description = "Enable the wait-online service";
     };
   };
 

diff --git a/nixos/mixins/virt/default.nix → nixos/modules/virt/default.nix b/nixos/mixins/virt/default.nix → nixos/modules/virt/default.nix
diff --git a/nixos/workstation/t510/default.nix b/nixos/workstation/t510/default.nix
@@ -11,15 +11,29 @@
     inputs.nixos-hardware.nixosModules.common-pc
     inputs.nixos-hardware.nixosModules.common-pc-ssd
 
-    ../../mixins/desktop/bitwarden.nix
     # fix for nixos-rebuild hangups on certain hardware
-    ../../mixins/hardware/disable-nm-wait.nix
     ../../mixins/hardware/grub-legacy-boot.nix
     ../../mixins/services/pipewire.nix
-    ../../mixins/virt
   ];
 
-  oxc.services.tailscale.enable = true;
+  oxc = {
+    desktop = {
+      bitwarden.enable = true;
+      zed.enable = true;
+
+      vscode.support = {
+        deno = true;
+      };
+    };
+    services = {
+      tailscale.enable = true;
+    };
+    containerisation = {
+      enable = true;
+      engine = "podman";
+    };
+    virtualisation.enable = true;
+  };
 
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;