restructure

home-manager/common/programs/git/default.nix

@@ -0,0 +1,12 @@
+{ inputs, outputs, lib, config, pkgs, ... }:
+
+{
+  programs.git = {
+    enable = true;
+    userName = "sajenim";
+    userEmail = "its.jassy@pm.me";
+    extraConfig = {
+      init.defaultBranch = "main";
+    };
+  };
+}

home-manager/common/programs/nvim/config/init.lua

@@ -0,0 +1,86 @@
+--
+-- Vim Options
+--
+
+-- Disable vim's built in file explorer
+vim.g.loaded_netrw = 1
+vim.g.loaded_netrwPlugin = 1
+
+-- {{{ General Configuration
+vim.opt.termguicolors = true          -- set termguicolors to enable highlight groups
+vim.opt.number        = true          -- print line numbers
+vim.opt.showmode      = false         -- if in insert, replace or visual mode put a message on the last line
+vim.opt.swapfile      = false         -- disable swap file
+vim.opt.clipboard     = 'unnamedplus' -- use the system clipboard as the default register
+-- }}}
+
+-- {{{ Spaces & Tabs
+vim.opt.tabstop     = 2     -- number of visual spaces per TAB
+vim.opt.softtabstop = 2     -- number of spaces in tab when editing
+vim.opt.shiftwidth  = 2     -- number of spaces to use for autoindent
+vim.opt.expandtab   = true  -- tabs are space
+vim.opt.autoindent  = true
+vim.opt.copyindent  = true  -- copy indent from the previous line
+-- }}}
+
+-- {{{ Keybinds
+vim.g.mapleader = ' '
+
+local opts = { noremap = true, silent = true }
+local map = vim.api.nvim_set_keymap
+
+
+map('n', '<leader>t', ':NvimTreeToggle<cr>', opts)
+-- }}}
+
+--
+-- Gruvbox Material
+-- 
+
+-- For dark version
+vim.opt.background = 'dark'
+
+-- Set contrast
+vim.g.gruvbox_material_background = 'hard'
+
+-- For better performance
+vim.g.gruvbox_material_better_performance = 0
+
+-- To disable italic in `Comment`, set this option to `1`
+vim.g.gruvbox_material_disable_italic_comment = 1
+
+-- To enable bold in function name just like the original gruvbox, set this option to `1`
+vim.g.gruvbox_material_enable_bold = 0
+
+-- To enable italic in this color scheme, set this option to `1`
+vim.g.gruvbox_material_enable_italic = 1
+
+-- Set the colorscheme
+vim.cmd [[colorscheme gruvbox-material]]
+
+
+--
+-- Load and run our libraries
+--
+
+-- load defaults
+require('nvim-tree').setup()
+require('Comment').setup()
+require('gitsigns').setup()
+
+-- user
+require('user.lspconfig')
+require('user.nvim-cmp')
+require('user.lualine')
+
+-- user.config
+require('user.config.server_configurations')
+
+
+-- Enable syntax highlighting
+require('nvim-treesitter.configs').setup {
+  highlight = {
+    enable = true,
+  }
+}
+

home-manager/common/programs/nvim/config/lua/user/config/server_configurations.lua

@@ -0,0 +1,33 @@
+-- Setup language servers
+require'lspconfig'.clangd.setup{}
+require'lspconfig'.nil_ls.setup{}
+
+-- haskell-language-server
+require'lspconfig'.hls.setup {
+  filetypes = { 'haskell', 'lhaskell', 'cabal' },
+}
+
+-- lua-language-server
+require'lspconfig'.lua_ls.setup {
+  settings = {
+    Lua = {
+      runtime = {
+        -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
+        version = 'LuaJIT',
+      },
+      diagnostics = {
+        -- Get the language server to recognize the `vim` global
+        globals = {'vim'},
+      },
+      workspace = {
+        -- Make the server aware of Neovim runtime files
+        library = vim.api.nvim_get_runtime_file("", true),
+        checkThirdParty = false,
+      },
+      -- Do not send telemetry data containing a randomized but unique identifier
+      telemetry = {
+        enable = false,
+      },
+    },
+  },
+}

home-manager/common/programs/nvim/config/lua/user/lspconfig.lua

@@ -0,0 +1,40 @@
+-- Global mappings.
+-- See `:help vim.diagnostic.*` for documentation on any of the below functions
+vim.keymap.set('n', '<space>de', vim.diagnostic.enable)
+vim.keymap.set('n', '<space>dd', vim.diagnostic.disable)
+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)
+    -- Enable completion triggered by <c-x><c-o>
+    vim.bo[ev.buf].omnifunc = 'v:lua.vim.lsp.omnifunc'
+
+    -- 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', '<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,
+})
+

home-manager/common/programs/nvim/config/lua/user/lualine.lua

