From b288102f7667313ea3bfec9d8d1a4fa5595b0457 Mon Sep 17 00:00:00 2001 From: hexchen Date: Mon, 11 Jan 2021 00:30:08 +0000 Subject: [PATCH] common/users: import hex-nix to deduplicate config --- common/hexchen.nix | 82 ++++------------------------------------------ common/users.nix | 12 ++----- 2 files changed, 9 insertions(+), 85 deletions(-) diff --git a/common/hexchen.nix b/common/hexchen.nix index c744cc7..c15e3bc 100644 --- a/common/hexchen.nix +++ b/common/hexchen.nix @@ -1,79 +1,9 @@ {config, lib, pkgs, ...}: -{ - home-manager.users.hexchen = { - programs.direnv = { - enable = true; - enableFishIntegration = true; - enableNixDirenvIntegration = true; - }; - programs.fish = { - enable = true; - shellAliases = { - icat = "${pkgs.kitty}/bin/kitty +kitten icat"; - }; - plugins = [ - { - name = "bass"; - src = pkgs.fetchFromGitHub { - owner = "edc"; - repo = "bass"; - rev = "d63054b24c2f63aaa3a08fb9ec9d0da4c70ab922"; - sha256 = "0pwci5xxm8308nrb52s5nyxijk0svar8nqrdfvkk2y34z1cg319b"; - }; - } - ]; - }; - programs.vim = { - enable = true; - extraConfig = '' - set viminfo='20,<1000 - set mouse=a - ''; /* - set tabstop=2 - set shiftwidth=2 - set expandtab - '';*/ - }; - - programs.git = { - enable = true; - userName = "hexchen"; - userEmail = "hexchen@lilwit.ch"; - signing = { - key = "B1DF5EAD"; - signByDefault = false; - }; - extraConfig = { - pull.rebase = true; - }; - }; - - programs.bat.enable = true; - programs.jq.enable = true; - programs.tmux.enable = true; - programs.ssh = { - enable = true; - controlMaster = "auto"; - controlPersist = "10m"; - hashKnownHosts = true; - matchBlocks = let - hexchen = { - forwardAgent = true; - extraOptions = { - RemoteForward = "/run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra"; - }; - port = 62954; - }; - in { - "*.chaoswit.ch" = hexchen; - "*.copyonwit.ch" = hexchen; - "*.lilwit.ch" = hexchen; - "*.hxchn.de" = hexchen; - "*.hacc.space" = hexchen; - "*.hacc.media" = hexchen; - }; - }; - }; - +let + sources = import ../nix/sources.nix; +in { + imports = [ + (sources.nix-hexchen + "/users/hexchen") + ]; } diff --git a/common/users.nix b/common/users.nix index ed74a20..e1cd07b 100644 --- a/common/users.nix +++ b/common/users.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: { imports = [ @@ -12,17 +12,11 @@ openssh.authorizedKeys.keys = with pkgs.lib; concatLists (mapAttrsToList (name: user: if elem "wheel" user.extraGroups then user.openssh.authorizedKeys.keys else []) config.users.users); }; + # all the actual config is imported from hexchen's nixfiles hexchen = { - uid = 1000; + uid = lib.mkForce 1000; isNormalUser = true; extraGroups = [ "wheel" ]; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDNVUDKx9sukRkb6INny432+2HZBWx/qIEAOvngF1qcj hexchen@montasch" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEvzA8w0/th/EJcqwogd5LIyTV4lcK6iSbkRYUtKli/V hexchen@mobile" - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDI3T1eFS77URHZ/HVWkMOqx7W1U54zJtn9C7QWsHOtyH72i/4EVj8SxYqLllElh1kuKUXSUipPeEzVsipFVvfH0wEuTDgFffiSQ3a8lfUgdEBuoySwceEoPgc5deapkOmiDIDeeWlrRe3nqspLRrSWU1DirMxoFPbwqJXRvpl6qJPxRg+2IolDcXlZ6yxB4Vv48vzRfVzZNUz7Pjmy2ebU8PbDoFWL/S3m7yOzQpv3L7KYBz7+rkjuF3AU2vy6CAfIySkVpspZZLtkTGCIJF228ev0e8NvhuN6ZnjzXxVTQOy32HCdPdbBbicu0uHfZ5O7JX9DjGd8kk1r2dnZwwy/ hexchen@yubi5" - ]; - shell = pkgs.fish; - packages = with pkgs; [ python38 go ]; }; stuebinm = {