diff --git a/flake.nix b/flake.nix index 5f97bee..892dc6d 100644 --- a/flake.nix +++ b/flake.nix @@ -24,10 +24,6 @@ url = "github:nix-community/fenix"; inputs.nixpkgs.follows = "nixpkgs"; }; - nil = { - url = "github:oxalica/nil"; - inputs.nixpkgs.follows = "nixpkgs"; - }; #nix.url = "github:DeterminateSystems/nix-src"; }; diff --git a/modules/common/rust.nix b/modules/common/rust.nix index 2bd9928..6d1a306 100644 --- a/modules/common/rust.nix +++ b/modules/common/rust.nix @@ -1,5 +1,4 @@ { pkgs, ... }: { - # TODO: install nil (nix language server) # TODO: check these out: https://github.com/RGBCube/ncc/blob/86212e148b2642a51814e873a81be73fbc494e86/modules/common/rust.nix#L15-L24 environment.systemPackages = with pkgs; [ (fenix.complete.withComponents [ @@ -11,21 +10,7 @@ ]) rust-analyzer-nightly - # for nil - nil + nixd nixfmt-rfc-style ]; - - # home-manager.sharedModules = [{ - # extraWrapperArgs = [ - # "--suffix" - # "LIBRARY_PATH" - # ":" - # "${lib.makeLibraryPath [ pkgs.stdenv.cc.cc pkgs.zlib ]}" - # "--suffix" - # "PKG_CONFIG_PATH" - # ":" - # "${lib.makeSearchPathOutput "dev" "lib/pkgconfig" [ pkgs.stdenv.cc.cc pkgs.zlib ]}" - # ]; - # }]; } diff --git a/modules/linux/xserver.nix b/modules/linux/xserver.nix index e41a297..afef466 100644 --- a/modules/linux/xserver.nix +++ b/modules/linux/xserver.nix @@ -1,7 +1,6 @@ { pkgs, lib, config, ... }: let inherit (lib) optionalAttrs; in { - # TODO: write i3 and i3status here instead of stowing virtualisation.vmware.guest.enable = true; environment.systemPackages = [ pkgs.fuzzel ];