hosts/d2nix/home-manager/home.nix

@@ -6,8 +6,7 @@
     ./variables.nix
     ./i3status.nix
     ./dunst.nix
-#    ./himalaya.nix
+    ./himalaya.nix
-    ./mails.nix
     ../../../modules/tmux.nix
     ../../../modules/emacs.nix
     ../../../modules/neovim.nix

hosts/d2nix/home-manager/mails.nix

@@ -1,47 +0,0 @@
-{ pkgs, config, lib, ... }:{
- # accounts.email.maildirBasePath = "Mailsdir";
-  accounts.email= {
-    accounts = {
-      dri = {
-        primary = true;
-        address = "alexandre@dri.fr";
-        userName = "1847_alexandre";
-        realName = "Alexandre LUCAZEAU";
-        passwordCommand = "keepassxc-cli show -a Password --no-password  -k $HOME/Nextcloud/PRIVE/keys/emails $HOME/Nextcloud/PRIVE/Keepass/emails.kdbx emails";
-      flavor = "plain";
-      folders = {
-        inbox = "INBOX";
-        trash = "Junk";
-      };
-      imap = {
-        host = "imap.dri.fr";
-        tls.enable = false;
-        };
-      smtp = {
-        host = "smtp.dri.fr";
-        port = 587;
-        tls.enable = false;
-      };
-
-      mbsync = {
-        enable = true;
-	create = "both";
-	expunge = "both";
-	};
-      notmuch.enable = true;
-      };
-    };
-  };
- services.mbsync = {
-   enable = true;
- };
-
- programs = {
-   msmtp.enable = true;
-   mbsync.enable = true;
-   notmuch.enable = true;
- };
-  #xdg.configFile = {
-  #  "msmtp/config".source= ./configs/msmtp_config;
-  #};
-}

hosts/d2nix/home-manager/packages.nix

@@ -42,10 +42,6 @@
     ferdi
     thunderbird
     cura
-    freecad
-    drawio
-    chromium
-    fido2luks
   ];
     nixpkgs.config.permittedInsecurePackages = [ 
       "ferdi-5.8.1"               

hosts/d2nix/nixos/configuration.nix

@@ -13,7 +13,6 @@
       ./network.nix
       modules/common.nix
       modules/smtp.nix
-      modules/redshift.nix
 #      modules/starship.nix
       modules/syncthing.nix
 #      modules/powermanagement.nix
@@ -27,9 +26,6 @@
     tmp.cleanOnBoot = true;
     kernelParams = [ "i915.enable_fbc=1" ];
   };
-  boot.initrd.luks.fido2Support = true;
-  boot.initrd.luks.devices."/dev/sda2".device = "/dev/sda2";
-  boot.initrd.luks.devices."/dev/sda2".fido2.credential = "a67d17616bf2568727498dffa95205df943383ab3a2f9798606532d5791a155a37dd52dae2262619c1da2be7562ec9dd94888c71a9326fea70dfe16214b5ea8ec0143b010000";
 
   hardware = {
     # Enable microcode updates for Intel CPU
@@ -92,12 +88,6 @@
     };
     dconf.enable=true;
   };
-  programs.thunar.enable = true;
-
-  programs.thunar.plugins = with pkgs.xfce; [
-  thunar-archive-plugin
-  thunar-volman
-];
   # Enable sound.
    sound.enable = true;
 
@@ -122,6 +112,12 @@
 
   environment.variables.EDITOR = "nvim";
 
+  location = {
+    provider = "manual";
+    latitude = 47.77;
+    longitude = -1.164;
+    };
+
     nix.settings.experimental-features = [ "nix-command" "flakes" ];
 }
 

modules/users.nix

@@ -28,7 +28,6 @@
   programs.fish.shellAliases = {
 	ll = "ls -l";
 	ls = "lsd";
-	lssh = "ssh -o 'PubkeyAcceptedKeyTypes +ssh-rsa' -o 'HostKeyAlgorithms +ssh-dss' -i ~/.ssh/id_rsa"
 #	vi = "nvim";
 #	vim = "nvim";
   };