Massive rewrite, further modularized

homeConfig/modules/gui/default.nix

@@ -6,11 +6,21 @@ let
 
 in
 { options.modules.gui = { enable = mkEnableOption "gui"; };
+  imports = [ ./modules ];
   config = mkIf cfg.enable {
     wayland.windowManager.sway = import ./config/sway.nix { inherit pkgs config lib; };
     programs.rofi = import ./config/rofi.nix { inherit pkgs config lib; };
     programs.bash.profileExtra = import ./config/shellHook.nix;
 
+    modules = {
+      alacritty.enable = true;
+      browsers.enable = true;
+      corn.enable = true;
+      fun.enable = true;
+      guiUtils.enable = true;
+      neovim.enable = true;
+    };
+
     gtk = {
       enable = true;
       theme.package = pkgs.juno-theme;
@@ -25,25 +35,10 @@ in
       platformTheme = "gtk";
     };
 
-    programs.btop.enable = true;
+    programs = {
+      imv.enable = true;
+    };
+
     fonts.fontconfig.enable = true;
-
-    home.packages = with pkgs; [
-      xdg-utils
-      grim
-      slurp
-      wl-clipboard
-      autotiling
-
-      imv
-      gimp
-      okular
-
-      noto-fonts
-      noto-fonts-cjk
-      noto-fonts-emoji
-
-      emote
-    ];
   };
 }

homeConfig/modules/gui/modules/alacritty/config/alacritty.nix

@@ -0,0 +1,69 @@
+{
+  scrolling = {
+    history = 10000;
+    multiplier = 3;
+  };
+
+  window = {
+    opacity = 0.90;
+  };
+
+  colors = {
+    primary = {
+      background = "#000000";
+      foreground = "#cdd6f4";
+    };
+
+    normal = {
+      black   = "#1e2127";
+      red     = "#e06c75";
+      green   = "#98c379";
+      yellow  = "#d19a66";
+      blue    = "#61afef";
+      magenta = "#c678dd";
+      cyan    = "#56b6c2";
+      white   = "#abb2bf";
+    };
+
+    bright = {
+      black   =  "#5c6370";
+      red     =  "#e06c75";
+      green   =  "#98c379";
+      yellow  =  "#d19a66";
+      blue    =  "#61afef";
+      magenta =  "#c678dd";
+      cyan    =  "#56b6c2";
+      white   =  "#ffffff";
+    };
+  };
+
+  font = {
+    size = 12;
+    normal = {
+      family = "Terminus";
+      style = "Regular";
+    };
+
+    bold = {
+      family = "Terminus";
+      style = "Bold";
+    };
+
+    italic = {
+      family = "Terminus";
+      style = "Italic";
+    };
+
+    bold_italic = {
+      family = "Terminus";
+      style = "Bold Italic";
+    };
+  };
+
+
+  #cursor = {
+  #  shape = "Block";
+  #  blinking = "Always";
+  #  blink_interval = 750;
+  #};
+}

homeConfig/modules/gui/modules/alacritty/default.nix

@@ -0,0 +1,22 @@
+{ pkgs, lib, config, ... }:
+
+with lib;
+let
+  cfg = config.modules.alacritty;
+
+in
+{ options.modules.alacritty = { enable = mkEnableOption "alacritty"; };
+  config = mkIf cfg.enable {
+    programs.alacritty = {
+      enable = true;
+      settings = import ./config/alacritty.nix;
+    };
+
+    home.packages = with pkgs; [
+      terminus-nerdfont
+      monocraft
+      ranger
+      highlight
+    ];
+  };
+}

homeConfig/modules/gui/modules/browsers/default.nix

@@ -0,0 +1,16 @@
+{ pkgs, lib, config, ... }:
+
+with lib;
+let
+  cfg = config.modules.browsers;
+
+in
+{ options.modules.browsers = { enable = mkEnableOption "browsers"; };
+  config = mkIf cfg.enable {
+    programs.firefox.enable = true;
+
+    home.packages = with pkgs; [
+     tor-browser
+    ];
+  };
+}

