gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 04:19:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

hosts/koishi: v330-14arr -> x270

Browse source
This commit is contained in:
kat witch 2021-10-03 01:02:53 +01:00
parent 34fd56c791
commit ec66fd0377
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
15 changed files with 380 additions and 287 deletions
Download patch file Download diff file Expand all files Collapse all files

5
config/hosts/goliath.nix
View file

@ -1,5 +1,4 @@
{ meta, tf, config, pkgs, lib, sources, ... }: with lib; {
imports = with meta; [
profiles.hardware.ms-7b86
profiles.hardware.razer
@ -18,6 +17,8 @@
services.zfs
];
config = {
deploy.tf = {
resources.goliath = {
provider = "null";
@ -245,5 +246,5 @@
};
system.stateVersion = "21.11";
};
}

59
config/hosts/koishi.nix
View file

@ -1,22 +1,11 @@
{ meta, config, pkgs, lib, ... }: with lib; {
options.home-manager.users = let
userBase16Extend = { config, nixos, ... }: {
base16.alias.default = "atelier.atelier-cave-light";
};
in mkOption {
type = types.attrsOf (types.submoduleWith {
modules = singleton userBase16Extend;
});
};
imports = with meta; [
profiles.hardware.v330-14arr
profiles.hardware.x270
profiles.gui
profiles.light
profiles.network
users.kat.guiFull
services.nginx
services.restic
services.zfs
services.dnscrypt-proxy
];
config = {
@ -31,41 +20,29 @@
};
};
boot.supportedFilesystems = singleton "zfs";
fileSystems = {
"/" = {
device = "rpool/safe/root";
fsType = "zfs";
};
"/home" = {
device = "rpool/safe/home";
fsType = "zfs";
};
"/nix" = {
device = "rpool/local/nix";
fsType = "zfs";
device = "/dev/disk/by-uuid/31bfd91b-bdba-47a9-81bf-c96e0adc88e3";
fsType = "xfs";
};
"/boot" = {
device = "/dev/disk/by-uuid/2552-18F2";
device = "/dev/disk/by-uuid/89A2-ED28";
fsType = "vfat";
};
};
swapDevices = [{ device = "/dev/disk/by-uuid/87ff4f68-cc00-494e-8eba-050469c3bf03"; }];
swapDevices =
[ { device = "/dev/disk/by-uuid/96952382-7f56-46b5-8c84-1f0130f68b63"; }
];
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
boot = {
supportedFilesystems = singleton "xfs";
initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/8dd300d3-c432-47b6-8466-55682cd1c1a1";
loader = {
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
};
modprobe.modules = {
iwlwifi = {
options = {
wd_disable = 1;
};
};
};
};
hardware.displays = {
@ -78,9 +55,13 @@
networking = {
hostId = "dddbb888";
useDHCP = false;
wireless.interfaces = singleton "wlp2s0";
wireless = {
enable = true;
userControlled.enable = true;
interfaces = singleton "wlp3s0";
};
interfaces = {
wlp2s0.ipv4.addresses = singleton {
wlp3s0.ipv4.addresses = singleton {
inherit (config.network.addresses.private.nixos.ipv4) address;
prefixLength = 24;
};
@ -104,12 +85,12 @@
listen.endpoints = [ "tcp://0.0.0.0:0" ];
};
firewall = {
public.interfaces = [ "enp1s0" "wlp2s0" ];
public.interfaces = [ "enp1s0" "wlp3s0" ];
private.interfaces = singleton "yggdrasil";
};
};
system.stateVersion = "20.09";
system.stateVersion = "21.11";
};
}

4
config/profiles/base/profiles.nix
View file

@ -9,6 +9,7 @@ with lib;
vfio = mkEnableOption "VFIO";
shared = mkEnableOption "Shared System";
trusted = mkEnableOption "Trusted Submodule";
light = mkEnableOption "Light mode";
cross = {
enable = mkEnableOption "cross/emulated compilation";
aarch64 = mkOption {
@ -42,6 +43,7 @@ with lib;
};
eeepc-1015pem = mkEnableOption "Asus Eee PC 1015PEM";
v330-14arr = mkEnableOption "Lenovo Ideapad v330-14ARR";
x270 = mkEnableOption "Lenovo Thinkpad x270";
};
};
home-manager.users = mkOption {
@ -55,6 +57,7 @@ with lib;
trusted = mkEnableOption "Trusted Submodule" // {
default = meta.trusted ? secrets;
};
light = mkEnableOption "Light mode";
cross = {
enable = mkEnableOption "cross/emulated compilation";
aarch64 = mkOption {
@ -88,6 +91,7 @@ with lib;
};
eeepc-1015pem = mkEnableOption "Asus Eee PC 1015PEM";
v330-14arr = mkEnableOption "Lenovo Ideapad v330-14ARR";
x270 = mkEnableOption "Lenovo Thinkpad x270";
};
};
config = {

8
config/profiles/hardware/default.nix
View file

@ -26,6 +26,14 @@
wifi
];
};
x270 = {
imports = [
x270
intel
laptop
wifi
];
};
eeepc-1015pem = {
imports = [
eeepc-1015pem

25
config/profiles/hardware/ryzen.nix
View file

@ -1,10 +1,28 @@
{ config, pkgs, ... }:
{ config, pkgs, lib, ... }: with lib; {
/*
This hardware profile corresponds to any machine which has an AMD Ryzen processor.
*/
{
options.home-manager.users = let
waybarExtend = { config, ... }: {
options = {
programs.waybar.settings = mkOption {
type = with types; listOf (submodule waybarExtend2);
};
};
};
waybarExtend2 = { config, ... }: {
config = {
modules.temperature.hwmon-path = "/sys/devices/pci0000:00/0000:00:18.3/hwmon/hwmon2/temp2_input";
};
};
in mkOption {
type = types.attrsOf (types.submoduleWith {
modules = singleton waybarExtend;
});
};
config = {
deploy.profile.hardware.ryzen = true;
boot = {
@ -23,4 +41,5 @@
ryzen-smu-monitor_cpu
ryzen-monitor
];
};
}

45
config/profiles/hardware/x270.nix Normal file
View file

@ -0,0 +1,45 @@
{ config, lib, ... }: with lib;
/*
This hardware profile corresponds to the Lenovo Thinkpad x270.
*/
{
options.home-manager.users = let
userTouchpadExtend = { config, nixos, ... }: {
wayland.windowManager.sway.config.input."2:7:SynPS/2_Synaptics_TouchPad" = {
dwt = "enabled";
tap = "enabled";
natural_scroll = "enabled";
middle_emulation = "enabled";
click_method = "clickfinger";
};
};
waybarExtend = { config, ... }: {
options = {
programs.waybar.settings = mkOption {
type = with types; listOf (submodule waybarExtend2);
};
};
};
waybarExtend2 = { config, ... }: {
config = {
modules.temperature.hwmon-path = "/sys/devices/pci0000:00/0000:00:18.3/hwmon/hwmon2/temp2_input";
};
};
in mkOption {
type = types.attrsOf (types.submoduleWith {
modules = [ userTouchpadExtend waybarExtend ];
});
};
config = {
deploy.profile.hardware.x270 = true;
boot = {
initrd.availableKernelModules =
[ "xhci_pci" "nvme" "usb_storage" "sd_mod" "sr_mod" "rtsx_usb_sdmmc" ];
kernelModules = [ "kvm-intel" ];
};
};
}

19
config/profiles/light.nix Normal file
View file

@ -0,0 +1,19 @@
{ config, lib, ... }: with lib; {
options.home-manager.users = let
lightModeExtend = { config, nixos, ... }: {
gtk.iconTheme.name = mkForce "Papirus-Light";
base16 = {
alias.default = "atelier.atelier-cave-light";
defaultSchemeName = "atelier.atelier-cave-light";
};
};
in mkOption {
type = types.attrsOf (types.submoduleWith {
modules = singleton lightModeExtend;
});
};
config = {
deploy.profile.light = true;
};
}

2
config/users/kat/dev/emacs.nix
View file

@ -15,7 +15,7 @@ let
};
};
in
optionalAttrs (builtins.getEnv "CI_PLATFORM" == "") {
optionalAttrs (builtins.getEnv "CI_PLATFORM" == "impure") {
home.packages = [ doom-emacs pkgs.sqlite ];
home.file.".emacs.d/init.el".text = ''

4
config/users/kat/gui/gtk.nix
View file

@ -4,8 +4,8 @@
gtk = {
enable = true;
iconTheme = {
name = "Numix-Square";
package = pkgs.numix-icon-theme-square;
name = "Papirus-Dark";
package = pkgs.papirus-icon-theme;
};
theme = {
name = "Adementary-dark";

1
config/users/kat/sway/gammastep.nix
View file

@ -3,6 +3,7 @@
{
services.gammastep = {
enable = true;
tray = true;
latitude = "51.5074";
longitude = "0.1278";
};

3
config/users/kat/sway/sway.nix
View file

@ -90,7 +90,8 @@ let lockCommand = config.programs.swaylock.script; in
"Escape" = "mode default";
};
};
bars = [{ command = "${pkgs.waybar}/bin/waybar"; }];
# bars = [{ command = "${pkgs.waybar}/bin/waybar"; }];
bars = [];
input = {
"*" = {

32
config/users/kat/sway/waybar/default.nix
View file

@ -1,19 +1,24 @@
{ config, lib, pkgs, kw, ... }:
{ config, lib, pkgs, kw, ... }: with lib;
{
xdg.configFile."waybar/style.css" = { inherit (kw.sassTemplate { name = "waybar-style"; src = ./waybar.sass; }) source; };
systemd.user.services.waybar.Service.Environment = singleton "NOTMUCH_CONFIG=${config.home.sessionVariables.NOTMUCH_CONFIG}";
programs.waybar = {
enable = true;
systemd.enable = true;
settings = [{
modules-left = [ "sway/workspaces" "sway/mode" "sway/window" ];
modules-center = [ "clock" "clock#s" "clock#arc" "clock#miku" "clock#hex" ];
modules-right = [
"pulseaudio"
"custom/mail"
"cpu"
"memory"
"temperature"
"battery"
"backlight"
"network"
"idle_inhibitor"
"custom/konawall"
@ -30,6 +35,10 @@
icon-size = 12;
spacing = 2;
};
backlight = {
format = "{icon} {percent}%";
format-icons = ["" ""];
};
"custom/gpg-status" = {
format = "{}";
interval = 300;
@ -41,20 +50,26 @@
interval = "once";
return-type = "json";
exec = "${pkgs.waybar-konawall}/bin/konawall-status";
exec-on-event = true;
on-click = "${pkgs.waybar-konawall}/bin/konawall-toggle";
on-click-right = "systemctl --user restart konawall";
signal = 8;
};
"custom/mail" = {
format = " {}";
interval = 30;
exec = "${pkgs.notmuch-arc}/bin/notmuch count tag:flagged OR tag:inbox AND NOT tag:killed";
};
cpu = { format = " {usage}%"; };
memory = { format = " {percentage}%"; };
temperature = {
format = " {temperatureC}°C";
hwmon-path = "/sys/devices/pci0000:00/0000:00:18.3/hwmon/hwmon2/temp2_input";
format = "{icon} {temperatureC}°C";
format-icons = ["" "" ""];
critical-threshold = 80;
};
idle_inhibitor = {
format = "{icon}";
format-icons = {
activated = "";
activated = "";
deactivated = "";
};
};
@ -65,8 +80,8 @@
critical = 15;
};
format = "{icon} {capacity}%";
format-charging = " {capacity}%";
format-plugged = " {capacity}%";
format-charging = " {capacity}%";
format-plugged = " {capacity}%";
format-alt = "{icon} {time}";
format-icons = [ "" "" "" "" "" ];
};
@ -96,9 +111,6 @@
tooltip-format = "{:%A, %F %T %z (%Z)}";
timezones = [
"Europe/London"
"America/Vancouver"
"Europe/Berlin"
"Pacific/Auckland"
];
interval = 1;
};

18
config/users/kat/sway/waybar/waybar.sass
View file

@ -13,6 +13,12 @@
text-shadow: none
box-shadow: none
tooltip
background: $base00t
border-radius: 1em
label
color: $base07
#mode
color: $base06
padding: 0 4px
@ -66,9 +72,9 @@
@extend %extend_1
background: $base0Ct
#custom-weather
#custom-mail
@extend %extend_1
background: $base00t
background: $base0Ft
#custom-konawall
@extend %extend_1
@ -103,6 +109,8 @@
menu
background: $base00t
border-radius: 1em
color: $base07
.modules-left
margin: 2px 4px
@ -173,11 +181,5 @@
color: $base06
border-bottom: 2px solid transparent
tooltip
background: $base00t
border-radius: 1em
label
color: $base07
window#waybar.empty #window
opacity: 0

12
nix/sources.json
View file

@ -41,10 +41,10 @@
"homepage": "",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "aa581fc7bce89b3abc60124de8dcc3b7c7a9277c",
"sha256": "160v5hsswcvyai1hc6r0gs00z9gm30qgqlgy0sk1x8iwcqslx3wz",
"rev": "5fa26165cf34adbe693b159093ea15f24f7f7ea4",
"sha256": "137a51jmk2h9mrp959ds6n1gdgg7wmvwhjxjjd6njcs40k38rshj",
"type": "tarball",
"url": "https://github.com/nix-community/emacs-overlay/archive/aa581fc7bce89b3abc60124de8dcc3b7c7a9277c.tar.gz",
"url": "https://github.com/nix-community/emacs-overlay/archive/5fa26165cf34adbe693b159093ea15f24f7f7ea4.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"hexchen": {
@ -89,10 +89,10 @@
"homepage": null,
"owner": "kittywitch",
"repo": "nixexprs",
"rev": "33418f835c61697569feb9d8753134f7c4143d5a",
"sha256": "023wma4xv5pshjfdvv9r67nbzwryh0m38vprnnf7ikl1g29a53wi",
"rev": "fc6a343976f4afa61850484ac2ace2202f7b9576",
"sha256": "0f1p8yqgbbp5jjkmsa1jbk78p1kr4x6slcx8bmzya65kcw9n2ajx",
"type": "tarball",
"url": "https://github.com/kittywitch/nixexprs/archive/33418f835c61697569feb9d8753134f7c4143d5a.tar.gz",
"url": "https://github.com/kittywitch/nixexprs/archive/fc6a343976f4afa61850484ac2ace2202f7b9576.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"niv": {

2
overlays/exprs

@ -1 +1 @@
Subproject commit 33418f835c61697569feb9d8753134f7c4143d5a
Subproject commit fc6a343976f4afa61850484ac2ace2202f7b9576