From b8155bff9e26eb980167cf5a99ed7c891247a44a Mon Sep 17 00:00:00 2001 From: Christoph Hollizeck Date: Fri, 8 Nov 2024 00:14:39 +0100 Subject: [PATCH] loptland: add ssh key of phone, make sure that fish loads op in terminal only session, without bricking homemanager --- modules/nixos/apps/cli-apps/helix/default.nix | 217 +++++++++--------- systems/x86_64-linux/loptland/default.nix | 12 +- 2 files changed, 112 insertions(+), 117 deletions(-) diff --git a/modules/nixos/apps/cli-apps/helix/default.nix b/modules/nixos/apps/cli-apps/helix/default.nix index d81fb6f..5610350 100644 --- a/modules/nixos/apps/cli-apps/helix/default.nix +++ b/modules/nixos/apps/cli-apps/helix/default.nix @@ -18,7 +18,7 @@ let in { options.${namespace}.apps.cli-apps.helix = { - enable = mkEnableOption "Whether to enable nixvim or not"; + enable = mkEnableOption "Whether to enable helix or not"; }; config = mkIf cfg.enable { @@ -30,124 +30,119 @@ in }; ${namespace} = { - home = { - extraOptions = { - programs.helix = { - enable = true; - package = helix-pkg; - defaultEditor = true; - settings = { - theme = "tokyonight"; - editor = { - auto-format = true; - line-number = "relative"; + home.extraOptions = { + programs.helix = { + enable = true; + package = helix-pkg; + defaultEditor = true; + settings = { + theme = "tokyonight"; + editor = { + auto-format = true; + line-number = "relative"; - lsp = { - display-inlay-hints = true; - display-messages = true; - }; - - cursor-shape = { - normal = "block"; - insert = "bar"; - select = "underline"; - }; - - indent-guides = { - render = true; - character = "|"; - }; - - statusline = { - left = [ - "mode" - "spinner" - ]; - center = [ "file-name" ]; - right = [ - "workspace-diagnostics" - "diagnostics" - "selections" - "position" - "total-line-numbers" - "spacer" - "file-encoding" - "file-line-ending" - "file-type" - ]; - separator = "│"; - }; + lsp = { + display-inlay-hints = true; + display-messages = true; }; - keys = { - normal = { - esc = [ - "collapse_selection" - "keep_primary_selection" - ]; - space = { - space = "file_picker"; - }; + cursor-shape = { + normal = "block"; + insert = "bar"; + select = "underline"; + }; - C-j = [ - "move_line_down" - "move_line_down" - "move_line_down" - "move_line_down" - "move_line_down" - ]; - C-k = [ - "move_line_up" - "move_line_up" - "move_line_up" - "move_line_up" - "move_line_up" - ]; - }; + indent-guides = { + render = true; + character = "|"; + }; + + statusline = { + left = [ + "mode" + "spinner" + ]; + center = [ "file-name" ]; + right = [ + "workspace-diagnostics" + "diagnostics" + "selections" + "position" + "total-line-numbers" + "spacer" + "file-encoding" + "file-line-ending" + "file-type" + ]; + separator = "│"; }; }; - languages = { - language = [ - { - name = "nix"; - auto-format = true; - formatter.command = "${pkgs.nixfmt-rfc-style}/bin/nixfmt"; - language-servers = [ - "nixd" - "nil" - ]; - } - { - # provided by the dev environment in the rust shell - name = "rust"; - auto-format = true; - formatter.command = "cargo fmt"; - language-servers = [ "rust-analyzer" ]; - } - ]; + keys = { + normal = { + esc = [ + "collapse_selection" + "keep_primary_selection" + ]; + space = { + space = "file_picker"; + }; - language-server = { - nil = { - command = "${pkgs.nil}/bin/nil"; - }; - nixd = { - command = "${pkgs.nixd}/bin/nixd"; - }; - marksman = { - command = "${pkgs.marksman}/bin/marksman"; - }; - vscode-json-language-server = { - command = "${pkgs.vscode-langservers-extracted}/bin/vscode-json-language-server"; - args = [ "--stdio" ]; - config.provideFormatter = true; - config.json.validate.enable = true; - }; - vscode-css-language-server = { - command = "${pkgs.vscode-langservers-extracted}/bin/vscode-css-language-server"; - args = [ "--stdio" ]; - config.provideFormatter = true; - }; + C-j = [ + "move_line_down" + "move_line_down" + "move_line_down" + "move_line_down" + "move_line_down" + ]; + C-k = [ + "move_line_up" + "move_line_up" + "move_line_up" + "move_line_up" + "move_line_up" + ]; + }; + }; + }; + + languages = { + language = [ + { + name = "nix"; + auto-format = true; + formatter.command = "${pkgs.nixfmt-rfc-style}/bin/nixfmt"; + language-servers = [ + "nixd" + "nil" + ]; + } + { + # provided by the dev environment in the rust shell + name = "rust"; + auto-format = true; + formatter.command = "cargo fmt"; + language-servers = [ "rust-analyzer" ]; + } + ]; + + language-server = { + nixd = { + command = "${pkgs.nixd}/bin/nixd"; + }; + marksman = { + command = "${pkgs.marksman}/bin/marksman"; + }; + vscode-json-language-server = { + command = "${pkgs.vscode-langservers-extracted}/bin/vscode-json-language-server"; + args = [ "--stdio" ]; + config.provideFormatter = true; + config.json.validate.enable = true; + }; + vscode-css-language-server = { + command = "${pkgs.vscode-langservers-extracted}/bin/vscode-css-language-server"; + args = [ "--stdio" ]; + config.provideFormatter = true; }; }; }; diff --git a/systems/x86_64-linux/loptland/default.nix b/systems/x86_64-linux/loptland/default.nix index b53511f..92ae507 100644 --- a/systems/x86_64-linux/loptland/default.nix +++ b/systems/x86_64-linux/loptland/default.nix @@ -108,14 +108,14 @@ in user.trustedPublicKeys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHFrDiO5+vMfD5MimkzN32iw3MnSMLZ0mHvOrHVVmLD0" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII4Pr7p0jizrvIl0UhcvrmL5SHRQQQWIcHLAnRFyUZS6" ]; + }; - home.extraOptions = { - programs.fish.shellInit = '' - eval $(op signin) - ''; - }; - + snowfallorg.users.${config.${namespace}.user.name}.home.config = { + programs.fish.shellInit = '' + eval $(op signin) + ''; }; system.stateVersion = "24.11";