diff --git a/flake.nix b/flake.nix index 5485053..f4cdc4f 100644 --- a/flake.nix +++ b/flake.nix @@ -146,9 +146,9 @@ meta = { nixpkgs = import nixpkgs { system = "x86_64-linux"; + config.allowUnfree = true; overlays = [ (_self: _super: { - # we assign the overlay created before to the overlays of nixpkgs. unstable = import nixpkgs-unstable { inherit system; config.allowUnfree = true; @@ -158,7 +158,6 @@ landingpage = landingpage.packages.${pkgs.system}.plain; trilium-server = nixpkgs-unstable.legacyPackages.${pkgs.system}.trilium-server; kmonad = kmonad.packages.${pkgs.system}.kmonad; - }) ]; }; @@ -211,11 +210,13 @@ cream = { name, nodes, pkgs, ... }: { deployment.allowLocalDeployment = true; deployment.targetHost = "${name}.private"; + #deployment.targetHost = "localhost"; deployment.tags = [ "desktop" "online" "private" ]; imports = [ grocy-scanner.nixosModule nixos-hardware.nixosModules.framework-12th-gen-intel private_assets.nixosModules.jobrad + retiolum.nixosModules.retiolum ]; home-manager.users.mainUser = { diff --git a/nixos/machines/cream/configuration.nix b/nixos/machines/cream/configuration.nix index bb5b54c..468aea1 100644 --- a/nixos/machines/cream/configuration.nix +++ b/nixos/machines/cream/configuration.nix @@ -9,8 +9,9 @@ ./hardware-configuration.nix ./packages.nix ./syncthing.nix - ./tinc.nix ./cups.nix + ./tinc.nix + ./tinc_retiolum.nix #./wifi-access-point.nix #./wireshark.nix diff --git a/nixos/machines/cream/tinc_retiolum.nix b/nixos/machines/cream/tinc_retiolum.nix new file mode 100644 index 0000000..416ab56 --- /dev/null +++ b/nixos/machines/cream/tinc_retiolum.nix @@ -0,0 +1,15 @@ +{ config, ... }: +{ + sops.secrets.tinc_retiolum_ed25519_key = { }; + sops.secrets.tinc_retiolum_rsa_key = { }; + + networking.retiolum.port = 720; + networking.retiolum.nodename = "sol"; + + services.tinc.networks.retiolum = { + + ed25519PrivateKeyFile = config.sops.secrets.tinc_retiolum_ed25519_key.path; + rsaPrivateKeyFile = config.sops.secrets.tinc_retiolum_rsa_key.path; + + }; +} diff --git a/nixos/system/desktop/packages.nix b/nixos/system/desktop/packages.nix index 51bebeb..658e883 100644 --- a/nixos/system/desktop/packages.nix +++ b/nixos/system/desktop/packages.nix @@ -222,7 +222,7 @@ in cups xfe # filemanager evince - sxiv + nsxiv (library.desktopFile sxiv { longName = "Image Viewer"; command = "sxiv";