Compare commits

..

No commits in common. "1f6326b4ced64a8410ee139b3a68df21a4f43f58" and "80f9f62740bc80c17fd29fc862301466a6c54877" have entirely different histories.

5 changed files with 10 additions and 38 deletions

View file

@ -1,7 +1,12 @@
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 bcaeddcedef875b01e87d240f5da49c0c0053339 Subproject commit 9ad94e33c2c889a62a526a767c864be71b630777

View file

@ -4,9 +4,11 @@
home.username = "steven"; home.username = "steven";
home.homeDirectory = "/home/steven"; home.homeDirectory = "/home/steven";
home.stateVersion = "25.11"; # Please read the comment before changing. home.stateVersion = "25.11"; # Please read the comment before changing.
home.packages = with pkgs; [ home.packages = [
]; ];
home.file = { home.file = {
"hmhello.txt".text = ''
hello'';
}; };
home.sessionVariables = { home.sessionVariables = {
QT_QPA_PLATFORMTHEME = "gtk3"; QT_QPA_PLATFORMTHEME = "gtk3";
@ -15,32 +17,6 @@
programs = { programs = {
home-manager.enable = true; home-manager.enable = true;
fish.enable = true; fish.enable = true;
zoxide.enable = true;
starship = {
enable = true;
enableFishIntegration = true;
settings = {
format = "$username@$hostname: $character";
right_format = "$directory$git_status$git_branch";
hostname = {
ssh_only = false;
style = "bold blue dimmed";
format = "[$hostname]($style)";
};
username = {
show_always = true;
format = "[$user]($style)";
};
directory = {
fish_style_pwd_dir_length = 4;
};
sudo = {
style = "bold green";
symbol = "SUDO";
disabled = false;
};
};
};
neovim = { neovim = {
enable = true; enable = true;
viAlias = true; viAlias = true;
@ -56,7 +32,6 @@
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;
}; };

View file

@ -12,18 +12,10 @@ 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" })