From 78e2285e54f6822a8fa4e30fc3767785a814bcd3 Mon Sep 17 00:00:00 2001 From: coast Date: Sat, 1 Nov 2025 21:01:51 +0330 Subject: [PATCH] Big nvim changes, change theme to catppuccin mocha on waybar, sway, and mako, and move etc/ files to /, removing etc --- config/foot/foot.ini | 67 +- config/mako/config | 16 +- config/nvim/init.lua | 9 + config/nvim/init.vim | 36 - config/nvim/lazy-lock.json | 30 + config/nvim/lua/config.lua | 82 +++ config/nvim/lua/plugins/lazy/init.lua | 17 + config/nvim/lua/plugins/lazy/plugins.lua | 71 ++ config/nvim/lua/plugins/lsp/init.lua | 156 ++++ config/nvim/lua/plugins/lualine/init.lua | 43 ++ .../nvim/lua/plugins/nvim-cursorline/init.lua | 14 + config/nvim/lua/plugins/nvim-tree/init.lua | 2 + config/nvim/lua/plugins/telescope/init.lua | 3 + config/nvim/lua/plugins/treesitter/init.lua | 10 + config/nvim/lua/plugins/whichkey/init.lua | 2 + config/nvim/nvim | 2 +- config/nvim/pack/graft/start/colorizer | 1 - config/nvim/pack/graft/start/nerdtree | 1 - config/nvim/pack/graft/start/vim-closetag | 1 - config/nvim/pack/graft/start/vim-commentary | 1 - config/nvim/pack/graft/start/vim-endwise | 1 - config/nvim/pack/graft/start/vim-fugitive | 1 - config/nvim/pack/graft/start/vim-lsp | 1 - config/nvim/pack/graft/start/vim-lsp-settings | 1 - config/nvim/pack/graft/start/vim-surround | 1 - config/nvim/pack/graft/start/vim-vinegar | 1 - config/nvim/vim-graft/LICENSE.txt | 674 ------------------ config/nvim/vim-graft/README | 29 - config/nvim/vim-graft/README.txt | 29 - config/nvim/vim-graft/Rakefile | 13 - config/nvim/vim-graft/config.rb | 22 - config/nvim/vim-graft/graft.rb | 49 -- config/nvim/vim-graft/plugin/graft.vim | 2 - config/waybar/config.jsonc | 30 +- config/waybar/style.css | 70 +- .../configuration/configuration.nix | 12 +- .../sys/coreutils-configuration.nix | 0 {etc/nixos => nixos}/flake.lock | 0 {etc/nixos => nixos}/flake.nix | 1 + nixos/hardware-configuration.nix | 39 + .../home-configuration/apps/sway.nix | 45 +- .../home-configuration/apps/zsh.nix | 81 +-- nixos/home-configuration/configuration.nix | 80 +++ {etc/portage => portage}/make.conf | 0 44 files changed, 709 insertions(+), 1037 deletions(-) create mode 100644 config/nvim/init.lua delete mode 100644 config/nvim/init.vim create mode 100644 config/nvim/lazy-lock.json create mode 100644 config/nvim/lua/config.lua create mode 100644 config/nvim/lua/plugins/lazy/init.lua create mode 100644 config/nvim/lua/plugins/lazy/plugins.lua create mode 100644 config/nvim/lua/plugins/lsp/init.lua create mode 100644 config/nvim/lua/plugins/lualine/init.lua create mode 100644 config/nvim/lua/plugins/nvim-cursorline/init.lua create mode 100644 config/nvim/lua/plugins/nvim-tree/init.lua create mode 100644 config/nvim/lua/plugins/telescope/init.lua create mode 100644 config/nvim/lua/plugins/treesitter/init.lua create mode 100644 config/nvim/lua/plugins/whichkey/init.lua delete mode 160000 config/nvim/pack/graft/start/colorizer delete mode 160000 config/nvim/pack/graft/start/nerdtree delete mode 160000 config/nvim/pack/graft/start/vim-closetag delete mode 160000 config/nvim/pack/graft/start/vim-commentary delete mode 160000 config/nvim/pack/graft/start/vim-endwise delete mode 160000 config/nvim/pack/graft/start/vim-fugitive delete mode 160000 config/nvim/pack/graft/start/vim-lsp delete mode 160000 config/nvim/pack/graft/start/vim-lsp-settings delete mode 160000 config/nvim/pack/graft/start/vim-surround delete mode 160000 config/nvim/pack/graft/start/vim-vinegar delete mode 100644 config/nvim/vim-graft/LICENSE.txt delete mode 100644 config/nvim/vim-graft/README delete mode 100644 config/nvim/vim-graft/README.txt delete mode 100644 config/nvim/vim-graft/Rakefile delete mode 100644 config/nvim/vim-graft/config.rb delete mode 100644 config/nvim/vim-graft/graft.rb delete mode 100644 config/nvim/vim-graft/plugin/graft.vim rename {etc/nixos => nixos}/configuration/configuration.nix (92%) rename {etc/nixos => nixos}/configuration/sys/coreutils-configuration.nix (100%) rename {etc/nixos => nixos}/flake.lock (100%) rename {etc/nixos => nixos}/flake.nix (97%) create mode 100644 nixos/hardware-configuration.nix rename {etc/nixos => nixos}/home-configuration/apps/sway.nix (67%) rename etc/nixos/home-configuration/configuration.nix => nixos/home-configuration/apps/zsh.nix (53%) create mode 100644 nixos/home-configuration/configuration.nix rename {etc/portage => portage}/make.conf (100%) diff --git a/config/foot/foot.ini b/config/foot/foot.ini index 67b4a44..29b7623 100644 --- a/config/foot/foot.ini +++ b/config/foot/foot.ini @@ -1,35 +1,40 @@ font=Maple Mono:size=14 -pad=8x8 +pad=4x4 [colors] -#foreground=ebdbb2 # light foreground (text) -alpha=0.9 -<<<<<<< HEAD -background=000000 # dark background -======= +alpha=1.0 background=111111 # dark background ->>>>>>> bd52954 (repush) -# -### Normal/regular colors (color palette 0-7) -#regular0=1d2021 # black -#regular1=fb4934 # red -#regular2=b8bb26 # green -#regular3=fabd2f # yellow -#regular4=83a598 # blue -#regular5=d3869b # magenta -#regular6=8ec07c # cyan -#regular7=ffffff # white -# -### Bright colors (color palette 8-15) -#bright0=7c6f64 # bright black -#bright1=fb4934 # bright red -#bright2=b8bb26 # bright green -#bright3=fabd2f # bright yellow -#bright4=83a598 # bright blue -#bright5=d3869b # bright magenta -#bright6=8ec07c # bright cyan -#bright7=ffffff # bright white -# -### dimmed colors (see foot.ini(5) man page) -#dim0=fe8019 -#dim1=fb4934 + +[colors] +foreground=cdd6f4 +background=1e1e2e + +regular0=45475a +regular1=f38ba8 +regular2=a6e3a1 +regular3=f9e2af +regular4=89b4fa +regular5=f5c2e7 +regular6=94e2d5 +regular7=bac2de + +bright0=585b70 +bright1=f38ba8 +bright2=a6e3a1 +bright3=f9e2af +bright4=89b4fa +bright5=f5c2e7 +bright6=94e2d5 +bright7=a6adc8 + +16=fab387 +17=f5e0dc + +selection-foreground=cdd6f4 +selection-background=414356 + +search-box-no-match=11111b f38ba8 +search-box-match=cdd6f4 313244 + +jump-labels=11111b fab387 +urls=89b4fa diff --git a/config/mako/config b/config/mako/config index 46a3a80..54b1655 100644 --- a/config/mako/config +++ b/config/mako/config @@ -1,15 +1,11 @@ -background-color=#000000 -text-color=#aeaeae -border-color=#1c1c1c default-timeout=5000 ignore-timeout=1 +background-color=#1e1e2e +text-color=#cdd6f4 +border-color=#b4befe +progress-color=over #313244 [urgency=low] -border-color=#aeaeae - -[urgency=normal] -border-color=#aeaeae - +border-color=#0b0b22 [urgency=high] -border-color=#383383 - +border-color=#fab387 diff --git a/config/nvim/init.lua b/config/nvim/init.lua new file mode 100644 index 0000000..3cad5fc --- /dev/null +++ b/config/nvim/init.lua @@ -0,0 +1,9 @@ +require("plugins/lazy") +require("plugins/lsp") +require("plugins/lualine") +require("plugins/nvim-cursorline") +require("plugins/nvim-tree") +require("plugins/telescope") +require("plugins/treesitter") +--require("plugins/whichkey") +require("config") diff --git a/config/nvim/init.vim b/config/nvim/init.vim deleted file mode 100644 index 0e93ccb..0000000 --- a/config/nvim/init.vim +++ /dev/null @@ -1,36 +0,0 @@ -se notgc bg=light -color vim - -let mapleader=" " - -se nu rnu -se fillchars=eob:\ - -se undofile -se undodir=~/.config/nvim/undodir - -filetype plugin indent on -se expandtab -se shiftwidth=4 -se softtabstop=4 -se tabstop=4 -se smartindent - -nnoremap cd :ex - -if executable('nil') - autocmd User lsp_setup call lsp#register_server({ - \ 'name': 'nil', - \ 'cmd': {server_info->['nil']}, - \ 'whitelist': ['nix'], - \ }) -endif - -if executable('clangd') - autocmd User lsp_setup call lsp#register_server({ - \ 'name': 'clangd', - \ 'cmd': {server_info-> ['clangd']}, - \ 'whitelist': ['c', 'cpp', 'objc', 'objcpp'], - \ 'root_markers': ['compile_commands.json', 'Makefile', '.git'], - \ }) -endif diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json new file mode 100644 index 0000000..bad3067 --- /dev/null +++ b/config/nvim/lazy-lock.json @@ -0,0 +1,30 @@ +{ + "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, + "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, + "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, + "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" }, + "cmp-spell": { "branch": "master", "commit": "694a4e50809d6d645c1ea29015dad0c293f019d6" }, + "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" }, + "lazy.nvim": { "branch": "main", "commit": "db067881fff0fd4be8c00e5bde7492e0e1c77a2f" }, + "lsp_signature.nvim": { "branch": "master", "commit": "d50e40b3bf9324128e71b0b7e589765ce89466d2" }, + "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" }, + "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" }, + "none-ls-extras.nvim": { "branch": "main", "commit": "924fe88a9983c7d90dbb31fc4e3129a583ea0a90" }, + "none-ls.nvim": { "branch": "main", "commit": "db2a48b79cfcdab8baa5d3f37f21c78b6705c62e" }, + "nvim": { "branch": "main", "commit": "fa42eb5e26819ef58884257d5ae95dd0552b9a66" }, + "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" }, + "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, + "nvim-cursorline": { "branch": "main", "commit": "804f0023692653b2b2368462d67d2a87056947f9" }, + "nvim-lspconfig": { "branch": "master", "commit": "77d3fdfb3554632c7a3b101ded643d422de7626f" }, + "nvim-tree.lua": { "branch": "master", "commit": "1c733e8c1957dc67f47580fe9c458a13b5612d5b" }, + "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, + "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" }, + "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, + "telescope-undo.nvim": { "branch": "main", "commit": "928d0c2dc9606e01e2cc547196f48d2eaecf58e5" }, + "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, + "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, + "typst-preview.nvim": { "branch": "master", "commit": "e544812bba84b4f7976590f2b6c0dfbd099e1893" }, + "vim-vsnip": { "branch": "master", "commit": "0a4b8419e44f47c57eec4c90df17567ad4b1b36e" } +} diff --git a/config/nvim/lua/config.lua b/config/nvim/lua/config.lua new file mode 100644 index 0000000..422aa2c --- /dev/null +++ b/config/nvim/lua/config.lua @@ -0,0 +1,82 @@ +local cfg = vim.opt +local cmd = vim.cmd +local g = vim.g + +g.mapleader = " " + +cfg.shiftwidth = 4 +cfg.tabstop = 4 +cfg.softtabstop = 4 +cfg.smarttab = true +cfg.smartindent = true + +cfg.number = true +cfg.relativenumber = true + +cfg.fillchars = "eob: " + +cfg.clipboard = "unnamedplus" + +g.loaded_netrw = 1 +g.loaded_netrwPlugin = 1 + +cfg.termguicolors = true + +cfg.spell = false +cfg.spelllang = { "en_us" } + +if vim.loop.os_uname().sysname == "Linux" then + cfg.shell = "/run/current-system/sw/bin/zsh" +else + cfg.shell = "/run/current-system/sw/bin/zsh" +end + +vim.cmd([[colorscheme catppuccin-mocha]]) + +vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { + border = "single", +}) +vim.diagnostic.config({ float = { border = "single" } }) + +vim.keymap.set("n", "u", ":Telescope") +vim.keymap.set("n", "", ":bn") +vim.keymap.set("n", "", ":bp") +vim.keymap.set("n", "", ":bw") + +vim.keymap.set("n", ".", vim.diagnostic.open_float) + +vim.api.nvim_create_autocmd("LspAttach", { + group = vim.api.nvim_create_augroup("UserLspConfig", {}), + callback = function(ev) + vim.bo[ev.buf].omnifunc = "v:lua.vim.lsp.omnifunc" + + 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", function() + vim.lsp.buf.hover({ border = "single" }) + end, opts) + vim.keymap.set("n", "gi", vim.lsp.buf.implementation, opts) + vim.keymap.set("n", "", vim.lsp.buf.signature_help, opts) + vim.keymap.set("n", "wa", vim.lsp.buf.add_workspace_folder, opts) + vim.keymap.set("n", "wr", vim.lsp.buf.remove_workspace_folder, opts) + vim.keymap.set("n", "wl", function() + print(vim.inspect(vim.lsp.buf.list_workspace_folders())) + end, opts) + vim.keymap.set("n", "D", vim.lsp.buf.type_definition, opts) + vim.keymap.set("n", "rn", vim.lsp.buf.rename, opts) + vim.keymap.set({ "n", "v" }, "ca", vim.lsp.buf.code_action, opts) + vim.keymap.set("n", "gr", vim.lsp.buf.references, opts) + vim.keymap.set("n", "f", function() + vim.lsp.buf.format({ async = true }) + end, opts) + end, +}) + +local builtin = require("telescope.builtin") +vim.keymap.set("n", "ff", builtin.find_files, {}) +vim.keymap.set("n", "fg", builtin.live_grep, {}) +vim.keymap.set("n", "fb", builtin.buffers, {}) +vim.keymap.set("n", "fh", builtin.help_tags, {}) +local treeapi = require("nvim-tree.api") +vim.keymap.set("n", "e", treeapi.tree.toggle, {}) diff --git a/config/nvim/lua/plugins/lazy/init.lua b/config/nvim/lua/plugins/lazy/init.lua new file mode 100644 index 0000000..497cf69 --- /dev/null +++ b/config/nvim/lua/plugins/lazy/init.lua @@ -0,0 +1,17 @@ +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", + lazypath, + }) +end +vim.opt.rtp:prepend(lazypath) + +local lazy_plugins = require("plugins/lazy/plugins") + +require("lazy").setup(lazy_plugins) +require("mason").setup() diff --git a/config/nvim/lua/plugins/lazy/plugins.lua b/config/nvim/lua/plugins/lazy/plugins.lua new file mode 100644 index 0000000..05dc86b --- /dev/null +++ b/config/nvim/lua/plugins/lazy/plugins.lua @@ -0,0 +1,71 @@ +return { + { + "andweeb/presence.nvim", + "catppuccin/nvim", + "neovim/nvim-lspconfig", + "williamboman/mason.nvim", + { + "nvim-telescope/telescope.nvim", + tag = "0.1.5", + dependencies = { "nvim-lua/plenary.nvim" }, + }, + { + "nvim-tree/nvim-tree.lua", + dependencies = { "nvim-tree/nvim-web-devicons" }, + }, + { + "nvim-lualine/lualine.nvim", + dependencies = { "nvim-tree/nvim-web-devicons" }, + }, + "yamatsum/nvim-cursorline", + { + "folke/todo-comments.nvim", + dependencies = { "nvim-lua/plenary.nvim" }, + opts = {}, + }, + { + "nvimtools/none-ls.nvim", + dependencies = { + "nvimtools/none-ls-extras.nvim", + }, + }, + { + "windwp/nvim-autopairs", + event = "InsertEnter", + }, + { + "hrsh7th/nvim-cmp", + dependencies = { + "neovim/nvim-lspconfig", + "hrsh7th/cmp-nvim-lsp", + "hrsh7th/cmp-nvim-lua", + "hrsh7th/cmp-buffer", + "hrsh7th/cmp-path", + "hrsh7th/cmp-cmdline", + "hrsh7th/cmp-vsnip", + "hrsh7th/vim-vsnip", + }, + }, + { + "ray-x/lsp_signature.nvim", + event = "VeryLazy", + }, + "nvim-treesitter/nvim-treesitter", + "f3fora/cmp-spell", + { + "debugloop/telescope-undo.nvim", + dependencies = { + { + "nvim-telescope/telescope.nvim", + dependencies = { "nvim-lua/plenary.nvim" }, + }, + }, + }, + { + "chomosuke/typst-preview.nvim", + lazy = false, + version = "1.*", + opts = {}, + }, + }, +} diff --git a/config/nvim/lua/plugins/lsp/init.lua b/config/nvim/lua/plugins/lsp/init.lua new file mode 100644 index 0000000..bd9f5cb --- /dev/null +++ b/config/nvim/lua/plugins/lsp/init.lua @@ -0,0 +1,156 @@ +local lsp = require("lspconfig") +local fmt = require("null-ls") +local cmp = require("cmp") + +require("nvim-autopairs").setup({}) +require("lsp_signature").setup({ + hint_enable = false, +}) +-- Formatters +local augroup = vim.api.nvim_create_augroup("LspFormatting", {}) +fmt.setup({ + sources = { + fmt.builtins.formatting.clang_format, + require("none-ls.formatting.rustfmt"), + fmt.builtins.formatting.stylua, + fmt.builtins.formatting.gofmt, + }, + -- Format on save + on_attach = function(client, bufnr) + if client.supports_method("textDocument/formatting") then + vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr }) + vim.api.nvim_create_autocmd("BufWritePre", { + group = augroup, + buffer = bufnr, + callback = function() + vim.lsp.buf.format({ async = false }) + end, + }) + end + end, +}) +cmp.setup({ + snippet = { + expand = function(args) + vim.fn["vsnip#anonymous"](args.body) + end, + }, + mapping = cmp.mapping.preset.insert({ + [""] = cmp.mapping.scroll_docs(-4), + [""] = cmp.mapping.scroll_docs(4), + [""] = cmp.mapping.complete(), + [""] = cmp.mapping.abort(), + [""] = cmp.mapping.confirm({ select = true }), + }), + window = { + completion = cmp.config.window.bordered(), + documentation = cmp.config.window.bordered(), + }, + sources = cmp.config.sources({ + { name = "nvim_lsp" }, + { name = "vsnip" }, + { + name = "spell", + option = { + keep_all_entries = false, + enable_in_context = function() + return true + end, + }, + }, + }, { + { name = "buffer" }, + { name = "nvim_lua" }, + }), +}) +cmp.setup.filetype("gitcommit", { + sources = cmp.config.sources({ + { name = "git" }, + }, { + { name = "buffer" }, + }), +}) + +cmp.setup.cmdline({ "/", "?" }, { + mapping = cmp.mapping.preset.cmdline(), + sources = { + { name = "buffer" }, + }, +}) + +cmp.setup.cmdline(":", { + mapping = cmp.mapping.preset.cmdline(), + sources = cmp.config.sources({ + { name = "path" }, + }, { + { name = "cmdline" }, + }), +}) + +local capabilities = require("cmp_nvim_lsp").default_capabilities() +lsp.rust_analyzer.setup({ + settings = { + ["rust-analyzer"] = {}, + }, + capabilities = capabilities, +}) + +local clangd_capabilities = vim.deepcopy(capabilities) +clangd_capabilities["offsetEncoding"] = "utf-8" + +lsp.clangd.setup({ + cmd = { + "clangd", + "--background-index", + "--function-arg-placeholders=0", + "-j=12", + "--clang-tidy", + }, + capabilities = clangd_capabilities, + init_options = { + documentFormatting = true, + }, +}) + +lsp.pyright.setup({ + capabilities = capabilities, +}) +lsp.gopls.setup({ + capabilities = capabilities, +}) +lsp.asm_lsp.setup({ + capabilities = capabilities, +}) +lsp.zls.setup({ + capabilities = capabilities, +}) +lsp.jdtls.setup({ + capabilities = capabilities, +}) +lsp.tinymist.setup({ + capabilities = capabilities, +}) +lsp.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 = { + version = "LuaJIT", + }, + workspace = { + checkThirdParty = false, + library = { + vim.env.VIMRUNTIME, + }, + }, + }, + }) + + client.notify("workspace/didChangeConfiguration", { settings = client.config.settings }) + end + return true + end, + capabilities = capabilities, +}) diff --git a/config/nvim/lua/plugins/lualine/init.lua b/config/nvim/lua/plugins/lualine/init.lua new file mode 100644 index 0000000..5540d24 --- /dev/null +++ b/config/nvim/lua/plugins/lualine/init.lua @@ -0,0 +1,43 @@ +local lualine = require("lualine") + +lualine.setup({ + options = { + icons_enabled = true, + theme = "auto", + component_separators = { left = "|", right = "|" }, + section_separators = { left = "", right = "" }, + disabled_filetypes = { + statusline = {}, + winbar = {}, + }, + ignore_focus = {}, + always_divide_middle = true, + globalstatus = false, + refresh = { + statusline = 1000, + tabline = 1000, + winbar = 1000, + }, + }, + sections = { + lualine_a = { "mode" }, + lualine_b = { "branch", "diff", "diagnostics" }, + lualine_c = { "filename" }, + lualine_x = { "encoding", "fileformat", "filetype" }, + lualine_y = {}, + lualine_z = { "location" }, + }, + inactive_sections = { + lualine_a = {}, + lualine_b = {}, + lualine_c = { "filename" }, + lualine_x = { "location" }, + lualine_y = {}, + lualine_z = {}, + }, + tabline = {}, + winbar = {}, + inactive_winbar = {}, + extensions = {}, +}) + diff --git a/config/nvim/lua/plugins/nvim-cursorline/init.lua b/config/nvim/lua/plugins/nvim-cursorline/init.lua new file mode 100644 index 0000000..cb3b797 --- /dev/null +++ b/config/nvim/lua/plugins/nvim-cursorline/init.lua @@ -0,0 +1,14 @@ +local curline = require('nvim-cursorline') + +curline.setup{ + cursorline = { + enable = true, + timeout = 1000, + number = false, + }, + cursorword = { + enable = true, + min_length = 3, + hl = { underline = true }, + } +} \ No newline at end of file diff --git a/config/nvim/lua/plugins/nvim-tree/init.lua b/config/nvim/lua/plugins/nvim-tree/init.lua new file mode 100644 index 0000000..c7174f7 --- /dev/null +++ b/config/nvim/lua/plugins/nvim-tree/init.lua @@ -0,0 +1,2 @@ +local tree = require("nvim-tree") +tree.setup() \ No newline at end of file diff --git a/config/nvim/lua/plugins/telescope/init.lua b/config/nvim/lua/plugins/telescope/init.lua new file mode 100644 index 0000000..2cb0f77 --- /dev/null +++ b/config/nvim/lua/plugins/telescope/init.lua @@ -0,0 +1,3 @@ +local tel = require("telescope") +tel.setup({}) +tel.load_extension("undo") diff --git a/config/nvim/lua/plugins/treesitter/init.lua b/config/nvim/lua/plugins/treesitter/init.lua new file mode 100644 index 0000000..192cab7 --- /dev/null +++ b/config/nvim/lua/plugins/treesitter/init.lua @@ -0,0 +1,10 @@ +local ts = require("nvim-treesitter.configs") + +ts.setup({ + ensure_installed = { "c", "cpp", "lua", "go", "gomod", "gowork", "gosum", "rust", "python" }, + auto_install = true, + sync_install = true, + highlight = { + enable = true + } +}) diff --git a/config/nvim/lua/plugins/whichkey/init.lua b/config/nvim/lua/plugins/whichkey/init.lua new file mode 100644 index 0000000..e6b9906 --- /dev/null +++ b/config/nvim/lua/plugins/whichkey/init.lua @@ -0,0 +1,2 @@ +local wk = require("which-key") +wk.setup({}) diff --git a/config/nvim/nvim b/config/nvim/nvim index b297066..a367c00 120000 --- a/config/nvim/nvim +++ b/config/nvim/nvim @@ -1 +1 @@ -/nix/store/5hcm30287f6kxb02yzr92lmqpx8npgjq-home-manager-files/.config/nvim \ No newline at end of file +/nix/store/88wrm111ys2gr576swa3isl80y217gaq-home-manager-files/.config/nvim \ No newline at end of file diff --git a/config/nvim/pack/graft/start/colorizer b/config/nvim/pack/graft/start/colorizer deleted file mode 160000 index 72790a0..0000000 --- a/config/nvim/pack/graft/start/colorizer +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 72790a003d5a706c287486a1a81e3a6b32158b54 diff --git a/config/nvim/pack/graft/start/nerdtree b/config/nvim/pack/graft/start/nerdtree deleted file mode 160000 index 690d061..0000000 --- a/config/nvim/pack/graft/start/nerdtree +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 690d061b591525890f1471c6675bcb5bdc8cdff9 diff --git a/config/nvim/pack/graft/start/vim-closetag b/config/nvim/pack/graft/start/vim-closetag deleted file mode 160000 index d0a562f..0000000 --- a/config/nvim/pack/graft/start/vim-closetag +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d0a562f8bdb107a50595aefe53b1a690460c3822 diff --git a/config/nvim/pack/graft/start/vim-commentary b/config/nvim/pack/graft/start/vim-commentary deleted file mode 160000 index 64a654e..0000000 --- a/config/nvim/pack/graft/start/vim-commentary +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 64a654ef4a20db1727938338310209b6a63f60c9 diff --git a/config/nvim/pack/graft/start/vim-endwise b/config/nvim/pack/graft/start/vim-endwise deleted file mode 160000 index eab5301..0000000 --- a/config/nvim/pack/graft/start/vim-endwise +++ /dev/null @@ -1 +0,0 @@ -Subproject commit eab530110d7a0d985902a3964894816b50dbf31a diff --git a/config/nvim/pack/graft/start/vim-fugitive b/config/nvim/pack/graft/start/vim-fugitive deleted file mode 160000 index 61b51c0..0000000 --- a/config/nvim/pack/graft/start/vim-fugitive +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4 diff --git a/config/nvim/pack/graft/start/vim-lsp b/config/nvim/pack/graft/start/vim-lsp deleted file mode 160000 index 04ef607..0000000 --- a/config/nvim/pack/graft/start/vim-lsp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 04ef607075184e7b8481245a40a9010368511e98 diff --git a/config/nvim/pack/graft/start/vim-lsp-settings b/config/nvim/pack/graft/start/vim-lsp-settings deleted file mode 160000 index 01d48cc..0000000 --- a/config/nvim/pack/graft/start/vim-lsp-settings +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 01d48cc7c176b3efb72cf8835803cbe6c58b53b3 diff --git a/config/nvim/pack/graft/start/vim-surround b/config/nvim/pack/graft/start/vim-surround deleted file mode 160000 index 3d188ed..0000000 --- a/config/nvim/pack/graft/start/vim-surround +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3d188ed2113431cf8dac77be61b842acb64433d9 diff --git a/config/nvim/pack/graft/start/vim-vinegar b/config/nvim/pack/graft/start/vim-vinegar deleted file mode 160000 index bb1bcdd..0000000 --- a/config/nvim/pack/graft/start/vim-vinegar +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bb1bcddf43cfebe05eb565a84ab069b357d0b3d6 diff --git a/config/nvim/vim-graft/LICENSE.txt b/config/nvim/vim-graft/LICENSE.txt deleted file mode 100644 index f288702..0000000 --- a/config/nvim/vim-graft/LICENSE.txt +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/config/nvim/vim-graft/README b/config/nvim/vim-graft/README deleted file mode 100644 index 0204e84..0000000 --- a/config/nvim/vim-graft/README +++ /dev/null @@ -1,29 +0,0 @@ -[ Vim Graft ] - -Simple plugin management for Vim, written in Ruby. Graft lets you configure which plugins to install using Ruby. - -( Installation ) - -1. Clone (or download and extract) this repository wherever you prefer. - -2. Edit config.rb - an example is provided. Set runtime to your desired Vim/Neovim directory (e.g., ~/.vim or ~/.local/share/nvim). - -3. Add plugins to the plugins array. You can use GitHub shortcuts (user/repo) or full URLs. - -4. Run the manager: - -rake - -5. Open Vim or Neovim and check that plugins are loaded: - -:echo &runtimepath - -Everything listed in config.rb will be installed automatically. - -( Usage ) - -- To add a plugin: append it to the plugins array and rerun ./graft.rb. - -- To remove a plugin: delete its entry from the array and remove its folder under pack/graft/start. - -- If Installed into a run time path, you can use `:EditPlugins` and `:SyncPlugins` commands from Vim. diff --git a/config/nvim/vim-graft/README.txt b/config/nvim/vim-graft/README.txt deleted file mode 100644 index 0204e84..0000000 --- a/config/nvim/vim-graft/README.txt +++ /dev/null @@ -1,29 +0,0 @@ -[ Vim Graft ] - -Simple plugin management for Vim, written in Ruby. Graft lets you configure which plugins to install using Ruby. - -( Installation ) - -1. Clone (or download and extract) this repository wherever you prefer. - -2. Edit config.rb - an example is provided. Set runtime to your desired Vim/Neovim directory (e.g., ~/.vim or ~/.local/share/nvim). - -3. Add plugins to the plugins array. You can use GitHub shortcuts (user/repo) or full URLs. - -4. Run the manager: - -rake - -5. Open Vim or Neovim and check that plugins are loaded: - -:echo &runtimepath - -Everything listed in config.rb will be installed automatically. - -( Usage ) - -- To add a plugin: append it to the plugins array and rerun ./graft.rb. - -- To remove a plugin: delete its entry from the array and remove its folder under pack/graft/start. - -- If Installed into a run time path, you can use `:EditPlugins` and `:SyncPlugins` commands from Vim. diff --git a/config/nvim/vim-graft/Rakefile b/config/nvim/vim-graft/Rakefile deleted file mode 100644 index 5e56522..0000000 --- a/config/nvim/vim-graft/Rakefile +++ /dev/null @@ -1,13 +0,0 @@ -task :default do - begin - load "./config.rb" # loads CONFIG - if defined?(CONFIG) && CONFIG[:runtime] && CONFIG[:plugins] - system("ruby graft.rb") - else - puts("Config is not appropriate.") - exit 1 - end - rescue => e - puts("Task failed: #{e.message}") - end -end diff --git a/config/nvim/vim-graft/config.rb b/config/nvim/vim-graft/config.rb deleted file mode 100644 index b2a8894..0000000 --- a/config/nvim/vim-graft/config.rb +++ /dev/null @@ -1,22 +0,0 @@ -CONFIG = { - runtime: "~/.config/nvim", - plugins: [ - "tpope/vim-fugitive", - "tpope/vim-sensible", - "tpope/vim-endwise", - "sheerun/vim-polyglot", - "andweeb/presence.nvim", - "preservim/nerdtree.git", - "tpope/vim-surround", - "alvan/vim-closetag", - "tpope/vim-commentary", - "tpope/vim-vinegar", - "lilydjwg/colorizer", - "prabirshrestha/vim-lsp", - "mattn/vim-lsp-settings", - "hrsh7th/nvim-cmp", - "hrsh7th/cmp-nvim-lsp", - "honza/vim-snippets", - "gentoo/gentoo-syntax", - ] -} diff --git a/config/nvim/vim-graft/graft.rb b/config/nvim/vim-graft/graft.rb deleted file mode 100644 index a1798f0..0000000 --- a/config/nvim/vim-graft/graft.rb +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env ruby -# Graft - Vim plugin management with ruby -# Copyright (C) 2025 Ahamed Rumi -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -require("./config.rb") -require("fileutils") - -PL = CONFIG[:plugins] -RT = File.expand_path("#{CONFIG[:runtime]}/pack/graft/start") - -# Create pack directory -if !Dir.exist?(RT) - FileUtils.mkdir_p(RT) -end - -# Install plugins -PL.each do |plugin| - # Dynamic plugin link - link = plugin.include?("://") ? plugin : "https://github.com/#{plugin}" - - # Base name of plugin - name = File.basename(link, ".git") - - # Handle plugin already exists - if Dir.exist?("#{RT}/#{name}") - puts "Skipping #{name} (already installed)" - next - end - - # install plugin - if system("git clone #{link} #{RT}/#{name} --depth=1") - puts("Done: install plugin #{link}") - else - puts("Fatal: failed to install plugin #{link}") - end -end diff --git a/config/nvim/vim-graft/plugin/graft.vim b/config/nvim/vim-graft/plugin/graft.vim deleted file mode 100644 index 9f94828..0000000 --- a/config/nvim/vim-graft/plugin/graft.vim +++ /dev/null @@ -1,2 +0,0 @@ -command! EditPlugins execute 'edit' fnamemodify(globpath(&runtimepath, 'vim-graft/config.rb', 1), ':p') -command! SyncPlugins execute '!ruby ' fnamemodify(globpath(&runtimepath, 'vim-graft/graft.rb', 1), ':p') diff --git a/config/waybar/config.jsonc b/config/waybar/config.jsonc index 7f358ba..c3fba09 100644 --- a/config/waybar/config.jsonc +++ b/config/waybar/config.jsonc @@ -1,23 +1,22 @@ { + "position": "top", "layer": "top", "modules-left": [ "sway/workspaces", - "sway/window" + "sway/mode", ], "modules-center": [ ], "modules-right": [ - "pulseaudio", "clock", - "network" - //"bluetooth" + "pulseaudio" +// "network" ], "pulseaudio": { "tooltip": false, "scroll-step": 5, "format": "VOL {volume}%", "format-muted": "muted", - "on-click": "~/.config/dunst/volume.sh mute", "format-icons": { "default": [ "", @@ -51,29 +50,36 @@ }, "bluetooth": { "format": " {status}", - "format-connected": " conn", + "format-connected": " CONN", "tooltip": true, + "on-click": "footclient -e bluetoothctl", "tooltip-format-connected": "{device_alias}" }, "clock": { - "format": "TIME {:%H:%M}", + "format": "TIME {:%I:%M %p}", "tooltip": true, - "tooltip-format": "{:%a, %b %d}" + "tooltip-format": "{:%a, %b %d, :%I:%M:%S %p}" }, "sway/workspaces": { - "format": "●" + "format": "{name}" }, "sway/window": { "icon": false, "icon-size": 20 }, + "sway/mode": { + "format": "{}" + }, "network": { - "interface": "eno1", +// "interface": "eno1", + "interface": "wlo1", "format-wifi": "WLAN {essid}", "format-ethernet": "ETH {ipaddr}/{cidr}", "format-disconnected": "disconnected", - "tooltip": false, - "max-length": 50 + "tooltip": true, + "tooltip-format": "Click to copy", + "max-length": 50, + "on-click": "sh -c 'ip addr show eno1 | grep \"inet \" | awk \"{print \\$2}\" | sed \"s#/.*##\" | wl-copy'" }, "battery": { "format": "{icon}: {capacity}%", diff --git a/config/waybar/style.css b/config/waybar/style.css index 3b138ce..a4f4431 100644 --- a/config/waybar/style.css +++ b/config/waybar/style.css @@ -1,14 +1,32 @@ -@define-color border #6f3913; +@define-color border #0b0b22; +@define-color background #1e1e2e; +@define-color surface0 #302d41; +@define-color overlay0 #393552; +@define-color text #cdd6f4; +@define-color text_dim #a6adc8; +@define-color blue #89b4fa; +@define-color green #a6e3a1; +@define-color yellow #f9e2af; +@define-color peach #fab387; +@define-color maroon #eba0ac; +@define-color lavender #b4befe; +@define-color pink #f5c2e7; +@define-color teal #94e2d5; +@define-color grey #454545; * { border: none; font-family: "MapleMono"; - font-size: 15px; - min-height: 10px; + font-size: 14px; + min-height: 8px; + margin-bottom: 1px; } window#waybar { - background: transparent; + background: @background; + border-bottom: 2px solid @surface0; + padding: 2px 0; + margin-bottom: 2px; } #disk, @@ -16,6 +34,7 @@ window#waybar { #window, #clock, #network, +#mode, #battery, #privacy, #memory, @@ -24,17 +43,18 @@ window#waybar { #tray, #bluetooth, #tray menu { - padding: 8px 10px 8px 10px; - margin: 5px 0 0 10px; - background: #111111; - color: #cccccc; + padding: 3px 6px; + margin: 4px 0 4px 6px; + background: @surface0; + color: @lavender; transition: 0.3s; - border: 2px solid @border; + border: 1.5px solid @border; border-radius: 0px; } #window { transition: none; + margin-bottom: 2px; } window#waybar.empty #window { @@ -44,42 +64,42 @@ window#waybar.empty #window { } #clock { - margin: 5px 0 0 15px; + margin: 4px 0 4px 8px; + color: @lavender; } -#network { - margin: 5px 15px 0 10px; +#pulseaudio { + margin-right: 10px; + color: @lavender; } #workspaces { - padding-top: 0; - padding-bottom: 0; + padding: 0; + color: @lavender; + margin-left: 10px; } #workspaces button { margin: 0; - padding: 2px; - color: #cccccc; - transition: color 0.3s; + padding: 1px 3px; + color: @lavender; + transition: none; } #workspaces button.empty { - color: #2e2e2e; + color: @lavender; } #workspaces button.active { - color: #ffffff; + color: @peach; } #workspaces button.urgent { - color: #000000; + color: @maroon; } #workspaces button:hover { - background: transparent; - color: transparent; + background: @overlay0; + color: @text; } -* { - transition: none; -} diff --git a/etc/nixos/configuration/configuration.nix b/nixos/configuration/configuration.nix similarity index 92% rename from etc/nixos/configuration/configuration.nix rename to nixos/configuration/configuration.nix index c2c1f1a..9a47cbe 100644 --- a/etc/nixos/configuration/configuration.nix +++ b/nixos/configuration/configuration.nix @@ -72,12 +72,14 @@ in security.sudo.enable = false; security.sudo-rs.enable = true; - virtualisation.waydroid.enable = true; + virtualisation = { + waydroid.enable = true; + podman = { + enable = true; + }; + }; environment.systemPackages = with pkgs; [ -# (lib.hiPrio unstable.uutils-coreutils-noprefix) -# (lib.hiPrio unstable.uutils-findutils) -# (lib.hiPrio unstable.uutils-diffutils) (pkgs.runCommand "vim-wrapper" { } '' mkdir -p $out/bin ln -s ${pkgs.neovim}/bin/nvim $out/bin/vim @@ -97,7 +99,7 @@ in users.users.coast = { isNormalUser = true; - extraGroups = [ "wheel" ]; + extraGroups = [ "wheel" "podman" ]; shell = pkgs.zsh; }; diff --git a/etc/nixos/configuration/sys/coreutils-configuration.nix b/nixos/configuration/sys/coreutils-configuration.nix similarity index 100% rename from etc/nixos/configuration/sys/coreutils-configuration.nix rename to nixos/configuration/sys/coreutils-configuration.nix diff --git a/etc/nixos/flake.lock b/nixos/flake.lock similarity index 100% rename from etc/nixos/flake.lock rename to nixos/flake.lock diff --git a/etc/nixos/flake.nix b/nixos/flake.nix similarity index 97% rename from etc/nixos/flake.nix rename to nixos/flake.nix index 5fd97c1..4c484eb 100644 --- a/etc/nixos/flake.nix +++ b/nixos/flake.nix @@ -32,6 +32,7 @@ imports = [ ./home-configuration/configuration.nix ./home-configuration/apps/sway.nix + ./home-configuration/apps/zsh.nix ]; }; }; diff --git a/nixos/hardware-configuration.nix b/nixos/hardware-configuration.nix new file mode 100644 index 0000000..52e9450 --- /dev/null +++ b/nixos/hardware-configuration.nix @@ -0,0 +1,39 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/2ed14a91-f00e-4c66-8c33-29f93a8451d7"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/FB28-548D"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + swapDevices = [ ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.eno1.useDHCP = lib.mkDefault true; + # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/etc/nixos/home-configuration/apps/sway.nix b/nixos/home-configuration/apps/sway.nix similarity index 67% rename from etc/nixos/home-configuration/apps/sway.nix rename to nixos/home-configuration/apps/sway.nix index ea65d84..f7cc230 100644 --- a/etc/nixos/home-configuration/apps/sway.nix +++ b/nixos/home-configuration/apps/sway.nix @@ -21,10 +21,14 @@ in default_floating_border pixel 2 for_window [class=".*"] border pixel 2 - client.focused #6f3913 #6f3913 #cccccc #6f3913 #6f3913 - client.focused_inactive #1c1c1c #111111 #cccccc #1c1c1c #111111 - client.unfocused #1c1c1c #111111 #888888 #1c1c1c #111111 - client.urgent #6f3913 #111111 #ffffff #6f3913 #111111 + client.focused #F5C2E7 #6C7086 #C6D0F5 #6C7086 #6C7086 + client.focused_inactive #313244 #313244 #C6D0F5 #585B70 #313244 + client.unfocused #313244 #313244 #A6ADC8 #313244 #313244 + client.urgent #F38BA8 #6C7086 #FFFFFF #F38BA8 #6C7086 + + seat * xcursor_theme Adwaita 24 + + input * xkb_options caps:escape ''; config = { modifier = "Mod4"; @@ -33,11 +37,11 @@ in outer = 5; }; bars = []; - output.eDP-1.disable = ""; +# output.eDP-1.disable = ""; keybindings = { "${modifier}+Return" = "exec ${terminal}"; - "${modifier}+Shift+Return" = "exec rofi -show drun"; - "${modifier}+r" = "exec ${menu} -l 10"; + "${modifier}+Shift+Return" = "exec ${menu} -l 10"; + "${modifier}+r" = "exec rofi -show drun"; "${modifier}+s" = "kill"; "${modifier}+Print" = "exec /home/coast/.local/src/local/bin/screenie-wlr"; "${modifier}+1" = "workspace 1"; @@ -69,24 +73,39 @@ in "${modifier}+Shift+p" = "exec /home/coast/.local/src/local/bin/setwall.py"; "${modifier}+Shift+d" = "mode 'resize'"; "${modifier}+space" = "floating toggle"; + + #lock the screen + "${modifier}+Shift+l" = "exec swaylock -c 000000"; + #layouts + "${modifier}+Shift+u" = "layout tabbed"; + "${modifier}+Shift+y" = "layout stacking"; + "${modifier}+Shift+t" = "layout toggle split"; }; modes = { resize = { - ${left} = "resize shrink width 10 px"; - ${down} = "resize grow height 10 px"; - ${up} = "resize shrink height 10 px"; - ${right} = "resize grow width 10 px"; + ${right} = "resize shrink width 10 px"; + ${up} = "resize grow height 10 px"; + ${down} = "resize shrink height 10 px"; + ${left} = "resize grow width 10 px"; "Escape" = "mode default"; "Return" = "mode default"; }; }; startup = [ - { command = "autotiling"; } - { command = "/home/coast/.local/src/local/bin/setwall.py/"; always = true; } + { command = "swaybg -i /home/coast/Downloads/wall1.png -m fill"; always = true; } { command = "waybar"; } { command = "foot -s"; always = true; } + { command = "autotiling"; } ]; }; }; + + services.swayidle = { + enable = true; + timeouts = [{ + timeout = 300; + command = "${pkgs.swaylock}/bin/swaylock --daemonize --color 000000"; + }]; + }; } diff --git a/etc/nixos/home-configuration/configuration.nix b/nixos/home-configuration/apps/zsh.nix similarity index 53% rename from etc/nixos/home-configuration/configuration.nix rename to nixos/home-configuration/apps/zsh.nix index dd50b06..d54d3df 100644 --- a/etc/nixos/home-configuration/configuration.nix +++ b/nixos/home-configuration/apps/zsh.nix @@ -1,80 +1,9 @@ { - config, - pkgs, - ... -}: let - dotDir = "${config.home.homeDirectory}/.local/src/config/"; - mkSl = path: config.lib.file.mkOutOfStoreSymlink path; - configs = { - kitty = "kitty"; - foot = "foot"; - qtile = "qtile"; - mako = "mako"; - nvim = "nvim"; - eww = "eww"; - waybar = "waybar"; - }; -in { - xdg.configFile = builtins.mapAttrs (name: subpath: { - source = mkSl "${dotDir}/${subpath}"; - recursive = true; - }) configs; - - - home = { - username = "coast"; - homeDirectory = "/home/coast"; - stateVersion = "25.05"; - packages = with pkgs; [ - alsa-utils - nix-search-cli - neofetch - dysk - tree - wl-clipboard - appimage-run - libnotify - grim - slurp - yazi - mate.caja - htop - nixpkgs-fmt - swaybg - wmenu - mako - nwg-look - xorg.xkill - mpv - vesktop - wlr-randr - autotiling - nodejs - gcc_multi - gnumake - clang-tools - ruby_3_4 - pkg-config - dmd - dtools - rustup - python3 - python313Packages.pip - unzip - zip - go - tauon - gimp - waybar - ]; - }; - - programs.git = { - enable = true; - userEmail = "coasteen@proton.me"; - userName = "coast"; - }; - + config, + pkgs, + ... +}: +{ programs.zsh = { enable = true; history = { diff --git a/nixos/home-configuration/configuration.nix b/nixos/home-configuration/configuration.nix new file mode 100644 index 0000000..04c913b --- /dev/null +++ b/nixos/home-configuration/configuration.nix @@ -0,0 +1,80 @@ +{ + config, + pkgs, + ... +}: let + dotDir = "${config.home.homeDirectory}/.local/src/config/"; + mkSl = path: config.lib.file.mkOutOfStoreSymlink path; + configs = { + kitty = "kitty"; + foot = "foot"; + qtile = "qtile"; + mako = "mako"; + nvim = "nvim"; + eww = "eww"; + waybar = "waybar"; + }; +in { + xdg.configFile = builtins.mapAttrs (name: subpath: { + source = mkSl "${dotDir}/${subpath}"; + recursive = true; + }) configs; + + home = { + username = "coast"; + homeDirectory = "/home/coast"; + stateVersion = "25.05"; + packages = with pkgs; [ + alsa-utils + nix-search-cli + hyfetch + dysk + autotiling + tree + stylua + gopls + lua-language-server + wl-clipboard + appimage-run + libnotify + grim + slurp + yazi + mate.caja + htop + nixpkgs-fmt + swaybg + wmenu + mako + nwg-look + xorg.xkill + mpv + vesktop + wlr-randr + nodejs + gcc_multi + gnumake + clang-tools + ruby_3_4 + pkg-config + dmd + dtools + rustup + python3 + python313Packages.pip + unzip + zip + go + tauon + gimp + waybar + ]; + }; + + programs.git = { + enable = true; + userEmail = "coasteen@proton.me"; + userName = "coast"; + }; + +} diff --git a/etc/portage/make.conf b/portage/make.conf similarity index 100% rename from etc/portage/make.conf rename to portage/make.conf