From 5a0b2a82be5d6c79278c370a4caa7e2c4829d0af Mon Sep 17 00:00:00 2001 From: Grigory Shipunov Date: Mon, 27 Jun 2022 18:50:35 +0200 Subject: [PATCH] add element-desktop --- flake.nix | 14 +++++++++++--- hosts/microwave/configuration.nix | 3 +-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index 2d4f13d..ca2f64f 100644 --- a/flake.nix +++ b/flake.nix @@ -10,9 +10,12 @@ url = github:astro/microvm.nix; inputs.nixpkgs.follows = "nixpkgs"; }; + rust-overlay = { + url = github:oxalica/rust-overlay; + }; }; - outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, sops-nix, microvm, ... }: { + outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, sops-nix, microvm, rust-overlay, ... }: { nixosConfigurations = { microwave = nixpkgs-unstable.lib.nixosSystem { system = "x86_64-linux"; @@ -25,14 +28,19 @@ ./modules/basic-tools.nix ./modules/gnupg.nix ./modules/hw-accel-intel.nix - ./modules/kernel-latest.nix - ./modules/virtualization.nix ./modules/radio.nix ./modules/tlp.nix ./modules/wireguard.nix ./modules/binary-caches.nix ./modules/science.nix ./modules/mail.nix + ({ pkgs, ... }: { + nixpkgs.overlays = [ rust-overlay.overlay ]; + environment.systemPackages = with pkgs; [ + rust-bin.stable.latest.default + gcc + ]; + }) ]; }; cirrus = nixpkgs.lib.nixosSystem { diff --git a/hosts/microwave/configuration.nix b/hosts/microwave/configuration.nix index 70ccc9c..779e600 100644 --- a/hosts/microwave/configuration.nix +++ b/hosts/microwave/configuration.nix @@ -5,8 +5,6 @@ { config, pkgs, ... }: { - # services.xserver.videoDrivers = [ "displaylink" "modesetting" ]; - # SWAP zramSwap = { enable = true; @@ -20,6 +18,7 @@ kicad gimp inkscape + element-desktop-wayland ]; networking.firewall.enable = true;