diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..b2be92b7 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +result diff --git a/home/modules/neovim/default.nix b/home/modules/neovim/default.nix index f7fd5882..d7b0468e 100644 --- a/home/modules/neovim/default.nix +++ b/home/modules/neovim/default.nix @@ -2,7 +2,7 @@ let inherit (lib.modules) mkIf; -inherit (lib.strings) concatStringsSep fixedWidthNumber hasInfix; +inherit (lib.strings) fixedWidthNumber hasInfix; inherit (lib.attrsets) mapAttrs filterAttrs; packDir = builtins.toString(pkgs.vimUtils.packDir config.programs.neovim.generatedConfigViml.configure.packages); initLua = pkgs.substituteAll ({ @@ -49,7 +49,7 @@ in mkIf config.programs.neovim.enable { bufferline-nvim # Language Server nvim-lspconfig - (pkgs.vimPlugins.nvim-treesitter.withPlugins (plugins: with pkgs.tree-sitter-grammars; [ + (pkgs.vimPlugins.nvim-treesitter.withPlugins (_: with pkgs.tree-sitter-grammars; [ tree-sitter-c tree-sitter-lua tree-sitter-rust diff --git a/nixos/modules/gnome.nix b/nixos/modules/gnome.nix index e29db84f..ea97157b 100644 --- a/nixos/modules/gnome.nix +++ b/nixos/modules/gnome.nix @@ -3,6 +3,7 @@ in { config = mkIf config.role.gnome { services.xserver = { + enable = true; desktopManager.gnome.enable = true; displayManager.gdm.enable = true; }; @@ -10,6 +11,11 @@ in { environment.systemPackages = with pkgs.gnomeExtensions; [ dash-to-dock gsconnect + appindicator + ]; + + services.udev.packages = with pkgs.gnome; [ + gnome-settings-daemon ]; }; } diff --git a/outputs.nix b/outputs.nix index 66b1cd48..ffebc3ce 100644 --- a/outputs.nix +++ b/outputs.nix @@ -36,8 +36,6 @@ }).impure; lib = inputs.nixpkgs.lib; inherit (lib.attrsets) mapAttrs; - inherit (builtins) removeAttrs; - inherit (lib.lists) singleton; in utils.lib.mkFlake { inherit self inputs; supportedSystems = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" ]; diff --git a/system/modules/roles.nix b/system/modules/roles.nix index 9c238811..cdff021d 100644 --- a/system/modules/roles.nix +++ b/system/modules/roles.nix @@ -1,6 +1,5 @@ { config, lib, ... }: let inherit (lib.options) mkOption mdDoc; - inherit (lib.modules) mkIf mkDefault; inherit (lib.types) bool; in { options = {