From 0e9459c7006f20cefc20d46f9a678d4055469fe1 Mon Sep 17 00:00:00 2001 From: fleaz Date: Mon, 25 Nov 2024 20:52:33 +0100 Subject: [PATCH 1/2] users: Update SSH keys --- users/fleaz.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/users/fleaz.nix b/users/fleaz.nix index 7888746..961bbf0 100644 --- a/users/fleaz.nix +++ b/users/fleaz.nix @@ -15,10 +15,17 @@ # Allow ssh between all my machines openssh.authorizedKeys.keys = [ + # Desktop NixOS "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOOQB+LpTMWkmrx/ve1gxfzCM3CAsWpYkQ5QBRH1Vqf8 fleaz@cray" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOufg1IAWXQBbUPTc3W3vORxFc94/MbbaYzpimqI+M/J fleaz@jimbo" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKpdn6umACgFp2zucdvjHclYVZxUxWNZZvM7/h6HcJ+x fleaz@milhouse" + + # Desktop WSL + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPgC76vTSe1t/FbsZvT785x1P/XLgiIuxr8QWxAucFoz fleaz@DESKTOP-M4KRLN1" + + # Framework "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAO0UjGRIPO9zPwulEXVK8/pUIninT2H8gW2YlGlHwKH fleaz@smithers" + + # Work Dell + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAQ7gJplIqFOyxJl7G86nmvmXfYegNYYpafHkbhdDPN9 felix@felix-xm2307" ]; }; } From 5eba61ee1b37c5140b6aef587e299cc7377ec3e1 Mon Sep 17 00:00:00 2001 From: fleaz Date: Mon, 25 Nov 2024 20:58:34 +0100 Subject: [PATCH 2/2] home/make: Move to seprate module --- home-manager/default.nix | 10 ++-------- home-manager/modules/mako.nix | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 home-manager/modules/mako.nix diff --git a/home-manager/default.nix b/home-manager/default.nix index 88a531f..29b03fc 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, ... }: let home-manager = (import ../nix/sources.nix).home-manager; @@ -27,6 +27,7 @@ in modules/foot.nix modules/manual.nix modules/tig.nix + modules/mako.nix ../secrets/ssh-config.nix ] ++ lib.optionals (config.networking.hostName == "smithers") [ modules/kanshi.nix @@ -80,7 +81,6 @@ in swayidle brightnessctl wl-clipboard - mako sway-contrib.grimshot albert foot @@ -147,12 +147,6 @@ in userEmail = "mail@felixbreidenstein.de"; }; - services.mako = { - enable = true; - groupBy = "app-name"; - defaultTimeout = 5000; - }; - services.gammastep = { enable = true; tray = true; diff --git a/home-manager/modules/mako.nix b/home-manager/modules/mako.nix new file mode 100644 index 0000000..7bfcd94 --- /dev/null +++ b/home-manager/modules/mako.nix @@ -0,0 +1,14 @@ +{ + services.mako = { + enable = true; + groupBy = "app-name"; + defaultTimeout = 5000; + extraConfig = '' + font=Inconsolata 10 + background-color=#1d2021 + border-color=#ebdbb2 + border-radius=10 + text-color=#ebdbb2 + ''; + }; +}