add sway

modules/home/apps/helpers/ags/default.nix

@@ -27,8 +27,8 @@ with lib.custom; let
     accountsservice
     swww
     gnome.gnome-control-center
-    gnome.nautilus
-    gnome.totem
+    nautilus
+    totem
     loupe
   ];
 

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

@@ -0,0 +1,20 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+with lib;
+with lib.custom; let
+  cfg = config.apps.term.foot;
+in {
+  options.apps.term.foot = with types; {
+    enable = mkBoolOpt false "Enable Foot Terminal";
+  };
+
+  config = mkIf cfg.enable {
+    programs.foot = {
+      enable = true;
+    };
+  };
+}

modules/home/apps/tools/neovim/default.nix

@@ -39,18 +39,13 @@ in {
       defaultEditor = true;
       extraPackages = with pkgs; [
         # Formatters
-        alejandra # Nix
         black # Python
         prettierd # Multi-language
         shfmt
         isort
-        stylua
         rustywind
 
         # LSP
-        lua-language-server
-        nixd
-        rust-analyzer
         vscode-langservers-extracted
         nodePackages.vscode-json-languageserver
         nodePackages.typescript-language-server

modules/home/shells/zsh/aliases.nix

@@ -28,6 +28,16 @@ with pkgs; {
   ls = "${getExe eza} -h --git --icons --color=auto --group-directories-first -s extension";
   tree = "${getExe eza} --tree --icons --tree";
   kys = "shutdown now";
+  w = ''| nvim -c "setlocal buftype=nofile bufhidden=wipe" -c "nnoremap <buffer> q :q!<CR>" -'';
+  lv = "nvim -c \"normal '\''0\"";
+  pf = ''
+    fzf --bind ctrl-y:preview-up,ctrl-e:preview-down \
+    --bind ctrl-b:preview-page-up,ctrl-f:preview-page-down \
+    --bind ctrl-u:preview-half-page-up,ctrl-d:preview-half-page-down \
+    --bind ctrl-k:up,ctrl-j:down \
+    --preview='bat --style=numbers --color=always --line-range :100 {}'
+  '';
+  ff = "for file in \`pf\`; do cmd=\"v \$file\" && print -rs -- \$cmd && eval \$cmd; done";
   gpl = "curl https://www.gnu.org/licenses/gpl-3.0.txt -o LICENSE";
   agpl = "curl https://www.gnu.org/licenses/agpl-3.0.txt -o LICENSE";
   tsm = "transmission-remote";

modules/home/shells/zsh/default.nix

@@ -42,6 +42,7 @@ in {
           "${zsh-autocomplete}/share/zsh-autocomplete/zsh-autocomplete.plugin.zsh"
           "${zsh-you-should-use}/share/zsh/plugins/you-should-use/you-should-use.plugin.zsh"
           "${zsh-navigation-tools}/share/zsh/site-functions/zsh-navigation-tools.plugin.zsh"
+          "${oh-my-zsh}/share/oh-my-zsh/plugins/colored-man-pages/colored-man-pages.plugin.zsh"
         ];
 
         source = map (source: "source ${source}") sources;

modules/home/wms/sway/default.nix

@@ -2,6 +2,7 @@
   lib,
   config,
   pkgs,
+  inputs,
   ...
 }:
 with lib;
@@ -22,7 +23,6 @@ in {
     wayland.windowManager.sway = {
       enable = true;
       xwayland = true;
-      package = pkgs.swayfx;
       extraOptions = ["--unsupported-gpu"];
 
       config = {

modules/nixos/protocols/wayland/default.nix

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

modules/nixos/sites/pterodactyl/default.nix

@@ -45,7 +45,7 @@ in {
 
     systemd.services."p_artisan-run" = {
       script = ''
-        ${pkgs.php}/bin/php /var/www/pterodactyl/artisan schedule:run >> /dev/null 2>&1
+        ${pkgs.php83}/bin/php /var/www/pterodactyl/artisan schedule:run >> /dev/null 2>&1
       '';
       serviceConfig = {
         Type = "oneshot";
@@ -79,7 +79,7 @@ in {
       after = ["redis.service"];
       wantedBy = ["multi-user.target"];
       script = ''
-        ${pkgs.php}/bin/php /var/www/pterodactyl/artisan queue:work --queue=high,standard,low --sleep=3 --tries=3
+        ${pkgs.php83}/bin/php /var/www/pterodactyl/artisan queue:work --queue=high,standard,low --sleep=3 --tries=3
       '';
       serviceConfig = {
         User = "nginx";
@@ -150,20 +150,20 @@ in {
 
     services.phpfpm = {
       phpOptions = ''
-        extension=${pkgs.php81Extensions.openssl}/lib/php/extensions/openssl.so
-        extension=${pkgs.php81Extensions.gd}/lib/php/extensions/gd.so
-        extension=${pkgs.php81Extensions.mysqlnd}/lib/php/extensions/mysqlnd.so
-        extension=${pkgs.php81Extensions.mbstring}/lib/php/extensions/mbstring.so
-        extension=${pkgs.php81Extensions.tokenizer}/lib/php/extensions/tokenizer.so
-        extension=${pkgs.php81Extensions.bcmath}/lib/php/extensions/bcmath.so
-        extension=${pkgs.php81Extensions.xml}/lib/php/extensions/xml.so
-        extension=${pkgs.php81Extensions.dom}/lib/php/extensions/dom.so
-        extension=${pkgs.php81Extensions.curl}/lib/php/extensions/curl.so
-        extension=${pkgs.php81Extensions.zip}/lib/php/extensions/zip.so
+        extension=${pkgs.php83Extensions.openssl}/lib/php/extensions/openssl.so
+        extension=${pkgs.php83Extensions.gd}/lib/php/extensions/gd.so
+        extension=${pkgs.php83Extensions.mysqlnd}/lib/php/extensions/mysqlnd.so
+        extension=${pkgs.php83Extensions.mbstring}/lib/php/extensions/mbstring.so
+        extension=${pkgs.php83Extensions.tokenizer}/lib/php/extensions/tokenizer.so
+        extension=${pkgs.php83Extensions.bcmath}/lib/php/extensions/bcmath.so
+        extension=${pkgs.php83Extensions.xml}/lib/php/extensions/xml.so
+        extension=${pkgs.php83Extensions.dom}/lib/php/extensions/dom.so
+        extension=${pkgs.php83Extensions.curl}/lib/php/extensions/curl.so
+        extension=${pkgs.php83Extensions.zip}/lib/php/extensions/zip.so
       '';
       pools.pterodactyl = {
         user = config.services.nginx.user;
-        phpPackage = pkgs.php81;
+        phpPackage = pkgs.php83;
         settings = {
           "pm" = "dynamic";
           "listen.owner" = config.services.nginx.user;