From 8ae37529d2e0560f74399d0a672ac302b3b72059 Mon Sep 17 00:00:00 2001 From: Alexandre LUCAZEAU Date: Tue, 8 Nov 2022 20:27:38 +0000 Subject: [PATCH 1/5] ADD appsmith FIX exa to lsd --- hosts/next/configuration.nix | 3 ++- hosts/next/databases.nix | 2 +- modules/common.nix | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hosts/next/configuration.nix b/hosts/next/configuration.nix index 87bccd1..d2df394 100644 --- a/hosts/next/configuration.nix +++ b/hosts/next/configuration.nix @@ -9,6 +9,7 @@ ../modules/navidrome.nix ../modules/transmission.nix ../modules/prometheus-node.nix + ../docker/appsmith.nix ./agenix.nix # ]; @@ -22,7 +23,7 @@ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKUA1RW6JwZasspAp8qmFRFnlV5WXjhLfStAAkM+KYLv lucazeau.alexandre@gmail.com" ]; - networking.firewall.allowedTCPPorts = [ 80 443 22 9002 4533]; + networking.firewall.allowedTCPPorts = [ 80 443 22 9002 4533 5050]; services.qemuGuest.enable = true; # environment.systemPackages = [ (pkgs.callPackage {}) ]; diff --git a/hosts/next/databases.nix b/hosts/next/databases.nix index 0a50f4e..ff7a150 100644 --- a/hosts/next/databases.nix +++ b/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" ]; diff --git a/modules/common.nix b/modules/common.nix index 5d3df66..97cb5cb 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -14,7 +14,7 @@ bat procs plocate - exa + lsd age ]; # Nix Garbage Collector From d2dfc4b4ec6b83f1bde48db134200460386bb7b5 Mon Sep 17 00:00:00 2001 From: Alexandre LUCAZEAU Date: Wed, 23 Nov 2022 21:13:35 +0100 Subject: [PATCH 2/5] DEL : appsmith for laptop ADD : Astrovim but not use ADD : some packages --- hosts/dell-5590/nixos/configuration.nix | 1 - hosts/dell-5590/nixpkgs/home.nix | 1 + hosts/dell-5590/nixpkgs/packages.nix | 8 +++++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hosts/dell-5590/nixos/configuration.nix b/hosts/dell-5590/nixos/configuration.nix index 6a9d020..6cae867 100644 --- a/hosts/dell-5590/nixos/configuration.nix +++ b/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. diff --git a/hosts/dell-5590/nixpkgs/home.nix b/hosts/dell-5590/nixpkgs/home.nix index da60f4f..a9a50ef 100644 --- a/hosts/dell-5590/nixpkgs/home.nix +++ b/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 diff --git a/hosts/dell-5590/nixpkgs/packages.nix b/hosts/dell-5590/nixpkgs/packages.nix index 031a4c0..9cdc653 100644 --- a/hosts/dell-5590/nixpkgs/packages.nix +++ b/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" ]; } From e36966c7a74729e057106141db3c5d4d49acf390 Mon Sep 17 00:00:00 2001 From: Alexandre LUCAZEAU Date: Tue, 29 Nov 2022 16:12:05 +0100 Subject: [PATCH 3/5] ADD dev.nix - postgresql database --- hosts/x201/nixos/configuration.nix | 2 +- hosts/x201/nixos/dev.nix | 32 ++++++++++++++++++++++++++++++ hosts/x201/nixpkgs/home.nix | 1 + hosts/x201/nixpkgs/packages.nix | 3 +-- 4 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 hosts/x201/nixos/dev.nix diff --git a/hosts/x201/nixos/configuration.nix b/hosts/x201/nixos/configuration.nix index 62517b6..8acb98d 100644 --- a/hosts/x201/nixos/configuration.nix +++ b/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 diff --git a/hosts/x201/nixos/dev.nix b/hosts/x201/nixos/dev.nix new file mode 100644 index 0000000..84e3e9f --- /dev/null +++ b/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; +# }; + +} diff --git a/hosts/x201/nixpkgs/home.nix b/hosts/x201/nixpkgs/home.nix index 6d2eae5..62a7683 100644 --- a/hosts/x201/nixpkgs/home.nix +++ b/hosts/x201/nixpkgs/home.nix @@ -10,6 +10,7 @@ ./emacs.nix ./i3status.nix ./neovim.nix + ./himalaya.nix ]; home.keyboard = { layout = "fr"; diff --git a/hosts/x201/nixpkgs/packages.nix b/hosts/x201/nixpkgs/packages.nix index 74737ac..5a2aaad 100644 --- a/hosts/x201/nixpkgs/packages.nix +++ b/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 ]; } From 249c42ff8d87c022fa509dc4497dfb5c7d2b2ea0 Mon Sep 17 00:00:00 2001 From: Alexandre LUCAZEAU Date: Thu, 15 Dec 2022 15:41:18 +0000 Subject: [PATCH 4/5] ADD ssh config for Hetzner storage boxes CHANGE backup config. Comment rest server, add hetzner storage box for repository --- hosts/next/backup.nix | 22 +++++++++++++--------- hosts/next/configuration.nix | 2 ++ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/hosts/next/backup.nix b/hosts/next/backup.nix index bc8b51e..475c780 100644 --- a/hosts/next/backup.nix +++ b/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; diff --git a/hosts/next/configuration.nix b/hosts/next/configuration.nix index d2df394..77a0ca0 100644 --- a/hosts/next/configuration.nix +++ b/hosts/next/configuration.nix @@ -10,6 +10,7 @@ ../modules/transmission.nix ../modules/prometheus-node.nix ../docker/appsmith.nix + ../docker/baserow.nix ./agenix.nix # ]; @@ -23,6 +24,7 @@ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKUA1RW6JwZasspAp8qmFRFnlV5WXjhLfStAAkM+KYLv lucazeau.alexandre@gmail.com" ]; + 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]; services.qemuGuest.enable = true; From 7e56ae92da892c7abac99270e3f1644769384342 Mon Sep 17 00:00:00 2001 From: Alexandre LUCAZEAU Date: Sat, 7 Jan 2023 19:20:06 +0000 Subject: [PATCH 5/5] ADD : shiori service and open firewall port 8080 --- hosts/next/configuration.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hosts/next/configuration.nix b/hosts/next/configuration.nix index 77a0ca0..ab3232a 100644 --- a/hosts/next/configuration.nix +++ b/hosts/next/configuration.nix @@ -25,8 +25,10 @@ ]; 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]; + networking.firewall.allowedTCPPorts = [ 80 443 22 9002 4533 5050 8080]; services.qemuGuest.enable = true; + + services.shiori.enable = true; # environment.systemPackages = [ (pkgs.callPackage {}) ]; # age.secrets.secret_restic = {