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

hosts/dell-5590/nixos/configuration.nix

@@ -12,7 +12,6 @@
       ./services.nix
       ./packages.nix
       ../modules/prometheus-node.nix
-      ./appsmith.nix
     ];
 
   # Use the systemd-boot EFI boot loader.

hosts/dell-5590/nixpkgs/home.nix

@@ -10,6 +10,7 @@
     ./mails.nix
     ./dunst.nix
     ./bat.nix
+    ./AstroNvim.nix
 #    ./redshift.nix
 #    ../../../modules/neovim.nix
     ../../../modules/rust.nix

hosts/dell-5590/nixpkgs/packages.nix

@@ -48,7 +48,6 @@
     neovim
     python3
     mtr
-    ferdi
     powertop
     unar # like 7z
     nmap
@@ -60,5 +59,12 @@
     vagrant
     zellij
     guake
+    dig
+    vlc
+    ferdi
+    pinta
+  ];
+  nixpkgs.config.permittedInsecurePackages = [
+    "ferdi-5.8.1"
   ];
 }

hosts/next/backup.nix

@@ -1,16 +1,20 @@
 {config, pkgs, ...}:
 {
+environment.systemPackages = with pkgs; [
+  restic
+  ];
 services.restic.backups = {
-  localbackup = {
-      initialize = true;
-      passwordFile = "/run/restic_pass";
-      paths = [ "/var/lib/nextcloud/data/" "/var/backup/postgresql" ];
-      repository = "rest:https://back.atlanticaweb.fr/Nextcloud";
-      timerConfig = {
-        OnCalendar = "02:05";
-        RandomizedDelaySec = "5h";
-      };
+  remotebackup = {
+    initialize = true;
+    passwordFile = "/run/restic_pass";
+    paths = [ "/var/lib/nextcloud/data/" "/var/backup/postgresql" ];
+    #repository = "rest:https://back.atlanticaweb.fr/Nextcloud";
+    repository = "sftp:u329746@u329746.your-storagebox.de:/home/Nextcloud"; 
+    timerConfig = {
+      OnCalendar = "02:05";
+      RandomizedDelaySec = "5h";
     };
+  };
 };
 services.postgresqlBackup = {
   enable = true;

hosts/next/configuration.nix

@@ -9,6 +9,8 @@
     ../modules/navidrome.nix
     ../modules/transmission.nix
     ../modules/prometheus-node.nix
+    ../docker/appsmith.nix
+    ../docker/baserow.nix
     ./agenix.nix
 #    <agenix/modules/age.nix>
   ];
@@ -22,8 +24,11 @@
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKUA1RW6JwZasspAp8qmFRFnlV5WXjhLfStAAkM+KYLv lucazeau.alexandre@gmail.com" 
   ];
 
-  networking.firewall.allowedTCPPorts = [ 80 443 22 9002 4533];
+  programs.ssh.extraConfig = "Host u329746.your-storagebox.de\n  Hostname u329746.your-storagebox.de\n  Port 23\n  user u329746\n  IdentityFile /home/alexandre/.ssh/id_ed25519-perso";
+  networking.firewall.allowedTCPPorts = [ 80 443 22 9002 4533 5050 8080];
   services.qemuGuest.enable = true; 
+
+  services.shiori.enable = true;
   
 #  environment.systemPackages = [ (pkgs.callPackage <agenix/pkgs/agenix.nix> {}) ];
 #  age.secrets.secret_restic = {

hosts/next/databases.nix

@@ -6,7 +6,7 @@ networking.firewall.allowedTCPPorts = [ 5432 5050 ];
   services.postgresql = {
     enable = true;
     enableTCPIP = true;
-    authentication = "host all all 192.168.0.0/16 trust";
+    authentication = "host all all 192.168.0.0/16 trust \nhost all all 10.88.0.0/16 trust";
 
     # Ensure the database, user, and permissions always exist
     ensureDatabases = [ "pizzajoffredb" ];

hosts/x201/nixos/configuration.nix

@@ -12,6 +12,7 @@
       ./services.nix
       ./scanner.nix
       ../modules/common.nix
+      ./dev.nix
     ];
 
   # Use the GRUB 2 boot loader.
@@ -87,7 +88,6 @@ fonts = {
     terminus_font
     proggyfonts
     dejavu_fonts
-    font-awesome-ttf
     font-awesome
     nerdfonts
     source-code-pro

hosts/x201/nixos/dev.nix

@@ -0,0 +1,32 @@
+{config, pkgs, ...}:
+{
+#  home.packages = with pkgs; [
+#    nodejs
+#  ];
+
+# Enable PostgreSQL 
+  services.postgresql = {
+    enable = true;
+    package = pkgs.postgresql_14 ;
+    enableTCPIP = true;
+    authentication = "
+    local all all trust
+    host all all 127.0.0.1/32 trust
+    ";
+
+    # Ensure the database, user, and permissions always exist
+    ensureDatabases = [ "pizzajoffredb" ];
+    ensureUsers = [
+     { name = "pizzajoffre";
+       ensurePermissions."DATABASE devpj" = "ALL PRIVILEGES";
+     }
+    ];
+  };
+#  services.pgadmin = {
+#    openFirewall = true;
+#    enable = true;
+#    initialEmail = "pizzajoffre@gmail.com";
+#    initialPasswordFile = /run/pgadmin;
+#  };
+
+}

hosts/x201/nixpkgs/home.nix

@@ -10,6 +10,7 @@
     ./emacs.nix
     ./i3status.nix
     ./neovim.nix
+    ./himalaya.nix
   ];
   home.keyboard = {
     layout = "fr";

hosts/x201/nixpkgs/packages.nix

@@ -23,13 +23,12 @@
     texlive.combined.scheme-full
     hugo
     eww
-    polybar
     alacritty
     youtube-dl
-    barrier
     zola
     keepassxc
     zlib
     python3
+    nodejs
   ];
 }

modules/common.nix

@@ -14,7 +14,7 @@
     bat
     procs
     plocate
-    exa
+    lsd
     age
     lsd
   ];