moved awesome and hyprland

hosts/vali/mars/default.nix

@@ -4,8 +4,5 @@ _: {
     ./programs.nix
     ./hardware-configuration.nix
     ./profile.nix
-    ./awesome/awesome.nix
-    ./hyprland/hyprland.nix
-
   ];
 }

modules/gui/default.nix

@@ -4,7 +4,7 @@ _: {
     ./gtk.nix
     ./foot.nix
     ./mpv.nix
-#    ./kakoune
+    #    ./kakoune
     ./qt.nix
     ./zathura.nix
     ./stylix.nix

modules/wms/wayland/niri/config.nix

@@ -1,9 +1,4 @@
-{
+{ pkgs, theme, config, ... }:
-  pkgs,
-  theme,
-  config,
-  ...
-}:
 with theme.colors; {
   programs.niri.settings = {
     outputs."eDP-1".position = {
@@ -36,18 +31,18 @@ with theme.colors; {
       };
       focus-follows-mouse = true;
       warp-mouse-to-focus = true;
-      trackpoint.accel-speed = 0.001;
+      trackpoint.accel-speed = 1.0e-3;
     };
 
     layout = {
       gaps = 16;
       center-focused-column = "never";
       preset-column-widths = [
-        {proportion = 0.333;}
+        { proportion = 0.333; }
-        {proportion = 0.5;}
+        { proportion = 0.5; }
-        {proportion = 0.666;}
+        { proportion = 0.666; }
       ];
-      default-column-width = {proportion = 0.5;};
+      default-column-width = { proportion = 0.5; };
 
       focus-ring = {
         enable = true;
@@ -61,14 +56,14 @@ with theme.colors; {
       butter = {
         spring = {
           damping-ratio = 0.75;
-          epsilon = 0.00010;
+          epsilon = 1.0e-4;
           stiffness = 400;
         };
       };
       smooth = {
         spring = {
           damping-ratio = 0.58;
-          epsilon = 0.00010;
+          epsilon = 1.0e-4;
           stiffness = 735;
         };
       };
@@ -81,27 +76,27 @@ with theme.colors; {
       window-close = smooth;
     };
 
-    window-rules = [
+    window-rules = [{
-      {
+      geometry-corner-radius = let radius = 8.0;
-        geometry-corner-radius = let radius =8.0; in{
+      in {
         bottom-left = radius;
         bottom-right = radius;
         top-left = radius;
         top-right = radius;
       };
-        clip-to-geometry= true;
+      clip-to-geometry = true;
-      }
+    }];
-    ];
 
-    binds = with config.lib.niri.actions; let
+    binds = with config.lib.niri.actions;
-      sh = spawn "sh" "-c";
+      let sh = spawn "sh" "-c";
       in {
         "Mod+Return" = {
           action = spawn "${pkgs.foot}/bin/foot";
           cooldown-ms = 500;
         };
         "Mod+Space".action = spawn "${pkgs.fuzzel}/bin/fuzzel";
-      "Mod+V".action = sh "${pkgs.cliphist}/bin/cliphist list | fuzzel --dmenu | cliphist decode | wl-copy";
+        "Mod+V".action = sh
+          "${pkgs.cliphist}/bin/cliphist list | fuzzel --dmenu | cliphist decode | wl-copy";
         "Mod+Shift+Period".action = spawn "emoji";
 
         "XF86AudioRaiseVolume".action = spawn "pamixer" "-i" "5";

modules/wms/wayland/niri/default.nix

@@ -1,17 +1,13 @@
-{
+{ pkgs, lib, theme, ... }:
-  pkgs,
+let
-  lib,
-  theme,
-  ...
-}: let
   mkService = lib.recursiveUpdate {
-    Unit.PartOf = ["graphical-session.target"];
+    Unit.PartOf = [ "graphical-session.target" ];
-    Unit.After = ["graphical-session.target"];
+    Unit.After = [ "graphical-session.target" ];
-    Install.WantedBy = ["graphical-session.target"];
+    Install.WantedBy = [ "graphical-session.target" ];
   };
 in {
-imports = [./config.nix];
+  imports = [ ./config.nix ];
-  home.packages = with pkgs; [pamixer];
+  home.packages = with pkgs; [ pamixer ];
   services = {
     wlsunset = {
       # TODO: fix opaque red screen issue
@@ -32,7 +28,7 @@ imports = [./config.nix];
     tray = {
       Unit = {
         Description = "Home Manager System Tray";
-        Requires = ["graphical-session-pre.target"];
+        Requires = [ "graphical-session-pre.target" ];
       };
     };
   };

options/desktop/fonts.nix

@@ -17,14 +17,11 @@
     # this fixes emoji stuff
     fontconfig = {
       defaultFonts = {
-              monospace = [
+        monospace = [ "JetBrainsMono Nerd Font" "Noto Color Emoji" ];
-                "JetBrainsMono Nerd Font"
+        sansSerif = [ "Lexend" "Noto Color Emoji" ];
-                "Noto Color Emoji"
+        serif = [ "Noto Serif" "Noto Color Emoji" ];
-              ];
+        emoji = [ "Noto Color Emoji" ];
-          sansSerif = ["Lexend" "Noto Color Emoji"];
+      };
-          serif = ["Noto Serif" "Noto Color Emoji"];
-          emoji = ["Noto Color Emoji"];
     };
   };
-  }
 }