homeConfig/modules/gui/modules/corn/default.nix

@@ -0,0 +1,19 @@
+{ pkgs, lib, config, ... }:
+
+with lib;
+let
+  cfg = config.modules.corn;
+
+in
+{ options.modules.corn = { enable = mkEnableOption "corn"; };
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      trezor-suite
+      trezorctl
+      trezord
+
+      electrum
+      bisq-desktop
+    ];
+  };
+}

homeConfig/modules/gui/modules/default.nix

@@ -0,0 +1,12 @@
+{
+  imports = [
+    ./alacritty
+    ./browsers
+
+    ./corn
+    ./fun
+
+    ./guiUtils
+    ./neovim
+  ];
+}

homeConfig/modules/gui/modules/fun/default.nix

@@ -0,0 +1,23 @@
+{ pkgs, lib, config, ... }:
+
+with lib;
+let
+  cfg = config.modules.fun;
+
+in
+{ options.modules.fun = { enable = mkEnableOption "fun"; };
+  config = mkIf cfg.enable {
+    programs.obs-studio = {
+      enable = true;
+      plugins = with pkgs.obs-studio-plugins; [
+        wlrobs
+        obs-pipewire-audio-capture
+        input-overlay
+      ];
+    };
+
+    home.packages = with pkgs; [
+      spotify webcord showmethekey
+    ];
+  };
+}

homeConfig/modules/gui/modules/guiUtils/default.nix

@@ -0,0 +1,19 @@
+{ pkgs, lib, config, ... }:
+
+with lib;
+let
+  cfg = config.modules.guiUtils;
+
+in
+{ options.modules.guiUtils = { enable = mkEnableOption "guiUtils"; };
+  config = mkIf cfg.enable {
+    programs.btop.enable = true;
+    home.packages = with pkgs; [
+      gimp
+      pdftk
+      teams-for-linux
+      zoom-us
+      exercism
+    ];
+  };
+}

homeConfig/modules/gui/modules/neovim/config/lazyvim/init.lua

@@ -0,0 +1,2 @@
+-- bootstrap lazy.nvim, LazyVim and your plugins
+require("config.lazy")

homeConfig/modules/gui/modules/neovim/config/lazyvim/lua/config/autocmds.lua

