chore(msyds): enable zathura

해결 #5

hosts/sydpc/configuration.nix

@@ -19,7 +19,7 @@
     slippi.enable = true;
     niri.enable = true;
     stylix.enable = true;
-    qemu.enable = true;
+    # qemu.enable = true;
     flatpak.enable = true;
     gtav-battleye-hack.enable = true;
     # gdm.enable = true;

modules/home/clojure.nix

@@ -9,6 +9,7 @@ in {
   config = lib.mkIf cfg.enable {
     sydnix.impermanence.cache.directories = [
       ".m2" # Clojure dependencies.
+      ".gitlibs"
     ];
   };
 }

modules/home/users/crumb/niri.nix

@@ -9,14 +9,6 @@ in {
       type = lib.types.nullOr lib.types.path;
       default = config.stylix.image;
     };
-    # xwayland-satellite implements rootless Xwayland in a separate application,
-    # without the host compositor's involvement. It makes X11 windows appear as
-    # normal windows, just like a native Xwayland integration. While it is still
-    # somewhat experimental, it handles a lot of applications correctly, like
-    # Steam, games and Discord.
-    xwayland-satellite.enable =
-      lib.mkEnableOption "xwayland-satellite starting with Niri"
-        // { default = true; };
     polkit.enable =
       lib.mkEnableOption "Niri/Gnome Polkit" // { default = true; };
     swaylock.enable =
@@ -67,26 +59,17 @@ in {
     stylix.targets.swaylock.enable = cfg.swaylock.enable;
 
     services.polkit-gnome.enable = cfg.polkit.enable;
+    sydnix.xwayland-satellite.enable = lib.mkDefault true;
 
     # File-picker.
     home.packages = [ pkgs.nautilus ];
 
-    systemd.user.services.xwayland-satellite =
-      lib.mkIf cfg.xwayland-satellite.enable {
-        Service.ExecStart =
-          ["${pkgs.xwayland-satellite}/bin/xwayland-satellite"];
-        Unit.After = ["niri.service"];
-        Unit.PartOf = ["niri.service"];
-        Install.WantedBy = ["niri.service"];
-      };
-
     programs.niri = {
       settings = {
         # Activates some Nixpkgs patches to help run Electron applications under
         # Wayland.
 	environment = {
 	  NIXOS_OZONE_WL = "1";
-	  DISPLAY = ":0";
 	  XDG_CURRENT_DESKTOP = "niri";
 	  QT_QPA_PLATFORM = "wayland";
 	  ELECTRON_OZONE_PLATFORM_HINT = "auto";

modules/home/users/crumb/tf2/my-config/cfg/overrides/autoexec.cfg

@@ -3,3 +3,7 @@ exec loadouts/init
 exec overrides/binds.cfg
 exec overrides/settings.cfg
 
+con_logfile console.log
+ip 0.0.0.0
+rcon_password monitor
+net_start

modules/home/users/msyds/emacs/init.el

@@ -67,4 +67,6 @@
     syd/grammatical-framework
     syd/tabs
     syd/lsp
-    syd/custom))
+    syd/custom
+    syd/transient
+    syd/bookmark))

modules/home/users/msyds/emacs/lisp/syd/bookmark.el

@@ -0,0 +1,10 @@
+;;; -*- lexical-binding: t; -*-
+
+(require 'syd/base)
+
+(use-package bookmark
+  :straight nil
+  :custom ((bookmark-default-file
+            (file-name-concat syd-data-dir "bookmarks"))))
+
+(provide 'syd/bookmark)

modules/home/users/msyds/emacs/lisp/syd/keymaps.el

@@ -69,7 +69,8 @@
 (general-def
   :prefix-map 'syd-leader-insert-map
   "u" #'insert-char
-  "e" #'emoji-insert)
+  "e" #'emoji-insert
+  "p" #'syd-insert-file-name)
 
 ;; This is necessary to properly rebind `universal-argument'.
 ;; `universal-argument-more' is a command that provides additional prefixes

modules/home/users/msyds/emacs/lisp/syd/prelude.el

@@ -193,4 +193,55 @@ form."
 	 (cons mode (intern (concat (match-string 1 s) "-ts-mode"))))
       (error "Symbol `%c' is not a mode." mode))))
 
