From 70b08268006ccf69b9f6c2b5e2c12a058e3bba4f Mon Sep 17 00:00:00 2001 From: Nathan Braswell Date: Mon, 13 Feb 2023 22:45:33 -0500 Subject: [PATCH] updates --- flake.lock | 12 ++++++------ flake.nix | 28 ++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index 266335c..c77248e 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1674771519, - "narHash": "sha256-U0W3S1nX6yEvLh3Vq70EORbmXecAKXfmEfCfaA4A+I8=", + "lastModified": 1675935446, + "narHash": "sha256-WajulTn7QdwC7QuXRBavrANuIXE5z+08EdxdRw1qsNs=", "owner": "nix-community", "repo": "home-manager", - "rev": "bb4b25b302dbf0f527f190461b080b5262871756", + "rev": "2dce7f1a55e785a22d61668516df62899278c9e4", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1674641431, - "narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=", + "lastModified": 1676202775, + "narHash": "sha256-gV/RnfVZkGLHn+5rmX2GSh5aquVHpWOJw1cnpEV03tQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b97ad7b4330aacda9b2343396eb3df8a853b4fc", + "rev": "d917136f550a8c36efb1724390c7245105f79023", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3bc4249..2581350 100644 --- a/flake.nix +++ b/flake.nix @@ -65,7 +65,9 @@ }; programs.vim = { enable = true; - plugins = with pkgs.vimPlugins; [ nerdcommenter vim-polyglot ]; + plugins = with pkgs.vimPlugins; [ + nerdcommenter vim-polyglot #parinfer-rust + ]; settings = { # Is the need for these obliviated by vim-polyglot using sleuth? #expandtab = false; @@ -154,16 +156,18 @@ (tool-bar-mode -1) (scroll-bar-mode -1) - ;; Use spaces, not tabs, for indentation. - (setq-default indent-tabs-mode nil) - ;; Highlight matching pairs of parentheses. - (setq show-paren-delay 0) - (show-paren-mode) + ;; Use spaces, not tabs, for indentation. + (setq-default indent-tabs-mode nil) + ;; Highlight matching pairs of parentheses. + (setq show-paren-delay 0) + (show-paren-mode) + + ;(require 'smartparens-config) (setq evil-want-C-u-scroll t) (evil-mode 1) - (evil-set-undo-system 'undo-redo) + (evil-set-undo-system 'undo-redo) (setq key-chord-two-keys-delay 0.5) (key-chord-define evil-insert-state-map "jk" 'evil-normal-state) (key-chord-mode 1) @@ -182,7 +186,13 @@ ) (load-theme 'dracula t) ''; - extraPackages = epkgs: with epkgs; [ evil key-chord magit proof-general paredit rainbow-delimiters dracula-theme ]; + extraPackages = epkgs: with epkgs; [ + evil key-chord magit proof-general + #paredit + #smartparens + #parinfer-rust-mode + rainbow-delimiters dracula-theme + ]; }; }; }; @@ -201,6 +211,8 @@ shell = "/run/current-system/sw/bin/bash"; }; + # testing + services.jellyfin.enable = false; services.pipewire = { enable = true; alsa.enable = true;