refactor home-manager

This commit is contained in:
♥ Minnie ♥ 2024-01-21 21:01:42 +08:00
parent a48829bbe6
commit caed1fc0d4
31 changed files with 243 additions and 270 deletions

View file

@ -0,0 +1,17 @@
{ pkgs, ... }:
{
imports = [
./git.nix
./zsh.nix
];
home.packages = with pkgs; [
lazygit
];
programs.ssh = {
enable = true;
matchBlocks."viridian".hostname = "192.168.1.102";
};
}

View file

@ -0,0 +1,18 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
lazygit
];
programs.git = {
enable = true;
userName = "sajenim";
userEmail = "its.jassy@pm.me";
extraConfig = {
init.defaultBranch = "main";
core.sshCommand = "~/.ssh/sajenim_sk";
user.signingkey = "~/.ssh/signing_sk";
};
};
}

View file

@ -0,0 +1,61 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
fzf # command-line fuzzy finder
];
programs.zsh = {
enable = true;
# Enable extra features
enableAutosuggestions = true;
enableCompletion = true;
syntaxHighlighting = {
enable = true;
};
dotDir = ".config/zsh";
# Commands that should be added to to top of '.zshrc'
initExtraFirst = ''
'';
# Aliases
shellAliases = {
c = "clear";
la = "ls -a";
ll = "ls -l";
tt = "wezterm cli set-tab-title ";
};
# An attribute set that adds to named directory hash table
dirHashes = {
# QMK Keymaps
crkbd = "$HOME/.github/qmk_keymaps/keyboards/crkbd/keymaps/sajenim";
kchrn = "$HOME/.github/qmk_keymaps/keyboards/keychron/q4/ansi_v2/keymaps/sajenim";
};
# Install plugins
plugins = [
{
name = "fzf-tab";
src = pkgs.fetchFromGitHub {
owner = "Aloxaf";
repo = "fzf-tab";
rev = "5a81e13792a1eed4a03d2083771ee6e5b616b9ab";
sha256 = "dPe5CLCAuuuLGRdRCt/nNruxMrP9f/oddRxERkgm1FE=";
};
}
];
# Extra commands that should be added to '.zshrc'
initExtra = ''
eval "$(direnv hook zsh)"
source ${pkgs.zsh-vi-mode}/share/zsh-vi-mode/zsh-vi-mode.plugin.zsh
path+=('/home/sajenim/.local/bin')
export PATH
PROMPT='%F{blue}%n@%m %F{cyan}%~ %F{red} %f';
'';
};
}

View file

@ -0,0 +1,7 @@
{ ... }:
{
imports = [
./discord
];
}

View file

@ -0,0 +1,41 @@
:root {
--font-primary: Fisa Code;
/* Gruvbox Material Dark Hard */
--fg0: #d4be98;
--bg0: #1d2021;
--bg1: #282828;
--grey0: #7c6f64;
--grey1: #928374;
--grey2: #a89984;
/* Midpoints between bg0 + bg1 */
--bg0_33: #212323;
--bg0_66: #242526;
}
.theme-dark {
--text-normal: var(--fg0);
--channels-default: var(--grey2);
--interactive-normal: var(--grey0);
--interactive-active: var(--grey0);
--channel-icon: var(--grey0);
--channeltextarea-background: var(--bg0_66);
--scrollbar-auto-thumb: var(--grey0);
--scrollbar-auto-track: var(--bg1);
--header-primary: var(--grey0);
--header-secondary: var(--grey2);
--background-primary: var(--bg0);
--background-secondary: var(--bg0_66);
--background-secondary-alt: var(--bg0_33);
--background-tertiary: var(--bg1);
--background-message-hover: var(--bg0_33);
--background-mentioned: var(--bg0_66);
--bg-overlay-selected: var(--bg1);
}

View file

@ -0,0 +1,24 @@
{ pkgs, ... }:
{
nixpkgs.overlays = [
(final: prev: {
discord = prev.discord.override { withOpenASAR = true; };
})
];
home.packages = with pkgs; [
discord
betterdiscordctl
];
home.file.".config/BetterDiscord/data/stable/custom.css" = {
enable = true;
source = ./config/custom.css;
};
home.persistence."/persist/home/sajenim".directories = [
".config/discord"
".config/BetterDiscord"
];
}

View file

