m

3 files changed, 61 insertions, 16 deletions

diff --git a/hosts/local/gui.nix b/hosts/local/gui.nix
index d783f28..fd8ae1e 100644
--- a/hosts/local/gui.nix
+++ b/hosts/local/gui.nix
@@ -1,19 +1,11 @@
 {pkgs, ...}: {
   environment.systemPackages = with pkgs; [
-    obsidian
-    imv
-    # keyboard stuff
-    xorg.xev
-
-    # terminals
+    #terminals
     kitty
     alacritty
     ghostty
     foot
 
-    # messaging
-    signal-desktop-bin
-    tdesktop
     # video
     mpv
     vlc
@@ -40,12 +32,5 @@
     gimp
     qbittorrent
     zathura # pdf
-    #
-    easyeffects # audio, cool stuff
-    # games!
-    ryujinx
-    wineWowPackages.staging
-    dosbox
-    siyuan
   ];
 }
diff --git a/hosts/local/s15/configuration.nix b/hosts/local/s15/configuration.nix
index a326dd4..ae594de 100644
--- a/hosts/local/s15/configuration.nix
+++ b/hosts/local/s15/configuration.nix
@@ -18,6 +18,11 @@
       ];
     };
 in {
+  nixpkgs.config = {
+    allowUnfree = true;
+    allowUnfreePredicate = _: true;
+    chromium.enableWideVine = true;
+  };
   wsl.enable = true;
   wsl.defaultUser = "y";
   imports = [
@@ -27,6 +32,7 @@ in {
     ../../pkgs.nix
     ../../server.nix
     ../../gpg.nix
+    ./gui.nix
   ];
   environment.systemPackages = [
     wrappers
diff --git a/hosts/local/s15/gui.nix b/hosts/local/s15/gui.nix
new file mode 100644
index 0000000..ec7cab2
--- /dev/null
+++ b/hosts/local/s15/gui.nix
@@ -0,0 +1,54 @@
+{
+  inputs,
+  pkgs,
+  ...
+}: {
+  environment.systemPackages = with pkgs; [
+    alacritty
+    mpv
+    vlc
+    imv
+    celluloid
+    ffmpeg-full
+    xfce.thunar
+    thunderbird
+    krita
+    wev
+  ];
+
+  programs.sway = {
+    enable = true;
+    wrapperFeatures.gtk = true;
+    extraPackages = with pkgs; [
+      wofi
+      foot
+      mako
+      kanshi
+      grim
+      slurp
+      wl-clipboard
+      wf-recorder
+    ];
+  };
+  environment.sessionVariables = {
+    NIXOS_OZONE_WL = "1";
+    DE = "generic";
+    LIBGL_ALWAYS_INDIRECT = 0;
+    GALLIUM_DRIVER = "llvmpipe";
+
+    SDL_VIDEODRIVER = "wayland";
+    QT_QPA_PLATFORM = "wayland";
+    QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
+    _JAVA_AWT_WM_NONREPARENTING = "1";
+    MOZ_ENABLE_WAYLAND = "1";
+
+    # GTK_IM_MODULE = "fcitx";
+    # QT_IM_MODULE = "fcitx";
+    # SDL_IM_MODULE = "fcitx";
+
+    XDG_CURRENT_DESKTOP = "sway";
+    GDK_BACKEND = "wayland";
+    XDG_SESSION_TYPE = "wayland";
+    XMODIFIERS = "@im=fcitx";
+  };
+}