Reorganize and refactor project

modules/home-manager/firefox/addons.json

@@ -0,0 +1,12 @@
+[
+  {
+    "slug": "sixindicator"
+  },
+  {
+    "slug": "indicatetls"
+  },
+  {
+    "pname": "http-version-indicator",
+    "slug": "http2-indicator"
+  }
+]

modules/home-manager/firefox/addons.nix

@@ -0,0 +1,11 @@
+pkgs: lib:
+let
+  rycee-addons = pkgs.nur.repos.rycee.firefox-addons;
+  custom-addons = import ./custom-addons.nix pkgs lib;
+in
+with rycee-addons; [
+  ublock-origin
+  istilldontcareaboutcookies
+  keepassxc-browser
+  custom-addons.simple-style-fox-2
+]

modules/home-manager/firefox/custom-addons.nix

@@ -0,0 +1,92 @@
+pkgs: lib:
+let
+  # Stolen from: https://github.com/nix-community/nur-combined/blob/master/repos/rycee/pkgs/firefox-addons/default.nix
+  buildFirefoxXpiAddon = lib.makeOverridable ({ stdenv ? pkgs.stdenv
+    , fetchurl ? pkgs.fetchurl, pname, version, addonId, url, sha256, meta, ...
+    }:
+    stdenv.mkDerivation {
+      name = "${pname}-${version}";
+
+      inherit meta;
+
+      src = fetchurl { inherit url sha256; };
+
+      preferLocalBuild = true;
+      allowSubstitutes = true;
+
+      buildCommand = ''
+        dst="$out/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
+        mkdir -p "$dst"
+        install -v -m644 "$src" "$dst/${addonId}.xpi"
+      '';
+    });
+in {
+  "http-version-indicator" = buildFirefoxXpiAddon {
+    pname = "http-version-indicator";
+    version = "3.2.1";
+    addonId = "spdyindicator@chengsun.github.com";
+    url =
+      "https://addons.mozilla.org/firefox/downloads/file/3767224/http2_indicator-3.2.1.xpi";
+    sha256 = "be9518017334ce502a1da514542c2ca4f974217d0c8e6c7c31d518aba57c09a8";
+    meta = with lib; {
+      homepage = "https://github.com/bsiegel/http-version-indicator";
+      description =
+        "An indicator showing the HTTP version used to load the page in the address bar.";
+      mozPermissions = [ "<all_urls>" "tabs" "webNavigation" "webRequest" ];
+      platforms = platforms.all;
+    };
+  };
+  "indicatetls" = buildFirefoxXpiAddon {
+    pname = "indicatetls";
+    version = "0.3.0";
+    addonId = "{252ee273-8c8d-4609-b54d-62ae345be0a1}";
+    url =
+      "https://addons.mozilla.org/firefox/downloads/file/3608595/indicatetls-0.3.0.xpi";
+    sha256 = "7a3b7edb1085f7b15d279c1013fac1d68f5247cfd6312d5275cb053e24a79465";
+    meta = with lib; {
+      homepage = "https://github.com/jannispinter/indicatetls";
+      description =
+        "Displays negotiated SSL/TLS protocol version and additional security information in the address bar";
+      license = licenses.mpl20;
+      mozPermissions = [
+        "tabs"
+        "webNavigation"
+        "webRequest"
+        "webRequestBlocking"
+        "http://*/*"
+        "https://*/*"
+      ];
+      platforms = platforms.all;
+    };
+  };
+  "sixindicator" = buildFirefoxXpiAddon {
+    pname = "sixindicator";
+    version = "1.3.0";
+    addonId = "{8c9cad02-c069-4e93-909d-d874da819c49}";
+    url =
+      "https://addons.mozilla.org/firefox/downloads/file/3493442/sixindicator-1.3.0.xpi";
+    sha256 = "415ab83ed4ac94d1efe114752a09df29536d1bd54cc9b7e5ce5d9ee55a84226d";
+    meta = with lib; {
+      homepage = "https://github.com/HostedDinner/SixIndicator";
+      description =
+        "Shows a simple icon, if IPv6 or IPv4 was used for the request of the site. When clicking on the icon, more information is shown, like the number of requests per domain and if these requests were made via IPv6 or IPv4.";
+      license = licenses.mit;
+      mozPermissions = [ "tabs" "webRequest" "<all_urls>" ];
+      platforms = platforms.all;
+    };
+  };
+  "simple-style-fox-2" = buildFirefoxXpiAddon {
+    pname = "simple-style-fox-2";
+    version = "10.0";
+    addonId = "{317526c6-ff2b-49c9-822e-d77b4a3da1d1}";
+    url =
+      "https://addons.mozilla.org/firefox/downloads/file/3934220/simple_style_fox_2-10.0.xpi";
+    sha256 = "1aaac3ba08d21086d7087015f92a27661940df45a97bf5680588c883f799a97d";
+    meta = with lib; {
+      description = "Simple style fox 2";
+      license = licenses.cc-by-30;
+      mozPermissions = [ ];
+      platforms = platforms.all;
+    };
+  };
+}

