From 47453cdfe10622c227bc8f8d055ff6f3066e7ccd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Fri, 18 Aug 2023 16:26:00 +0300 Subject: [PATCH] home-manager/motiejus: add very basic test configs --- flake.nix | 3 +++ modules/base/default.nix | 1 - modules/base/users/default.nix | 27 ++++++++++++++++++++++++++- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index be0eee8..43809e2 100644 --- a/flake.nix +++ b/flake.nix @@ -54,6 +54,7 @@ ./modules agenix.nixosModules.default + home-manager.nixosModules.home-manager { age.secrets.motiejus-passwd-hash.file = ./secrets/motiejus_passwd_hash.age; @@ -80,6 +81,7 @@ ./modules agenix.nixosModules.default + home-manager.nixosModules.home-manager { age.secrets.motiejus-passwd-hash.file = ./secrets/motiejus_passwd_hash.age; @@ -103,6 +105,7 @@ ./modules agenix.nixosModules.default + home-manager.nixosModules.home-manager { age.secrets.motiejus-passwd-hash.file = ./secrets/motiejus_passwd_hash.age; diff --git a/modules/base/default.nix b/modules/base/default.nix index 303ca90..8f914b9 100644 --- a/modules/base/default.nix +++ b/modules/base/default.nix @@ -83,7 +83,6 @@ parted sqlite procps - direnv ripgrep vimv-rs sysstat diff --git a/modules/base/users/default.nix b/modules/base/users/default.nix index 3102ff6..c3ecde2 100644 --- a/modules/base/users/default.nix +++ b/modules/base/users/default.nix @@ -2,6 +2,7 @@ config, lib, myData, + #home-manager, ... }: { options.mj.base.users = with lib.types; { @@ -27,7 +28,9 @@ users = { mutableUsers = false; - users = with config.mj.base.users; { + users = let + passwd = config.mj.base.users.passwd; + in { motiejus = { isNormalUser = true; @@ -41,5 +44,27 @@ lib.filterAttrs (n: v: v != null) passwd.root; }; }; + + home-manager.users.motiejus = {pkgs, ...}: { + home.stateVersion = "23.05"; + programs.direnv.enable = true; + programs.git = { + enable = true; + userEmail = "motiejus@jakstys.lt"; + aliases.yolo = "commit --amend --no-edit -a"; + extraConfig = { + rerere.enabled = true; + pull.ff = "only"; + merge.conflictstyle = "diff3"; + }; + }; + programs.bash = { + enable = true; + shellAliases = { + "l" = "echo -n ł | xclip -selection clipboard"; + "gp" = "${pkgs.git} remote | ${pkgs.parallel} --verbose git push"; + }; + }; + }; }; }