@@ -0,0 +1,177 @@
+-- Autocmds are automatically loaded on the VeryLazy event
+-- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua
+-- Add any additional autocmds here
+
+vim.g.autoformat = false
+vim.cmd([[
+  au BufRead,BufNewFile *.purs set filetype=purescript
+]])
+
+require("which-key").register({
+	t = {
+		"<cmd>:new | setlocal nonumber norelativenumber | resize 10 | terminal<CR>",
+		"Open terminal in new window",
+	},
+}, {
+	prefix = "<leader>",
+})
+
+require("notify").setup({
+	background_colour = "#000000",
+})
+
+local lsp = require("lsp-zero").preset({})
+
+--require("null-ls").setup({
+--	-- you can reuse a shared lspconfig on_attach callback here
+--	on_attach = function(client, bufnr)
+--		if client.supports_method("textDocument/formatting") then
+--			vim.api.nvim_clear_autocmds({ group = vim.api.nvim_create_augroup("LspFormatting", {}), buffer = bufnr })
+--			vim.api.nvim_create_autocmd("BufWritePre", {
+--				group = augroup,
+--				buffer = bufnr,
+--				callback = function()
+--					vim.lsp.buf.format({
+--						bufnr = bufnr,
+--						filter = function(client)
+--							return client.name == "null-ls"
+--						end,
+--					})
+--					vim.lsp.buf.formatting_sync()
+--				end,
+--			})
+--		end
+--	end,
+--})
+
+-- https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md
+lsp.setup_servers({
+	--"tsserver",
+	"hls",
+	"pyright",
+	"nil_ls",
+	"cssls",
+	"html",
+	"jsonls",
+	"diagnosticls",
+	"lua_ls",
+	"marksman",
+	"purescriptls",
+	"tailwindcss",
+	"bashls",
+	"dhall_lsp_server",
+	"volar",
+  "clangd",
+})
+
+require("lspconfig").lua_ls.setup(lsp.nvim_lua_ls())
+
+lsp.setup()
+
+local cmp_nvim_lsp = require "cmp_nvim_lsp"
+
+require("lspconfig").clangd.setup {
+  on_attach = on_attach,
+  capabilities = cmp_nvim_lsp.default_capabilities(),
+  cmd = {
+    "clangd",
+    "--offset-encoding=utf-16",
+  },
+}
+
+require("lspconfig").volar.setup({
+	filetypes = { "typescript", "javascript", "javascriptreact", "typescriptreact", "vue", "json" },
+})
+
+require("lspconfig").nil_ls.setup {
+  settings = {
+    ["nil"] = {
+      nix = {
+        flake = {
+          autoArchive = true,
+        }
+      }
+    }
+  }
+}
+
+local cmp = require("cmp")
+cmp.setup({
+	snippet = {
+		expand = function(args)
+			require("luasnip").lsp_expand(args.body)
+		end,
+	},
+	sources = {
+		{ name = "nvim_lsp" },
+		{ name = "luasnip" },
+		-- other sources...
+	},
+	formatting = {
+		format = function(entry, vim_item)
+			vim_item.menu = ""
+			return vim_item
+		end,
+	},
+	-- other configurations...
+})
+
+cmp.setup({
+	enabled = function()
+		-- disable completion in comments
+		local context = require("cmp.config.context")
+		-- keep command mode completion enabled when cursor is in a comment
+		if vim.api.nvim_get_mode().mode == "c" then
+			return true
+		else
+			return not context.in_treesitter_capture("comment") and not context.in_syntax_group("comment")
+		end
+	end,
+	mapping = {
+		["<C-p>"] = cmp.mapping.select_prev_item(),
+		["<C-n>"] = cmp.mapping.select_next_item(),
+--	["<Down>"] = cmp.mapping.select_next_item(),
+--	["<Up>"] = cmp.mapping.select_prev_item(),
+		["<C-d>"] = cmp.mapping.scroll_docs(-4),
+		["<C-f>"] = cmp.mapping.scroll_docs(4),
+
+		["<Tab>"] = cmp.mapping(function(fallback)
+			if cmp.visible() then
+				cmp.select_next_item()
+			elseif cmp.completed then
+				cmp.confirm({ select = true })
+			else
+				fallback()
+			end
+		end, { "i", "s" }),
+		["<S-Tab>"] = cmp.mapping.select_prev_item(),
+
+		["<CR>"] = cmp.mapping(function(fallback)
+			fallback()
+		end, { "i", "s" }),
+	},
+})
+
+local dap = require("dap")
+dap.adapters.haskell = {
+	type = "executable",
+	command = "haskell-debug-adapter",
+	args = { "--hackage-version=0.0.33.0" },
+}
+dap.configurations.haskell = {
+	{
+		type = "haskell",
+		request = "launch",
+		name = "Debug",
+		workspace = "${workspaceFolder}",
+		startup = "${file}",
+		stopOnEntry = true,
+		logFile = vim.fn.stdpath("data") .. "/haskell-dap.log",
+		logLevel = "WARNING",
+		ghciEnv = vim.empty_dict(),
+		ghciPrompt = "λ: ",
+		-- Adjust the prompt to the prompt you see when you invoke the ghci command below
+		ghciInitialPrompt = "λ: ",
+		ghciCmd = "stack ghci --test --no-load --no-build --main-is TARGET --ghci-options -fprint-evld-with-show",
+	},
+}

homeConfig/modules/gui/modules/neovim/config/lazyvim/lua/config/keymaps.lua

