diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/git.home.nix | 5 | ||||
| -rw-r--r-- | modules/keybase.home.nix | 6 | ||||
| -rw-r--r-- | modules/keyboard/default.nix | 2 |
3 files changed, 2 insertions, 11 deletions
diff --git a/modules/git.home.nix b/modules/git.home.nix index 0622128..963abb4 100644 --- a/modules/git.home.nix +++ b/modules/git.home.nix @@ -94,9 +94,8 @@ new = "green bold"; whitespace = "red reverse"; }; - pull = { - rebase = true; - }; + pull.rebase = true; + rebase.autosquash = true; # pager = { # diff = "${pkgs.delta}/bin/delta --color-only"; # }; diff --git a/modules/keybase.home.nix b/modules/keybase.home.nix deleted file mode 100644 index 771025c..0000000 --- a/modules/keybase.home.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ config, pkgs, ... }: -{ - services.kbfs.enable = false; - services.keybase.enable = false; -} - diff --git a/modules/keyboard/default.nix b/modules/keyboard/default.nix index 81e3c91..47486ce 100644 --- a/modules/keyboard/default.nix +++ b/modules/keyboard/default.nix @@ -1,7 +1,5 @@ { ... }: { - # imports = [ ./kmonad.nix ]; - services.kmonad = { enable = true; keyboards = { |