Merge branch 'main' of git.datarift.nl:erwin/nixos-config

This commit is contained in:
Erwin Boskma 2023-11-20 17:11:18 +01:00
commit 4915fcbd57
Signed by: erwin
SSH key fingerprint: SHA256:/Wk1WZdLg+vQHs3in9qq7PsIp8SMzwGSk/RLZ5zPuZk
4 changed files with 10 additions and 10 deletions

View file

@ -439,6 +439,7 @@ Set fonts.
(set-face-attribute 'default frame :height font-height))) (set-face-attribute 'default frame :height font-height)))
(add-hook 'server-after-make-frame-hook 'my/set-font-size) (add-hook 'server-after-make-frame-hook 'my/set-font-size)
(add-hook 'after-make-frame-functions 'my/set-font-size)
(defun my/setup-fonts () (defun my/setup-fonts ()
(set-face-attribute 'default nil :family my/default-font :weight 'light) (set-face-attribute 'default nil :family my/default-font :weight 'light)

View file

@ -5,8 +5,8 @@
with lib; let with lib; let
cfg = config.eboskma.programs.ssh; cfg = config.eboskma.programs.ssh;
var = config.eboskma.var; var = config.eboskma.var;
personalKey = "~/.ssh/id_ed25519"; personalKey = "~/.ssh/id_ed25519_sk_personal.pub";
horusKey = "~/.ssh/id_ed25519"; horusKey = "~/.ssh/id_ed25519_sk_horus.pub";
in in
{ {
options.eboskma.programs.ssh = { enable = mkEnableOption "activate ssh"; }; options.eboskma.programs.ssh = { enable = mkEnableOption "activate ssh"; };

View file

@ -54,7 +54,7 @@
wallpaper = ../../wallpapers/river-3840.png; wallpaper = ../../wallpapers/river-3840.png;
}; };
kanata = { kanata = {
enable = true; enable = false;
devices = [ devices = [
"/dev/input/by-id/usb-04d9_USB-HID_Keyboard-event-kbd" "/dev/input/by-id/usb-04d9_USB-HID_Keyboard-event-kbd"
]; ];

View file

@ -96,7 +96,7 @@ in
enable = true; enable = true;
name = "Erwin Boskma"; name = "Erwin Boskma";
email = "erwin@horus.nu"; email = "erwin@horus.nu";
signingKey = "~/.ssh/id_ed25519_sk"; signingKey = "~/.ssh/id_ed25519_sk_horus.pub";
signingKeyFormat = "ssh"; signingKeyFormat = "ssh";
}; };
gpg.enable = true; gpg.enable = true;
@ -161,9 +161,10 @@ in
}; };
input = { input = {
"1241:662:USB-HID_Keyboard" = { "1241:662:USB-HID_Keyboard" = {
xkb_layout = "us"; xkb_layout = "us,us";
xkb_options = "lv3:ralt_switch,eurosign:5"; xkb_variant = "colemak,";
xkb_numlock = "enable"; xkb_options = "lv3:ralt_switch,eurosign:5,caps:backspace,ctrl:nocaps";
xkb_numlock = "enabled";
}; };
"1133:49257:Logitech_USB_Laser_Mouse" = { "1133:49257:Logitech_USB_Laser_Mouse" = {
natural_scroll = "enabled"; natural_scroll = "enabled";
@ -265,11 +266,9 @@ in
wayvnc wayvnc
winetricks winetricks
wineWowPackages.stable wineWowPackages.stable
wl-clipboard
zathura zathura
zeal zeal
# localSessionScript
# remoteSessionScript
] ]
++ (with gst_all_1; [ gstreamer gstreamer.dev gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav gst-vaapi ]); ++ (with gst_all_1; [ gstreamer gstreamer.dev gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav gst-vaapi ]);