Compare commits
2 commits
80f9f62740
...
1f6326b4ce
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1f6326b4ce |
||
|
|
cfbcb0b3a8 |
5 changed files with 38 additions and 10 deletions
5
Makefile
5
Makefile
|
|
@ -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
2
dwl
|
|
@ -1 +1 @@
|
||||||
Subproject commit 9ad94e33c2c889a62a526a767c864be71b630777
|
Subproject commit bcaeddcedef875b01e87d240f5da49c0c0053339
|
||||||
|
|
@ -4,11 +4,9 @@
|
||||||
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 = [
|
home.packages = with pkgs; [
|
||||||
];
|
];
|
||||||
home.file = {
|
home.file = {
|
||||||
"hmhello.txt".text = ''
|
|
||||||
hello'';
|
|
||||||
};
|
};
|
||||||
home.sessionVariables = {
|
home.sessionVariables = {
|
||||||
QT_QPA_PLATFORMTHEME = "gtk3";
|
QT_QPA_PLATFORMTHEME = "gtk3";
|
||||||
|
|
@ -17,6 +15,32 @@
|
||||||
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;
|
||||||
|
|
@ -32,6 +56,7 @@
|
||||||
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;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -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" })
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue