From 696636c10a9a6a75649e9ace721057eda40e28fc Mon Sep 17 00:00:00 2001 From: Ludovic Ortega Date: Mon, 7 Oct 2024 23:08:51 +0200 Subject: [PATCH] fix: set console font & ssh agent --- flake.lock | 36 ++++++++++++------------- home/user/default.nix | 1 + home/user/programs/kitty.nix | 6 +++-- home/user/services/default.nix | 1 + home/user/services/ssh-agent.nix | 22 +++++++++++++++ system/modules/internationalization.nix | 7 ++++- 6 files changed, 52 insertions(+), 21 deletions(-) create mode 100644 home/user/services/default.nix create mode 100644 home/user/services/ssh-agent.nix diff --git a/flake.lock b/flake.lock index 39d7159..933ca6d 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1726842196, - "narHash": "sha256-u9h03JQUuQJ607xmti9F9Eh6E96kKUAGP+aXWgwm70o=", + "lastModified": 1728109432, + "narHash": "sha256-wmbErh8FG7dRKOtMMpHUqDtFjeqt9Zjx4zssSeTalwU=", "owner": "nix-community", "repo": "disko", - "rev": "51994df8ba24d5db5459ccf17b6494643301ad28", + "rev": "48ebb577855fb2398653f033b3b2208a9249203d", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1726818100, - "narHash": "sha256-z2V74f5vXqkN5Q+goFlhbFXY/dNaBAyeLpr2bxu4Eic=", + "lastModified": 1726989464, + "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "owner": "nix-community", "repo": "home-manager", - "rev": "1bbc1a5a1f4de7401c92db85b2119ed21bb4139d", + "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "type": "github" }, "original": { @@ -179,11 +179,11 @@ ] }, "locked": { - "lastModified": 1726902823, - "narHash": "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4=", + "lastModified": 1728306985, + "narHash": "sha256-l/KpcWTv2SjxCnqFs5GYhvjeVYd40WQV4/F2+w9btd4=", "owner": "nix-community", "repo": "home-manager", - "rev": "14929f7089268481d86b83ed31ffd88713dcd415", + "rev": "3ac39b2a8b7cbfc0f96628d8a84867c885bc988b", "type": "github" }, "original": { @@ -257,11 +257,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1726905744, - "narHash": "sha256-xyNtG5C+xvfsnOVEamFe9zCCnuNwk93K/TlFC/4DmCI=", + "lastModified": 1728269138, + "narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b493dfd4a8cf9552932179e56ff3b5819a9b8381", + "rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b", "type": "github" }, "original": { @@ -289,11 +289,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1726838390, - "narHash": "sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM=", + "lastModified": 1728193676, + "narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "944b2aea7f0a2d7c79f72468106bc5510cbf5101", + "rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6", "type": "github" }, "original": { @@ -305,11 +305,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1726755586, - "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "type": "github" }, "original": { diff --git a/home/user/default.nix b/home/user/default.nix index 029fdad..5abc79f 100644 --- a/home/user/default.nix +++ b/home/user/default.nix @@ -6,6 +6,7 @@ ./packages.nix ./programs ./script.nix + ./services ./theme.nix ]; diff --git a/home/user/programs/kitty.nix b/home/user/programs/kitty.nix index 6f65a54..c2615f4 100644 --- a/home/user/programs/kitty.nix +++ b/home/user/programs/kitty.nix @@ -1,7 +1,9 @@ -{ pkgs, ... }: { programs.kitty = { enable = true; - font.name = "JetBrainsMono Nerd Font"; + font = { + name = "JetBrainsMono Nerd Font"; + size = 12; + }; }; } diff --git a/home/user/services/default.nix b/home/user/services/default.nix new file mode 100644 index 0000000..562f5e5 --- /dev/null +++ b/home/user/services/default.nix @@ -0,0 +1 @@ +{ imports = [ ./ssh-agent.nix ]; } diff --git a/home/user/services/ssh-agent.nix b/home/user/services/ssh-agent.nix new file mode 100644 index 0000000..272a749 --- /dev/null +++ b/home/user/services/ssh-agent.nix @@ -0,0 +1,22 @@ +{ + systemd.user.services.ssh-agent = { + Unit = { + Description = "SSH Agent"; + }; + Install = { + WantedBy = [ "default.target" ]; + }; + UnitConfig.ConditionUser = "!@system"; + Service = { + ExecStartPre = "${pkgs.coreutils}/bin/rm -f %t/ssh-agent"; + ExecStart = "${pkgs.openssh}/bin/ssh-agent -a %t/ssh-agent"; + StandardOutput = "null"; + Type = "forking"; + Restart = "on-failure"; + SuccessExitStatus = "0 2"; + }; + + Environment.SSH_ASKPASS = lib.optionalString cfg.enableAskPassword askPasswordWrapper; + Environment.DISPLAY = "fake"; + }; +} diff --git a/system/modules/internationalization.nix b/system/modules/internationalization.nix index 35617bc..17c6fc9 100644 --- a/system/modules/internationalization.nix +++ b/system/modules/internationalization.nix @@ -1,8 +1,13 @@ +{ pkgs, ... }: { time.timeZone = "Europe/Paris"; i18n.defaultLocale = "fr_FR.UTF-8"; - console.keyMap = "fr"; + console = { + keyMap = "fr"; + font = "ter-i32b"; + packages = with pkgs; [ terminus_font ]; + }; services = { xserver = {