@ -0,0 +1,33 @@
{ inputs, pkgs, ... }:
{
imports = [
./picom.nix
./rofi.nix
];
home.packages = with pkgs; [
feh
xmobar
unstable.wezterm
];
home.file = {
".local/share/fonts" = {
recursive = true;
source = "${inputs.self}/pkgs/patched-fonts";
};
".xinitrc".source = ./xinitrc;
};
xdg.configFile = {
wezterm = { source = ./wezterm/config; recursive = true; };
};
xsession.windowManager.xmonad = {
enable = true;
enableContribAndExtras = true;
config = "${inputs.self}/pkgs/xmonad-config/src/xmonad.hs";
};
}

View file

@ -0,0 +1,15 @@
{ ... }:
{
services.picom = {
enable = true;
shadow = true;
backend = "glx";
settings = {
corner-radius = 10;
rounded-corners-exclude = [
"window_type = 'dock'"
];
};
};
}

View file

@ -0,0 +1,9 @@
{ ... }:
{
programs.rofi = {
enable = true;
font = "Fisa Code 10";
};
}

View file

@ -0,0 +1,36 @@
[colors]
background = '#1d2021'
foreground = '#d4be98'
selection_bg = '#d4be98'
selection_fg = '#3c3836'
cursor_bg = '#d4be98'
cursor_fg = '#1d2021'
cursor_border = '#d4be98'
ansi = [
'#1d2021',
'#ea6962',
'#a9b665',
'#d8a657',
'#7daea3',
'#d3869b',
'#89b482',
'#d4be98',
]
brights = [
'#7c6f64',
'#ea6962',
'#a9b665',
'#d8a657',
'#7daea3',
'#d3869b',
'#89b482',
'#d4be98',
]
[colors.indexed]
[metadata]
name = 'gruvbox_material_dark_hard'
origin_url = 'https://gist.github.com/theoriginalstove/89aa16316a756721816886398080dbd6'

View file

@ -0,0 +1,126 @@
-- Pull in the wezterm API
local wezterm = require 'wezterm'
local act = wezterm.action
-- This table will hold the configuration.
local config = {}
-- In newer versions of wezterm, use the config_builder which will
-- help provide clearer error messages
if wezterm.config_builder then
config = wezterm.config_builder()
end
-- This function returns the suggested title for a tab.
-- It prefers the title that was set via `tab:set_title()`
-- or `wezterm cli set-tab-title`, but falls back to the
-- title of the active pane in that tab.
function tab_title(tab_info)
local title = tab_info.tab_title
-- if the tab title is explicitly set, take that
if title and #title > 0 then
return title
end
-- Otherwise, use the title from the active pane
-- in that tab
return tab_info.active_pane.title
end
wezterm.on(
'format-tab-title',
function(tab, tabs, panes, config, hover, max_width)
local title = tab_title(tab)
return { { Text = ' ' .. title .. '' }, }
end
)
-- Do not check for or show window with update information
config.check_for_updates = false
config.show_update_window = false
--| Font Configuration
config.font = wezterm.font 'Fisa Code'
config.font_size = 10.0
--| Color scheme
config.color_scheme = 'gruvbox_material_dark_hard'
--| Padding
config.window_padding = {
left = 20,
right = 20,
top = 20,
bottom = 0,
}
--| Style Inactive Panes
config.inactive_pane_hsb = {
saturation = 1.0,
brightness = 1.0,
}
--| Tab Bar Appearance
config.use_fancy_tab_bar = false
config.enable_tab_bar = true
config.hide_tab_bar_if_only_one_tab = false
config.tab_bar_at_bottom = false
config.tab_max_width = 24
config.show_tab_index_in_tab_bar = false
--| Colors
config.colors = {
tab_bar = {
--| Tab Bar Colors
background = '#282828',
--| Tab Colors
active_tab = { bg_color = '#282828', fg_color = '#7daea3', intensity = 'Bold', italic = false, },
inactive_tab = { bg_color = '#282828', fg_color = '#7c6f64', intensity = 'Normal', italic = false, },
inactive_tab_hover = { bg_color = '#282828', fg_color = '#7c6f64', intensity = 'Normal', italic = false, },
new_tab = { bg_color = '#282828', fg_color = '#7c6f64', intensity = 'Normal', italic = false, },
new_tab_hover = { bg_color = '#282828', fg_color = '#7c6f64', intensity = 'Normal', italic = false, },
}
}
--| Key Assignments
config.disable_default_key_bindings = true
config.keys = {}
for i = 1, 8 do
--| CTRL+ALT + number to activate tab
table.insert(config.keys, {
key = tostring(i),
mods = 'CTRL|ALT',
action = act.ActivateTab(i - 1),
})
end
config.keys = {
--| Spawn Tab
{ key = 't', mods = 'ALT', action = act.SpawnTab 'CurrentPaneDomain', },
--| Tab Navigation
{ key = 'LeftArrow', mods = 'ALT', action = act.ActivateTabRelative(-1) },
{ key = 'RightArrow', mods = 'ALT', action = act.ActivateTabRelative(1) },
--| Close Tab
{ key = 'w', mods = 'ALT|CTRL', action = act.CloseCurrentTab { confirm = false }, },
--| Split Panes
{ key = 'v', mods = 'ALT', action = act.SplitVertical { domain = 'CurrentPaneDomain' }, },
{ key = 'h', mods = 'ALT', action = act.SplitHorizontal { domain = 'CurrentPaneDomain' }, },
--| Adjust Pane Size
{ key = 'PageDown', mods = 'ALT', action = act.AdjustPaneSize { 'Down', 5 } },
{ key = 'PageUp', mods = 'ALT', action = act.AdjustPaneSize { 'Up', 5 } },
--| Pane Navigation
{ key = 'DownArrow', mods = 'ALT', action = act.ActivatePaneDirection 'Next', },
{ key = 'UpArrow', mods = 'ALT', action = act.ActivatePaneDirection 'Prev', },
--| Close Pane
{ key = 'x', mods = "ALT", action = act.CloseCurrentPane { confirm = false }, },
--| Copy Mode / Clipboard
{ key = 'X', mods = 'CTRL', action = act.ActivateCopyMode, },
{ key = 'C', mods = 'CTRL', action = act.CopyTo 'ClipboardAndPrimarySelection', },
{ key = 'V', mods = 'CTRL', action = act.PasteFrom 'Clipboard', },
}
return config

