changes

hosts/nb/modules/sway/sway.nix

@@ -25,27 +25,24 @@ let
   unstable = import (fetchTarball https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz) {
     config = { allowUnfree = true; };
   };
-  orca-slicer-pin = import (builtins.fetchTarball {
-    url = "https://github.com/NixOS/nixpkgs/archive/67b4bf1df4ae54d6866d78ccbd1ac7e8a8db8b73.tar.gz";
-  }) {};
   apache-ds-pin = import (builtins.fetchTarball {
     url = "https://github.com/NixOS/nixpkgs/archive/9aec01027f7ea2bca07bb51d5ed83e78088871c1.tar.gz";
   }) {};
-  ddev-pin = import (builtins.fetchTarball {
-    url = "https://github.com/NixOS/nixpkgs/archive/34a626458d686f1b58139620a8b2793e9e123bba.tar.gz";
-  }) {};
+  # ddev-pin = import (builtins.fetchTarball {
+  #   url = "https://github.com/NixOS/nixpkgs/archive/34a626458d686f1b58139620a8b2793e9e123bba.tar.gz";
+  # }) {};
 in {
   imports = [
     ./social.nix
     ./signal-work.nix
     # ./parsec.nix
-    ./rustdesk.nix
+    # ./rustdesk.nix
     ./thunderbird.nix
   ];
 
   environment.variables.XCURSOR_SIZE = "24";
 
-  hardware.opengl.extraPackages = [ pkgs.amdvlk ];
+  hardware.graphics.extraPackages = [ pkgs.amdvlk ];
   environment.variables.VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/amd_icd64.json";
 
   hardware.pulseaudio.support32Bit = true;
@@ -78,13 +75,16 @@ in {
   };
 
   environment.systemPackages = with pkgs; [
-    alsaUtils
+    alsa-utils
     audacity
     apache-ds-pin.apache-directory-studio
     bitwarden
     bitwarden-cli
     rofi-rbw-wayland
-    cryptomator
+    # cryptomator
+    fontforge
+
+    code-cursor
 
     quickemu
 
@@ -111,7 +111,7 @@ in {
     })
 
     dbus-sway-environment
-    ddev-pin.ddev
+    ddev
     dracula-theme
     foot
     fractal
@@ -119,8 +119,8 @@ in {
     git
     glib
     gimp
-    gnome.seahorse
-    gnome3.adwaita-icon-theme
+    seahorse
+    adwaita-icon-theme
     go
     grim
     hunspell
@@ -169,7 +169,7 @@ in {
 
   fonts.packages = with pkgs; [
     noto-fonts
-    noto-fonts-cjk
+    noto-fonts-cjk-sans
     noto-fonts-emoji
     nerdfonts
   ];