+(defun syd--insert-file-name-annotation (x)
+  (concat
+   " "
+   (propertize " " 'display `(space :align-to (- right ,(+ 1 (length x)))))
+   x))
+
+(defun syd-insert-file-name ()
+  (interactive)
+  (let* ((path (read-file-name "Path: " nil nil 'confirm))
+         (proj-root (project-root (project-current)))
+         (alts
+          `((,(file-relative-name path proj-root) . "Project-relative")
+            (,(file-relative-name path default-directory) . "File-relative")
+            (,path . "Absolute")
+            ("... (choose a dir)")))
+         (choice
+          (completing-read
+           "Variant: "
+           (lambda (s p flag)
+             (pcase flag
+               ('metadata
+                `(metadata
+                  (annotation-function
+                   . ,(lambda (s)
+                        (when-let* ((desc (cdr (assoc s alts))))
+                          (syd--insert-file-name-annotation
+                           desc))))))
+               (_ (all-completions s (mapcar #'car alts) p)))))))
+    (if (equal choice "... (choose a root)")
+        (insert (file-relative-name
+                 path (read-file-name "Relative to: " nil nil
+                                      'confirm)))
+      (insert choice))))
+
+(defun syd-import-systemd-environment ()
+  (interactive)
+  (with-temp-buffer
+    (shell-command "systemctl --user show-environment" (current-buffer))
+    (goto-char (point-min))
+    (while (re-search-forward
+            (rx bol (group (+ (not "=")))
+                "="
+                (or (and "$'" (group (* (not "'"))) "'")
+                    (group (* any)))
+                eol)
+            nil t)
+      (let ((var (match-string 1))
+            (val (or (match-string 2)
+                     (match-string 3))))
+        (setenv var val)))))
+
 (provide 'syd/prelude)

modules/home/users/msyds/emacs/lisp/syd/transient.el

@@ -0,0 +1,10 @@
+;;; -*- lexical-binding: t; -*-
+
+(require 'syd/base)
+
+(use-package transient
+  :straight nil
+  :custom ((transient-history-file
+            (file-name-concat syd-data-dir "transient/history.el"))))
+
+(provide 'syd/transient)

modules/home/users/msyds/zathura.nix

@@ -0,0 +1,14 @@
+{ config, lib, pkgs, ... }:
+
+let cfg = config.sydnix.users.msyds.zathura;
+in {
+  options.sydnix.users.msyds.zathura = {
+    enable = lib.mkEnableOption "Zathura";
+  };
+
+  config = lib.mkIf cfg.enable {
+    programs.zathura = {
+      enable = true;
+    };
+  };
+}

modules/home/xwayland-satellite.nix

@@ -0,0 +1,38 @@
+{ config, lib, pkgs, ... }:
+
+let cfg = config.sydnix.xwayland-satellite;
+in {
+  options.sydnix.xwayland-satellite = {
+    # xwayland-satellite implements rootless Xwayland in a separate
+    # application, without the host compositor's involvement. It makes
+    # X11 windows appear as normal windows, just like a native
+    # Xwayland integration. While it is still somewhat experimental,
+    # it handles a lot of applications correctly, like Steam, games
+    # and Discord.
+    enable = lib.mkEnableOption "XWayland outside your Wayland";
+  };
+
+  config = lib.mkIf cfg.enable {
+    systemd.user.services.xwayland-satellite =
+      let xwayland-satellite =
+        pkgs.xwayland-satellite.override { withSystemd = true; };
+      in {
+        Unit = {
+          Description = "Xwayland outside your Wayland";
+          BindsTo = [ "graphical-session.target" ];
+          PartOf = [ "graphical-session.target" ];
+          After = [ "graphical-session.target" ];
+          Requisite = [ "graphical-session.target" ];
+        };
+        Service = {
+          Type = "notify";
+          NotifyAccess = "all";
+          ExecStart = lib.getExe xwayland-satellite;
+          StandardOutput = "journal";
+          ExecStartPost = "systemctl --user set-environment DISPLAY=:0";
+          ExecStop = "systemctl --user unset-environment DISPLAY";
+        };
+        Install.WantedBy = [ "graphical-session.target" ];
+      };
+  };
+}

modules/nixos/dank-material-shell.nix

@@ -12,6 +12,13 @@ in {
       enableDynamicTheming = false;
     };
 
+    # Start after xwayland-satellite, if possible.  So DMS can start
+    # with the DISPLAY env var set.
+    systemd.user.services.dms = {
+      wants = ["xwayland-satellite.service"];
+      after = ["xwayland-satellite.service"];
+    };
+
     services.displayManager.dms-greeter = {
       enable = true;
       compositor.name = assert config.sydnix.niri.enable; "niri";

users/msyds/default.nix

@@ -48,6 +48,7 @@
         toki-pona.enable = true;
         prism-launcher.enable = on "sydpc";
         flatpak.enable = on "sydpc";
+        drawing-tablet.enable = on "sydpc";
         sops = {
           enable = true;
           keyFile = "/persist/private-keys/age/crumb";
@@ -66,6 +67,7 @@
           fcitx5.enable = true;
           anki.enable = true;
           mumble.enable = true;
+          rnote.enable = on "sydpc";
         };
         users.msyds = {
 	  discord.enable = true;
@@ -76,7 +78,8 @@
           syncthing.enable = true;
           fonts.enable = true;
 	  dank-material-shell.enable = true;
-	  sioyek.enable = true;
+	  sioyek.enable = on "fruitbook";
+          zathura.enable = on "sydpc";
         };
       };