View file

@ -0,0 +1,13 @@
#/bin/bash
# Setup our monitors
xrandr --output HDMI-A-0 --mode 1920x1080 --output DisplayPort-0 --mode 2560x1440 --right-of HDMI-A-0
# Apply our wallpaper
feh --bg-center ~/.github/dotfiles.nix/assets/chinatown.png
# Enable our compositor
picom -b
# Launch our window manager
exec xmonad

View file

@ -0,0 +1,21 @@
{ pkgs, ... }:
{
imports = [
./mangohud.nix
];
home = {
packages = with pkgs; [
gamemode
protonup-ng
prismlauncher
runelite
];
persistence."/persist/home/sajenim" = {
directories = [
".runelite"
];
};
};
}

View file

@ -0,0 +1,35 @@
{ pkgs, ... }:
{
programs.mangohud = {
enable = true;
package = pkgs.mangohud;
settings = {
# Performance
fps_limit = 60;
# GPU
gpu_temp = true;
gpu_junction_temp = true;
gpu_core_clock = true;
gpu_fan = true;
gpu_voltage = true;
# CPU
cpu_temp = true;
cpu_mhz = true;
# FPS
fps = true;
frametime = false;
frame_timing = false;
# Miscellaneous
wine = true;
gamemode = true;
toggle_hud = "F9";
# Hud dimensions
table_columns = 4;
};
};
}

View file

@ -0,0 +1,31 @@
--
-- Bootstrap lazy.nvim
--
local lazypath = vim.fn.stdpath('data') .. '/lazy/lazy.nvim'
if not vim.loop.fs_stat(lazypath) then
vim.fn.system({
'git',
'clone',
'--filter=blob:none',
'https://github.com/folke/lazy.nvim.git',
'--branch=stable', -- latest stable release
lazypath,
})
end
vim.opt.rtp:prepend(lazypath)
--
-- Load our configurations
--
require('configs.options')
--
-- Load our plugin specs
--
require('lazy').setup('plugins')

View file

@ -0,0 +1,17 @@
-- Keybinds
vim.g.mapleader = ' '
-- General
vim.opt.number = true
vim.opt.showmode = false
vim.opt.swapfile = false
vim.opt.clipboard = 'unnamedplus'
-- Tabs & spaces
vim.opt.tabstop = 2
vim.opt.softtabstop = 2
vim.opt.shiftwidth = 2
vim.opt.expandtab = true
vim.opt.autoindent = true
vim.opt.copyindent = true