modules/home-manager/firefox/default.nix

@@ -0,0 +1,32 @@
+{ pkgs, lib, ... }:
+let
+  firefoxAddons = import ./addons.nix pkgs lib;
+  firefoxSettings = {
+    "browser.aboutConfig.showWarning" = false;
+    "browser.toolbars.bookmarks.visibility" = "always";
+    "browser.tabs.firefox-view" = false;
+    "browser.shell.checkDefaultBrowser" = false;
+    "browser.translations.automaticallyPopup" = false;
+    "signon.rememberSignons" = false;
+    "media.webspeech.synth.dont_notify_on_error" = true;
+    "browser.gesture.swipe.left" = false;
+    "browser.gesture.swipe.right" = false;
+    "browser.newtabpage.activity-stream.showSponsored" = false;
+    "browser.newtabpage.activity-stream.showSponsoredTopSites" = false;
+  };
+in
+{
+  config = {
+    programs.firefox = {
+      enable = true;
+      profiles = {
+        default = {
+          id = 0;
+          isDefault = true;
+          settings = firefoxSettings;
+          extensions = firefoxAddons;
+        };
+      };
+    };
+  };
+}

modules/home-manager/keepassxc/default.nix

@@ -0,0 +1,10 @@
+{ pkgs, config, flake, ... }: {
+  config = {
+    home.packages = [ pkgs.unstable.keepassxc ];
+
+    homeage.file."keepassxc.ini" = {
+      source = "${flake}/secrets/keepassxc.ini.age";
+      symlinks = [ "${config.xdg.configHome}/keepassxc/keepassxc.ini" ];
+    };
+  };
+}

modules/home-manager/neovim/bufferline.lua

@@ -0,0 +1,13 @@
+require("bufferline").setup({
+	options = {
+		diagnostics = "nvim_lsp",
+		diagnostics_indicator = function(count, level, diagnostics_dict, context)
+			local icon = level:match("error") and " " or " "
+			return " " .. icon .. count
+		end,
+		separator_style = "slant",
+		hover = { enabled = true, reveal = { "close" } },
+	},
+})
+
+vim.keymap.set("n", "<leader>ft", ":BufferLinePick<CR>", {})

modules/home-manager/neovim/cmp.lua

@@ -0,0 +1,43 @@
+local cmp = require("cmp")
+local luasnip = require("luasnip")
+
+require("luasnip.loaders.from_vscode").lazy_load()
+luasnip.config.setup({})
+
+cmp.setup({
+	snippet = {
+		expand = function(args)
+			luasnip.lsp_expand(args.body)
+		end,
+	},
+	mapping = cmp.mapping.preset.insert({
+		["<C-n>"] = cmp.mapping.select_next_item(),
+		["<C-p>"] = cmp.mapping.select_prev_item(),
+		["<C-d>"] = cmp.mapping.scroll_docs(-4),
+		["<C-f>"] = cmp.mapping.scroll_docs(4),
+		["<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_locally_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.locally_jumpable(-1) then
+				luasnip.jump(-1)
+			else
+				fallback()
+			end
+		end, { "i", "s" }),
+	}),
+	sources = { { name = "nvim_lsp" }, { name = "luasnip" } },
+})

modules/home-manager/neovim/commentary.lua