@@ -0,0 +1,87 @@
+-- Use external source for diff
+local function diff_source()
+  local gitsigns = vim.b.gitsigns_status_dict
+  if gitsigns then
+    return {
+      added = gitsigns.added,
+      modified = gitsigns.changed,
+      removed = gitsigns.removed
+    }
+  end
+end
+
+-- Configure the statusline
+require('lualine').setup {
+  options = {
+    -- Set our theme and icon status
+    icons_enabled = true,
+    theme = 'gruvbox-material',
+
+    -- Define our seperators
+    component_separators = { left = '', right = ''},
+    section_separators = { left = '', right = ''},
+
+    -- Disable some filetypes
+    disabled_filetypes = {
+      statusline = {},
+      winbar = {},
+    },
+
+    -- If current filetype in in this list it'll
+    -- always be drawn as inactive statusline
+    ignore_focus = {},
+
+    -- When set to true, left sections i.e. 'a','b' and 'c'
+    -- can't take over the entire statusline even
+    -- if neither of 'x', 'y' or 'z' are present.
+    always_divide_middle = true,
+
+    -- enable global statusline (have a single statusline
+    -- at bottom of neovim instead of one for  every window).
+    globalstatus = true,
+
+    -- sets how often lualine should refreash it's contents (in ms)
+    refresh = {
+      statusline = 1000,
+      tabline = 1000,
+      winbar = 1000,
+    }
+  },
+
+  -- Setup our active statusline components
+  sections = {
+    lualine_a = {'mode'},
+    lualine_b = { {'FugitiveHead', icon = ''}, {'diff', source = diff_source}, 'diagnostics'},
+    lualine_c = {'filename'},
+    lualine_x = {'encoding', 'fileformat', 'filetype'},
+    lualine_y = {'progress'},
+    lualine_z = {'location'}
+  },
+
+  -- Setup our inactive statusline components
+  inactive_sections = {
+    lualine_a = {},
+    lualine_b = {},
+    lualine_c = {'filename'},
+    lualine_x = {'location'},
+    lualine_y = {},
+    lualine_z = {}
+  },
+
+  -- Setup our tabline components
+  tabline = {
+    lualine_a = {'buffers'},
+    lualine_b = {'searchcount'},
+    lualine_c = {},
+    lualine_x = {},
+    lualine_y = {},
+    lualine_z = {'tabs'}
+  },
+
+  -- Setup our winbar components
+  winbar = {},
+  inactive_winbar = {},
+
+  -- Load our extensions
+  extensions = {'fugitive', 'nvim-tree'}
+}

home-manager/common/programs/nvim/config/lua/user/nvim-cmp.lua

@@ -0,0 +1,60 @@
+-- Add additional capabilities supported by nvim-cmp
+local capabilities = require("cmp_nvim_lsp").default_capabilities()
+
+local lspconfig = require('lspconfig')
+
+-- Enable some language servers with the additional completion capabilities offered by nvim-cmp
+local servers = { 'clangd', 'lua_ls', 'nil_ls' }
+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-n>"] = cmp.mapping.abort(),
+    ['<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' },
+  },
+}
+

home-manager/common/programs/nvim/default.nix

@@ -0,0 +1,58 @@
+{ inputs, outputs, lib, config, pkgs, ... }:
+
+{
+
+  home.packages = with pkgs; [
+    # Language servers
+    clang-tools             # C, C++, Objective C/C++, OpenCL, CUDA, and RenderScript
+    haskell-language-server # Haskell
+    # lua-language-server     # Lua
+    nil                     # Nix
+  ];
+
+  programs.neovim = {
+    enable = true;
+    package = pkgs.neovim-unwrapped;
+    plugins = with pkgs.vimPlugins; [
+      # Install all grammar packages 
+      # nvim-treesitter.withAllGrammars
+
+      # Or specific grammar packages only
+      (nvim-treesitter.withPlugins (p: [
+        p.c
+        p.lua
+        p.nix
+      ]))
+
+      # Quality of Life Enhancements
+      comment-nvim           # Smart and powerful commenting
+
+      # User Interface
+      gruvbox-material       # Theme
+      dashboard-nvim         # Start screen
+      nvim-tree-lua          # File explorer
+      lualine-nvim           # Statusline
+
+      # Git Integration
+      vim-fugitive           # Call any arbitary git command
+      gitsigns-nvim          # Git decorations
+      
+      # Autocompletion
+      nvim-lspconfig         # Collection of configurations for built-in LSP client
+      nvim-cmp               # Autocompletion plugin
+      cmp-nvim-lsp           # LSP source for nvim-cmp
+      cmp_luasnip            # Snippets source for nvim-cmp
+      luasnip                # Snippets plugin
+
+      # Misc
+      vim-shellcheck         # Static analysis tool for shell scripts
+      markdown-preview-nvim  # Preview markdown in browser
+
+      # Dependencies
+      nvim-web-devicons      # Provides icons
+    ];
+  };
+
+  xdg.configFile.nvim = { source = ./config; recursive = true; };
+
+}

home-manager/common/programs/zsh/default.nix

@@ -0,0 +1,60 @@
+{ inputs, outputs, lib, config, pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    fzf # command-line fuzzy finder
+  ];
+
+  programs.zsh = {
+    enable = true;
+    
+    # Enable extra features
+    enableAutosuggestions = true;
+    enableCompletion = true;
+    dotDir = ".config/zsh";
+    
+    # Commands that should be added to to top of '.zshrc'
+    initExtraFirst = ''
+    '';
+
+    # Aliases
+    shellAliases = {
+      c  = "clear";
+      hm = "cd ~/";
+      tp = "trash-put";
+      ud = "cd ..";
+      la = "ls -a";
+      ll = "ls -l";
+      tt = "wezterm cli set-tab-title ";
+      uh = "home-manager switch --flake .#sajenim@fuchsia";
+      us = "sudo nixos-rebuild switch --flake .#fuchsia";
+    };
+
+    # An attribute set that adds to named directory hash table
+    dirHashes = {
+      # QMK Keymaps
+      km-crkbd = "$HOME/Projects/keyboards/qmk_keymaps/keyboards/crkbd/keymaps/sajenim";
+      km-kchrn = "$HOME/Projects/keyboards/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 = ''
+      source ${pkgs.zsh-vi-mode}/share/zsh-vi-mode/zsh-vi-mode.plugin.zsh
+      PROMPT='%F{blue}%n %F{cyan}%~ %F{red}♥ %f';
+    '';
+  };
+}
+