format code

flake.nix

@@ -28,10 +28,6 @@
     };
 
     # Various flakes
-    alacritty-theme = {
-      url = "github:alacritty/alacritty-theme";
-      flake = false;
-    };
     yazi-flavors = {
       url = "github:yazi-rs/flavors";
       flake = false;

homes/julian/aspi.nix

@@ -8,6 +8,7 @@
     ./features/neovim
     ./features/ghostty
     ./features/wezterm
+    ./features/alacritty
     ./features/yazi
     ./features/emacs
 
@@ -20,7 +21,7 @@
 
   hostName = "aspi";
   is-nixos = true;
-  terminal = "ghostty";
+  terminal = "alacritty";
 
   #  -------   ----------
   # | eDP-1 | | HDMI-A-1 |

homes/julian/features/alacritty/alacritty.toml

@@ -1,3 +0,0 @@
-import = [
-    "~/.config/alacritty/theme/themes/smoooooth.toml"
-]

homes/julian/features/alacritty/default.nix

@@ -1,15 +1,12 @@
 {
   lib,
-  pkgs,
-  inputs,
   config,
   ...
 }: {
-  home.packages = with pkgs; [alacritty];
-
-  home.file = {
-    ".config/alacritty/theme".source = "${inputs.alacritty-theme}";
-    ".config/alacritty/alacritty.toml".source = ./alacritty.toml;
+  programs.alacritty = {
+    enable = true;
+    settings = {};
+    theme = "smoooooth";
   };
 
   home.sessionVariables.TERMINAL = lib.mkIf (config.terminal == "alacritty") "alacritty";

homes/julian/features/ghostty/default.nix

@@ -9,7 +9,6 @@
     settings = {
       theme = "catppuccin-mocha";
       font-size = 12;
-      font-family = "DejaVu Sans";
     };
   };
 

homes/julian/features/hyprland/default.nix

@@ -48,23 +48,21 @@ in {
     wf-recorder
     wl-clipboard
 
-    (pkgs.writeShellScriptBin
-      "toggle-screen-mirroring"
-      (builtins.readFile
-        ./toggle-screen-mirroring.sh))
+    (pkgs.writeShellScriptBin "toggle-screen-mirroring" (
+      builtins.readFile ./toggle-screen-mirroring.sh
+    ))
 
-    (
-      pkgs.writeShellScriptBin
-      "correct-workspace-locations"
-      (
-        lib.concatStringsSep "\n"
-        (
-          builtins.concatLists (
-            map (monitor: map (ws: "hyprctl dispatch moveworkspacetomonitor ${ws} ${monitor.name}") monitor.workspaces) config.monitors
+    (pkgs.writeShellScriptBin "correct-workspace-locations" (
+      lib.concatStringsSep "\n" (
+        builtins.concatLists (
+          map (
+            monitor:
+              map (ws: "hyprctl dispatch moveworkspacetomonitor ${ws} ${monitor.name}") monitor.workspaces
           )
+          config.monitors
         )
       )
-    )
+    ))
   ];
 
   services.cliphist = {
@@ -157,6 +155,9 @@ in {
     settings = {
       "$mod" = "SUPER";
 
+      # Environment variables programs like emacs have access to
+      env = "TERMINAL,${config.terminal}";
+
       # Monitors
       monitor = ",preferred,auto,1";
 
@@ -280,7 +281,7 @@ in {
           # opening applications
           "$mod, D, exec, wofi --show drun,run"
           "$mod, E, exec, pcmanfm"
-          "$mod, Return, exec, ghostty"
+          "$mod, Return, exec, ${config.terminal}"
           "$mod, B, exec, firefox"
           "$mod, C, exec, qalculate-gtk"
 

homes/julian/features/neovim/default.nix

@@ -151,6 +151,7 @@
           pyright.enable = true;
           dockerls.enable = true;
           lua_ls.enable = true;
+          clangd.enable = true;
         };
       };
     };

hosts/aspi/default.nix

@@ -4,6 +4,7 @@
 
     ../common/global
     ../common/users/julian
+    ../common/optional/binarycaches.nix
 
     ../common/optional/remote-builder.nix
     ../common/optional/boot-efi.nix

hosts/builder/default.nix

@@ -30,8 +30,12 @@
     substituters = [
       "https://nix-community.cachix.org"
       "https://cache.nixos.org/"
+      "https://hyprland.cachix.org"
+    ];
+    trusted-public-keys = [
+      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
     ];
-    trusted-public-keys = ["nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="];
 
     trusted-users = ["nix"];
     max-jobs = "auto";

hosts/common/global/nix.nix

@@ -26,26 +26,6 @@
   ];
   # warn-dirty = false;
 
-  # Setup binary caches
-  nix.settings = {
-    substituters = [
-      "https://nix-community.cachix.org"
-      "https://cache.nixos.org/"
-      "https://hyprland.cachix.org"
-      "http://binarycache.julian-mutter.de"
-    ];
-    trusted-public-keys = [
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-      "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
-      "binarycache.julian-mutter.de:oJ67uRFwRhNPKL58CHzy3QQLv38Kx7OA1K+6xlEPu7E="
-    ];
-
-    trusted-users = [
-      "root"
-      "@wheel"
-    ]; # needed for devenv to add custom caches
-  };
-
   nix.gc = {
     automatic = true;
     dates = "weekly";

hosts/common/optional/binarycaches.nix

@@ -0,0 +1,25 @@
+{
+  lib,
+  outputs,
+  ...
+}: {
+  # Setup binary caches
+  nix.settings = {
+    substituters = [
+      "https://nix-community.cachix.org"
+      "https://cache.nixos.org/"
+      "https://hyprland.cachix.org"
+      "http://binarycache.julian-mutter.de"
+    ];
+    trusted-public-keys = [
+      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
+      "binarycache.julian-mutter.de:oJ67uRFwRhNPKL58CHzy3QQLv38Kx7OA1K+6xlEPu7E="
+    ];
+
+    trusted-users = [
+      "root"
+      "@wheel"
+    ]; # needed for devenv to add custom caches
+  };
+}

hosts/kardorf/default.nix

@@ -5,6 +5,7 @@
     ../common/global
     ../common/users/julian
     ../common/users/wolfi
+    ../common/optional/binarycaches.nix
 
     ../common/optional/xserver.nix
     ../common/optional/remote-builder.nix

hosts/pianonix/default.nix

@@ -15,6 +15,7 @@
 
     ../common/global
     ../common/users/julian
+    ../common/optional/binarycaches.nix
 
     ../common/optional/pipewire.nix
     ../common/optional/remote-builder.nix

modules/home-manager/terminal.nix

@@ -1,9 +1,4 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: {
+{lib, ...}: {
   options.terminal = lib.mkOption {
     type = lib.types.str;
     example = "alacritty";

pkgs/open-messaging/default.nix

@@ -20,7 +20,7 @@ writeShellApplication {
     sleep 0.1
     nheko &
     sleep 0.1
-    telegram-desktop &
+    Telegram &
     sleep 0.1
     discord &
   '';