From 17d483c8c8a96fad2200acaf802b7ef0b0eb494d Mon Sep 17 00:00:00 2001 From: Linnnus Date: Wed, 6 Sep 2023 08:18:38 +0200 Subject: =?UTF-8?q?hej=20g=C3=B8r=20lige=20mere?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- use-cases/cli-basics.nix | 13 +++++ use-cases/default.nix | 40 ++++++-------- use-cases/development/default.nix | 10 ---- use-cases/development/git/default.nix | 18 ------- use-cases/development/neovim/default.nix | 29 ---------- use-cases/development/neovim/filetype.nix | 20 ------- use-cases/development/neovim/lsp.nix | 89 ------------------------------- use-cases/development/zsh/default.nix | 19 ------- use-cases/git/default.nix | 18 +++++++ use-cases/neovim/default.nix | 29 ++++++++++ use-cases/neovim/filetype.nix | 20 +++++++ use-cases/neovim/lsp.nix | 89 +++++++++++++++++++++++++++++++ use-cases/sysadmin/default.nix | 16 ------ use-cases/zsh/default.nix | 19 +++++++ 14 files changed, 203 insertions(+), 226 deletions(-) create mode 100644 use-cases/cli-basics.nix delete mode 100644 use-cases/development/default.nix delete mode 100644 use-cases/development/git/default.nix delete mode 100644 use-cases/development/neovim/default.nix delete mode 100644 use-cases/development/neovim/filetype.nix delete mode 100644 use-cases/development/neovim/lsp.nix delete mode 100644 use-cases/development/zsh/default.nix create mode 100644 use-cases/git/default.nix create mode 100644 use-cases/neovim/default.nix create mode 100644 use-cases/neovim/filetype.nix create mode 100644 use-cases/neovim/lsp.nix delete mode 100644 use-cases/sysadmin/default.nix create mode 100644 use-cases/zsh/default.nix (limited to 'use-cases') diff --git a/use-cases/cli-basics.nix b/use-cases/cli-basics.nix new file mode 100644 index 0000000..cd1e333 --- /dev/null +++ b/use-cases/cli-basics.nix @@ -0,0 +1,13 @@ +# This module defines Home Manager configuration options for the 'sysadmin' use +# case. That is, basic system administration. + +{ pkgs, super, lib, ... }: + +{ + home.packages = with pkgs; [ + tree + jc + jq + vim + ]; +} diff --git a/use-cases/default.nix b/use-cases/default.nix index 5af2903..6823d9c 100644 --- a/use-cases/default.nix +++ b/use-cases/default.nix @@ -1,43 +1,33 @@ -# This configuration is centered around use cases, rather than profiles. Since -# all of the machines I manage are single-user machines, there's no point in -# creating multiple users. -# -# While the users don't differ, the use cases definitely do. I use some -# machines for homework and gaming, while others are used for web-browsing and -# development. Each use case is a subdirectory with (home-manager) -# configuration options. -# -# Note that e.g. "running a DNS server" is not a use case. That's specified in -# the respective host's `configuration.nix`. - { config, lib, flakeInputs, ... }: let - inherit (lib) mkEnableOption mkIf; - cfg = config.my.use-cases; + inherit (lib) mkOption types optional elem; + + hasUseCase = c: elem c config.my.use-cases; in { - options.my.use-cases = { - development.enable = mkEnableOption "development use case"; - sysadmin.enable = mkEnableOption "sysadmin use case"; + options.my.use-cases = mkOption { + description = "use-cases/modules to enable"; + type = types.listOf (types.enum ["gui" "development" "sysadmin"]); }; config = { home-manager.users.linus = { - imports = - (lib.optional cfg.development.enable ./development) ++ - (lib.optional cfg.sysadmin.enable ./sysadmin); - # TODO: Graphical linux config (remember assertion). + imports = + (optional (hasUseCase "development") ./neovim) ++ + (optional (hasUseCase "development") && (hasUseCase "gui" && pkgs.stdenv.isDarwin) ./kitty) ++ + (optional (hasUseCase "development") && (hasUseCase "gui" && pkgs.stdenv.isLinux) ./st) ++ + (optional (hasUseCase "sysadmin") || (hasUseCase "development") ./zsh) ++ + (optional (hasUseCase "sysadmin") || (hasUseCase "development") ./cli-basics.nix); - xdg.enable = true; + xdg.enable = true; }; - # Pass - home-manager.extraSpecialArgs = { + home.extraSpecialArgs = { super = config; inherit flakeInputs; }; - home-manager.useGlobalPkgs = true; + home.useGlobalPkgs = true; }; } diff --git a/use-cases/development/default.nix b/use-cases/development/default.nix deleted file mode 100644 index 1acffec..0000000 --- a/use-cases/development/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ config, lib, ... }: - -{ - imports = - [ - ./git - ./neovim - ./zsh # TODO: move to sysadmin? - ]; -} diff --git a/use-cases/development/git/default.nix b/use-cases/development/git/default.nix deleted file mode 100644 index 8df44db..0000000 --- a/use-cases/development/git/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ ... }: - -{ - programs.git = { - enable = true; - - # Set privacy-respecting user information. - userName = "Linnnus"; - userEmail = "linnnus@users.noreply.github.com"; - }; - - home.shellAliases = { - gs = "git status"; - gd = "git diff"; - gc = "git commit"; - gap = "git add --patch"; - }; -} diff --git a/use-cases/development/neovim/default.nix b/use-cases/development/neovim/default.nix deleted file mode 100644 index 5c265b8..0000000 --- a/use-cases/development/neovim/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -# This file contains the HM configuration options for Neovim. - -{ pkgs, lib, ... }: - -{ - imports = - [ - ./lsp.nix - ./filetype.nix - ]; - - programs.neovim = { - enable = true; - - # Typing `vi`, `vim`, or `vimdiff` will also run neovim. - viAlias = true; - vimAlias = true; - vimdiffAlias = true; - }; - - # Set Neovim as the default editor. - home.sessionVariables.EDITOR = "nvim"; - home.sessionVariables.VISUAL = "nvim"; - - # Use neovim as man pager. - home.sessionVariables.MANPAGER = "nvim +Man!"; -} - -# vi: foldmethod=marker diff --git a/use-cases/development/neovim/filetype.nix b/use-cases/development/neovim/filetype.nix deleted file mode 100644 index 66d5e68..0000000 --- a/use-cases/development/neovim/filetype.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This module configures various syntax/filetype plugins for Neovim. - -{ pkgs, ... }: - -let - vim-noweb = pkgs.vimUtils.buildVimPlugin { - pname = "vim-noweb"; - version = "26-08-2023"; # day of retrieval - src = pkgs.fetchzip { - url = "https://metaed.com/papers/vim-noweb/vim-noweb.tgz"; - hash = "sha256-c5eUZiKIjAfjJ33l821h5DjozMpMf0CaK03QIkSUfxg="; - }; - }; -in -{ - programs.neovim.plugins = with pkgs.vimPlugins; [ - vim-nix - vim-noweb - ]; -} diff --git a/use-cases/development/neovim/lsp.nix b/use-cases/development/neovim/lsp.nix deleted file mode 100644 index 0c7321d..0000000 --- a/use-cases/development/neovim/lsp.nix +++ /dev/null @@ -1,89 +0,0 @@ -# This module sets up LSP server configurations for Neovim. It is waaay -# overcomplicated as it kind of turned into an experiment in generating Lua -# code from a Nix attrset. - -{ pkgs, lib, ... }: - -let - servers = { - pyright.cmd = [ "${pkgs.pyright}/bin/pyright-langserver" ]; - }; - defaultConfig = { - flags.debounce_text_changes = 150; - }; - combinedConfig = lib.mapAttrs (name: value: value // defaultConfig) servers; - - nixToLua = s: - if builtins.isAttrs s then - let - renderAttr = name: value: "[ [==========[" + name + "]==========] ] = " + (nixToLua value); - attrsList = map (name: renderAttr name s.${name}) (lib.attrNames s); - attrsListStr = lib.concatStringsSep ", " attrsList; - in - "{ ${attrsListStr} }" - else if builtins.isList s then - "{ " + (lib.concatStringsSep ", " (map nixToLua s)) + " }" - else if builtins.isString s then - # Oh boy I sure hope `s` doesn't contain "]==========]". - "[==========[" + s + "]==========]" - else if builtins.isInt s || builtins.isFloat s then - toString s - else - throw "Cannot convert ${builtins.typeOf s} to Lua value!"; - combinedConfigStr = nixToLua combinedConfig; -in -{ - programs.neovim.plugins = [ - { - plugin = pkgs.vimPlugins.nvim-lspconfig; - type = "lua"; - config = '' - local lspconfig = require("lspconfig") - local util = require("lspconfig.util") - - -- Mappings. - -- See `:help vim.diagnostic.*` for documentation on any of the below functions - local opts = { noremap=true, silent=true } - vim.keymap.set('n', 'e', vim.diagnostic.open_float, opts) - vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts) - vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts) - vim.keymap.set('n', 'q', vim.diagnostic.setloclist, opts) - - -- Use an on_attach function to only map the following keys - -- after the language server attaches to the current buffer - local on_attach = function(client, bufnr) - -- Enable completion triggered by - vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') - - -- Mappings. - -- See `:help vim.lsp.*` for documentation on any of the below functions - local bufopts = { noremap=true, silent=true, buffer=bufnr } - vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts) - vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts) - vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts) - vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts) - vim.keymap.set('n', '', vim.lsp.buf.signature_help, bufopts) - vim.keymap.set('n', 'wa', vim.lsp.buf.add_workspace_folder, bufopts) - vim.keymap.set('n', 'wr', vim.lsp.buf.remove_workspace_folder, bufopts) - vim.keymap.set('n', 'wl', function() - print(vim.inspect(vim.lsp.buf.list_workspace_folders())) - end, bufopts) - vim.keymap.set('n', 'D', vim.lsp.buf.type_definition, bufopts) - vim.keymap.set('n', 'rn', vim.lsp.buf.rename, bufopts) - vim.keymap.set('n', 'ca', vim.lsp.buf.code_action, bufopts) - vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts) - vim.keymap.set('n', 'f', function() vim.lsp.buf.format { async = true } end, bufopts) - vim.keymap.set('n', 's', function() vim.cmd[[ClangdSwitchSourceHeader]] end, bufopts) - end - - -- Use a loop to conveniently call 'setup' on multiple servers and - -- map buffer local keybindings when the language server attaches - local servers = ${combinedConfigStr}; - for server, config in pairs(servers) do - config.on_attach = on_attach; -- inject lua event handler; not elegant! - lspconfig[server].setup(config) - end - ''; - } - ]; -} diff --git a/use-cases/development/zsh/default.nix b/use-cases/development/zsh/default.nix deleted file mode 100644 index ac88554..0000000 --- a/use-cases/development/zsh/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ pkgs, config, ... }: - -{ - programs.zsh = { - enable = true; - - defaultKeymap = "viins"; - - # Feeble attempt at cleaning up home directory. - # TODO: dotDir = (pathRelativeTo config.xdg.configHome config.home) + "/zsh"; - dotDir = ".config/zsh"; - history.path = config.xdg.cacheHome + "/zsh/history"; - }; - - programs.fzf = { - enable = true; - enableZshIntegration = true; - }; -} diff --git a/use-cases/git/default.nix b/use-cases/git/default.nix new file mode 100644 index 0000000..8df44db --- /dev/null +++ b/use-cases/git/default.nix @@ -0,0 +1,18 @@ +{ ... }: + +{ + programs.git = { + enable = true; + + # Set privacy-respecting user information. + userName = "Linnnus"; + userEmail = "linnnus@users.noreply.github.com"; + }; + + home.shellAliases = { + gs = "git status"; + gd = "git diff"; + gc = "git commit"; + gap = "git add --patch"; + }; +} diff --git a/use-cases/neovim/default.nix b/use-cases/neovim/default.nix new file mode 100644 index 0000000..5c265b8 --- /dev/null +++ b/use-cases/neovim/default.nix @@ -0,0 +1,29 @@ +# This file contains the HM configuration options for Neovim. + +{ pkgs, lib, ... }: + +{ + imports = + [ + ./lsp.nix + ./filetype.nix + ]; + + programs.neovim = { + enable = true; + + # Typing `vi`, `vim`, or `vimdiff` will also run neovim. + viAlias = true; + vimAlias = true; + vimdiffAlias = true; + }; + + # Set Neovim as the default editor. + home.sessionVariables.EDITOR = "nvim"; + home.sessionVariables.VISUAL = "nvim"; + + # Use neovim as man pager. + home.sessionVariables.MANPAGER = "nvim +Man!"; +} + +# vi: foldmethod=marker diff --git a/use-cases/neovim/filetype.nix b/use-cases/neovim/filetype.nix new file mode 100644 index 0000000..66d5e68 --- /dev/null +++ b/use-cases/neovim/filetype.nix @@ -0,0 +1,20 @@ +# This module configures various syntax/filetype plugins for Neovim. + +{ pkgs, ... }: + +let + vim-noweb = pkgs.vimUtils.buildVimPlugin { + pname = "vim-noweb"; + version = "26-08-2023"; # day of retrieval + src = pkgs.fetchzip { + url = "https://metaed.com/papers/vim-noweb/vim-noweb.tgz"; + hash = "sha256-c5eUZiKIjAfjJ33l821h5DjozMpMf0CaK03QIkSUfxg="; + }; + }; +in +{ + programs.neovim.plugins = with pkgs.vimPlugins; [ + vim-nix + vim-noweb + ]; +} diff --git a/use-cases/neovim/lsp.nix b/use-cases/neovim/lsp.nix new file mode 100644 index 0000000..0c7321d --- /dev/null +++ b/use-cases/neovim/lsp.nix @@ -0,0 +1,89 @@ +# This module sets up LSP server configurations for Neovim. It is waaay +# overcomplicated as it kind of turned into an experiment in generating Lua +# code from a Nix attrset. + +{ pkgs, lib, ... }: + +let + servers = { + pyright.cmd = [ "${pkgs.pyright}/bin/pyright-langserver" ]; + }; + defaultConfig = { + flags.debounce_text_changes = 150; + }; + combinedConfig = lib.mapAttrs (name: value: value // defaultConfig) servers; + + nixToLua = s: + if builtins.isAttrs s then + let + renderAttr = name: value: "[ [==========[" + name + "]==========] ] = " + (nixToLua value); + attrsList = map (name: renderAttr name s.${name}) (lib.attrNames s); + attrsListStr = lib.concatStringsSep ", " attrsList; + in + "{ ${attrsListStr} }" + else if builtins.isList s then + "{ " + (lib.concatStringsSep ", " (map nixToLua s)) + " }" + else if builtins.isString s then + # Oh boy I sure hope `s` doesn't contain "]==========]". + "[==========[" + s + "]==========]" + else if builtins.isInt s || builtins.isFloat s then + toString s + else + throw "Cannot convert ${builtins.typeOf s} to Lua value!"; + combinedConfigStr = nixToLua combinedConfig; +in +{ + programs.neovim.plugins = [ + { + plugin = pkgs.vimPlugins.nvim-lspconfig; + type = "lua"; + config = '' + local lspconfig = require("lspconfig") + local util = require("lspconfig.util") + + -- Mappings. + -- See `:help vim.diagnostic.*` for documentation on any of the below functions + local opts = { noremap=true, silent=true } + vim.keymap.set('n', 'e', vim.diagnostic.open_float, opts) + vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, opts) + vim.keymap.set('n', ']d', vim.diagnostic.goto_next, opts) + vim.keymap.set('n', 'q', vim.diagnostic.setloclist, opts) + + -- Use an on_attach function to only map the following keys + -- after the language server attaches to the current buffer + local on_attach = function(client, bufnr) + -- Enable completion triggered by + vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') + + -- Mappings. + -- See `:help vim.lsp.*` for documentation on any of the below functions + local bufopts = { noremap=true, silent=true, buffer=bufnr } + vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts) + vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts) + vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts) + vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts) + vim.keymap.set('n', '', vim.lsp.buf.signature_help, bufopts) + vim.keymap.set('n', 'wa', vim.lsp.buf.add_workspace_folder, bufopts) + vim.keymap.set('n', 'wr', vim.lsp.buf.remove_workspace_folder, bufopts) + vim.keymap.set('n', 'wl', function() + print(vim.inspect(vim.lsp.buf.list_workspace_folders())) + end, bufopts) + vim.keymap.set('n', 'D', vim.lsp.buf.type_definition, bufopts) + vim.keymap.set('n', 'rn', vim.lsp.buf.rename, bufopts) + vim.keymap.set('n', 'ca', vim.lsp.buf.code_action, bufopts) + vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts) + vim.keymap.set('n', 'f', function() vim.lsp.buf.format { async = true } end, bufopts) + vim.keymap.set('n', 's', function() vim.cmd[[ClangdSwitchSourceHeader]] end, bufopts) + end + + -- Use a loop to conveniently call 'setup' on multiple servers and + -- map buffer local keybindings when the language server attaches + local servers = ${combinedConfigStr}; + for server, config in pairs(servers) do + config.on_attach = on_attach; -- inject lua event handler; not elegant! + lspconfig[server].setup(config) + end + ''; + } + ]; +} diff --git a/use-cases/sysadmin/default.nix b/use-cases/sysadmin/default.nix deleted file mode 100644 index 1958797..0000000 --- a/use-cases/sysadmin/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This module defines Home Manager configuration options for the 'sysadmin' use -# case. That is, basic system administration. - -{ pkgs, super, lib, ... }: - -let - inherit (lib) optional; -in -{ - home.packages = with pkgs; [ - tree - jc - jq - # is this not the right it is the one passed to home-manager not nixos ???? 'config'? - ] ++ (optional (!super.my.use-cases.development.enable) vim); -} diff --git a/use-cases/zsh/default.nix b/use-cases/zsh/default.nix new file mode 100644 index 0000000..ac88554 --- /dev/null +++ b/use-cases/zsh/default.nix @@ -0,0 +1,19 @@ +{ pkgs, config, ... }: + +{ + programs.zsh = { + enable = true; + + defaultKeymap = "viins"; + + # Feeble attempt at cleaning up home directory. + # TODO: dotDir = (pathRelativeTo config.xdg.configHome config.home) + "/zsh"; + dotDir = ".config/zsh"; + history.path = config.xdg.cacheHome + "/zsh/history"; + }; + + programs.fzf = { + enable = true; + enableZshIntegration = true; + }; +} -- cgit v1.2.3