diff options
author | Griffin Smith <grfn@gws.fyi> | 2020-11-29T23·59-0500 |
---|---|---|
committer | glittershark <grfn@gws.fyi> | 2020-11-30T00·03+0000 |
commit | d4fb573cf76ebb1651bcce711bd4cba849a1404d (patch) | |
tree | 025969daf566ce5c15dadb0227cb0b297de51fb1 | |
parent | 904cd3e6c040f7ac028c75f8a1fd7e2b1cb2b629 (diff) |
feat(gs/system): Init yeren r/1962
My new work laptop, a dell XPS 13. Change-Id: Ieab06622c9b280182025edfa63adf649e5fc70d8 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2205 Tested-by: BuildkiteCI Reviewed-by: glittershark <grfn@gws.fyi> Reviewed-by: lukegb <lukegb@tvl.fyi>
-rw-r--r-- | ops/nixos/all-systems.nix | 1 | ||||
-rw-r--r-- | users/glittershark/system/home/default.nix | 9 | ||||
-rw-r--r-- | users/glittershark/system/home/machines/yeren.nix | 17 | ||||
-rw-r--r-- | users/glittershark/system/system/default.nix | 7 | ||||
-rw-r--r-- | users/glittershark/system/system/machines/yeren.nix | 46 | ||||
-rw-r--r-- | users/glittershark/system/system/modules/common.nix | 8 | ||||
-rw-r--r-- | users/glittershark/system/system/modules/desktop.nix | 6 | ||||
-rw-r--r-- | users/glittershark/system/system/modules/xserver.nix | 11 |
8 files changed, 79 insertions, 26 deletions
diff --git a/ops/nixos/all-systems.nix b/ops/nixos/all-systems.nix index ba63de2f2dd5..d1bf39746252 100644 --- a/ops/nixos/all-systems.nix +++ b/ops/nixos/all-systems.nix @@ -11,4 +11,5 @@ (with depot.users.glittershark.system.system; [ chupacabra + yeren ]) diff --git a/users/glittershark/system/home/default.nix b/users/glittershark/system/home/default.nix index d19397192e4d..1d6d8795ab97 100644 --- a/users/glittershark/system/home/default.nix +++ b/users/glittershark/system/home/default.nix @@ -25,5 +25,12 @@ rec { dobharchuHome = dobharchu.activation-script; - meta.targets = [ "chupacabraHome" ]; + yeren = home ./machines/yeren.nix; + + yerenHome = yeren.activation-script; + + meta.targets = [ + "chupacabraHome" + "yerenHome" + ]; } diff --git a/users/glittershark/system/home/machines/yeren.nix b/users/glittershark/system/home/machines/yeren.nix new file mode 100644 index 000000000000..43f59d375159 --- /dev/null +++ b/users/glittershark/system/home/machines/yeren.nix @@ -0,0 +1,17 @@ +{ pkgs, lib, config, ... }: + +{ + 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; + }; +} diff --git a/users/glittershark/system/system/default.nix b/users/glittershark/system/system/default.nix index 2223f33ce3e0..a9eb4a130a78 100644 --- a/users/glittershark/system/system/default.nix +++ b/users/glittershark/system/system/default.nix @@ -13,12 +13,19 @@ rec { configuration = mugwump; }).system; + yeren = import ./machines/yeren.nix; + + yerenSystem = (pkgs.nixos { + configuration = yeren; + }).system; + iso = import ./iso.nix args; # Build chupacabra in CI meta.targets = [ "chupacabraSystem" "mugwumpSystem" + "yerenSystem" "iso" ]; diff --git a/users/glittershark/system/system/machines/yeren.nix b/users/glittershark/system/system/machines/yeren.nix new file mode 100644 index 000000000000..541da0969e0e --- /dev/null +++ b/users/glittershark/system/system/machines/yeren.nix @@ -0,0 +1,46 @@ +{ modulesPath, config, lib, pkgs, ... }: + +{ + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ../modules/common.nix + ../modules/reusable/battery.nix + ../modules/xserver.nix + ../modules/fonts.nix + ../modules/sound.nix + ]; + + networking.hostName = "yeren"; + + system.stateVersion = "21.03"; + + boot = { + initrd = { + availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + kernelModules = [ ]; + + luks.devices = { + "cryptroot".device = "/dev/disk/by-uuid/dcfbc22d-e0d2-411b-8dd3-96704d3aae2e"; + "cryptswap".device = "/dev/disk/by-uuid/48b8a8fd-559c-4759-a617-56f221cfaaec"; + }; + }; + + kernelPackages = pkgs.linuxPackages_latest; + kernelModules = [ "kvm-intel" ]; + extraModulePackages = [ ]; + }; + + fileSystems = { + "/" = { + device = "/dev/mapper/cryptroot"; + fsType = "btrfs"; + }; + + "/boot" = { + device = "/dev/disk/by-uuid/53A9-248B"; + fsType = "vfat"; + }; + }; + + swapDevices = [{ device = "/dev/mapper/cryptswap"; }]; +} diff --git a/users/glittershark/system/system/modules/common.nix b/users/glittershark/system/system/modules/common.nix index 711f686d8dd0..0eab590660a4 100644 --- a/users/glittershark/system/system/modules/common.nix +++ b/users/glittershark/system/system/modules/common.nix @@ -56,14 +56,6 @@ with lib; shell = pkgs.zsh; }; - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "20.03"; # Did you read the comment? - nixpkgs.config.allowUnfree = true; nix = { diff --git a/users/glittershark/system/system/modules/desktop.nix b/users/glittershark/system/system/modules/desktop.nix index dc2847a779d6..3adbd9d9b07f 100644 --- a/users/glittershark/system/system/modules/desktop.nix +++ b/users/glittershark/system/system/modules/desktop.nix @@ -16,10 +16,4 @@ ]; services.geoclue2.enable = true; - - powerManagement = { - enable = true; - cpuFreqGovernor = lib.mkDefault "powersave"; - powertop.enable = true; - }; } diff --git a/users/glittershark/system/system/modules/xserver.nix b/users/glittershark/system/system/modules/xserver.nix index 07e9a4fdf790..35ee44112ea1 100644 --- a/users/glittershark/system/system/modules/xserver.nix +++ b/users/glittershark/system/system/modules/xserver.nix @@ -9,19 +9,8 @@ displayManager = { defaultSession = "none+i3"; - - autoLogin = { - enable = true; - user = "grfn"; - }; }; windowManager.i3.enable = true; -# enable = true; -# extraPackages = with pkgs; [ -# i3status -# i3lock -# ]; -# }; }; } |