diff --git a/common/nvim/init.lua b/common/nvim/init.lua index 5491b53..10eaa50 100644 --- a/common/nvim/init.lua +++ b/common/nvim/init.lua @@ -52,8 +52,9 @@ vim.opt.list = true vim.opt.listchars = { tab = "» ", trail = "·", nbsp = "␣" } -- make tabs a reasonable width -vim.opt.tabstop = 4 -vim.opt.softtabstop = 4 +vim.opt.tabstop = 2 +vim.opt.softtabstop = 2 +vim.opt.shiftwidth = 2 -- Preview substitutions live, as you type! vim.opt.inccommand = "split" @@ -157,7 +158,7 @@ require("lazy").setup({ "tpope/vim-fugitive", -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link). - "tpope/vim-sleuth", -- Detect tabstop and shiftwidth automatically + -- "tpope/vim-sleuth", -- Detect tabstop and shiftwidth automatically -- NOTE: Plugins can also be added by using a table, -- with the first argument being the link and the following diff --git a/common/nvim/nvim.nix b/common/nvim/nvim.nix index e726057..2318ce7 100644 --- a/common/nvim/nvim.nix +++ b/common/nvim/nvim.nix @@ -7,7 +7,6 @@ # TODO: find how I can make this build dependencies only gnumake - cargo rustc python3 ]; diff --git a/flake.nix b/flake.nix index 22aa857..8cabacf 100644 --- a/flake.nix +++ b/flake.nix @@ -16,13 +16,13 @@ }; automapaper = { - url = "github:itepastra/automapaper"; - inputs.nixpkgs.follows = "nixpkgs"; + url = "github:itepastra/automapaper"; + inputs.nixpkgs.follows = "nixpkgs"; }; nix-minecraft = { - url = "github:Infinidoge/nix-minecraft"; - inputs.nixpkgs.follows = "nixpkgs"; + url = "github:Infinidoge/nix-minecraft"; + inputs.nixpkgs.follows = "nixpkgs"; }; hyprland = { @@ -36,13 +36,13 @@ }; disko = { - url = "github:nix-community/disko"; - inputs.nixpkgs.follows = "nixpkgs"; + url = "github:nix-community/disko"; + inputs.nixpkgs.follows = "nixpkgs"; }; lazy = { - url = "github:bobvanderlinden/nixos-config"; - inputs.nixpkgs.follows = "nixpkgs"; + url = "github:bobvanderlinden/nixos-config"; + inputs.nixpkgs.follows = "nixpkgs"; }; }; @@ -51,28 +51,27 @@ { nixosConfigurations = { lambdaOS = nixpkgs.lib.nixosSystem { - specialArgs = { - inherit inputs; - inherit nix-colors; - inherit automapaper; - }; - modules = [ - ./hosts/default/configuration.nix - inputs.home-manager.nixosModules.default - ]; - }; + specialArgs = { + inherit inputs; + inherit nix-colors; + inherit automapaper; + }; + modules = [ + ./hosts/default/configuration.nix + inputs.home-manager.nixosModules.default + ]; + }; NoasServer = nixpkgs.lib.nixosSystem { - specialArgs = { - inherit inputs; - inherit nix-colors; - }; - modules = [ - disko.nixosModules.disko - ./hosts/server/configuration.nix - inputs.home-manager.nixosModules.default - ]; - }; + specialArgs = { + inherit inputs; + inherit nix-colors; + }; + modules = [ + disko.nixosModules.disko + ./hosts/server/configuration.nix + inputs.home-manager.nixosModules.default + ]; + }; }; - }; } diff --git a/hosts/default/home.nix b/hosts/default/home.nix index b4881af..7a367af 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -66,6 +66,8 @@ nodejs opam stack + rustup + bend localsend ];