From 0efd7a97f4f536c516086cea251bff76d743a9c5 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@hoyer.xyz>
Date: Fri, 12 Jan 2024 10:53:57 +0100
Subject: [PATCH 1/2] add alacritty
---
.../harald@mpro.fritz.box/default.nix | 1 +
.../home/cli-apps/home-manager/default.nix | 1 -
modules/home/tools/alacritty/default.nix | 22 +++++++++++++++++++
3 files changed, 23 insertions(+), 1 deletion(-)
create mode 100644 modules/home/tools/alacritty/default.nix
diff --git a/homes/x86_64-darwin/harald@mpro.fritz.box/default.nix b/homes/x86_64-darwin/harald@mpro.fritz.box/default.nix
index eab10ff..18cb702 100644
--- a/homes/x86_64-darwin/harald@mpro.fritz.box/default.nix
+++ b/homes/x86_64-darwin/harald@mpro.fritz.box/default.nix
@@ -27,6 +27,7 @@
};
tools = {
direnv.enable = true;
+ alacritty.enable = true;
# jetbrains.enable = true;
};
};
diff --git a/modules/home/cli-apps/home-manager/default.nix b/modules/home/cli-apps/home-manager/default.nix
index 450c53c..cedb56a 100644
--- a/modules/home/cli-apps/home-manager/default.nix
+++ b/modules/home/cli-apps/home-manager/default.nix
@@ -25,7 +25,6 @@ in
};
home.packages = with pkgs; [
- bat
vim
cachix
];
diff --git a/modules/home/tools/alacritty/default.nix b/modules/home/tools/alacritty/default.nix
new file mode 100644
index 0000000..809f86c
--- /dev/null
+++ b/modules/home/tools/alacritty/default.nix
@@ -0,0 +1,22 @@
+{ lib
+, config
+, pkgs
+, ...
+}:
+let
+ inherit (lib) mkEnableOption mkIf;
+
+ cfg = config.plusultra.tools.alacritty;
+in
+{
+ options.plusultra.tools.alacritty = {
+ enable = mkEnableOption "alacritty";
+ };
+
+ config = mkIf cfg.enable {
+ home.packages = with pkgs; [
+ alacritty
+ (pkgs.nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" "JetBrainsMono" ]; })
+ ];
+ };
+}
From 8e20509b926ef72bdebf9aa5fd421f5bf83a6480 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@hoyer.xyz>
Date: Fri, 12 Jan 2024 12:12:55 +0100
Subject: [PATCH 2/2] add ssh and mosh
---
homes/x86_64-darwin/harald@mpro.fritz.box/default.nix | 1 +
homes/x86_64-linux/harald@sgx-nixos/default.nix | 1 +
modules/home/tools/ssh/default.nix | 4 ++++
3 files changed, 6 insertions(+)
diff --git a/homes/x86_64-darwin/harald@mpro.fritz.box/default.nix b/homes/x86_64-darwin/harald@mpro.fritz.box/default.nix
index 18cb702..d68ac9d 100644
--- a/homes/x86_64-darwin/harald@mpro.fritz.box/default.nix
+++ b/homes/x86_64-darwin/harald@mpro.fritz.box/default.nix
@@ -28,6 +28,7 @@
tools = {
direnv.enable = true;
alacritty.enable = true;
+ ssh.enable = true;
# jetbrains.enable = true;
};
};
diff --git a/homes/x86_64-linux/harald@sgx-nixos/default.nix b/homes/x86_64-linux/harald@sgx-nixos/default.nix
index 7504363..41a59db 100644
--- a/homes/x86_64-linux/harald@sgx-nixos/default.nix
+++ b/homes/x86_64-linux/harald@sgx-nixos/default.nix
@@ -27,6 +27,7 @@
};
tools = {
direnv.enable = true;
+ ssh.enable = true;
# jetbrains.enable = true;
};
};
diff --git a/modules/home/tools/ssh/default.nix b/modules/home/tools/ssh/default.nix
index 6d6cd55..e8f545b 100644
--- a/modules/home/tools/ssh/default.nix
+++ b/modules/home/tools/ssh/default.nix
@@ -10,7 +10,11 @@ in
};
config = mkIf cfg.enable {
+ home.packages = with pkgs; [
+ mosh
+ ];
programs.ssh = {
+ enable = true;
extraConfig = ''
Host *
HostKeyAlgorithms +ssh-rsa