diff options
| -rw-r--r-- | abbenay/configuration.nix | 18 | ||||
| -rw-r--r-- | cyberbox/configuration.nix | 23 | ||||
| -rw-r--r-- | flake.lock | 69 | ||||
| -rw-r--r-- | flake.nix | 6 |
4 files changed, 5 insertions, 111 deletions
diff --git a/abbenay/configuration.nix b/abbenay/configuration.nix index 3042cd1..ec4c08d 100644 --- a/abbenay/configuration.nix +++ b/abbenay/configuration.nix @@ -9,22 +9,8 @@ services.avahi.enable = true; services.avahi.nssmdns = true; - services.peerix = { enable = true; - package = inputs.peerix.packages.x86_64-linux.peerix; - openFirewall = true; - privateKeyFile = "/var/lib/peerix/peerix-private"; - # publicKeyFile = "/var/lib/peerix/peerix-public"; - publicKey = "cyberbox:peerix-cyberbox:tU7BvNanoiDAFqXQcPItEUCE4jLzdoZ589e3DYqPM9E= peerix-abbenay:sWkpQo5oyhEEXXMEm+8+2KkVcBkfIVpa06jhBs2LRXM="; }; - # services.xserver = { - # enable = true; - # layout = "de"; - # xkbOptions = "eurosign:e,caps:escape"; - # displayManager.gdm.enable = true; - # desktopManager.gnome.enable = true; - # }; - # services.gnome.gnome-keyring.enable = pkgs.lib.mkForce false; environment.systemPackages = with pkgs; [ gnome3.gnome-tweaks @@ -33,9 +19,11 @@ cifs-utils ]; + # for nix-serve + networking.firewall.allowedTCPPorts = [ 5000 ]; + networking = { hostName = "abbenay"; - useDHCP = false; interfaces.enp3s0.useDHCP = true; # networkmanager shouldn't handle nixos container diff --git a/cyberbox/configuration.nix b/cyberbox/configuration.nix index 31c49c4..12b22ae 100644 --- a/cyberbox/configuration.nix +++ b/cyberbox/configuration.nix @@ -29,29 +29,6 @@ }; - services.peerix = { - enable = true; - openFirewall = true; - package = inputs.peerix.packages.x86_64-linux.peerix; - privateKeyFile = "/var/lib/peerix/peerix-private"; - # publicKeyFile = "/var/lib/peerix-public"; - publicKey = "peerix-abbenay:sWkpQo5oyhEEXXMEm+8+2KkVcBkfIVpa06jhBs2LRXM= peerix-cyberbox:tU7BvNanoiDAFqXQcPItEUCE4jLzdoZ589e3DYqPM9E="; - }; - - - # Enable the X11 windowing system. - # services.xserver.enable = true; - - # entrypoint for emacs configured with home-manager - # (must be available on the user's $PATH) - # services.xserver.windowManager.session = pkgs.lib.singleton { - # name = "exwm"; - # start = "emacs -l ${pkgs.writeText "emacs-exwm-load" '' - # (require 'exwm-config) - # (exwm-config-default) - # (defvar inexwm t) - # ''}"; - # }; # Enable touchpad support (enabled default in most desktopManager). # services.xserver.libinput.enable = true; @@ -118,22 +118,6 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1627913399, - "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1667395993, @@ -149,21 +133,6 @@ "type": "github" } }, - "flake-utils_2": { - "locked": { - "lastModified": 1634851050, - "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "gtfsBooks": { "flake": false, "locked": { @@ -223,20 +192,6 @@ "type": "github" } }, - "nixos-hardware": { - "locked": { - "lastModified": 1670174919, - "narHash": "sha256-XdQr3BUnrvVLRFunLWrZORhwYHDG0+9jUUe0Jv1pths=", - "owner": "NixOS", - "repo": "nixos-hardware", - "rev": "9d87bc030a0bf3f00e953dbf095a7d8e852dab6b", - "type": "github" - }, - "original": { - "id": "nixos-hardware", - "type": "indirect" - } - }, "nixpkgs": { "locked": { "lastModified": 1670193339, @@ -312,28 +267,6 @@ "type": "indirect" } }, - "peerix": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1661429880, - "narHash": "sha256-7/m468XZW82O7KhDtRdQ7RnPsh83+tA8N4U0FncFo1U=", - "owner": "cid-chan", - "repo": "peerix", - "rev": "32cd1b098b83c90726848bd6726f74e72c557abb", - "type": "github" - }, - "original": { - "owner": "cid-chan", - "repo": "peerix", - "type": "github" - } - }, "playground": { "flake": false, "locked": { @@ -360,10 +293,8 @@ "gtfsBooks": "gtfsBooks", "home-manager": "home-manager", "naersk": "naersk", - "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", - "peerix": "peerix", "playground": "playground", "sfz": "sfz", "showrt": "showrt", @@ -8,8 +8,6 @@ home-manager.url = "github:nix-community/home-manager/release-22.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - peerix.url = "github:cid-chan/peerix"; - peerix.inputs.nixpkgs.follows = "nixpkgs"; naersk.url = "github:nix-community/naersk"; naersk.inputs.nixpkgs.follows = "nixpkgs"; deploy-rs.url = "github:serokell/deploy-rs"; @@ -42,7 +40,7 @@ walint.flake = false; }; - outputs = { self, nixpkgs, deploy-rs, peerix, nixos-hardware, ... }@inputs: + outputs = { self, nixpkgs, deploy-rs, ... }@inputs: let mkConfig = imports: config: nixpkgs.lib.nixosSystem { @@ -52,7 +50,7 @@ specialArgs = { inherit inputs; }; }; mkServer = mkConfig [ ./common/headless.nix ]; - mkDesktop = mkConfig [ ./common/desktop.nix peerix.nixosModules.peerix ]; + mkDesktop = mkConfig [ ./common/desktop.nix ]; deploy-vps = hostname: { inherit hostname; profiles.system = { |