noa/nixconf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix lua, maybe bend now

Browse source
This commit is contained in:
Noa Aarts 2024-05-20 22:40:56 +02:00
parent 479c55b555
commit 1d9644dcbc
4 changed files with 34 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

7
common/nvim/init.lua
View file

@ -52,8 +52,9 @@ vim.opt.list = true
vim.opt.listchars = { tab = "» ", trail = "·", nbsp = "␣" } vim.opt.listchars = { tab = "» ", trail = "·", nbsp = "␣" }
-- make tabs a reasonable width -- make tabs a reasonable width
vim.opt.tabstop = 4 vim.opt.tabstop = 2
vim.opt.softtabstop = 4 vim.opt.softtabstop = 2
vim.opt.shiftwidth = 2
-- Preview substitutions live, as you type! -- Preview substitutions live, as you type!
vim.opt.inccommand = "split" vim.opt.inccommand = "split"
@ -157,7 +158,7 @@ require("lazy").setup({
"tpope/vim-fugitive", "tpope/vim-fugitive",
-- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link). -- 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, -- NOTE: Plugins can also be added by using a table,
-- with the first argument being the link and the following -- with the first argument being the link and the following

1
common/nvim/nvim.nix
View file

@ -7,7 +7,6 @@
# TODO: find how I can make this build dependencies only # TODO: find how I can make this build dependencies only
gnumake gnumake
cargo
rustc rustc
python3 python3
]; ];

57
flake.nix
View file

@ -16,13 +16,13 @@
}; };
automapaper = { automapaper = {
url = "github:itepastra/automapaper"; url = "github:itepastra/automapaper";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-minecraft = { nix-minecraft = {
url = "github:Infinidoge/nix-minecraft"; url = "github:Infinidoge/nix-minecraft";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
hyprland = { hyprland = {
@ -36,13 +36,13 @@
}; };
disko = { disko = {
url = "github:nix-community/disko"; url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
lazy = { lazy = {
url = "github:bobvanderlinden/nixos-config"; url = "github:bobvanderlinden/nixos-config";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
@ -51,28 +51,27 @@
{ {
nixosConfigurations = { nixosConfigurations = {
lambdaOS = nixpkgs.lib.nixosSystem { lambdaOS = nixpkgs.lib.nixosSystem {
specialArgs = { specialArgs = {
inherit inputs; inherit inputs;
inherit nix-colors; inherit nix-colors;
inherit automapaper; inherit automapaper;
}; };
modules = [ modules = [
./hosts/default/configuration.nix ./hosts/default/configuration.nix
inputs.home-manager.nixosModules.default inputs.home-manager.nixosModules.default
]; ];
}; };
NoasServer = nixpkgs.lib.nixosSystem { NoasServer = nixpkgs.lib.nixosSystem {
specialArgs = { specialArgs = {
inherit inputs; inherit inputs;
inherit nix-colors; inherit nix-colors;
}; };
modules = [ modules = [
disko.nixosModules.disko disko.nixosModules.disko
./hosts/server/configuration.nix ./hosts/server/configuration.nix
inputs.home-manager.nixosModules.default inputs.home-manager.nixosModules.default
]; ];
}; };
}; };
}; };
} }

2
hosts/default/home.nix
View file

@ -66,6 +66,8 @@
nodejs nodejs
opam opam
stack stack
rustup
bend
localsend localsend
]; ];