upd hyprland & sway

homes/x86_64-linux/zoey@earth/default.nix

@@ -7,7 +7,6 @@
 }: {
   wms.hyprland.enable = true;
   apps = {
-    web.firefox.enable = true;
     web.librewolf.enable = true;
     web.librewolf.setDefault = true;
 
@@ -24,6 +23,7 @@
 
     term.kitty.enable = true;
     term.foot.enable = true;
+    term.rio.enable = true;
 
     music.spotify.enable = true;
 

lib/theme/default.nix

@@ -19,5 +19,14 @@
     "highlighthigh" = "524f67";
   };
 
+  fonts = {
+    mono = {
+      normal = "Iosevka Bold";
+      bold = "Iosevka ExtraBold";
+      italic = "Iosevka Bold Italic";
+      bold_italic = "Iosevka ExtraBold Italic";
+    };
+  };
+
   wallpaper = ./wallpaper.png;
 }

modules/home/apps/music/spotify/default.nix

@@ -20,19 +20,7 @@ in {
     programs.spicetify = {
       enable = true;
       theme = spicePkgs.themes.catppuccin;
-      spotifyPackage = pkgs.spotify.overrideAttrs {
+      spotifyPackage = pkgs.spotify;
-        fixupPhase = ''
-          runHook preFixup
-
-          wrapProgramShell $out/share/spotify/spotify \
-            ''${gappsWrapperArgs[@]} \
-            --prefix LD_LIBRARY_PATH : "$librarypath" \
-            --prefix PATH : "${pkgs.gnome.zenity}/bin" \
-            --add-flags "--disable-gpu"
-
-          runHook postFixup
-        '';
-      };
       colorScheme = "mocha";
 
       enabledExtensions = with spicePkgs.extensions; [

modules/home/apps/term/foot/default.nix

@@ -15,6 +15,11 @@ in {
   config = mkIf cfg.enable {
     programs.foot = {
       enable = true;
+      settings = {
+        colors = {
+          alpha = "0.9";
+        };
+      };
     };
   };
 }

modules/home/apps/term/rio/default.nix

@@ -0,0 +1,59 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+with lib;
+with lib.custom; let
+  cfg = config.apps.term.rio;
+in {
+  options.apps.term.rio = with types; {
+    enable = mkBoolOpt false "Enable Rio Terminal";
+  };
+
+  config = mkIf cfg.enable {
+    programs.rio = {
+      enable = true;
+      settings = {
+        window = {
+          opacity = 0.9;
+          blur = true;
+        };
+
+        padding-x = 10;
+        padding-y = [10 10];
+
+        navigation = {
+          mode = "Plain";
+        };
+
+        fonts = {
+          regular = {
+            family = "Iosevka";
+            style = "normal";
+            weight = 700;
+          };
+
+          bold = {
+            family = "Iosevka";
+            style = "normal";
+            weight = 800;
+          };
+
+          italic = {
+            family = "Iosevka";
+            style = "italic";
+            weight = 700;
+          };
+
+          bold-italic = {
+            family = "Iosevka";
+            style = "italic";
+            weight = 800;
+          };
+        };
+      };
+    };
+  };
+}

modules/home/wms/hyprland/default.nix

@@ -41,16 +41,16 @@ in {
   config = mkIf cfg.enable {
     wayland.windowManager.hyprland = {
       enable = true;
-      xwayland.enable = true;
+      # xwayland.enable = true;
       # package = inputs.hyprland.packages.${system}.default;
 
       systemd = {
         enable = true;
-        # variables = ["--all"];
+        variables = ["--all"];
-        # extraCommands = [
+        extraCommands = [
-        #   "systemctl --user stop graphical-session.target"
+          "systemctl --user stop graphical-session.target"
-        #   "systemctl --user start hyprland-session.target"
+          "systemctl --user start hyprland-session.target"
-        # ];
+        ];
       };
     };
 

modules/home/wms/sway/default.nix

@@ -31,6 +31,8 @@ in {
 
         menu = "killall anyrun || anyrun";
 
+        modifier = "Mod4";
+
         input = {
           "Logitech USB Receiver Keyboard" = {
             accel_profile = "flat";

modules/nixos/protocols/wayland/default.nix

@@ -16,7 +16,6 @@ in {
 
   config = mkIf cfg.enable {
     environment.etc."greetd/environments".text = ''
-      Hyprland
       sway
     '';
 
@@ -35,7 +34,7 @@ in {
 
     environment = {
       variables = {
-        # NIXOS_OZONE_WL = "1";
+        NIXOS_OZONE_WL = "1";
         __GL_GSYNC_ALLOWED = "0";
         __GL_VRR_ALLOWED = "0";
         _JAVA_AWT_WM_NONEREPARENTING = "1";

packages/zen-browser/default.nix

@@ -0,0 +1,23 @@
+let
+  pkgs = import <nixpkgs> {};
+  # I don't know if it needs gcc
+in
+  pkgs.mkShell {
+    nativeBuildInputs = with pkgs; [
+      # TODO: Install from cargo? Or use this instead?
+      rust-cbindgen
+      # TODO: Install from cargo? Or use this instead?
+      rust-bindgen
+
+      alsa-lib
+      cargo
+      clang
+      gcc
+      libpulseaudio
+      libclang
+      llvm
+      pkg-config
+      python3
+      rustc
+    ];
+  }