Changes to Aloria config

home/Aloria.nix

@@ -11,6 +11,9 @@
         distrobox
         gnome-disk-utility
         moonlight-qt
+        vscode
+        texliveFull
+        zed-editor
     ];
 
     services.hyprpaper = {
@@ -25,7 +28,7 @@
     };
 
     # wayland.windowManager.hyprland.settings.env = ["WLR_DRM_DEVICES,/dev/dri/by-path/pci-0000:01:00.0-card"]; # Nvidia
-    wayland.windowManager.hyprland.settings.env = ["WLR_DRM_DEVICES,/dev/dri/by-path/pci-0000:00:02.0-card"]; # Intel
+    # wayland.windowManager.hyprland.settings.env = ["WLR_DRM_DEVICES,/dev/dri/by-path/pci-0000:00:02.0-card"]; # Intel
     wayland.windowManager.hyprland.settings = {
         exec-once = [
             "${pkgs.swaylock-fancy}/bin/swaylock-fancy"
@@ -44,7 +47,8 @@
         general.gaps_out = 1;
     };
 
-    programs.alacritty.settings.font.size = 13;
+    programs.alacritty.settings.font.size = 12;
+    programs.kitty.font.size = 12;
     programs.zsh.initExtra = pkgs.lib.mkForce ''
       LOCAL_SEARCH_DIRS=(~/.dotfiles/)
       REMOTE_SEARCH_DIRS=( ~/Workspace)

home/alacritty/default.nix

@@ -42,19 +42,19 @@
             font = {
                 size = pkgs.lib.mkDefault 15;
                 bold = {
-                    family = "Iosevka Extended";
+                    family = "FiraCode Nerd Font";
                     style = "Bold";
                 };
                 bold_italic = {
-                    family = "Iosevka Extended";
+                    family = "FiraCode Nerd Font";
                     style = "Bold Italic";
                 };
                 italic = {
-                    family = "Iosevka Extended";
+                    family = "FiraCode Nerd Font";
                     style = "Italic";
                 };
                 normal = {
-                    family = "Iosevka Extended";
+                    family = "FiraCode Nerd Font";
                     style = "Regular";
                 };
             };

home/hyprland/default.nix

@@ -5,7 +5,8 @@ let
     nautilus = "${pkgs.nautilus}/bin/nautilus";
     gnome-calendar = "${pkgs.gnome-calendar}/bin/gnome-calendar";
     wpctl = "${pkgs.wireplumber}/bin/wpctl";
-    alacritty = "${pkgs.alacritty}/bin/alacritty";
+    terminal-name = ".kitty-wrapped";
+    terminal = "${pkgs.kitty}/bin/kitty";
     swaylock = "${pkgs.swaylock-fancy}/bin/swaylock-fancy";
     rofi = "${pkgs.rofi}/bin/rofi";
     jq = "${pkgs.jq}/bin/jq";
@@ -25,7 +26,7 @@ let
     # workspace_command_prefix = "";
     # hyprland_plugins = [];
 
-    launch_alacritty = pkgs.writeShellScriptBin "launch_alacritty" ''
+    launch_terminal = pkgs.writeShellScriptBin "launch_terminal" ''
         function find_leaf_pid(){
             local PID=$1
             local CHILD_PID=$(pgrep -P "$PID")
@@ -50,21 +51,21 @@ let
                 CLIENT=$(echo "$SSH_COMMAND" | awk '{ print $5 }')
                 PREVIOUS_SESSION_ID=$(grep -z "SSH_SESSION_ID" "/proc/$LEAF_PID/environ" | xargs -0 -n 1 | grep -oP "[0-9]*")
                 SSH_SESSION_ID=$RANDOM
-                ${alacritty} -e zsh -c "SSH_SESSION_ID=$SSH_SESSION_ID waypipe ssh -t \"$CLIENT\" env SSH_SESSION_ID=\"$SSH_SESSION_ID\" PREVIOUS_SESSION_ID=\"$PREVIOUS_SESSION_ID\" \"zsh --login\""
+                ${terminal} -e zsh -c "SSH_SESSION_ID=$SSH_SESSION_ID waypipe ssh -t \"$CLIENT\" env SSH_SESSION_ID=\"$SSH_SESSION_ID\" PREVIOUS_SESSION_ID=\"$PREVIOUS_SESSION_ID\" \"zsh --login\""
             else
-                ${alacritty} -e zsh -c "ssh -t \"$(echo "$SSH_COMMAND" | awk '{ print $2 }')\""
+                ${terminal} -e zsh -c "ssh -t \"$(echo "$SSH_COMMAND" | awk '{ print $2 }')\""
             fi
 
         else # Not an ssh session
-            if [ "$(ps -p "$1" -o comm=)" == "alacritty" ]; then
+            if [ "$(ps -p "$1" -o comm=)" == "${terminal-name}" ]; then
                 CWD=$(readlink -e /proc/"$LEAF_PID"/cwd)
                 if [ "$CWD" != "" ]; then
-                    ${alacritty} --working-directory "$CWD"
+                    ${terminal} --working-directory "$CWD"
                 else
-                    ${alacritty}
+                    ${terminal}
                 fi
             else
-                ${alacritty}
+                ${terminal}
             fi
         fi
     '';
@@ -106,7 +107,7 @@ in {
             ];
             env = [
                 "WLR_NO_HARDWARE_CURSORS,1"
-                "TERMINAL,${alacritty}"
+                "TERMINAL,${terminal}"
                 "WLR_RENDERER_ALLOW_SOFTWARE,1"
             ];
             debug = { disable_logs = false; };
@@ -172,8 +173,8 @@ in {
                 "$mainMod, mouse:273, resizewindow"
             ];
             bind = [
-                "$mainMod, return, exec, ${launch_alacritty}/bin/launch_alacritty $(hyprctl activewindow -j | ${jq} .pid)"
+                "$mainMod, return, exec, ${launch_terminal}/bin/launch_terminal $(hyprctl activewindow -j | ${jq} .pid)"
-                "$mainMod SHIFT, return, exec, ${alacritty}"
+                "$mainMod SHIFT, return, exec, ${terminal}"
                 "$mainMod, Q, killactive,"
                 "$mainMod, A, exec, ${nautilus}"
                 "$mainMod, S, exec, LC_TIME=\"en_GB.UTF-8\" ${gnome-calendar}"

home/kitty/default.nix

@@ -1,18 +1,20 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
     programs.kitty = {
         enable = true;
         shellIntegration.enableZshIntegration = true;
         font = {
-            name = "Iosevka Extended";
+            name = "'ZedMono Nerd Font' style='Extended Light' features=+ss05";
-            size = 15;
+            size = lib.mkDefault 15;
 
         };
         settings = {
             cursor_shape = "block";
-            cursor_beam_thickness = 10;
+            cursor_beam_thickness = 1;
             scrollback_lines = 100000;
+            enable_audio_bell = "no";
+            "modify_font" = "cell_height 115%";
 
             # Theme
             background = "#000010";

home/nvim/files/lua/plugins/catppuccin.lua

@@ -20,8 +20,8 @@ return {
         color_overrides = {
             mocha = {
                 -- this 16 colors are changed to onedark
-                base = "#11121D",
+                base = "#1A1B26",
-                text = "#abb2bf",
+                text = "#A6ADD2",
                 rosewater = "#b6bdca",
                 lavender = "#ed8897",
                 red = "#e06c75",

home/nvim/files/lua/plugins/treesitter.lua

@@ -5,7 +5,7 @@ return {
     },
     build = ":TSUpdate",
     opts = {
-        ensure_installed_sync = { "typst", "cpp", "c", "lua", "vim", "dockerfile", "python", "java", "cmake", "diff", "gitcommit", "html", "css", "javascript", "json", "rust", "sql", "yaml", "markdown", "markdown_inline", "nix" },
+        ensure_installed_sync = { "typst", "cpp", "c", "lua", "vim", "dockerfile", "python", "java", "cmake", "diff", "gitcommit", "html", "css", "javascript", "json", "rust", "sql", "yaml", "markdown", "markdown_inline", "nix", "bibtex" },
         auto_install = true,
         highlight = {
             enable = true,

hosts/Aloria/default.nix

@@ -62,7 +62,7 @@ in {
             address = [ "10.0.0.5/24" "2a02:a03f:83ad:2101::5/128" ];
             privateKeyFile = "/home/user/.secrets/Wireguard/Aloria.key";
             listenPort = 51820;
-            autostart = true;
+            autostart = false;
             postUp = "resolvectl dns Tunnel 10.0.0.1; resolvectl domain Tunnel ~thomasave.be;";
             dns = ["10.0.0.1"];
             peers = [{
@@ -76,7 +76,7 @@ in {
             address = [ "10.0.0.5/24" "2a02:a03f:83ad:2101::5/128" ];
             privateKeyFile = "/home/user/.secrets/Wireguard/Aloria.key";
             listenPort = 51820;
-            autostart = false;
+            autostart = true;
             postUp = "resolvectl dns OPNsense 10.0.0.1; resolvectl domain OPNsense ~thomasave.be;";
             dns = ["10.0.0.1"];
             peers = [{

hosts/Common/default.nix

@@ -35,7 +35,8 @@
         iosevka
         roboto
         font-awesome
-        (nerdfonts.override { fonts = [ "FiraCode" "Ubuntu" ]; })
+        nerdfonts
+        # (nerdfonts.override { fonts = [ "FiraCode" "Ubuntu" ]; })
     ];
 
     environment.systemPackages = with pkgs; [