From 2de2e7f644302ab1409dc46d62b2c3b0e9d73252 Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Mon, 17 Mar 2025 23:02:04 +0100 Subject: [PATCH] feat: init exwm --- machines/arcadia/default.nix | 22 ++++++++++++++++++++-- machines/arcadia/home-julien.nix | 7 +++++-- secrets/secrets.nix | 5 +++++ 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/machines/arcadia/default.nix b/machines/arcadia/default.nix index 7c81d7b..5afa411 100644 --- a/machines/arcadia/default.nix +++ b/machines/arcadia/default.nix @@ -1,9 +1,19 @@ { pkgs, inputs, + lib, ... }: +let + emacs-from-overlay = pkgs.emacsWithPackagesFromUsePackage { + config = ../../../emacs-config/ReadMe.org; + package = pkgs.emacs-igc; + alwaysEnsure = true; + alwaysTangle = true; + extraEmacsPackages = epkgs: [ epkgs.exwm ]; + }; +in { imports = [ ./hardware.nix @@ -82,8 +92,16 @@ programs.ssh.startAgent = true; - services.xserver.desktopManager.gnome.enable = true; - services.xserver.displayManager.gdm.enable = true; + services.xserver.displayManager.lightdm.enable = true; + services.xserver.desktopManager.xterm.enable = true; + services.xserver.enable = true; + + services.xserver.windowManager.session = lib.singleton { + name = "exwm"; + start = '' + ${emacs-from-overlay}/bin/emacs -l /home/julien/.emacs.d/exwm-config.el + ''; + }; services.gnome.gnome-keyring.enable = true; system.stateVersion = "25.05"; diff --git a/machines/arcadia/home-julien.nix b/machines/arcadia/home-julien.nix index 3853b5e..edaace0 100644 --- a/machines/arcadia/home-julien.nix +++ b/machines/arcadia/home-julien.nix @@ -38,7 +38,7 @@ fira-code feh meld - emacs + emacs-igc vlc jftui libreoffice @@ -58,6 +58,10 @@ signal-desktop scli texlive.combined.scheme-full + unstable.nixd + emacs-lsp-booster + hunspellDicts.en_US + hunspellDicts.fr-moderne ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts); fonts.fontconfig.enable = true; @@ -68,7 +72,6 @@ home.persistence."/persistent/home/julien" = { files = [ - ".config/gnome-initial-setup-done" ".config/background" ".cert/nm-openvpn/telecom-paris-ca.pem" ]; diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 58dc69c..48309b3 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -5,6 +5,7 @@ let lisa = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO4kSscukEEoW/QiLgyZQluhsYK4wF+lFphlCakKYC2q"; core-security = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICLnOINGYOFb+bLUUTV9sjwi2qbpwcaQlmGmWfy1PeGR"; arcadia = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBR6TATH7NrekBiRk8mMnxNw0LcDzMHgHh/JtpPUCfqT julien@arcadia"; + arcadia_home = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHH2mPgov6t7oFfEjtZr/DdJW5qSQYqbw+4uYitOCf9n julien@arcadia"; fischer = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPeKDFxgdZlhNXEUx8ex0Fj2Re+tDBvUr52SS4Wh3V9n"; core-data = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPAcIdJ3gr17bvDZ8NAcDBkEmOPTEhpg2yq3p1NNQB0f"; lambda = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKluGTi+vGRLU2emYBhTJuEy7Qw0xq1e0Ey7wvU9xYHz"; @@ -119,6 +120,7 @@ in gallifrey_home gustave_home fisher_home + arcadia_home ]; "work-mail-pw.age".publicKeys = [ gallifrey @@ -127,6 +129,7 @@ in gallifrey_home gustave_home fisher_home + arcadia_home ]; "telecom-mail-pw.age".publicKeys = [ gallifrey @@ -135,6 +138,7 @@ in gallifrey_home gustave_home fisher_home + arcadia_home ]; "ens-mail-pw.age".publicKeys = [ gallifrey @@ -142,6 +146,7 @@ in fischer gallifrey_home gustave_home + arcadia_home fisher_home ];