diff --git a/machines/ace/home.nix b/machines/ace/home.nix index 127141e..0da2838 100644 --- a/machines/ace/home.nix +++ b/machines/ace/home.nix @@ -43,7 +43,7 @@ pandoc pass pciutils - pinentry + pinentry-all ripgrep rustc slides diff --git a/machines/dragon/hardware-configuration.nix b/machines/dragon/hardware-configuration.nix index 81df5ea..0a6fe6f 100644 --- a/machines/dragon/hardware-configuration.nix +++ b/machines/dragon/hardware-configuration.nix @@ -40,12 +40,40 @@ swapDevices = [ { device = "/dev/disk/by-uuid/96a0423d-a4c0-4376-9d34-5a99b764010a"; } ]; - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true; + networking = { + useDHCP = lib.mkDefault true; + wg-quick.interfaces = { + wgnixin = { + address = [ + "192.168.12.4/32" + "2a01:4f9:1a:9a05::4/128" + ]; + dns = [ + "80.67.169.12" + "80.67.169.40" + "2001:910:800::12" + "2001:910:800::40" + ]; + privateKeyFile = "/home/mrflos/Nextcloud/Apps/lab12.mrflos.wg-private.key"; + + peers = [ + { + publicKey = "cUmp55I20JEhxr+RMmOsX+6U9kcDiAq3grnvzjQ642w="; + #allowedIPs = [ + # "0.0.0.0/0" + # "::/0" + #]; + allowedIPs = [ + "192.168.12.0/24" + "2a01:4f9:1a:9a05::/64" + ]; + endpoint = "vpn.lab12.fr:51812"; + persistentKeepalive = 25; + } + ]; + }; + }; + }; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/modules/console.nix b/modules/console.nix index b5df943..e10575d 100644 --- a/modules/console.nix +++ b/modules/console.nix @@ -22,6 +22,7 @@ atuin bat btop + busybox cargo catnip cmatrix @@ -56,7 +57,7 @@ pandoc pass pciutils - pinentry + pinentry-all ripgrep rustc slides diff --git a/modules/desktop.nix b/modules/desktop.nix index 9e9500d..d1206ed 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -59,6 +59,7 @@ droidcam.enable = true; firefox.enable = true; firefox.languagePacks = [ "fr" ]; + firefox.nativeMessagingHosts.packages = [ pkgs.passff-host ]; hyprland.enable = true; ssh.askPassword = pkgs.lib.mkForce "${pkgs.ksshaskpass.out}/bin/ksshaskpass"; # conflict between kde and gnome cf. https://github.com/NixOS/nixpkgs/issues/75867 diff --git a/modules/local-dev.nix b/modules/local-dev.nix index 6209e32..ead49f5 100644 --- a/modules/local-dev.nix +++ b/modules/local-dev.nix @@ -108,6 +108,7 @@ python311Packages.virtualenv rpi-imager ruff-lsp + stdenvNoCC stylelint symfony-cli tree-sitter