View file

@ -0,0 +1,165 @@
return {
--
-- LSP Configuration
--
{
'neovim/nvim-lspconfig',
event = { 'BufReadPost', 'BufNewFile' },
dependencies = {
'hrsh7th/nvim-cmp', -- Autocompletion plugin
'hrsh7th/cmp-nvim-lsp', -- LSP source for nvim-cmp
'saadparwaiz1/cmp_luasnip', -- Snippets source for nvim-cmp
'L3MON4D3/LuaSnip', -- Snippets plugin
},
config = function ()
--
-- Setup language servers.
--
local lspconfig = require('lspconfig')
-- Lua
lspconfig.lua_ls.setup {
on_init = function(client)
local path = client.workspace_folders[1].name
if not vim.loop.fs_stat(path..'/.luarc.json') and not vim.loop.fs_stat(path..'/.luarc.jsonc') then
client.config.settings = vim.tbl_deep_extend('force', client.config.settings, {
Lua = {
runtime = {
-- Tell the language server which version of Lua you're using
-- (most likely LuaJIT in the case of Neovim)
version = 'LuaJIT'
},
-- Make the server aware of Neovim runtime files
workspace = {
checkThirdParty = false,
library = {
vim.env.VIMRUNTIME
-- "${3rd}/luv/library"
-- "${3rd}/busted/library",
}
-- or pull in all of 'runtimepath'. NOTE: this is a lot slower
-- library = vim.api.nvim_get_runtime_file("", true)
}
}
})
client.notify("workspace/didChangeConfiguration", { settings = client.config.settings })
end
return true
end
}
-- Haskell
lspconfig.hls.setup{
filetypes = { 'haskell', 'lhaskell', 'cabal' },
}
-- Nix
lspconfig.nil_ls.setup{}
--
-- Global mappings
--
-- See `:help vim.diagnostic.*` for documentation on any of the below functions
vim.keymap.set('n', '<space>e', vim.diagnostic.open_float)
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev)
vim.keymap.set('n', ']d', vim.diagnostic.goto_next)
vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist)
-- Use LspAttach autocommand to only map the following keys
-- after the language server attaches to the current buffer
vim.api.nvim_create_autocmd('LspAttach', {
group = vim.api.nvim_create_augroup('UserLspConfig', {}),
callback = function(ev)
-- Buffer local mappings.
-- See `:help vim.lsp.*` for documentation on any of the below functions
local opts = { buffer = ev.buf }
vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts)
vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts)
vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts)
vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, opts)
vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, opts)
vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, opts)
vim.keymap.set('n', '<space>wl', function()
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
end, opts)
vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, opts)
vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, opts)
vim.keymap.set({ 'n', 'v' }, '<space>ca', vim.lsp.buf.code_action, opts)
vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts)
vim.keymap.set('n', '<space>f', function()
vim.lsp.buf.format { async = true }
end, opts)
end,
})
--
-- Autocompletion
--
-- Add additional capabilities supported by nvim-cmp
local capabilities = require("cmp_nvim_lsp").default_capabilities()
-- Enable some language servers with the additional completion capabilities offered by nvim-cmp
local servers = { 'clangd', 'rust_analyzer', 'pyright', 'tsserver' }
for _, lsp in ipairs(servers) do
lspconfig[lsp].setup {
-- on_attach = my_custom_on_attach,
capabilities = capabilities,
}
end
-- luasnip setup
local luasnip = require 'luasnip'
-- nvim-cmp setup
local cmp = require 'cmp'
cmp.setup {
snippet = {
expand = function(args)
luasnip.lsp_expand(args.body)
end,
},
mapping = cmp.mapping.preset.insert({
['<C-u>'] = cmp.mapping.scroll_docs(-4), -- Up
['<C-d>'] = cmp.mapping.scroll_docs(4), -- Down
-- C-b (back) C-f (forward) for snippet placeholder navigation.
['<C-Space>'] = cmp.mapping.complete(),
['<CR>'] = cmp.mapping.confirm {
behavior = cmp.ConfirmBehavior.Replace,
select = true,
},
['<Tab>'] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_next_item()
elseif luasnip.expand_or_jumpable() then
luasnip.expand_or_jump()
else
fallback()
end
end, { 'i', 's' }),
['<S-Tab>'] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_prev_item()
elseif luasnip.jumpable(-1) then
luasnip.jump(-1)
else
fallback()
end
end, { 'i', 's' }),
}),
sources = {
{ name = 'nvim_lsp' },
{ name = 'luasnip' },
},
}
end
},
}

