From 6266c5d32f9ff651fcfc3a4cc0c68e89da56ca65 Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Sun, 11 Apr 2021 17:53:27 -0400 Subject: refactor(users/glittershark): Rename to grfn Rename my //users directory and all places that refer to glittershark to grfn, including nix references and documentation. This may require some extra attention inside of gerrit's database after it lands to allow me to actually push things. Change-Id: I4728b7ec2c60024392c1c1fa6e0d4a59b3e266fa Reviewed-on: https://cl.tvl.fyi/c/depot/+/2933 Tested-by: BuildkiteCI Reviewed-by: tazjin Reviewed-by: lukegb Reviewed-by: glittershark --- users/grfn/system/home/machines/chupacabra.nix | 54 +++++++++++++++++++ users/grfn/system/home/machines/dobharchu.nix | 17 ++++++ users/grfn/system/home/machines/roswell.nix | 57 ++++++++++++++++++++ users/grfn/system/home/machines/yeren.nix | 75 ++++++++++++++++++++++++++ 4 files changed, 203 insertions(+) create mode 100644 users/grfn/system/home/machines/chupacabra.nix create mode 100644 users/grfn/system/home/machines/dobharchu.nix create mode 100644 users/grfn/system/home/machines/roswell.nix create mode 100644 users/grfn/system/home/machines/yeren.nix (limited to 'users/grfn/system/home/machines') diff --git a/users/grfn/system/home/machines/chupacabra.nix b/users/grfn/system/home/machines/chupacabra.nix new file mode 100644 index 0000000000..04f34ccbc4 --- /dev/null +++ b/users/grfn/system/home/machines/chupacabra.nix @@ -0,0 +1,54 @@ +{ pkgs, lib, config, ... }: + +with lib; + +let + laptopKeyboardId = "25"; +in { + imports = [ + ../platforms/linux.nix + ../modules/common.nix + ../modules/games.nix + ../modules/rtlsdr.nix + ../modules/ptt.nix + ]; + + # for when hacking + programs.home-manager.path = "/home/grfn/code/home-manager"; + programs.home-manager.enable = true; + home.stateVersion = "19.09"; + + system.machine = { + wirelessInterface = "wlp59s0"; + i3FontSize = 9; + }; + + systemd.user.services.laptop-keyboard = { + Unit = { + Description = "Swap caps+escape and alt+super, but only on the built-in laptop keyboard"; + After = [ "graphical-session-pre.target" ]; + PartOf = [ "graphical-session.target" ]; + }; + + Install = { WantedBy = [ "graphical-session.target" ]; }; + + Service = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = ( + "${pkgs.xorg.setxkbmap}/bin/setxkbmap " + + "-device ${laptopKeyboardId} " + + "-option caps:swapescape " + + "-option compose:ralt " + + "-option altwin:swap_alt_win" + ); + }; + }; + + home.packages = with pkgs; [ + steam + xorg.libxcb + ]; + + xsession.windowManager.i3.config.keybindings.F7 = "exec lock"; +} diff --git a/users/grfn/system/home/machines/dobharchu.nix b/users/grfn/system/home/machines/dobharchu.nix new file mode 100644 index 0000000000..0b8503a00e --- /dev/null +++ b/users/grfn/system/home/machines/dobharchu.nix @@ -0,0 +1,17 @@ +{ config, lib, pkgs, ... }: + +{ + imports = [ + ../platforms/darwin.nix + ../modules/common.nix + ../modules/games.nix + ]; + + home.packages = with pkgs; [ + coreutils + gnupg + nix-prefetch-github + pass + pinentry_mac + ]; +} diff --git a/users/grfn/system/home/machines/roswell.nix b/users/grfn/system/home/machines/roswell.nix new file mode 100644 index 0000000000..1b1bbf29c6 --- /dev/null +++ b/users/grfn/system/home/machines/roswell.nix @@ -0,0 +1,57 @@ +{ pkgs, lib, config, ... }: + +let + laptopKeyboardId = "5"; +in + +{ + imports = [ + ../platforms/linux.nix + ../modules/shell.nix + ../modules/development.nix + ../modules/emacs.nix + ../modules/vim.nix + ]; + + home.packages = with pkgs; [ + # System utilities + bat + htop + killall + bind + zip unzip + tree + ncat + bc + pv + + # Security + gnupg + keybase + openssl + + # Nix things + nixfmt + nix-prefetch-github + nix-review + cachix + ]; + + + nixpkgs.config.allowUnfree = true; + + programs.password-store.enable = true; + + programs.home-manager.enable = true; + home.stateVersion = "20.03"; + + xsession.enable = lib.mkForce false; + + services.lorri.enable = true; + + programs.direnv = { + enable = true; + enableBashIntegration = true; + enableZshIntegration = true; + }; +} diff --git a/users/grfn/system/home/machines/yeren.nix b/users/grfn/system/home/machines/yeren.nix new file mode 100644 index 0000000000..8ee6602307 --- /dev/null +++ b/users/grfn/system/home/machines/yeren.nix @@ -0,0 +1,75 @@ +{ pkgs, lib, config, ... }: + +let + laptopKeyboardId = "5"; +in + +{ + imports = [ + ../platforms/linux.nix + ../modules/common.nix + ]; + + # for when hacking + programs.home-manager.enable = true; + home.stateVersion = "20.03"; + + system.machine = { + wirelessInterface = "wlp0s20f3"; + i3FontSize = 9; + }; + + home.packages = with pkgs; [ + zoom-us + slack + mysql + graphviz + mypaint + xdot + + (discord.override rec { + version = "0.0.14"; + src = fetchurl { + url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; + sha256 = "1rq490fdl5pinhxk8lkfcfmfq7apj79jzf3m14yql1rc9gpilrf2"; + }; + }) + + steam + + (awscli2.overridePythonAttrs (oldAttrs: { + postPatch = '' + substituteInPlace setup.py \ + --replace 'colorama>=0.2.5,<0.4.4' 'colorama' \ + --replace 'wcwidth<0.2.0' 'colorama' \ + --replace 'cryptography>=2.8.0,<=2.9.0' 'cryptography' \ + --replace 'docutils>=0.10,<0.16' 'docutils' \ + --replace 'ruamel.yaml>=0.15.0,<0.16.0' 'ruamel.yaml' + ''; + })) + ]; + + systemd.user.services.laptop-keyboard = { + Unit = { + Description = "Swap caps+escape and alt+super, but only on the built-in laptop keyboard"; + After = [ "graphical-session-pre.target" ]; + PartOf = [ "graphical-session.target" ]; + }; + + Install = { WantedBy = [ "graphical-session.target" ]; }; + + Service = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = ( + "${pkgs.xorg.setxkbmap}/bin/setxkbmap " + + "-device ${laptopKeyboardId} " + + "-option caps:swapescape " + + "-option compose:ralt " + + "-option altwin:swap_alt_win" + ); + }; + }; + + xsession.windowManager.i3.config.keybindings.F9 = "exec lock"; +} -- cgit 1.4.1