diff --git a/machines/polysaa/default.nix b/machines/polysaa/default.nix index 51e6776..1e579cd 100644 --- a/machines/polysaa/default.nix +++ b/machines/polysaa/default.nix @@ -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 diff --git a/profiles/basic/email.nix b/profiles/basic/email.nix index c53bce8..96bb644 100644 --- a/profiles/basic/email.nix +++ b/profiles/basic/email.nix @@ -1,4 +1,11 @@ -{config, lib, pkgs, sops, ...}: { +{ + config, + lib, + pkgs, + sops, + ... +}: +{ home-manager.users.mysaa.accounts.email.accounts = { diff --git a/profiles/basic/git.nix b/profiles/basic/git.nix index 9d29731..6661edf 100644 --- a/profiles/basic/git.nix +++ b/profiles/basic/git.nix @@ -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"; + }; }; -}; } diff --git a/profiles/basic/secrets.nix b/profiles/basic/secrets.nix index 682d7a4..81a7eeb 100644 --- a/profiles/basic/secrets.nix +++ b/profiles/basic/secrets.nix @@ -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" + ]; }; } diff --git a/profiles/basic/ssh.nix b/profiles/basic/ssh.nix index 0cd4784..86b460d 100644 --- a/profiles/basic/ssh.nix +++ b/profiles/basic/ssh.nix @@ -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 + ''; + }; } diff --git a/profiles/graphical/packages.nix b/profiles/graphical/packages.nix index 790ba77..b271288 100644 --- a/profiles/graphical/packages.nix +++ b/profiles/graphical/packages.nix @@ -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) (