From 41357c5deb7480d75d9bd63a065bafdd0d463e2e Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 4 Mar 2023 01:48:55 +0100 Subject: [PATCH] fix home --- users/pbsds/default.nix | 1 + users/pbsds/home/default.nix | 4 ---- users/pbsds/home/profiles/micro.nix | 2 +- users/pbsds/home/profiles/shell.nix | 3 +++ 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/users/pbsds/default.nix b/users/pbsds/default.nix index ded9093..6881ade 100644 --- a/users/pbsds/default.nix +++ b/users/pbsds/default.nix @@ -34,6 +34,7 @@ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCo5/9uHIKhhpVbcLSKslj9wdBiV4YaY/tydTfypNZBMMP2U54640t8JvHHkxCZRur8AqYupellxAqkmKn516Ut0WvfQcNgF7ieI66JHkK1j7kSFHHG1nkJHslwCh2PeYtfx5zHZZq8X9v/UjVGY182BC4BHC5zixmNiUvvc+N24BRT4NwslFmMYVcTdoNBSJXPgte4uUd+FZrAnHQrjYdJVANgI4i1d11mxlDFgJrPJj30KaIDxHAsAWgCEqGLMDO9N1cpGGbXVeXfoGvv+vdCXgbyA8BK7wWwXvy5HlvhpEJo8g84r6uKMMkEf+K1MpTiaNjdu+7/sKD/ZOyDB4RgCBs0DskouWRi+xfxABaKBj6706Z3hpj+GfpuSXrHKgGYXIL4cZHaAlz8GVsN1mUL4eJ12Sk14Od2QUHbzp7TDz5eaWuczPs5W9qXwNDMZcmBBZ3mkt9ZYPvAPRjeLpAKhhA9xPL3hbob5hhAENTWsFRFJEgpm8l362XFIOLHr/M= pbsds@rocm" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDHV25/jfk0upLl6JOq1tu1n+VNkMr0OOu8nZa3NBZQfqrGiLQuTTFycBd5hhoWBaZewb0R8jm/GESE4gfeiLtObe0bKXo8SVty5hNrIq06BbICXByJR99ux17psaNyp/dvZO7gkjKm3m30q7TfbZANlIwhv0XmqCz8S31ocJddFznWyK3nFau/Lvzpupi0Y+7yHkmcKiWYzZsjluQF90M5X5nIf2x4jj7WY0IkR2l41MOLk4NCQNIor6EyAXnHs78JBS3kY5p2x7t/cBpMDBmbgZePdfjGv/L4vFgYiG1wTZT77PWPA93GHueZWDGUkIvKbNriP/U+bShKnGjIfZttjerhzsFE1V/RctCFToqHkW39439nCj6eFpgUiLHkx/mAUPz/whKP+9x5I3/DQkgYZ7qA424Msdz2wXWNi3465Mtrf5XPsjWNReEWt9I29W19K5OLO9QQVrkgdioSCvxoHLvQypPscPkLVF8srzCVA6npUOrOuJ5zZcK1ax2/0v8= pbsds@frotbjoff" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBHdkKmRB0WjD3L+k8GNTVJDLpOUqLBMW17ld/Jzapo6 pbsds@bolle" + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC7fYndgIXJM+tLSfkbprWc8ClOI58wlaZCg6I+wMYINeOwxLU24BmIyQAhNeqhHYBdXiyIAl5KN3+YajN1nx6zq2XPXLut31Xtf+0yMdRMX4rXgqOnsBeG4eTfNsPx+v7VNANth8dIADpk59Y9ioWB6JI6NF0wfkqrCSTpt2q9gpTA35MBe41hlaxqxYGq+PlfZyJbN4TJCORZROkjw1P6K+EoYUHTHmduMZSAnpzx5bTHL2r1VK1jLRL4q2O1LP9G7eVYUsZKxKznJqtAeoOGBL4OX2JeIXT51/pXTW0NNyVPELD6aUUZjK8aVK2JDXupXegYO8cHqwLaz7rZj3G8evGamSlGvAYR4Gwvvp4Du8ZRZVM3Gt1allhPMTLnm/gy9Lta35D8SHH0IUKWD3buo5HZliZgSMAvoSrT03vpuGILLoWEkTjpPT0qKIlBd/ qlACBzKC9Wwmda5WWgMsfe0zP4zNLVdves5nkMrbY91TYSFM0FuDCaRsK5Mrhx7i0= root@noximilien" ]; }; } diff --git a/users/pbsds/home/default.nix b/users/pbsds/home/default.nix index a44bf49..467bf76 100644 --- a/users/pbsds/home/default.nix +++ b/users/pbsds/home/default.nix @@ -1,11 +1,7 @@ # https://nix-community.github.io/home-manager/options.html { pkgs, config, ... }: - { - programs.jump.enableBash = true; # TODO: upstream? imports = [ - ./modules/jump.nix - ./profiles/bat.nix ./profiles/git.nix ./profiles/gtk.nix diff --git a/users/pbsds/home/profiles/micro.nix b/users/pbsds/home/profiles/micro.nix index cdbea12..215d3e5 100644 --- a/users/pbsds/home/profiles/micro.nix +++ b/users/pbsds/home/profiles/micro.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { # TODO: upstream this - imports = [ ./modules/micro.nix ]; + imports = [ ../modules/micro.nix ]; disabledModules = [ "programs/micro.nix" ]; home.shellAliases.ed = "$EDITOR"; # ed is the standard editor diff --git a/users/pbsds/home/profiles/shell.nix b/users/pbsds/home/profiles/shell.nix index 6081112..5d104c5 100644 --- a/users/pbsds/home/profiles/shell.nix +++ b/users/pbsds/home/profiles/shell.nix @@ -16,6 +16,9 @@ "checkjobs" ]; + imports = [ ../modules/jump.nix ]; + programs.jump.enableBash = true; # TODO: upstream? + programs.fzf.enable = true; # TODO: does this conflict with system-wide setup? programs.exa.enable = true;