From 2c6342b3520d756572f08068bd86e9c650bcb41f Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Sat, 10 Jun 2023 17:46:41 +0200 Subject: [PATCH 1/9] 22.11 -> 23.05 --- flake.lock | 116 ++++++++++++++++++---------------------------------- flake.nix | 15 +++---- lib/luj.nix | 2 +- 3 files changed, 45 insertions(+), 88 deletions(-) diff --git a/flake.lock b/flake.lock index 0cac52e..9e0eabb 100644 --- a/flake.lock +++ b/flake.lock @@ -85,11 +85,11 @@ ] }, "locked": { - "lastModified": 1683779844, - "narHash": "sha256-sIeOU0GsCeQEn5TpqE/jFRN4EGsPsjqVRsPdrzIDABM=", + "lastModified": 1685948350, + "narHash": "sha256-1FldJ059so0X/rScdbIiOlQbjjSNCCTdj2cUr5pHU4A=", "owner": "serokell", "repo": "deploy-rs", - "rev": "c80189917086e43d49eece2bd86f56813500a0eb", + "rev": "65211db63ba1199f09b4c9f27e5eba5ec50d76ac", "type": "github" }, "original": { @@ -165,45 +165,23 @@ } }, "home-manager": { - "inputs": { - "nixpkgs": [ - "unstable" - ], - "utils": "utils" - }, - "locked": { - "lastModified": 1681092193, - "narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-22.11", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager-unstable": { "inputs": { "nixpkgs": [ "unstable" ] }, "locked": { - "lastModified": 1681586242, - "narHash": "sha256-2TPuYRCm+snJgZTH2yw4VEXUyYRugir69I1uS5uONx0=", + "lastModified": 1685599623, + "narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=", "owner": "nix-community", "repo": "home-manager", - "rev": "75f4f362e1b5ebdc4076fcbdb4188b4fd736187c", + "rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-23.05", "repo": "home-manager", - "rev": "75f4f362e1b5ebdc4076fcbdb4188b4fd736187c", "type": "github" } }, @@ -231,11 +209,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1685632091, - "narHash": "sha256-RAfDARolNWT4ZF8IH6WwVd2s0jMuaA9zUPeb+I8/L1A=", + "lastModified": 1686306040, + "narHash": "sha256-pkS/Cz4yLUsl3ITipjmAolRpK7PS4c893VtUNMdHWf8=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "9cf72a30fc040f0bd2fb4651ec7f8e82df962278", + "rev": "cf37922d4285689990a648bc02aecb90a07a36ba", "type": "github" }, "original": { @@ -270,11 +248,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1685378141, - "narHash": "sha256-/ehJbAtSJS86NlqHVOeR2ViBKlImKH4guFVPacTmCr8=", + "lastModified": 1685950944, + "narHash": "sha256-59by/hDMxPhq2KLRdjL5n5HoQjbfLdpykOa7BG6gEYw=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "cd86c196f3500f20539754d347c8378349ca0974", + "rev": "64d0ebd66652a5614b645b1ffb4d592ba50d532a", "type": "github" }, "original": { @@ -375,11 +353,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1683434835, - "narHash": "sha256-idBmY6LKkB5hTcTFroUi1oQdCK1/fDfJA+qNaivl1Wk=", + "lastModified": 1686194558, + "narHash": "sha256-ZEgCpLJ95TJ66A8QPgaetafhw9G7/mq8vZZFX2672Xg=", "owner": "tpwrules", "repo": "nixos-apple-silicon", - "rev": "ef6f0de57ef175e0de8c7e846a95481ac6f4ce58", + "rev": "6b08b1821c45601c6833c9e5e391c0ab777631a5", "type": "github" }, "original": { @@ -390,11 +368,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1685383865, - "narHash": "sha256-3uQytfnotO6QJv3r04ajSXbEFMII0dUtw0uqYlZ4dbk=", + "lastModified": 1685655444, + "narHash": "sha256-6EujQNAeaUkWvpEZZcVF8qSfQrNVWFNNGbUJxv/A5a8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e871d8aa6f57cc8e0dc087d1c5013f6e212b4ce", + "rev": "e635192892f5abbc2289eaac3a73cdb249abaefd", "type": "github" }, "original": { @@ -454,32 +432,32 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1683286087, - "narHash": "sha256-xseOd7W7xwF5GOF2RW8qhjmVGrKoBz+caBlreaNzoeI=", + "lastModified": 1685931219, + "narHash": "sha256-8EWeOZ6LKQfgAjB/USffUSELPRjw88A+xTcXnOUvO5M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3e313808bd2e0a0669430787fb22e43b2f4bf8bf", + "rev": "7409480d5c8584a1a83c422530419efe4afb0d19", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "3e313808bd2e0a0669430787fb22e43b2f4bf8bf", + "rev": "7409480d5c8584a1a83c422530419efe4afb0d19", "type": "github" } }, "nixpkgs_5": { "locked": { - "lastModified": 1685468986, - "narHash": "sha256-YSj3K71KjRZgeL0hS3sYLYHI0g8aIVIf9lcsRMCIW2A=", + "lastModified": 1686237827, + "narHash": "sha256-fAZB+Zkcmc+qlauiFnIH9+2qgwM0NO/ru5pWEw3tDow=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9af373a61647257d16ae6062cddaa9094d24920c", + "rev": "81ed90058a851eb73be835c770e062c6938c8a9e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } @@ -490,7 +468,6 @@ "deploy-rs": "deploy-rs", "flake-utils": "flake-utils", "home-manager": "home-manager", - "home-manager-unstable": "home-manager-unstable", "homepage": "homepage", "hyprland": "hyprland", "hyprpaper": "hyprpaper", @@ -559,11 +536,11 @@ "rust-overlay_3": { "flake": false, "locked": { - "lastModified": 1675132198, - "narHash": "sha256-izOVjdIfdv0OzcfO9rXX0lfGkQn4tdJ0eNm3P3LYo/o=", + "lastModified": 1686105195, + "narHash": "sha256-tBTKW+oqfT86Mvq/nm8Tkk3pzhJFXJWXJrj71cTF7lE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "48b1403150c3f5a9aeee8bc4c77c8926f29c6501", + "rev": "1279a72003f5e4b08c8eca1101d8f57452a539f9", "type": "github" }, "original": { @@ -610,11 +587,11 @@ ] }, "locked": { - "lastModified": 1685434555, - "narHash": "sha256-aZl0yeaYX3T2L3W3yXOd3S9OfpS+8YUOT2b1KwrSf6E=", + "lastModified": 1685848844, + "narHash": "sha256-Iury+/SVbAwLES76QJSiKFiQDzmf/8Hsq8j54WF2qyw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "876846cde9762ae563f018c17993354875e2538e", + "rev": "a522e12ee35e50fa7d902a164a9796e420e6e75b", "type": "github" }, "original": { @@ -640,11 +617,11 @@ }, "unstable": { "locked": { - "lastModified": 1685564631, - "narHash": "sha256-8ywr3AkblY4++3lIVxmrWZFzac7+f32ZEhH/A8pNscI=", + "lastModified": 1686226982, + "narHash": "sha256-nLuiPoeiVfqqzeq9rmXxpybh77VS37dsY/k8N2LoxVg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4f53efe34b3a8877ac923b9350c874e3dcd5dc0a", + "rev": "a64b73e07d4aa65cfcbda29ecf78eaf9e72e44bd", "type": "github" }, "original": { @@ -654,30 +631,15 @@ "type": "github" } }, - "utils": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "wlroots": { "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1685491729, - "narHash": "sha256-YfpP8tKpcr0Lxlr3PdoMaY3GD/uJRl6E5pp5KQCEuzg=", + "lastModified": 1685803001, + "narHash": "sha256-yxq/U9zL1ssFZtgT27A96UKteCiKb3zSmbA/dokK76U=", "owner": "wlroots", "repo": "wlroots", - "rev": "3f0487d310974f6ff889ca80e4fb4005553814ed", + "rev": "b61d5922f1d0910a848deb100570ad8587aea38d", "type": "gitlab" }, "original": { diff --git a/flake.nix b/flake.nix index 155b4b4..6147564 100644 --- a/flake.nix +++ b/flake.nix @@ -2,17 +2,10 @@ description = "A flake for my personnal configurations"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; - - flake-utils.url = "github:numtide/flake-utils"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; home-manager = { - url = "github:nix-community/home-manager/release-22.11"; - inputs.nixpkgs.follows = "unstable"; - }; - - home-manager-unstable = { - url = "github:nix-community/home-manager/75f4f362e1b5ebdc4076fcbdb4188b4fd736187c"; + url = "github:nix-community/home-manager/release-23.05"; inputs.nixpkgs.follows = "unstable"; }; @@ -25,10 +18,12 @@ url = "github:NixOS/nixpkgs/nixos-unstable"; }; + flake-utils.url = "github:numtide/flake-utils"; + deploy-rs = { url = "github:serokell/deploy-rs"; - inputs.utils.follows = "flake-utils"; inputs.nixpkgs.follows = "unstable"; + inputs.utils.follows = "flake-utils"; }; sops-nix = { diff --git a/lib/luj.nix b/lib/luj.nix index f879190..20c1985 100644 --- a/lib/luj.nix +++ b/lib/luj.nix @@ -37,7 +37,7 @@ inputs: lib: with lib; let macintosh = { arch = "aarch64-linux"; nixpkgs_version = inputs.nixos-apple-silicon.inputs.nixpkgs; - hm_version = inputs.home-manager-unstable; + hm_version = inputs.home-manager; }; lambda = { arch = "aarch64-linux"; From a975b46c4153b7d9f6e9088f16a7523825f89e7f Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Sat, 10 Jun 2023 17:47:17 +0200 Subject: [PATCH 2/9] changed ssh machines --- home-manager-modules/ssh-client/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/home-manager-modules/ssh-client/default.nix b/home-manager-modules/ssh-client/default.nix index a0a6bee..d373c77 100644 --- a/home-manager-modules/ssh-client/default.nix +++ b/home-manager-modules/ssh-client/default.nix @@ -50,15 +50,15 @@ with lib; user = "julien_malka"; port = 23; }; - curry = { + router = { hostname = "vms.julienmalka.me"; user = "julien"; - port = 60; }; - mails = { - hostname = "192.168.1.78"; + core-security = { + hostname = "192.168.0.175"; user = "julien"; - proxyJump = "curry"; + proxyJump = "router"; + port = 45; }; }; }; From 9bdd84bbf9e7e0dd7e0b7ced2307bf617a17babe Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Sat, 10 Jun 2023 17:50:04 +0200 Subject: [PATCH 3/9] resolved on macintosh --- machines/macintosh/default.nix | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/machines/macintosh/default.nix b/machines/macintosh/default.nix index ea146dc..1c07085 100644 --- a/machines/macintosh/default.nix +++ b/machines/macintosh/default.nix @@ -1,7 +1,3 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - { config, pkgs, lib, inputs, ... }: { @@ -15,12 +11,11 @@ inputs.nixos-apple-silicon.nixosModules.apple-silicon-support ]; - # Use the systemd-boot EFI boot loader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = false; nixpkgs.config.allowUnsupportedSystem = false; networking.hostName = "macintosh"; # Define your hostname. - # Pick only one of the below networking options. + networking.wireless.enable = false; hardware.asahi.addEdgeKernelConfig = true; @@ -34,18 +29,15 @@ LIBSEAT_BACKEND = "logind"; }; - programs.fish.shellInit = '' - if test -z (pgrep ssh-agent) - eval (ssh-agent -c) > /dev/null - set -Ux SSH_AUTH_SOCK $SSH_AUTH_SOCK - set -Ux SSH_AGENT_PID $SSH_AGENT_PID - set -Ux SSH_AUTH_SOCK $SSH_AUTH_SOCK - end - ''; - + services.xserver.enable = true; + services.xserver.displayManager.gdm.enable = true; services.tailscale.enable = true; networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. + networking.networkmanager.dns = "systemd-resolved"; + services.resolved.enable = true; + + time.timeZone = "Europe/Paris"; # Select internationalisation properties. @@ -88,8 +80,6 @@ security.pam.services.swaylock = { }; - services.gnome3.gnome-keyring.enable = true; - security.pam.services.login.enableGnomeKeyring = true; programs.ssh.startAgent = true; programs.adb.enable = true; From 5acd6c32da7c057ca3a5c7801f4b1095ee0de0d8 Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Sat, 10 Jun 2023 17:56:59 +0200 Subject: [PATCH 4/9] correct keymap in gdm --- machines/macintosh/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/machines/macintosh/default.nix b/machines/macintosh/default.nix index 1c07085..0a344d2 100644 --- a/machines/macintosh/default.nix +++ b/machines/macintosh/default.nix @@ -29,8 +29,17 @@ LIBSEAT_BACKEND = "logind"; }; - services.xserver.enable = true; - services.xserver.displayManager.gdm.enable = true; + services.xserver = { + enable = true; + layout = "fr"; + displayManager.gdm.enable = true; + libinput = { + enable = true; + naturalScrolling = true; + }; + }; + + services.tailscale.enable = true; networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. @@ -49,11 +58,6 @@ hardware.asahi.peripheralFirmwareDirectory = ./firmware; - services.xserver.libinput = { - enable = true; - naturalScrolling = true; - }; - hardware.opengl.enable = true; hardware.opengl.driSupport = true; From dec99022a97d2e1e201e1c37f1d0d4ba4264a1c2 Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Sat, 10 Jun 2023 19:02:29 +0200 Subject: [PATCH 5/9] swaylock --- home-manager-modules/hyprland/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/home-manager-modules/hyprland/default.nix b/home-manager-modules/hyprland/default.nix index 51154d5..4f5a928 100644 --- a/home-manager-modules/hyprland/default.nix +++ b/home-manager-modules/hyprland/default.nix @@ -21,6 +21,12 @@ with lib; xdg.configFile."hypr/hyprland.conf".text = '' exec-once = waybar & hyprpaper exec-once=dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY + exec swayidle -w \ + timeout 300 'swaylock -f -c 000000' \ + timeout 600 'swaymsg "output * dpms off"' \ + resume 'swaymsg "output * dpms on"' \ + before-sleep 'swaylock -f -c 000000' + exec-once = nm-applet --indicator # Monitors monitor = eDP-1, preferred, auto, auto @@ -164,7 +170,7 @@ with lib; - home.packages = with pkgs; [ qt6.qtwayland libsForQt5.qt5.qtwayland hyprpaper swaylock ]; + home.packages = with pkgs; [ qt6.qtwayland libsForQt5.qt5.qtwayland hyprpaper swaylock swayidle ]; }; } From 8f94c1e1f0256bcabba2e41137f6e9377786b6d7 Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Sat, 10 Jun 2023 19:07:06 +0200 Subject: [PATCH 6/9] renamed depreciated options --- machines/bin-cache/default.nix | 2 +- machines/lambda/default.nix | 2 +- modules/ssh-server/default.nix | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/machines/bin-cache/default.nix b/machines/bin-cache/default.nix index e393066..0f8c6b2 100644 --- a/machines/bin-cache/default.nix +++ b/machines/bin-cache/default.nix @@ -118,7 +118,7 @@ VfXtULncAiEA2gmqdr+ugFz5tvPdKwanroTiMTUMhhCRYVlQlyTApyQ= services.openssh = { enable = true; ports = [ 45 ]; - permitRootLogin = "yes"; + settings.PermitRootLogin = "yes"; openFirewall = true; }; diff --git a/machines/lambda/default.nix b/machines/lambda/default.nix index 4d1dfcf..97d83e7 100644 --- a/machines/lambda/default.nix +++ b/machines/lambda/default.nix @@ -142,7 +142,7 @@ VfXtULncAiEA2gmqdr+ugFz5tvPdKwanroTiMTUMhhCRYVlQlyTApyQ= services.openssh = { enable = true; ports = [ 45 ]; - permitRootLogin = "yes"; + settings.PermitRootLogin = "yes"; openFirewall = true; }; diff --git a/modules/ssh-server/default.nix b/modules/ssh-server/default.nix index 5d6b89a..5843a3a 100644 --- a/modules/ssh-server/default.nix +++ b/modules/ssh-server/default.nix @@ -13,8 +13,8 @@ with lib; services.openssh = { enable = true; ports = [ 45 ]; - passwordAuthentication = false; - permitRootLogin = "yes"; + settings.PasswordAuthentication = false; + settings.PermitRootLogin = "yes"; openFirewall = true; }; }; From 2770d8fb58caa912e536d63be027d0bd53881f5e Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Sat, 10 Jun 2023 19:28:42 +0200 Subject: [PATCH 7/9] nix index automatic --- base.nix | 4 +++- flake.lock | 21 +++++++++++++++++++++ flake.nix | 6 ++++++ lib/default.nix | 1 + 4 files changed, 31 insertions(+), 1 deletion(-) diff --git a/base.nix b/base.nix index 1e53721..b089ee4 100644 --- a/base.nix +++ b/base.nix @@ -26,11 +26,13 @@ rxvt_unicode xorg.xbacklight neovim - comma ]; environment.variables.EDITOR = "nvim"; + programs.command-not-found.enable = false; + programs.nix-index-database.comma.enable = true; + networking.firewall.checkReversePath = "loose"; systemd.services.NetworkManager-wait-online.enable = false; diff --git a/flake.lock b/flake.lock index 9e0eabb..df702a1 100644 --- a/flake.lock +++ b/flake.lock @@ -325,6 +325,26 @@ "type": "github" } }, + "nix-index-database": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1685764721, + "narHash": "sha256-CIy1iwQTEKfZRrid4gBLA+r/LPGA9IUFo0lKJVyECGI=", + "owner": "Mic92", + "repo": "nix-index-database", + "rev": "669ca1f2e2bc401abab6b837ae9c51503edc9b49", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "nix-index-database", + "type": "github" + } + }, "nix-rfc-92": { "inputs": { "flake-compat": "flake-compat_3", @@ -473,6 +493,7 @@ "hyprpaper": "hyprpaper", "linkal": "linkal", "nil": "nil", + "nix-index-database": "nix-index-database", "nix-rfc-92": "nix-rfc-92", "nixos-apple-silicon": "nixos-apple-silicon", "nixpkgs": "nixpkgs_5", diff --git a/flake.nix b/flake.nix index 6147564..9d2f003 100644 --- a/flake.nix +++ b/flake.nix @@ -70,6 +70,12 @@ inputs.nixpkgs.follows = "unstable"; }; + nix-index-database = + { + url = "github:Mic92/nix-index-database"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nix-rfc-92.url = "github:obsidiansystems/nix/dynamic-drvs"; }; diff --git a/lib/default.nix b/lib/default.nix index daaa0a3..50cf757 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -24,6 +24,7 @@ in inputs.simple-nixos-mailserver.nixosModule inputs.hyprland.nixosModules.default inputs.attic.nixosModules.atticd + inputs.nix-index-database.nixosModules.nix-index { home-manager.useGlobalPkgs = true; nixpkgs.overlays = [ From e0bbef57d358a2218db3e95d176bd229bcef8463 Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Sat, 10 Jun 2023 19:33:29 +0200 Subject: [PATCH 8/9] deleted bin-cache as a job --- flake.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/flake.nix b/flake.nix index 9d2f003..e1f5954 100644 --- a/flake.nix +++ b/flake.nix @@ -240,7 +240,6 @@ machines.lisa = self.nixosConfigurations.lisa.config.system.build.toplevel; machines.macintosh = self.nixosConfigurations.macintosh.config.system.build.toplevel; machines.lambda = self.nixosConfigurations.lambda.config.system.build.toplevel; - machines.bin-cache = self.nixosConfigurations.bin-cache.config.system.build.toplevel; packages.x86_64-linux = packages.x86_64-linux; packages.aarch64-linux = packages.aarch64-linux; }; From 30628ce7177bbfee172adf5a206768938b7cb4bf Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Sat, 10 Jun 2023 19:54:28 +0200 Subject: [PATCH 9/9] changed ssh config --- home-manager-modules/ssh-client/default.nix | 43 +-------------------- 1 file changed, 2 insertions(+), 41 deletions(-) diff --git a/home-manager-modules/ssh-client/default.nix b/home-manager-modules/ssh-client/default.nix index d373c77..eb6f049 100644 --- a/home-manager-modules/ssh-client/default.nix +++ b/home-manager-modules/ssh-client/default.nix @@ -12,54 +12,15 @@ with lib; programs.ssh = { enable = true; matchBlocks = { - newton = { - hostname = "newton.julienmalka.me"; - user = "julien"; - port = 45; - }; - lisa = { - hostname = "lisa.julienmalka.me"; - user = "julien"; - port = 45; - }; - newton-init = { - hostname = "newton.julienmalka.me"; - user = "root"; - port = 2222; - }; sas = { hostname = "sas.eleves.ens.fr"; user = "jmalka"; }; - lambda = { - hostname = "lambda.julienmalka.me"; - user = "root"; - port = 45; - }; - tower = { - hostname = "tower.julienmalka.me"; + "*" = { + hostname = "%h.luj"; user = "julien"; port = 45; }; - saumon = { - hostname = "saumon.julienmalka.me"; - user = "julien"; - }; - stockly = { - hostname = "charybdis.stockly.tech"; - user = "julien_malka"; - port = 23; - }; - router = { - hostname = "vms.julienmalka.me"; - user = "julien"; - }; - core-security = { - hostname = "192.168.0.175"; - user = "julien"; - proxyJump = "router"; - port = 45; - }; }; }; };