@@ -0,0 +1,2 @@
+vim.cmd([[autocmd FileType nix setlocal commentstring=#%s]])
+vim.cmd([[autocmd FileType terraform setlocal commentstring=#%s]])

modules/home-manager/neovim/core.lua

@@ -0,0 +1,9 @@
+vim.o.background = "dark"
+vim.cmd([[colorscheme gruvbox]])
+vim.g.mapleader = ";"
+vim.o.signcolumn = "yes"
+vim.wo.number = true
+vim.wo.relativenumber = true
+vim.wo.cursorline = true
+vim.opt.termguicolors = true
+vim.o.mousemoveevent = true

modules/home-manager/neovim/default.nix

@@ -0,0 +1,83 @@
+{ pkgs, ... }: {
+  config = {
+    programs.neovim = {
+      enable = true;
+      viAlias = true;
+      vimAlias = true;
+      vimdiffAlias = true;
+      defaultEditor = true;
+      extraLuaConfig = builtins.readFile ./core.lua;
+
+      extraPackages = with pkgs; [
+        nil
+        nodePackages.pyright
+        neofetch
+        gopls
+        terraform-ls
+        nixfmt-classic
+        stylua
+        black
+        nixpkgs-fmt
+      ];
+
+      plugins = with pkgs.vimPlugins; [
+        {
+          plugin = nvim-lspconfig;
+          type = "lua";
+          config = builtins.readFile ./lspconfig.lua;
+        }
+        gruvbox-nvim
+        {
+          plugin = leap-nvim;
+          type = "lua";
+          config = builtins.readFile ./leap.lua;
+        }
+        {
+          plugin = telescope-nvim;
+          type = "lua";
+          config = builtins.readFile ./telescope.lua;
+        }
+        {
+          plugin = vim-commentary;
+          type = "lua";
+          config = builtins.readFile ./commentary.lua;
+        }
+        vim-sleuth
+        {
+          plugin = gitsigns-nvim;
+          type = "lua";
+          config = ''require("gitsigns").setup()'';
+        }
+        {
+          plugin = nvim-cmp;
+          type = "lua";
+          config = builtins.readFile ./cmp.lua;
+        }
+        cmp-nvim-lsp
+        friendly-snippets
+        neodev-nvim
+        luasnip
+        cmp_luasnip
+        {
+          plugin = nvim-treesitter.withAllGrammars;
+          type = "lua";
+          config = builtins.readFile ./treesitter.lua;
+        }
+        {
+          plugin = bufferline-nvim;
+          type = "lua";
+          config = builtins.readFile ./bufferline.lua;
+        }
+        nvim-web-devicons
+        lsp-format-nvim
+        {
+          plugin = pkgs.vimPlugins.none-ls-nvim;
+          type = "lua";
+          config = builtins.readFile ./none-ls.lua;
+        }
+      ];
+    };
+
+    programs.git.extraConfig.core.editor = "nvim";
+  };
+}

modules/home-manager/neovim/leap.lua

@@ -0,0 +1,4 @@
+require("leap").add_default_mappings()
+-- Don't remap 'x' in visual mode.
+vim.keymap.del({ "x", "o" }, "x")
+vim.keymap.del({ "x", "o" }, "X")

modules/home-manager/neovim/lspconfig.lua

@@ -0,0 +1,58 @@
+require("lsp-format").setup({})
+
+local on_attach = function(client, bufnr)
+	local bufmap = function(keys, func)
+		vim.keymap.set("n", keys, func, { buffer = bufnr })
+	end
+
+	bufmap("<leader>r", vim.lsp.buf.rename)
+	bufmap("<leader>a", vim.lsp.buf.code_action)
+
+	bufmap("gd", vim.lsp.buf.definition)
+	bufmap("gD", vim.lsp.buf.declaration)
+	bufmap("gI", vim.lsp.buf.implementation)
+	bufmap("<leader>D", vim.lsp.buf.type_definition)
+
+	bufmap("gr", require("telescope.builtin").lsp_references)
+	bufmap("<leader>s", require("telescope.builtin").lsp_document_symbols)
+	bufmap("<leader>S", require("telescope.builtin").lsp_dynamic_workspace_symbols)
+
+	bufmap("K", vim.lsp.buf.hover)
+
+	vim.api.nvim_buf_create_user_command(bufnr, "Format", function(_)
+		vim.lsp.buf.format()
+	end, {})
+end
+
+local capabilities = vim.lsp.protocol.make_client_capabilities()
+capabilities = require("cmp_nvim_lsp").default_capabilities(capabilities)
+
+require("neodev").setup()
+require("lspconfig").nil_ls.setup({
+	on_attach = on_attach,
+	capabilities = capabilities,
+})
+require("lspconfig").pyright.setup({
+	on_attach = on_attach,
+	capabilities = capabilities,
+})
+require("lspconfig").gopls.setup({
+	on_attach = on_attach,
+	capabilities = capabilities,
+})
+require("lspconfig").terraformls.setup({
+	on_attach = on_attach,
+	capabilities = capabilities,
+})
+
+-- require'lspconfig'.efm.setup {
+--     on_attach = require("lsp-format").on_attach,
+--     init_options = {documentFormatting = true},
+--     settings = {
+--         languages = {
+--             lua = {{formatCommand = "lua-format -i", formatStdin = true}},
+--             nix = {{formatCommand = "nixfmt", formatStdin = true}}
+--         }
+--     },
+--     filetypes = {"lua", "nix"}
+-- }

modules/home-manager/neovim/none-ls.lua

@@ -0,0 +1,53 @@
+-- renamed to none-ls
+local null_ls_status_ok, null_ls = pcall(require, "null-ls")
+if not null_ls_status_ok then
+	return
+end
+
+local formatting = null_ls.builtins.formatting
+local diagnostics = null_ls.builtins.diagnostics
+local code_actions = null_ls.builtins.code_actions
+
+-- to setup format on save
+local augroup = vim.api.nvim_create_augroup("LspFormatting", {})
+
+require("null-ls").setup({
+	sources = {
+		formatting.stylua,
+		formatting.black,
+		formatting.nixpkgs_fmt,
+		formatting.mix,
+	},
+
+	-- configure format on save
+	on_attach = function(current_client, bufnr)
+		if current_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({
+						filter = function(client)
+							--  only use null-ls for formatting instead of lsp server
+							return client.name == "null-ls"
+						end,
+						bufnr = bufnr,
+					})
+				end,
+			})
+		end
+	end,
+})
+
+-- formatting command
+vim.api.nvim_create_user_command("Format", function()
+	vim.lsp.buf.format(nil, 10000)
+end, {})
+
+vim.keymap.set(
+	"n",
+	"<leader>fm",
+	":Format<CR>",
+	{ desc = "Format current buffer (also done on save)", noremap = true, silent = true }
+)

modules/home-manager/neovim/telescope.lua

@@ -0,0 +1,17 @@
+local builtin = require("telescope.builtin")
+
+vim.keymap.set("n", "<leader>ff", builtin.find_files, {})
+vim.keymap.set("n", "<leader>fg", builtin.live_grep, {})
+vim.keymap.set("n", "<leader>fb", builtin.buffers, {})
+vim.keymap.set("n", "<leader>fr", builtin.lsp_references, {})
+vim.keymap.set("n", "<leader>fs", builtin.lsp_document_symbols, {})
+
+require("telescope").setup({
+	pickers = {
+		find_files = { theme = "dropdown" },
+		live_grep = { theme = "dropdown" },
+		buffers = { theme = "dropdown" },
+		lsp_references = { theme = "dropdown" },
+		lsp_document_symbols = { theme = "dropdown" },
+	},
+})

modules/home-manager/neovim/treesitter.lua

@@ -0,0 +1,9 @@
+require("nvim-treesitter.configs").setup({
+	ensure_installed = {},
+
+	auto_install = false,
+
+	highlight = { enable = true },
+
+	indent = { enable = true },
+})

modules/home-manager/syncthing/default.nix

@@ -0,0 +1,15 @@
+{ config, flake, ... }: {
+  config = {
+    services.syncthing.enable = true;
+
+    homeage.file."syncthing-key.pem" = {
+      source = "${flake}/secrets/syncthing-key.pem.age";
+      symlinks = [ "${config.xdg.configHome}/syncthing/key.pem" ];
+    };
+
+    homeage.file."syncthing-cert.pem" = {
+      source = "${flake}/secrets/syncthing-cert.pem.age";
+      symlinks = [ "${config.xdg.configHome}/syncthing/cert.pem" ];
+    };
+  };
+}