diff options
Diffstat (limited to 'users')
-rw-r--r-- | users/multi/OWNERS | 3 | ||||
-rw-r--r-- | users/multi/home/.skip-subtree | 0 | ||||
-rw-r--r-- | users/multi/home/configs/whitby.nix | 109 | ||||
-rw-r--r-- | users/multi/home/default.nix | 27 | ||||
-rw-r--r-- | users/multi/home/home-manager.nix | 10 | ||||
-rw-r--r-- | users/multi/keys.nix | 18 | ||||
-rw-r--r-- | users/multi/pkgs/.skip-subtree | 0 | ||||
-rw-r--r-- | users/multi/pkgs/default.nix | 13 | ||||
-rw-r--r-- | users/multi/pkgs/htop/default.nix | 19 |
9 files changed, 0 insertions, 199 deletions
diff --git a/users/multi/OWNERS b/users/multi/OWNERS deleted file mode 100644 index ffb57ce2d671..000000000000 --- a/users/multi/OWNERS +++ /dev/null @@ -1,3 +0,0 @@ -inherited: false -owners: - - multi diff --git a/users/multi/home/.skip-subtree b/users/multi/home/.skip-subtree deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/users/multi/home/.skip-subtree +++ /dev/null diff --git a/users/multi/home/configs/whitby.nix b/users/multi/home/configs/whitby.nix deleted file mode 100644 index 3f6882a55bba..000000000000 --- a/users/multi/home/configs/whitby.nix +++ /dev/null @@ -1,109 +0,0 @@ -{ depot, pkgs, ... }: - -let - nixpkgs = import pkgs.nixpkgsSrc {}; - localpkgs = depot.users.multi.pkgs; - - # use the depot checkout in my home directory, to make hacking around easier, - # instead of the depot checkout sitting in the nix stores - depotPath = "/home/multi/depot"; -in - -{ - programs = { - home-manager = { - enable = true; - path = toString nixpkgs.home-manager.src; - }; - - bash = { - enable = true; - initExtra = '' - PS1="[\\u@\\h:\\w" - if [[ -n "$IN_NIX_SHELL" ]]; then - PS1="$PS1 (nix-shell)]\\\$ " - else - PS1="$PS1]\\\$ " - fi - - nix-shell() { - local comarg=0 - for i in "$@"; do - [[ "$i" == "--command" ]] && comarg=1 - done - - if (( commarg == 0 )); then - command nix-shell --command bash "$@" - else - command nix-shell "$@" - fi - } - - _Z_CMD=d - source ~/.z.sh - ''; - }; - - readline = { - enable = true; - bindings = { - "\\e[5~" = "history-search-backward"; - "\\e[6~" = "history-search-forward"; - "\\C-w" = "\"\\e\\C-h\""; - }; - includeSystemConfig = false; - variables = { - expand-tilde = true; - colored-stats = true; - page-completions = false; - menu-complete-display-prefix = true; - colored-completion-prefix = true; - completion-query-items = 0; - completion-ignore-case = true; - revert-all-at-newline = true; - show-all-if-ambiguous = true; - skip-completed-text = true; - }; - }; - - tmux = { - enable = true; - terminal = "tmux-256color"; - escapeTime = 50; - extraConfig = '' - bind-key -n C-S-Left swap-window -dt -1 - bind-key -n C-S-Right swap-window -dt +1 - ''; - }; - - vim = { - enable = true; - extraConfig = "set mouse="; - }; - }; - - home.sessionVariables = { - NIX_PATH = - "nixpkgs=${pkgs.nixpkgsSrc}:" + - "depot=${depotPath}"; - HOME_MANAGER_CONFIG = "${depotPath}/users/multi/home/home-manager.nix"; - EDITOR = "vim"; - }; - - home.packages = [ - nixpkgs.lsof - nixpkgs.strace - nixpkgs.file - nixpkgs.pciutils - localpkgs.htop - ]; - - home.file = { - z = { - source = builtins.fetchurl "https://raw.githubusercontent.com/rupa/z/9f76454b32c0007f20b0eae46d55d7a1488c9df9/z.sh"; - target = ".z.sh"; - }; - }; - - home.stateVersion = "20.03"; -} diff --git a/users/multi/home/default.nix b/users/multi/home/default.nix deleted file mode 100644 index b5befe6bb6b8..000000000000 --- a/users/multi/home/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ depot, pkgs, lib, ... }: - -let - nixpkgs = import pkgs.nixpkgsSrc {}; - home-modules = import "${nixpkgs.home-manager.src}/modules"; - outerLib = lib; - - home = path: - let - configSet = import path { inherit depot pkgs; }; - in - home-modules { - pkgs = nixpkgs; - configuration = { config, lib, ... }: ( - { - _module.args.pkgs = outerLib.mkForce (import pkgs.nixpkgsSrc {}); - } // configSet - ); - }; - -in - rec { - whitby = home ./configs/whitby.nix; - whitbyHome = whitby.activationPackage; - - meta.targets = [ "whitbyHome" ]; - } diff --git a/users/multi/home/home-manager.nix b/users/multi/home/home-manager.nix deleted file mode 100644 index a93a541a0840..000000000000 --- a/users/multi/home/home-manager.nix +++ /dev/null @@ -1,10 +0,0 @@ -let - depot = import <depot> {}; - pkgs = depot.third_party; - - home = path: import path { inherit depot pkgs; }; -in - { - whitby = home ./configs/whitby.nix; - } - diff --git a/users/multi/keys.nix b/users/multi/keys.nix deleted file mode 100644 index b2da3b6b6f2e..000000000000 --- a/users/multi/keys.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ ... }: - -let - keys = { - thinkpad = { - interactiveLogin = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOtKHxl87H1RSHU7xs37PcDej+EREdPRQKuaAUfgKvLR multi@in-addr.xyz"; - nixRemote = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG8ucz+x0K0ynQYy59u1VJbhy6SQv6wiunIKCDNwvZDr thinkpad nix"; - }; - yubikey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCl9/WmXJcZ1dWAHQDgjJksG2vEkeSyG+b70dLk5bb5CdytsLsv8oJYPH+g2CXkaCAPc0oGfS92KRcYk7gwNinckbNWCq5Y4rG51L92yfujoXNDuddSDtPZT1PTvPTv0YmkD9/rE4SUFuPJ/bYPBqsW40BdK3f5EbISAiKmRuulZrEl053H0aRNmNbCbK4LNDgFYO78XkCmNEDAftGu5N1zY0RbU3YBw/oDzj/zWEXmliEGrpM9CrTkPbV0+OsTWpw5QXdkMUGg/YnNgtEJpDdnE5cIo1CGoUgm/jgVzvloEwCSv/2nOczGdDSE1z7YCSxNO2vSeioFiCJlQhFOKFV88GhlnOmL0YhGCBGakRFh8Ld61urdwGGbws/9z6nRZ5eiCqPw791kz0L0rhwdD9bkYjdJopkMx2rc50nRlPZVJM6Wl5oegGsZa20v9Kw5PJQsJNyPyVMGNKaRcTylu4lNaOeyP3pd7PjbDjmtRGSptDhPuaUjJrSTRizlWZ2PIODkd9b9n5PzquI/itCPNUdA4Ofe96Xm1oLae8psTWMnxt8hraQeIJZuiLJkdonI22BEA2voMciSLyFLGc1suo9HzMkmy3eJMZktKTjD9Nib9gOTqoNQevgcmu2oa1ZJdHA5vGi/obmT820/4+67HiJbcpIGgHp5wPtWfxmwM1RiZw== cardno:000608114525"; - }; - - configs = { - whitbyLogin = [ keys.thinkpad.interactiveLogin keys.thinkpad.nixRemote keys.yubikey ]; - whitbyNix = [ keys.thinkpad.nixRemote ]; - }; - -in - configs diff --git a/users/multi/pkgs/.skip-subtree b/users/multi/pkgs/.skip-subtree deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/users/multi/pkgs/.skip-subtree +++ /dev/null diff --git a/users/multi/pkgs/default.nix b/users/multi/pkgs/default.nix deleted file mode 100644 index ee30a106917d..000000000000 --- a/users/multi/pkgs/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ depot, pkgs, ... }: - -let - nixpkgs = import pkgs.nixpkgsSrc {}; - localpkg = path: import path { pkgs = nixpkgs; }; - - packages = { - htop = localpkg ./htop; - }; -in - packages // { - meta.targets = builtins.attrNames packages; - } diff --git a/users/multi/pkgs/htop/default.nix b/users/multi/pkgs/htop/default.nix deleted file mode 100644 index f023410bd2a3..000000000000 --- a/users/multi/pkgs/htop/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ pkgs, ... }: - -let - newVer = "3.0.2"; - - newSrc = pkgs.fetchFromGitHub { - owner = "htop-dev"; - repo = "htop"; - rev = "59ef15b2ad6037f40d7fe4207b2b59dd11b14b8b"; - sha256 = "0sirwfvqwwq2x2k25vd4k4cf9d5qv17yjizidxq4y5xfh2v0djmd"; - }; -in - with pkgs; htop.overrideAttrs - ({ nativeBuildInputs ? [], ... }: - { - nativeBuildInputs = nativeBuildInputs ++ [ autoreconfHook ]; - src = newSrc; - version = newVer; - }) |