steven/rice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: move some build processes to nix home-manager

Browse source
This commit is contained in:
Zhongheng Liu 2026-03-16 16:37:29 +01:00
commit 1f6326b4ce
Signed by untrusted user who does not match committer: steven
GPG key ID: 805A28B071DAD84B
4 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -1,12 +1,7 @@
install: install:
cp ./environment /etc/environment
$(MAKE) -C ./scripts install $(MAKE) -C ./scripts install
$(MAKE) -C ./neovim
$(MAKE) -C ./starship
$(MAKE) -C ./dwl install $(MAKE) -C ./dwl install
$(MAKE) -C ./someblocks install $(MAKE) -C ./someblocks install
$(MAKE) -C ./dunst install $(MAKE) -C ./dunst install
cd ./somebar && meson setup build --reconfigure && ninja -C build && ninja -C build install && cd .. cd ./somebar && meson setup build --reconfigure && ninja -C build && ninja -C build install && cd ..
cd ./wmenu && meson setup build --reconfigure && ninja -C build && ninja -C build install && cd .. cd ./wmenu && meson setup build --reconfigure && ninja -C build && ninja -C build install && cd ..

2
dwl

@ -1 +1 @@
Subproject commit 9ad94e33c2c889a62a526a767c864be71b630777 Subproject commit bcaeddcedef875b01e87d240f5da49c0c0053339

20
home-manager/home.nix
View file

@ -15,6 +15,7 @@
programs = { programs = {
home-manager.enable = true; home-manager.enable = true;
fish.enable = true; fish.enable = true;
zoxide.enable = true;
starship = { starship = {
enable = true; enable = true;
enableFishIntegration = true; enableFishIntegration = true;
@ -46,15 +47,16 @@
vimAlias = true; vimAlias = true;
plugins = with pkgs.vimPlugins; [ plugins = with pkgs.vimPlugins; [
oil-nvim oil-nvim
nvim-colorizer-lua nvim-colorizer-lua
nvim-treesitter nvim-treesitter
mini-nvim mini-nvim
plenary-nvim plenary-nvim
telescope-nvim telescope-nvim
gitsigns-nvim gitsigns-nvim
vim-airline vim-airline
nvim-web-devicons nvim-web-devicons
vim-startify vim-startify
nvim-lspconfig
]; ];
extraLuaConfig = builtins.readFile ./neovim/init.lua; extraLuaConfig = builtins.readFile ./neovim/init.lua;
}; };

10
home-manager/neovim/init.lua
View file

@ -12,10 +12,18 @@ vim.cmd [[
-- Disable netrw first: -- Disable netrw first:
vim.g.loaded_netrw = 1 vim.g.loaded_netrw = 1
vim.g.loaded_netrwPlugin = 1 vim.g.loaded_netrwPlugin = 1
vim.diagnostic.config({
virtual_text = true,
})
require("oil").setup({ require("oil").setup({
default_file_explorer = true, default_file_explorer = true,
}) })
vim.lsp.config['rust-analyzer'] = {
cmd = { 'rust-analyzer' },
filetypes = { 'rust' },
root_markers = { {'Cargo.toml', 'Cargo.lock'} },
}
vim.lsp.enable('rust-analyzer')
-- Keymaps -- Keymaps
vim.keymap.set("n", "-", require("oil").open, { desc = "Open Oil" }) vim.keymap.set("n", "-", require("oil").open, { desc = "Open Oil" })
vim.keymap.set("n", "<leader>-", require("oil").open_float, { desc = "Open Oil float" }) vim.keymap.set("n", "<leader>-", require("oil").open_float, { desc = "Open Oil float" })