From 5bd0aa3e2aae947a8a865208da6b8844c7b2c0d3 Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Mon, 6 Nov 2023 10:20:46 +0100 Subject: [PATCH] telecom: init --- machines/telecom/default.nix | 19 +++++++++++++++---- machines/telecom/home-julien.nix | 6 ++++-- machines/telecom/root.jwe | 1 + 3 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 machines/telecom/root.jwe diff --git a/machines/telecom/default.nix b/machines/telecom/default.nix index 6ff656b..599e172 100644 --- a/machines/telecom/default.nix +++ b/machines/telecom/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, inputs, nixpkgs-patched, ... }: +{ config, pkgs, lib, inputs, ... }: { imports = @@ -41,8 +41,6 @@ networking.wireless.enable = false; - programs.hyprland.enable = true; - programs.hyprland.package = pkgs.hyprland; environment.sessionVariables = { LIBSEAT_BACKEND = "logind"; }; @@ -51,8 +49,14 @@ enable = true; layout = "fr"; displayManager.gdm.enable = true; + displayManager.gdm.wayland = true; }; + programs.sway.enable = true; + + nixpkgs.config.permittedInsecurePackages = [ + "zotero-6.0.27" + ]; services.tailscale.enable = true; networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. @@ -60,13 +64,20 @@ networking.networkmanager.dns = "systemd-resolved"; services.resolved.enable = true; + boot.initrd.clevis = { + enable = true; + devices."cryptroot".secretFile = ./root.jwe; + }; + + boot.initrd.systemd.enableTpm2 = true; + + time.timeZone = "Europe/Paris"; # Select internationalisation properties. i18n.defaultLocale = "en_US.UTF-8"; console = { - font = "Lat2-Terminus16"; useXkbConfig = true; # use xkbOptions in tty. }; diff --git a/machines/telecom/home-julien.nix b/machines/telecom/home-julien.nix index 97d4929..3262da2 100644 --- a/machines/telecom/home-julien.nix +++ b/machines/telecom/home-julien.nix @@ -9,7 +9,7 @@ luj.programs.git.enable = true; luj.programs.gtk.enable = true; luj.programs.alacritty.enable = true; - luj.programs.hyprland.enable = true; + luj.programs.sway.enable = true; luj.programs.waybar.enable = true; luj.programs.kitty.enable = true; luj.emails.enable = true; @@ -37,6 +37,8 @@ }; }; + xsession.enable = true; + home.packages = with pkgs; [ du-dust @@ -48,7 +50,7 @@ meld vlc jftui - stable.nerdfonts + nerdfonts libreoffice font-awesome nodejs diff --git a/machines/telecom/root.jwe b/machines/telecom/root.jwe new file mode 100644 index 0000000..df6aeb7 --- /dev/null +++ b/machines/telecom/root.jwe @@ -0,0 +1 @@ +eyJhbGciOiJkaXIiLCJjbGV2aXMiOnsicGluIjoidHBtMiIsInRwbTIiOnsiaGFzaCI6InNoYTI1NiIsImp3a19wcml2IjoiQU80QUlPTG9sak5fQTVia3FnMExxZzd2ZTE5TUR6TElScFJWYjdaNDVPenZ1UnBJQUJDTWFkQWdYYV9BWW5vQUU3VnRMWF9xNG44di1NdVh4YWVzVVQwUm51cEZYVzlEN2hDZ2QwY2pROFJoX2YyLWFzbGhPYWkxTU4wZ0hib3d5U25weVlYOHFfeUY5UXRZcjR6TXlwVFZfUmpwT18tdmZwSnFzYlBsTk9uWkpIc1pNd01rbHpuVXJYeXJnelpYRVlWUG9vU3RoSVFhZWF1enJDeG9DTWhKTXozTjdvNzRQT3M0MElxYjBXMHhrYW1WVjh1ZDFYbklxaG5hOGNQUDhqcjdsOXIwamRrOHJJTzF5LThhcWphTlMxVnFQYmJDNDVSNE80YUw0Y3cwV0VRTXRXVmxIWVhGcEt5dUtnN0wiLCJqd2tfcHViIjoiQUM0QUNBQUxBQUFFMGdBQUFCQUFJQVVLTVl0Slp2ZEltZWZla20xOFFxYTVtWWRYRlo2Q25RSi1tSkkxUFdHViIsImtleSI6ImVjYyJ9fSwiZW5jIjoiQTI1NkdDTSJ9..h1YWJLRjyGOHJF1a.oRKmPpgk3Q5fLJUOBQ.nKokH0S90iew6-k5n_aaeA \ No newline at end of file