fix(emacs): haskell cache

해결 #5

hosts/sydpc/configuration.nix

@@ -10,6 +10,8 @@
     v4l2loopback
   ];
 
+  programs.dconf.enable = true;
+
   sydnix = {
     filesystemType = "btrfs";
     wifi.enable = true;
@@ -19,7 +21,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/easyeffects.nix

@@ -0,0 +1,22 @@
+{ config, lib, pkgs, osConfig, ... }:
+
+let cfg = config.sydnix.easyeffects;
+in {
+  options.sydnix.easyeffects = {
+    enable = lib.mkEnableOption "Easyeffects";
+  };
+
+  config = lib.mkIf cfg.enable {
+    services.easyeffects = {
+      enable = true;
+      extraPresets.thanks-ash =
+        builtins.fromJSON
+          (builtins.readFile ./easyeffects/thanks-ash.json);
+    };
+
+    warnings = lib.optional (!osConfig.programs.dconf.enable) ''
+      Easyeffects requires services.dconf.enable = true in the NixOS
+      config.
+    '';
+  };
+}

modules/home/easyeffects/thanks-ash.json

@@ -0,0 +1,777 @@
+{
+    "input": {
+        "blocklist": [],
+        "equalizer#0": {
+            "balance": 0.0,
+            "bypass": false,
+            "input-gain": 0.0,
+            "left": {
+                "band0": {
+                    "frequency": 22.4,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band1": {
+                    "frequency": 27.8,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band10": {
+                    "frequency": 194.06,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band11": {
+                    "frequency": 240.81,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band12": {
+                    "frequency": 298.834,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band13": {
+                    "frequency": 370.834,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band14": {
+                    "frequency": 460.182,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band15": {
+                    "frequency": 571.057,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band16": {
+                    "frequency": 708.647,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band17": {
+                    "frequency": 879.387,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band18": {
+                    "frequency": 1091.26,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band19": {
+                    "frequency": 1354.19,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band2": {
+                    "frequency": 34.51,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band20": {
+                    "frequency": 1680.47,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band21": {
+                    "frequency": 2085.35,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band22": {
+                    "frequency": 2587.79,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band23": {
+                    "frequency": 3211.29,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band24": {
+                    "frequency": 3985.01,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band25": {
+                    "frequency": 4945.15,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band26": {
+                    "frequency": 6136.63,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band27": {
+                    "frequency": 7615.17,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band28": {
+                    "frequency": 9449.96,
+                    "gain": 0.05000000000000426,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band29": {
+                    "frequency": 11726.8,
+                    "gain": -0.5300000000000011,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band3": {
+                    "frequency": 42.82,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band30": {
+                    "frequency": 14552.2,
+                    "gain": -22.29,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band31": {
+                    "frequency": 18058.4,
+                    "gain": -36.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band4": {
+                    "frequency": 53.14,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band5": {
+                    "frequency": 65.95,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band6": {
+                    "frequency": 81.83,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band7": {
+                    "frequency": 101.55,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band8": {
+                    "frequency": 126.0,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band9": {
+                    "frequency": 156.38,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                }
+            },
+            "mode": "IIR",
+            "num-bands": 32,
+            "output-gain": 0.0,
+            "pitch-left": 0.0,
+            "pitch-right": 0.0,
+            "right": {
+                "band0": {
+                    "frequency": 22.4,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band1": {
+                    "frequency": 27.8,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band10": {
+                    "frequency": 194.06,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band11": {
+                    "frequency": 240.81,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band12": {
+                    "frequency": 298.834,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band13": {
+                    "frequency": 370.834,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band14": {
+                    "frequency": 460.182,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band15": {
+                    "frequency": 571.057,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band16": {
+                    "frequency": 708.647,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band17": {
+                    "frequency": 879.387,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band18": {
+                    "frequency": 1091.26,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band19": {
+                    "frequency": 1354.19,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band2": {
+                    "frequency": 34.51,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band20": {
+                    "frequency": 1680.47,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band21": {
+                    "frequency": 2085.35,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band22": {
+                    "frequency": 2587.79,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band23": {
+                    "frequency": 3211.29,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band24": {
+                    "frequency": 3985.01,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band25": {
+                    "frequency": 4945.15,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band26": {
+                    "frequency": 6136.63,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band27": {
+                    "frequency": 7615.17,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band28": {
+                    "frequency": 9449.96,
+                    "gain": 0.05000000000000426,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band29": {
+                    "frequency": 11726.8,
+                    "gain": -0.5300000000000011,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band3": {
+                    "frequency": 42.82,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band30": {
+                    "frequency": 14552.2,
+                    "gain": -22.29,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band31": {
+                    "frequency": 18058.4,
+                    "gain": -36.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band4": {
+                    "frequency": 53.14,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band5": {
+                    "frequency": 65.95,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band6": {
+                    "frequency": 81.83,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band7": {
+                    "frequency": 101.55,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band8": {
+                    "frequency": 126.0,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                },
+                "band9": {
+                    "frequency": 156.38,
+                    "gain": 0.0,
+                    "mode": "RLC (BT)",
+                    "mute": false,
+                    "q": 4.36,
+                    "slope": "x1",
+                    "solo": false,
+                    "type": "Bell",
+                    "width": 4.0
+                }
+            },
+            "split-channels": false
+        },
+        "gate#0": {
+            "attack": 5.0,
+            "bypass": false,
+            "curve-threshold": -30.0,
+            "curve-zone": -6.0,
+            "dry": -80.01,
+            "hpf-frequency": 10.0,
+            "hpf-mode": "Off",
+            "hysteresis": false,
+            "hysteresis-threshold": -12.0,
+            "hysteresis-zone": -6.0,
+            "input-gain": 0.0,
+            "input-to-link": 0.0,
+            "input-to-sidechain": 0.0,
+            "link-to-input": 0.0,
+            "link-to-sidechain": 0.0,
+            "lpf-frequency": 20000.0,
+            "lpf-mode": "Off",
+            "makeup": 0.0,
+            "output-gain": 0.0,
+            "reduction": -24.0,
+            "release": 250.0,
+            "sidechain": {
+                "lookahead": 0.0,
+                "mode": "Peak",
+                "preamp": 0.0,
+                "reactivity": 10.0,
+                "source": "Middle",
+                "stereo-split-source": "Left/Right",
+                "type": "Internal"
+            },
+            "sidechain-to-input": 0.0,
+            "sidechain-to-link": 0.0,
+            "stereo-split": false,
+            "wet": 0.0
+        },
+        "loudness#0": {
+            "bypass": false,
+            "clipping": false,
+            "clipping-range": 6.0,
+            "fft": "4096",
+            "iir-approximation": "Normal",
+            "input-gain": 0.0,
+            "mode": "FFT",
+            "output-gain": 0.0,
+            "std": "ISO226-2023",
+            "volume": 7.0
+        },
+        "plugins_order": [
+            "gate#0",
+            "equalizer#0",
+            "loudness#0"
+        ]
+    }
+}

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,8 @@
     syd/grammatical-framework
     syd/tabs
     syd/lsp
-    syd/custom))
+    syd/custom
+    syd/transient
+    syd/bookmark
+    syd/haskell
+    syd/qbe))

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/clojure.el