@@ -0,0 +1,8 @@
+-- Keymaps are automatically loaded on the VeryLazy event
+-- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua
+-- Add any additional keymaps here
+
+vim.keymap.set("n", "<C-U>", "<C-U>zz", { silent = true })
+vim.keymap.set("n", "<C-D>", "<C-D>zz", { silent = true })
+vim.keymap.set("n", "H", ":bprev<CR>", { silent = true })
+vim.keymap.set("n", "L", ":bnext<CR>", { silent = true })

homeConfig/modules/gui/modules/neovim/config/lazyvim/lua/config/lazy.lua

@@ -0,0 +1,44 @@
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not vim.loop.fs_stat(lazypath) then
+  -- bootstrap lazy.nvim
+  -- stylua: ignore
+  vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath })
+end
+vim.opt.rtp:prepend(vim.env.LAZY or lazypath)
+
+require("lazy").setup({
+	spec = {
+		-- add LazyVim and import its plugins
+		{ "LazyVim/LazyVim", import = "lazyvim.plugins" },
+		-- import any extras modules here
+		{ import = "lazyvim.plugins.extras.dap.core" },
+		-- import/override with your plugins
+		{ import = "plugins" },
+	},
+	defaults = {
+		-- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup.
+		-- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default.
+		lazy = false,
+		-- It's recommended to leave version=false for now, since a lot the plugin that support versioning,
+		-- have outdated releases, which may break your Neovim install.
+		version = false, -- always use the latest git commit
+		-- version = "*", -- try installing the latest stable version for plugins that support semver
+	},
+	install = { colorscheme = { "github-theme" } },
+	checker = { enabled = true }, -- automatically check for plugin updates
+	performance = {
+		rtp = {
+			-- disable some rtp plugins
+			disabled_plugins = {
+				"gzip",
+				-- "matchit",
+				-- "matchparen",
+				-- "netrwPlugin",
+				"tarPlugin",
+				"tohtml",
+				"tutor",
+				"zipPlugin",
+			},
+		},
+	},
+})

homeConfig/modules/gui/modules/neovim/config/lazyvim/lua/config/options.lua

