refactoring in to modules and things, color changes, niri testing

home.nix

@@ -2,6 +2,7 @@
 {
   imports = [
     modules/gnome
+    modules/niri
     modules/sway
   ];
 
@@ -15,6 +16,7 @@
       _1password-cli
       _1password-gui
       atkinson-hyperlegible
+      atkinson-monolegible
       alacritty
       blueman
       brightnessctl
@@ -49,9 +51,11 @@
       pamixer
       pavucontrol
       powertop
+      prettyping
       qutebrowser
       rclone
       rockbox-utility
+      rose-pine-cursor
       signal-desktop
       solargraph
       sops
@@ -66,8 +70,6 @@
       wl-clipboard
       wl-mirror
       sway-launcher-desktop
-      swaynotificationcenter
-      swayosd
       vivaldi
       xdg-utils
       zellij
@@ -123,6 +125,7 @@
       };
     };
   };
+
   programs = {
     atuin = {
       enable = true;
@@ -157,13 +160,9 @@
     };
     fish = {
       enable = true;
-      loginShellInit = ''
-        # if test (tty) = /dev/tty1
-        #   exec sway
-        # end
-      '';
       shellAliases = {
         cat = "bat";
+        ping = "prettyping";
       };
     };
     fzf = {
@@ -462,7 +461,6 @@
       enable = true;
       enableFishIntegration = true;
     };
-    swaylock.enable = true;
     waybar = {
       enable = true;
       systemd.enable = true;
@@ -554,31 +552,6 @@
     };
     gnome-keyring.enable = true;
     playerctld.enable = true;
-    swayidle = {
-      enable = true;
-      events = [
-        { event = "before-sleep"; command = "${pkgs.swaylock}/bin/swaylock -fF"; }
-      ];
-      timeouts = [
-        { 
-          timeout = 300;
-          command = "${pkgs.swaylock}/bin/swaylock -fF"; 
-        }
-        { 
-          timeout = 330; 
-          command = "${pkgs.sway}/bin/swaymsg 'output * dpms off'";
-          resumeCommand = "${pkgs.sway}/bin/swaymsg 'output * dpms on'";
-        }
-      ];
-    };
-    swaync = {
-      enable = true;
-
-    };
-    swayosd = {
-      enable = true;
-      display = "DP-1";
-    };
     syncthing = {
       enable = true;
       # dataDir = "/home/muhh/Sync";
@@ -606,11 +579,19 @@
     polarity = "dark";
     # base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
     # base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-city-terminal-dark.yaml";
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/everforest.yaml";
+    #base16Scheme = "${pkgs.base16-schemes}/share/themes/everforest.yaml";
+    base16Scheme = ./share/themes/flexoki-light.yaml;
+    cursor = {
+      name = "Rosé Pine";
+      package = pkgs.rose-pine-cursor;
+      size = 48;
+    };
     fonts = {
       monospace = {
         package = pkgs.nerd-fonts.iosevka;
         name = "Iosevka Nerd Font";
+        # package = pkgs.atkinson-monolegible;
+        # name = "Atkinson Monolegible";
       };
       sizes = {
         terminal = 14;
@@ -618,96 +599,6 @@
     };
   };
 
-  wayland.windowManager = {
-    sway = {
-      enable = true;
-      extraConfig = ''
-      smart_gaps inverse_outer
-      '';
-      config = {
-        bars = [];
-        window = {
-          commands = [
-            {
-              command = "floating enable, sticky enable, resize set 20 ppt 40 ppt, border pixel 10";
-              criteria = {
-                app_id = "^launcher";
-              };
-            }
-          ];
-        };
-        gaps = {
-          inner = 30;
-          vertical = 50;
-          horizontal = 400;
-          # smartGaps = true;
-          smartBorders = "on";
-        };
-        input = {
-          "type:keyboard" = {
-            xkb_layout = "eu";
-            xkb_options = "compose:rwin";
-          };
-          "type:touchpad" = {
-            tap = "enabled";
-            natural_scroll = "enabled";
-            dwt = "enabled";
-            accel_profile = "adaptive";
-            pointer_accel = "0.5";
-          };
-        };
-        keybindings = let
-          modifier = config.wayland.windowManager.sway.config.modifier;
-        in lib.mkOptionDefault {
-          "XF86AudioRaiseVolume" = "exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"; 
-          "XF86AudioLowerVolume" = "exec wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"; 
-          "XF86AudioMute" = "exec wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; 
-          "XF86MonBrightnessUp" = "exec brightnessctl set 10%+";
-          "XF86MonBrightnessDown" = "exec brightnessctl set 10%-";
-          "XF86AudioPlay" = "exec playerctl play-pause";
-          "XF86AudioNext" = "exec playerctl next";
-          "XF86AudioPrev" = "exec playerctl previous";
-            "${modifier}+o" = "for_window [class=obsidian] scratchpad show";
-        };
-        menu = "kitty --app-id launcher -e sway-launcher-desktop";
-        modifier = "Mod4";
-        output = {
-          DP-1 = {
-            resolution = "3840x2160@30Hz";
-            position = "1280 0";
-            # background = "/home/muhh/Sync/Backgrounds/wald.jpg fill";
-            scale = "1.5";
-          };
-          HDMI-A-1 = {
-            resolution = "1920x1080@60.000Hz";
-            transform = "180";
-            position = "0 0";
-            scale = "1.5";
-            # background = "/home/muhh/Sync/Backgrounds/pfuetze.jpg fill";
-          };
-        };
-        seat = {
-          "*" = {
-            hide_cursor = "5000";
-          };
-        };
-        terminal = "kitty";
-        window = {
-          titlebar = false;
-        };
-        workspaceOutputAssign = 
-          map (x: {
-            workspace = x;
-            output = "DP-1";
-          }) ["1" "2" "3" "4" "5" "6" "7"]
-          ++ map (x: {
-            workspace = x;
-            output = "HDMI-A-1";
-          }) ["8" "9" "10"];
-      };
-      wrapperFeatures.gtk = true;
-    };
-  };
   # catppuccin = {
   #   enable = true;
   #   flavor = "mocha";