pkgs: Add chocolate-doom2xx

home-manager/modules/gui/alacritty-xterm.toml

@@ -1,28 +0,0 @@
-# XTerm's default colors
-
-# Default colors
-[colors.primary]
-background = '#000000'
-foreground = '#ffffff'
-
-# Normal colors
-[colors.normal]
-black   = '#000000'
-red     = '#cd0000'
-green   = '#00cd00'
-yellow  = '#cdcd00'
-blue    = '#0000ee'
-magenta = '#cd00cd'
-cyan    = '#00cdcd'
-white   = '#e5e5e5'
-
-# Bright colors
-[colors.bright]
-black   = '#7f7f7f'
-red     = '#ff0000'
-green   = '#00ff00'
-yellow  = '#ffff00'
-blue    = '#5c5cff'
-magenta = '#ff00ff'
-cyan    = '#00ffff'
-white   = '#ffffff'

home-manager/modules/gui/default.nix

@@ -10,15 +10,6 @@ let
     name = "Monocraft";
     size = 10;
   };
-
-  doomWad = pkgs.fetchurl {
-    url = "https://distro.ibiblio.org/slitaz/sources/packages/d/doom1.wad";
-    hash = "sha256-HX1DvlAeZ9kn5BXguPPinDvzMHXoWXIYFvZSpSbKx3E=";
-  };
-  doomNcurses = pkgs.writeShellScript "doom-ncurses" ''
-    SDL_AUDIODRIVER=null SDL_VIDEODRIVER=caca CACA_DRIVER=ncurses exec ${pkgs.chocolate-doom2xx}/bin/chocolate-doom -iwad ${doomWad}
-  '';
-  lockCmd = "swaylock-plugin --command-each '${pkgs.windowtolayer}/bin/windowtolayer -- alacritty -e ${doomNcurses}'";
 in
 {
   options.my.gui = {
@@ -60,15 +51,7 @@ in
           alacritty = {
             enable = true;
             settings = {
-              import = [ ./alacritty-xterm.toml ];
-
-              font = {
-                size = font.size;
-                normal = {
-                  family = font.name;
-                  style = "Regular";
-                };
-              };
+              font.normal.family = font.name;
             };
           };
 
@@ -82,25 +65,6 @@ in
             };
           };
 
-          termite = {
-            enable = true;
-            font = "${font.name} ${toString font.size}";
-            backgroundColor = "rgba(0, 0, 0, 0.8)";
-          };
-
-          foot = {
-            enable = true;
-            settings = {
-              main = {
-                font = "${font.name}:size=${toString font.size}";
-              };
-              colors = {
-                alpha = 0.8;
-                background = "000000";
-              };
-            };
-          };
-
           helix = {
             enable = true;
             settings = {
@@ -198,7 +162,7 @@ in
                   in
                   lib.mkOptionDefault {
                     "${mod}+d" = null;
-                    "${mod}+l" = "exec ${lockCmd}";
+                    "${mod}+l" = "exec swaylock -i ${./lock.png} -s stretch";
                     "${mod}+x" = "exec ${cfg.menu}";
                     "${mod}+Shift+x" = "exec rofi -show drun";
                     "${mod}+q" = "kill";

nixos/modules/gui.nix

@@ -23,13 +23,13 @@ in
 
     security = {
       polkit.enable = true;
-      pam.services.swaylock-plugin = {};
+      pam.services.swaylock = {};
     };
 
     environment.systemPackages = with pkgs; [
       # for pw-jack
       pipewire.jack
-      swaylock-plugin
+      swaylock
     ];
     services = {
       pipewire = {

pkgs/chocolate-doom2xx.nix

@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     # for documentation
     python3
   ];
-  buildInputs = [ (SDL.override { cacaSupport = true; }) SDL_mixer SDL_net ];
+  buildInputs = [ SDL SDL_mixer SDL_net ];
   enableParallelBuilding = true;
 
   meta = {

pkgs/default.nix

@@ -10,6 +10,4 @@ in
   modrinth-app = callPackage ./modrinth-app { };
   glfw-minecraft = callPackage ./glfw-minecraft { };
   chocolate-doom2xx = callPackage ./chocolate-doom2xx.nix { };
-  windowtolayer = callPackage ./windowtolayer.nix { };
-  swaylock-plugin = callPackage ./swaylock-plugin.nix { };
 }

pkgs/swaylock-plugin.nix

@@ -1,41 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch
-, meson, ninja, pkg-config, scdoc, wayland-scanner
-, wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam
-}:
-
-stdenv.mkDerivation rec {
-  pname = "swaylock-plugin";
-  version = "1dd15b6";
-
-  src = fetchFromGitHub {
-    owner = "mstoeckl";
-    repo = pname;
-    rev = "1dd15b6ecbe91be7a3dc4a0fa9514fb166fb2e07";
-    hash = "sha256-xWyDDT8sXAL58HtA9ifzCenKMmOZquzXZaz3ttGGJuY=";
-  };
-
-  strictDeps = true;
-  depsBuildBuild = [ pkg-config ];
-  nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];
-  buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ];
-
-  mesonFlags = [
-    "-Dpam=enabled" "-Dgdk-pixbuf=enabled" "-Dman-pages=enabled"
-  ];
-  env.NIX_CFLAGS_COMPILE = "-Wno-maybe-uninitialized";
-
-  meta = with lib; {
-    description = "Screen locker for Wayland -- fork with background plugin support";
-    longDescription = ''
-      Fork of swaylock, a screen locking utility for Wayland compositors.
-      With swaylock-plugin, you can for your lockscreen background display
-      the animated output from any wallpaper program that implements the
-      wlr-layer-shell-unstable-v1 protocol.
-    '';
-    inherit (src.meta) homepage;
-    mainProgram = "swaylock";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ devplayer0 ];
-  };
-}

pkgs/windowtolayer.nix

@@ -1,18 +0,0 @@
-{ lib
-, fetchFromGitLab
-, rustPlatform
-}:
-rustPlatform.buildRustPackage rec {
-  pname = "windowtolayer";
-  version = "a5b89c3c";
-
-  src = fetchFromGitLab {
-    domain = "gitlab.freedesktop.org";
-    owner = "mstoeckl";
-    repo = pname;
-    rev = "a5b89c3c047297fd574932860a6c89e9ea02ba5d";
-    hash = "sha256-rssL2XkbTqUvJqfUFhzULeE4/VBzjeBC5iZWSJ8MJ+M=";
-  };
-
-  cargoHash = "sha256-XHmLsx9qdjlBz4xJFFiO24bR9CMw1o5368K+YMpMIBA=";
-}