View file

@ -0,0 +1,21 @@
return {
--
-- Modified version of gruvbox
--
{
'sainnhe/gruvbox-material',
lazy = false,
priority = 1000,
config = function()
vim.o.termguicolors = true
vim.o.background = 'dark'
vim.g.gruvbox_material_background = 'hard'
vim.g.gruvbox_material_better_performance = 1
vim.cmd([[colorscheme gruvbox-material]])
end,
},
}

View file

@ -0,0 +1,98 @@
return {
--
-- Treesitter
--
{
'nvim-treesitter/nvim-treesitter',
build = ":TSUpdate",
config = function()
local configs = require('nvim-treesitter.configs')
configs.setup({
auto_install = true,
highlight = { enable = true },
indent = { enable = true },
})
end
},
--
-- Fuzzy Finder
--
{
'nvim-telescope/telescope.nvim',
tag = '0.1.3',
dependencies = {
'nvim-lua/plenary.nvim',
'nvim-tree/nvim-web-devicons',
},
keys = {
{ '<leader>ff', '<cmd>Telescope find_files<cr>', desc = 'Find Files' },
{ '<leader>fg', '<cmd>Telescope live_grep<cr>' , desc = 'Live Grep' },
{ '<leader>fb', '<cmd>Telescope buffers<cr>' , desc = 'Buffers' },
{ '<leader>fh', '<cmd>Telescope help_tags<cr>' , desc = 'Help Tags' },
},
config = function()
require('telescope').setup()
end
},
--
-- Commenting
--
{
'numToStr/Comment.nvim',
config = function()
require('Comment').setup()
end
},
--
-- Git Commands
--
{
'kdheepak/lazygit.nvim',
dependencies = {
'nvim-lua/plenary.nvim'
},
keys = {
{ '<leader>gg', '<cmd>LazyGit<cr>', desc = 'LazyGit' },
}
},
--
-- Display Keybindings
--
{
'folke/which-key.nvim',
event = 'VeryLazy',
init = function()
vim.o.timeout = true
vim.o.timeoutlen = 300
end,
opts = { },
},
--
-- Preview Markdown
--
{
'iamcco/markdown-preview.nvim',
cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" },
build = "cd app && npm install",
init = function ()
vim.g.mkdp_filetypes = { "markdown" }
end,
ft = { "markdown" },
},
}

View file

@ -0,0 +1,60 @@
return {
--
-- File explorer
--
{
'nvim-neo-tree/neo-tree.nvim',
dependencies = {
'nvim-lua/plenary.nvim',
'nvim-tree/nvim-web-devicons',
'MunifTanjim/nui.nvim',
},
keys = {
{ '\\', '<cmd>Neotree reveal<cr>', desc = 'Neotree' },
},
opts = {
close_if_last_window = true,
}
},
--
-- Statusline
--
{
'nvim-lualine/lualine.nvim',
event = 'VeryLazy',
dependencies = {
'nvim-tree/nvim-web-devicons',
},
config = function()
require('lualine').setup {
options = {
icons_enabled = true,
theme = 'gruvbox-material',
component_separators = { left = '', right = ''},
section_separators = { left = '', right = ''},
globalstatus = true,
extensions = {
'neotree'
},
}
}
end,
},
--
-- Git decorations
--
{
'lewis6991/gitsigns.nvim',
config = function()
require('gitsigns').setup()
end
}
}

View file

@ -0,0 +1,27 @@
{ pkgs, ... }:
{
programs.neovim = {
enable = true;
#package = pkgs.neovim-nightly;
defaultEditor = true;
extraPackages = with pkgs; [
# Required for nvim-treesitter
gcc
# Required for telescope.nvim
fd
ripgrep
# Required for markdown-preview.nvim
nodejs
yarn
# Language server packages
nil
haskell-language-server
lua-language-server
];
};
home.persistence."/persist/home/sajenim".directories = [ ".local/share/nvim" ];
xdg.configFile.nvim = { source = ./config; recursive = true; };
}

View file

@ -0,0 +1,17 @@
{ pkgs, ... }:
{
home = {
packages = with pkgs; [
blender
freecad
openscad
prusa-slicer
];
persistence."/persist/home/sajenim" = {
directories = [
".config/PrusaSlicer"
];
};
};
}