From b856e26b3a79ad1468cd31c3f6d1c3ed114e7dcb Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Tue, 13 Jun 2023 09:06:39 -0400 Subject: [PATCH] nix: Formatting --- containers/dev.nix | 2 +- containers/gui.nix | 2 +- containers/srb2.nix | 2 +- containers/wine.nix | 2 +- flake.nix | 2 +- modules/neovim/default.nix | 8 ++++---- src/main.nix | 4 +++- 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/containers/dev.nix b/containers/dev.nix index a67e45b..f2d7423 100644 --- a/containers/dev.nix +++ b/containers/dev.nix @@ -17,7 +17,7 @@ in }; }; - config = { pkgs, lib, ... }: { + config = { pkgs, ... }: { imports = [ home-manager.nixosModules.home-manager ../modules/git diff --git a/containers/gui.nix b/containers/gui.nix index ec010f1..eb951af 100644 --- a/containers/gui.nix +++ b/containers/gui.nix @@ -26,7 +26,7 @@ in }; }; - config = { pkgs, lib, ... }: { + config = { pkgs, ... }: { imports = [ home-manager.nixosModules.home-manager stylix.nixosModules.stylix diff --git a/containers/srb2.nix b/containers/srb2.nix index 28cac57..e16f997 100644 --- a/containers/srb2.nix +++ b/containers/srb2.nix @@ -38,7 +38,7 @@ in } ]; - config = { pkgs, lib, ... }: { + config = { pkgs, ... }: { imports = [ home-manager.nixosModules.home-manager stylix.nixosModules.stylix diff --git a/containers/wine.nix b/containers/wine.nix index 953007e..ee82988 100644 --- a/containers/wine.nix +++ b/containers/wine.nix @@ -20,7 +20,7 @@ let VARIABLES = import ../src/variables.nix; in { }; }; - config = { pkgs, lib, ... }: { + config = { pkgs, ... }: { programs = { fish.enable = true; neovim.enable = true; diff --git a/flake.nix b/flake.nix index 8eeb258..2d6eaaf 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - outputs = { self, nixpkgs, home-manager, hyprland, stylix, nix-gaming, crystal-flake, ... } @ attrs: + outputs = { self, nixpkgs, home-manager, hyprland, stylix, nix-gaming, ... } @ attrs: let VARIABLES = import ./src/variables.nix; in { formatter."${VARIABLES.system}" = nixpkgs.legacyPackages."${VARIABLES.system}".nixpkgs-fmt; diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix index a73701e..736647f 100644 --- a/modules/neovim/default.nix +++ b/modules/neovim/default.nix @@ -151,14 +151,14 @@ in { plugin = indent-blankline-nvim; type = "lua"; - config = '' + config = /* lua */ '' require("indent_blankline").setup() ''; } { plugin = gitsigns-nvim; type = "lua"; - config = '' + config = /* lua */ '' require('gitsigns').setup() ''; } @@ -169,7 +169,7 @@ in { plugin = nvim-scrollbar; type = "lua"; - config = ''require("scrollbar").setup()''; + config = /* lua */ ''require("scrollbar").setup()''; } { plugin = nvim-lspconfig; @@ -251,7 +251,7 @@ in { plugin = toggleterm-nvim; type = "lua"; - config = '' + config = /* lua */ '' require("toggleterm").setup { shade_terminals = false } diff --git a/src/main.nix b/src/main.nix index 3abce26..b8eefc9 100644 --- a/src/main.nix +++ b/src/main.nix @@ -17,6 +17,8 @@ let VARIABLES = import ./variables.nix; in { ../containers/wine.nix ../containers/dev.nix ../containers/gui.nix + ../containers/srb2.nix + ../containers/osu.nix ]; # locale @@ -259,7 +261,7 @@ let VARIABLES = import ./variables.nix; in { virtualisation.vmware.host = { enable = true; - extraConfig = '' + extraConfig = /* config */ '' # Enable 3D acceleration on the host mks.gl.allowUnsupportedDrivers = "TRUE" mks.vk.allowUnsupportedDevices = "TRUE"