@@ -0,0 +1,29 @@
+-- Options are automatically loaded before lazy.nvim startup
+-- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua
+-- Add any additional options here
+
+vim.opt.tabstop = 2
+vim.opt.shiftwidth = 2
+vim.opt.softtabstop = 2
+vim.opt.expandtab = true
+vim.opt.smartindent = true
+
+vim.cmd([[
+  autocmd FileType python setlocal tabstop=4 shiftwidth=4 softtabstop=4
+]])
+
+vim.cmd([[
+  autocmd FileType haskell setlocal tabstop=4 shiftwidth=4 softtabstop=4
+]])
+
+vim.opt.ignorecase = true
+vim.opt.smartcase = true
+
+vim.opt.swapfile = false
+vim.opt.backup = false
+vim.opt.undofile = true
+
+vim.o.termguicolors = true
+vim.opt.guicursor = "n-v-c:block,i:block,r:block"
+
+vim.cmd [[highlight PmenuSel guifg=#53565d guibg=#f0c981]]

homeConfig/modules/gui/modules/neovim/config/lazyvim/lua/plugins/core.lua

@@ -0,0 +1,102 @@
+return {
+	{
+		"olimorris/onedarkpro.nvim",
+		lazy = false,
+		priority = 1000,
+		config = function()
+			require("onedarkpro").setup({
+				colors = {
+					bg = "#000000",
+					fg = "#abb2bf",
+					red = "#ef596f",
+					orange = "#d19a66",
+					yellow = "#e5c07b",
+					green = "#89ca78",
+					cyan = "#2bbac5",
+					blue = "#61afef",
+					purple = "#d55fde",
+					white = "#abb2bf",
+					black = "#000000",
+					gray = "#434852",
+					highlight = "#e2be7d",
+					comment = "#7f848e",
+					none = "NONE",
+				},
+				options = {
+					transparency = true,
+				},
+			})
+			vim.cmd("colorscheme onedark_dark")
+		end,
+	},
+
+	{
+		"VonHeikemen/lsp-zero.nvim",
+		branch = "v2.x",
+		dependencies = {
+			{ "neovim/nvim-lspconfig" },
+
+			{ "hrsh7th/nvim-cmp" },
+			{ "hrsh7th/cmp-buffer" },
+			{ "hrsh7th/cmp-path" },
+			{ "hrsh7th/cmp-nvim-lsp" },
+
+			{ "L3MON4D3/LuaSnip" },
+		},
+	},
+
+	--[[
+  {
+		"jackMort/ChatGPT.nvim",
+		event = "VeryLazy",
+		config = function()
+			require("chatgpt").setup({
+				api_key_cmd = "pass show api/chatgpt-apikey",
+			})
+		end,
+		dependencies = {
+			"MunifTanjim/nui.nvim",
+			"nvim-lua/plenary.nvim",
+			"nvim-telescope/telescope.nvim",
+		},
+	},
+]]
+
+	{
+		"nvim-treesitter/nvim-treesitter-context",
+		config = function()
+			require("treesitter-context").setup({
+				enable = true, -- Enable this plugin (Can be enabled/disabled later via commands)
+				max_lines = 0, -- How many lines the window should span. Values <= 0 mean no limit.
+				min_window_height = 0, -- Minimum editor window height to enable context. Values <= 0 mean no limit.
+				line_numbers = false,
+				multiline_threshold = 20, -- Maximum number of lines to collapse for a single context line
+				trim_scope = "outer", -- Which context lines to discard if `max_lines` is exceeded. Choices: 'inner', 'outer'
+				mode = "cursor", -- Line used to calculate context. Choices: 'cursor', 'topline'
+				-- Separator between context and content. Should be a single character string, like '-'.
+				-- When separator is set, the context will only show up when there are at least 2 lines above cursorline.
+				separator = "-",
+				zindex = 20, -- The Z-index of the context window
+				on_attach = nil, -- (fun(buf: integer): boolean) return false to disable attaching
+			})
+		end,
+	},
+
+  {
+    "nvim-neo-tree/neo-tree.nvim",
+    config = function()
+      require("neo-tree").setup({
+        window = {
+          position = "left",
+          width = 20,
+        },
+      })
+    end,
+  },
+
+	{ "williamboman/mason.nvim", enabled = false },
+	{ "williamboman/mason-lspconfig.nvim", enabled = false },
+	{ "jay-babu/mason-nvim-dap.nvim", enabled = false },
+	{ "catppuccin/nvim", enabled = false },
+  { "folke/flash.nvim", enabled = false }
+}

homeConfig/modules/gui/modules/neovim/config/servers.nix

@@ -0,0 +1,24 @@
+{ pkgs, ... }:
+
+let
+  lsp = with pkgs; [
+    nil nixfmt
+    marksman shfmt
+    sumneko-lua-language-server stylua
+    haskell-language-server hlint
+    nodePackages."@tailwindcss/language-server"
+    dhall-lsp-server
+  ];
+
+  lsp' = with pkgs.nodePackages; [
+    vscode-langservers-extracted
+    typescript-language-server
+    bash-language-server
+    diagnostic-languageserver
+    pyright
+    purescript-language-server
+    volar
+  ];
+
+in
+  lsp ++ lsp'

homeConfig/modules/gui/modules/neovim/default.nix

@@ -0,0 +1,24 @@
+{ pkgs, lib, config, ... }:
+
+with lib;
+let
+  cfg = config.modules.neovim;
+
+in
+{ options.modules.neovim = { enable = mkEnableOption "neovim"; };
+  config = mkIf cfg.enable {
+    programs.neovim = {
+      enable = true;
+      vimAlias = true;
+      extraPackages = import ./config/servers.nix { inherit pkgs; };
+    };
+
+    home.file.".config/nvim" = {
+      source = ./config/lazyvim;
+      recursive = true;
+    };
+    home.packages = with pkgs; [
+      lazygit
+    ];
+  };
+}