@@ -21,21 +21,38 @@
 (use-package cider
   :after clojure-mode
   :config
+
   (defun syd-clojure-doc (arg)
     (interactive "P")
     (cider-doc arg)
     cider-doc-buffer)
+
   (defun syd-clojure-eval-region (beg end)
     (cider-eval-region beg end))
+
   (syd-handle '(clojure-mode clojurescript-mode cider-repl-mode)
     :docs #'cider-doc
     :eval-region #'syd-clojure-eval-region
     :load-buffer #'cider-load-buffer)
+
   (add-hook 'cider-repl-mode-hook #'syd-lisp-mode)
+
   (syd-push shackle-rules
-      `("*cider-doc*" ,@syd-help-popup-options)
+            `("*cider-doc*" ,@syd-help-popup-options)
-      '("*cider-test-report*")
+            '("*cider-test-report*")
-      '("*cider-error*")))
+            '("*cider-error*"))
+
+  (defun syd-clojure-classpath-relative-file-name (file-name)
+    (when (and cider-mode (cider-nrepl-eval-session))
+      (let ((prefixes (-filter #'file-directory-p
+                               (cider-classpath-entries))))
+        (cl-loop for classpath-entry in prefixes
+                 for prefix = (file-name-as-directory classpath-entry)
+                 when (string-prefix-p prefix file-name)
+                 return (string-remove-prefix prefix file-name)))))
+  (add-to-list 'syd-insert-file-name-alist
+               `(,#'syd-clojure-classpath-relative-file-name
+                 . "Classpath-relative")))
 
 (use-package cider-mode
   :straight nil        ; Part of `cider'.
@@ -116,6 +133,9 @@
 
 (use-package clj-refactor
   :config
-  (add-hook 'clojure-mode-hook #'syd-clojure--setup-clj-refactor))
+  (add-hook 'clojure-mode-hook #'syd-clojure--setup-clj-refactor)
+  (dolist (x '(("p" . "babashka.process")
+               ("fs" . "babashka.fs")))
+    (add-to-list 'cljr-magic-require-namespaces x)))
 
 (provide 'syd/clojure)

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

@@ -0,0 +1,65 @@
+;; -*- lexical-binding: t; -*-
+(require 'syd/base)
+(require 'syd/handle)
+
+(defun syd-haskell-open-repl ()
+  "Open a Haskell REPL."
+  (interactive)
+  (require 'inf-haskell)
+  (run-haskell))
+
+(defun syd-haskell-evil-open-above ()
+  "Opens a line above the current, following Haskell-mode's indentation"
+  (interactive)
+  (evil-beginning-of-line)
+  (haskell-indentation-newline-and-indent)
+  (evil-previous-line)
+  (haskell-indentation-indent-line)
+  (evil-append-line nil))
+
+(defun syd-haskell-evil-open-below ()
+  "Opens a line below the current, following Haskell-mode's indentation"
+  (interactive)
+  (evil-append-line nil)
+  (haskell-indentation-newline-and-indent))
+
+(defun syd-haskell-hoogle-start-server ()
+  (interactive)
+  (haskell-hoogle-start-server)
+  (message "Hoogle started on localhost:%d" haskell-hoogle-port-number))
+
+(use-package haskell-mode
+  :mode (("\\.l?hs'" . haskell-literate-mode)
+         ("\\.hs'" . haskell-mode))
+  :custom (; Show errors in REPL, not popup buffers.
+           (haskell-interactive-popup-errors nil)
+           (haskell-process-suggest-remove-import-line t)
+           (haskell-process-auto-import-loaded-modules t))
+  :general
+  (:keymaps 'haskell-mode-map
+   :states '(normal visual motion emacs insert)
+   :major-modes t
+   :prefix syd-localleader-key
+   :non-normal-prefix syd-alt-localleader-key
+   "c" #'haskell-cabal-visit-file
+   "h s" #'syd-haskell-hoogle-start-server
+   "h q" #'haskell-hoogle-kill-server)
+  (:keymaps 'interactive-haskell-mode-map
+   :states '(normal insert)
+   "C-j" #'haskell-interactive-mode-history-next
+   "C-k" #'haskell-interactive-mode-history-previous)
+  (:keymaps 'haskell-mode-map
+   :states 'normal
+   [remap evil-open-above] #'syd-haskell-evil-open-above
+   [remap evil-open-below] #'syd-haskell-evil-open-below)
+  :config
+  (add-to-list 'completion-ignored-extensions ".hi"))
+
+(use-package lsp-haskell
+  :defer t
+  :custom ((lsp-haskell-server-path "haskell-language-server"))
+  :init
+  (add-hook 'haskell-mode-hook #'lsp-deferred 'append)
+  (add-hook 'haskell-literate-mode-hook #'lsp-deferred 'append))
+
+(provide 'syd/haskell)

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/lsp.el

@@ -2,6 +2,7 @@
 
 (require 'syd/base)
 (require 'syd/popups)
+(require 'syd/handle)
 
 (use-package lsp-mode
   :init
@@ -35,6 +36,12 @@
   (syd-push
    shackle-rules
    `(("*lsp-help*" "*lsp-install*")
-     ,@syd-help-popup-options)))
+     :select nil :size 0.42 :popup t :align bottom))
+  (defun syd-lsp-handle-docs ()
+    (interactive)
+    (lsp-describe-thing-at-point)
+    (get-buffer "*lsp-help*"))
+  (syd-handle 'lsp-mode
+    :docs #'syd-lsp-handle-docs)))
 
 (provide 'syd/lsp)

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

@@ -193,4 +193,74 @@ 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 (descs)
+  (when descs
+    (let ((s (string-join descs ", ")))
+      (concat
+       " "
+       (propertize " " 'display `(space :align-to (- right ,(+ 1 (length s)))))
+       s))))
+
+(defun syd-project-relative-file-name (file-name)
+  (file-relative-name file-name (project-root (project-current))))
+
+(defvar syd-insert-file-name-alist
+  `((,#'syd-project-relative-file-name . "Project-relative")
+    (,#'file-relative-name . "File-relative")
+    (,#'identity . "Absolute"))
+  "List of pairs where each cons is a function mapping paths to paths
+  or nil, and each cons is a string description.")
+
+(defun syd--evaluate-syd-insert-file-name-alist (path)
+  (cl-loop for (fn . lbl) in syd-insert-file-name-alist
+           for r = (funcall fn path)
+           when r
+           collect (cons r lbl)))
+
+(defun syd-insert-file-name ()
+  (interactive)
+  (let* ((path (expand-file-name
+                (read-file-name "Path: " nil nil 'confirm)))
+         (choose-a-dir "... (choose a dir)")
+         (alts (cons `(,choose-a-dir)
+                     (syd--evaluate-syd-insert-file-name-alist path)))
+         (choice
+          (completing-read
+           "Variant: "
+           (lambda (s p flag)
+             (pcase flag
+               ('metadata
+                `(metadata
+                  (annotation-function
+                   . ,(lambda (s)
+                        (let ((descs
+                               (cl-loop for (p . lbl) in alts
+                                        when (equal p s)
+                                        collect lbl)))
+                          (syd--insert-file-name-annotation
+                           descs))))))
+               (_ (all-completions s (mapcar #'car alts) p)))))))
+    (if (equal choice choose-a-dir)
+        (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/qbe.el

@@ -0,0 +1,12 @@
+;; -*- lexical-binding: t; -*-
+(require 'syd/base)
+
+(use-package qbe-mode
+  :mode "\\.qbe\\'"
+  :straight (:type git
+             :host github
+             :repo "mbknust/qbe-mode")
+  :config
+  (add-hook 'qbe-mode-hook #'indent-tabs-mode))
+
+(provide 'syd/qbe)

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";

modules/nixos/nixpkgs.nix

@@ -22,11 +22,13 @@ in {
           "https://nix-community.cachix.org"
           "https://cache.nixos.org"
           "https://cache.iog.io"
+          "https://cache.zw3rk.com"
         ];
         trusted-public-keys = [
           (builtins.readFile ../../public-keys/deertopia-cache.pub.pem)
           "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
           "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
+          "loony-tools:pr9m4BkM/5/eSTZlkQyRt57Jz7OMBxNSUiMC4FkcNfk="
         ];
       };
     };

users/msyds/default.nix

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