Format + new ssh
This commit is contained in:
		
							parent
							
								
									c56c99352b
								
							
						
					
					
						commit
						b0d74406fa
					
				@ -21,7 +21,15 @@
 | 
			
		||||
    "usb_storage"
 | 
			
		||||
    "sd_mod"
 | 
			
		||||
  ];
 | 
			
		||||
  boot.initrd.kernelModules = [ "dm-snapshot" "uas" "usbcore" "usb_storage" "ext4" "nls_cp437" "nls_iso8859_1"];
 | 
			
		||||
  boot.initrd.kernelModules = [
 | 
			
		||||
    "dm-snapshot"
 | 
			
		||||
    "uas"
 | 
			
		||||
    "usbcore"
 | 
			
		||||
    "usb_storage"
 | 
			
		||||
    "ext4"
 | 
			
		||||
    "nls_cp437"
 | 
			
		||||
    "nls_iso8859_1"
 | 
			
		||||
  ];
 | 
			
		||||
  boot.initrd.postDeviceCommands = pkgs.lib.mkBefore ''
 | 
			
		||||
    mkdir -m 0755 -p /run/secrets/
 | 
			
		||||
    sleep 2
 | 
			
		||||
 | 
			
		||||
@ -1,4 +1,11 @@
 | 
			
		||||
{config, lib, pkgs, sops, ...}: {
 | 
			
		||||
{
 | 
			
		||||
  config,
 | 
			
		||||
  lib,
 | 
			
		||||
  pkgs,
 | 
			
		||||
  sops,
 | 
			
		||||
  ...
 | 
			
		||||
}:
 | 
			
		||||
{
 | 
			
		||||
 | 
			
		||||
  home-manager.users.mysaa.accounts.email.accounts = {
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -1,15 +1,21 @@
 | 
			
		||||
{config, lib, pkgs, ...}: {
 | 
			
		||||
{
 | 
			
		||||
  config,
 | 
			
		||||
  lib,
 | 
			
		||||
  pkgs,
 | 
			
		||||
  ...
 | 
			
		||||
}:
 | 
			
		||||
{
 | 
			
		||||
 | 
			
		||||
home-manager.users.mysaa.programs.git = {
 | 
			
		||||
  enable = true;
 | 
			
		||||
  userEmail = "mysaa@hadoly.fr";
 | 
			
		||||
  userName = "Mysaa Java";
 | 
			
		||||
  home-manager.users.mysaa.programs.git = {
 | 
			
		||||
    enable = true;
 | 
			
		||||
    userEmail = "mysaa@hadoly.fr";
 | 
			
		||||
    userName = "Mysaa Java";
 | 
			
		||||
 | 
			
		||||
  signing.key = "880352F5FD83DF24F41413CC4E77725580DA73CE";
 | 
			
		||||
    signing.key = "880352F5FD83DF24F41413CC4E77725580DA73CE";
 | 
			
		||||
 | 
			
		||||
  aliases = {
 | 
			
		||||
    l = "log --oneline --graph";
 | 
			
		||||
    aliases = {
 | 
			
		||||
      l = "log --oneline --graph";
 | 
			
		||||
    };
 | 
			
		||||
  };
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -1,9 +1,20 @@
 | 
			
		||||
{config, lib, pkgs, ...}: {
 | 
			
		||||
{
 | 
			
		||||
  config,
 | 
			
		||||
  lib,
 | 
			
		||||
  pkgs,
 | 
			
		||||
  ...
 | 
			
		||||
}:
 | 
			
		||||
{
 | 
			
		||||
 | 
			
		||||
  fileSystems."/run/secrets" = {
 | 
			
		||||
    device = "/dev/disk/by-uuid/545bfd15-0973-4395-9d05-6c4c78a9e45c";
 | 
			
		||||
    fsType = "ext4";
 | 
			
		||||
    options = ["nofail" "noauto" "ro" "x-systemd.automount"];
 | 
			
		||||
    options = [
 | 
			
		||||
      "nofail"
 | 
			
		||||
      "noauto"
 | 
			
		||||
      "ro"
 | 
			
		||||
      "x-systemd.automount"
 | 
			
		||||
    ];
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -1,16 +1,37 @@
 | 
			
		||||
{config, lib, pkgs, ...}: {
 | 
			
		||||
{
 | 
			
		||||
  config,
 | 
			
		||||
  lib,
 | 
			
		||||
  pkgs,
 | 
			
		||||
  ...
 | 
			
		||||
}:
 | 
			
		||||
{
 | 
			
		||||
 | 
			
		||||
programs.ssh = {
 | 
			
		||||
  extraConfig = ''
 | 
			
		||||
    Host git-ssh.hadoly.fr
 | 
			
		||||
      Hostname git-ssh.hadoly.fr
 | 
			
		||||
      IdentityFile /run/secrets/ssh/mysaa@git.hadoly.fr
 | 
			
		||||
      Port 6900
 | 
			
		||||
  programs.ssh = {
 | 
			
		||||
    extraConfig = ''
 | 
			
		||||
      Host git-ssh.hadoly.fr
 | 
			
		||||
        Hostname git-ssh.hadoly.fr
 | 
			
		||||
        IdentityFile /run/secrets/ssh/mysaa@git.hadoly.fr
 | 
			
		||||
        Port 6900
 | 
			
		||||
 | 
			
		||||
    Host github.com
 | 
			
		||||
      HostName github.com
 | 
			
		||||
      IdentityFile /run/secrets/ssh/MysaaJava@github.com
 | 
			
		||||
  '';
 | 
			
		||||
};
 | 
			
		||||
      Host github.com
 | 
			
		||||
        HostName github.com
 | 
			
		||||
        IdentityFile /run/secrets/ssh/MysaaJava@github.com
 | 
			
		||||
 | 
			
		||||
      Host midori
 | 
			
		||||
        HostName midori.bernard.com.de
 | 
			
		||||
        User mysaa
 | 
			
		||||
        IdentityFile /run/secrets/ssh/mysaa@midori.bernard.com.de
 | 
			
		||||
 | 
			
		||||
      Match host nasvrillon exec "nc -w 1 -z 192.168.1.39 5001"
 | 
			
		||||
        HostName 192.168.1.39
 | 
			
		||||
        Port 22
 | 
			
		||||
      Host nasvrillon
 | 
			
		||||
        HostName nasvrillon.myqnapcloud.com
 | 
			
		||||
        User samy
 | 
			
		||||
        Port 6962
 | 
			
		||||
        ConnectTimeout 10
 | 
			
		||||
        AddressFamily inet
 | 
			
		||||
    '';
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -32,13 +32,19 @@
 | 
			
		||||
    #hyphenDicts.fr_FR
 | 
			
		||||
    hyphenDicts.en_US
 | 
			
		||||
    hyphenDicts.de_DE
 | 
			
		||||
    steam
 | 
			
		||||
  ];
 | 
			
		||||
 | 
			
		||||
  programs.steam.enable = true;
 | 
			
		||||
 | 
			
		||||
  home-manager.users.mysaa.services.kdeconnect.enable = true;
 | 
			
		||||
  # We open kdeconnect ports
 | 
			
		||||
  networking.firewall = rec {
 | 
			
		||||
    allowedTCPPortRanges = [ { from = 1714; to = 1764; } ];
 | 
			
		||||
    allowedTCPPortRanges = [
 | 
			
		||||
      {
 | 
			
		||||
        from = 1714;
 | 
			
		||||
        to = 1764;
 | 
			
		||||
      }
 | 
			
		||||
    ];
 | 
			
		||||
    allowedUDPPortRanges = allowedTCPPortRanges;
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
@ -48,7 +54,8 @@
 | 
			
		||||
    enable = true;
 | 
			
		||||
    profiles.default = {
 | 
			
		||||
      isDefault = true;
 | 
			
		||||
      settings = {}
 | 
			
		||||
      settings =
 | 
			
		||||
        { }
 | 
			
		||||
        // lib.attrsets.concatMapAttrs (
 | 
			
		||||
          _: account:
 | 
			
		||||
          lib.optionalAttrs (account.passwordCommand != null) (
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user