Merge branch 'main' of git.atlanticaweb.fr:alexandre/nixos-config

FIX Emacs configuration

hosts/x201/home-manager/home.nix

@@ -7,10 +7,11 @@
     ./starship.nix
     #./mails.nix
     ./mpd.nix
-    ./emacs.nix
+#    ./emacs.nix
     ./i3status.nix
     ./himalaya.nix
     ../../../modules/tmux.nix
+    ../../../modules/emacs.nix
   ];
   home.stateVersion = "21.11";
   home.username = "alexandre";

hosts/x201/home-manager/i3status.nix

@@ -1,3 +1,4 @@
+
 { config, pkgs, ... }:{
 
   programs.i3status-rust = {
@@ -8,18 +9,16 @@
           {
              block = "disk_space";
              path = "/";
-             alias = "/";
-             info_type = "available";
-             unit = "GB";
+	     format =  "$icon $percentage";
+             format_alt = " $icon $available / $total ";
+	     info_type = "used";
              interval = 60;
              warning = 20.0;
              alert = 10.0;
            }
            {
              block = "memory";
-             display_type = "memory";
-             format_mem = "{mem_used_percents}";
-             format_swap = "{swap_used_percents}";
+	     format = " $icon $mem_avail.eng(prefix:M)/$mem_total.eng(prefix:M)($mem_total_used_percents.eng(w:2)) ";
            }
            {
              block = "cpu";
@@ -37,10 +36,15 @@
            {
              block = "battery";
            }
+          {
+            block = "kdeconnect";
+            format = " $icon {$bat_icon $bat_charge |}{$notif_icon |}{$network_icon$network_strength $network_type |}";
+            bat_good = 101;
+          }
            {
              block = "time";
              interval = 60;
-             format = "%a %d/%m %R";
+             format = " $icon $timestamp.datetime(f:'%d/%m %R', l:fr_FR) ";
            }
         ];
       icons = "material-nf";

hosts/x201/home-manager/packages.nix

@@ -33,5 +33,6 @@
     vlc
     guake
     graphviz
+    kdeconnect
   ];
 }

hosts/x201/nixos/configuration.nix

@@ -19,7 +19,6 @@
   # Use the GRUB 2 boot loader.
   boot.loader.grub.devices = [ "/dev/sda" ];
   boot.loader.grub.enable = true;
-  boot.loader.grub.version = 2;
   boot.loader.grub.enableCryptodisk = true;
   boot.loader.supportsInitrdSecrets = true;
 #  boot.loader.grub.efiSupport = true;
@@ -35,7 +34,7 @@
   boot.plymouth.enable = true;
 
   # Clear /tmp during boot
-  boot.cleanTmpDir = true;
+ boot.tmp.cleanOnBoot = true;
  boot.initrd.kernelModules = [ "i915" ];
  boot.kernelParams = [ "i915.enable_fbc=1" ];
  # Enable microcode updates for Intel CPU
@@ -71,8 +70,6 @@
 
   nixpkgs.config.allowUnfree = true;
 
-  networking.firewall.enable = true;
-
   i18n.defaultLocale = "fr_FR.UTF-8";
   console = {
     font = "Lat2-Terminus16";
@@ -181,14 +178,19 @@ fonts = {
 
   # Enable the OpenSSH daemon.
   services.openssh.enable = true;
-  services.openssh.permitRootLogin = "no";
+  services.openssh.settings.PermitRootLogin = "no";
   # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-   networking.firewall.allowedTCPPorts = [ 24800 6600 ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
+ networking.firewall = {
+   enable = true;
+   allowedTCPPorts = [ 24800 6600 ];
+ # For kdeconnect
+   allowedTCPPortRanges = [ 
+      { from = 1714; to = 1764; } # KDE Connect
+    ];  
+    allowedUDPPortRanges = [ 
+      { from = 1714; to = 1764; } # KDE Connect
+    ];  
+  };
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave