From 95128333e31cfcd3097b13b03f83a92842285365 Mon Sep 17 00:00:00 2001 From: Lucy Hochkamp Date: Wed, 11 Oct 2023 15:58:15 +0200 Subject: [PATCH] feat: added vscode config --- .envrc | 6 --- .gitignore | 1 + flake.nix | 53 ------------------- .../PLEASE FORGIVE ME FOR THIS SINFUL ACT | 0 hm-imports/vscode/default.nix | 17 ++++++ hosts/daedalus/default.nix | 2 + 6 files changed, 20 insertions(+), 59 deletions(-) create mode 100644 hm-imports/vscode/PLEASE FORGIVE ME FOR THIS SINFUL ACT create mode 100644 hm-imports/vscode/default.nix diff --git a/.envrc b/.envrc index c23bb916..3550a30f 100644 --- a/.envrc +++ b/.envrc @@ -1,7 +1 @@ -use_flake() { - watch_file flake.nix - watch_file flake.lock - eval "$(nix print-dev-env)" -} - use flake diff --git a/.gitignore b/.gitignore index 4774bded..007af98a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ # Ignore configurable file with secrets #/data/secrets.nix .DS_Store +/.direnv # Ignore build symlinks result* diff --git a/flake.nix b/flake.nix index 2d24bcd2..5860f007 100644 --- a/flake.nix +++ b/flake.nix @@ -102,59 +102,6 @@ overlays = [ self.overlays.default neovim-nightly-overlay.overlay - (final: prev: { - python3 = prev.python3.override { - packageOverrides = pyself: pysuper: { - notmuch2 = pysuper.notmuch2.overridePythonAttrs (old: { - postPatch = old.postPatch + ''sed -i "s|/private.*/notmuch-${old.version}/|$(pwd)/../../|g" _notmuch_config.py''; - meta.broken = false; - }); - }; - }; - alot = prev.alot.overrideAttrs - (super: { - meta.platforms = lib.platforms.unix; - disabledTests = super.disabledTests ++ [ - "test_returned_string_starts_with_pgp" - "test_returned_string_is_lower_case" - "test_raises_for_unknown_hash_name" - "test_valid_signature_generated" - "test_verify_signature_good" - "test_verify_signature_bad" - "test_valid" - "test_revoked" - "test_expired" - "test_invalid" - "test_encrypt" - "test_encrypt_no_check" - "test_sign" - "test_sign_no_check" - "test_valid_single" - "test_valid_multiple" - "test_invalid_email" - "test_invalid_revoked" - "test_invalid_invalid" - "test_invalid_not_enough_trust" - "test_list_no_hints" - "test_list_hint" - "test_list_keys_pub" - "test_list_keys_private" - "test_plain" - "test_validate" - "test_missing_key" - "test_invalid_key" - "test_signed_only_true" - "test_signed_only_false" - "test_ambiguous_one_valid" - "test_ambiguous_two_valid" - "test_ambiguous_no_valid" - "test_encrypt" - "test_decrypt" - ]; - }); - - - }) ]; genPkgsWithOverlays = system: import nixpkgs { inherit system overlays; diff --git a/hm-imports/vscode/PLEASE FORGIVE ME FOR THIS SINFUL ACT b/hm-imports/vscode/PLEASE FORGIVE ME FOR THIS SINFUL ACT new file mode 100644 index 00000000..e69de29b diff --git a/hm-imports/vscode/default.nix b/hm-imports/vscode/default.nix new file mode 100644 index 00000000..59699be8 --- /dev/null +++ b/hm-imports/vscode/default.nix @@ -0,0 +1,17 @@ +{ pkgs, config, lib, ... }: +let + cfg = config.ragon.vscode; +in +{ + options.ragon.vscode.enable = lib.mkOption { default = false; }; + config = lib.mkIf cfg.enable { + programs.vscode = { + enable = true; + extensions = with pkgs.vscode-extensions; [ + vscodevim.vim # vim mode (hopefully good) + yzhang.markdown-all-in-one # markdown + jdinhlife.gruvbox # theme + ]; + }; + }; +} diff --git a/hosts/daedalus/default.nix b/hosts/daedalus/default.nix index 79ff5969..6faaeb9f 100644 --- a/hosts/daedalus/default.nix +++ b/hosts/daedalus/default.nix @@ -65,6 +65,8 @@ with lib.my; home.file.".hammerspoon/Spoons/MiroWindowsManager.spoon".source = "${inputs.miro}/MiroWindowsManager.spoon"; home.file.".finicky.js".source = ./finicky.js; + ragon.vscode.enable = true; + programs.home-manager.enable = true; home.stateVersion = "21.11";