hosts/marpa/configuration.nix

@@ -8,9 +8,9 @@
     inputs.sops-nix.nixosModules.sops
     ./system/hardware-configuration.nix
     ./services
-    ../../modules/opentablet.nix
-    ../../modules/sops.nix
     ../../modules/system.nix
+    ../../modules/sops.nix
+    ../../modules/opentablet.nix
     ../../programs/flatpak.nix
     ../../programs/hyprland.nix
     ../../programs/steam.nix

users/modules/default.nix

@@ -5,7 +5,6 @@
     ./btop.nix
     ./direnv.nix
     ./eza.nix
-    ./gpg.nix
     ./mopidy.nix
     ./nh.nix
     ./nix-index.nix

users/modules/emacs.nix

@@ -3,8 +3,7 @@
   config,
   lib,
   ...
-}:
+}: with lib; let
-with lib; let
   emacsDefaultPackage = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages (
     epkgs: [
       epkgs.vterm

users/modules/gpg.nix

@@ -1,12 +0,0 @@
-{pkgs, ...}:{
-  programs.gpg = {
-    enable = true;
-    mutableKeys = true;
-    mutableTrust = true;
-  };
-  services.gpg-agent = {
-    enable = true;
-    enableSshSupport = true;
-    pinentry.package = pkgs.pinentry-emacs;
-  };
-}

users/modules/hyprland.nix

@@ -70,15 +70,8 @@ in {
           border_size = 2;
           "col.active_border" = "rgb(81a1c1) rgb(a3be8c) 45deg";
           "col.inactive_border" = "rgb(4c566a)";
-          layout = "master";
+          layout = "dwindle";
         };
-        master = {
-          orientation = "center";
-          new_status = "inherit";
-        };
-        workspace = [
-          "2, layoutopt:orientation:bottom"
-        ];
         decoration = {
           rounding = 5;
           # blur = {

users/modules/kitty.nix

@@ -1,7 +1,6 @@
 {
   programs.kitty = {
     enable = true;
-    themeFile = "Nord";
     settings = {
       enable_audio_bell = true;
       enabled_layouts = "fat,fat:mirrored=true,tall,tall:mirrored=true";

users/modules/nix-index.nix

@@ -1,4 +1,5 @@
-{inputs, ...}: {
+{ inputs, ... }:
+{
   imports = [
     inputs.nix-index-database.hmModules.nix-index
   ];

users/phundrak/email.nix

@@ -1,15 +1,4 @@
-{config, ...}: let
+{config, ...}: {
-  signature = ''
-    Lucien “Phundrak” Cartier-Tilet
-    https://phundrak.com (Français)
-    https://phundrak.com/en (English)
-    Sent from GNU/Emacs
-  '';
-in {
-  home.file.".signature" = {
-    target = ".signature";
-    text = signature;
-  };
   accounts.email = {
     maildirBasePath = "Mail";
     accounts."lucien@phundrak.com" = {
@@ -23,7 +12,12 @@ in {
       ];
       passwordCommand = "cat ${config.sops.secrets.emailPassword.path}";
       signature = {
-        text = signature;
+        text = ''
+          Lucien “Phundrak” Cartier-Tilet
+          https://phundrak.com (Français)
+          https://phundrak.com/en (English)
+          Sent from GNU/Emacs
+        '';
         showSignature = "append";
       };
       userName = "lucien@phundrak.com";