From bb0a0ccb1c70340a722bd93472a9d45316928567 Mon Sep 17 00:00:00 2001 From: unexplrd Date: Mon, 24 Mar 2025 14:56:06 +0200 Subject: [PATCH] sync w/ laptop Signed-off-by: unexplrd --- hosts/sarien/configuration.nix | 20 ++++++++++++-- hosts/sarien/sops.nix | 31 +++++++++++++++++++-- hosts/sarien/stylix-light.nix | 50 ++++++++++++++++++++++++++++++++++ hosts/sarien/stylix.nix | 13 ++++----- 4 files changed, 102 insertions(+), 12 deletions(-) create mode 100644 hosts/sarien/stylix-light.nix diff --git a/hosts/sarien/configuration.nix b/hosts/sarien/configuration.nix index 8c580e7..3e3a245 100644 --- a/hosts/sarien/configuration.nix +++ b/hosts/sarien/configuration.nix @@ -1,6 +1,7 @@ # device-specific setup { pkgs, + config, inputs, ... }: { @@ -11,7 +12,7 @@ self.nixosModules.system ./hardware.nix ./programs.nix - ./stylix.nix + ./stylix-light.nix ./disko.nix ./users.nix ./sops.nix @@ -23,9 +24,24 @@ nix = { channel.enable = false; - settings.experimental-features = ["nix-command" "flakes"]; daemonCPUSchedPolicy = "idle"; + settings = { + experimental-features = ["nix-command" "flakes"]; + builders-use-substitutes = true; + }; + distributedBuilds = true; + buildMachines = [ + { + hostName = "dunamis"; + sshUser = "user"; + system = "x86_64-linux"; + sshKey = config.sops.secrets."ssh-sarien-user".path; + supportedFeatures = ["nixos-test" "big-parallel" "kvm" "benchmark"]; + publicHostKey = builtins.readFile "${inputs.mysecrets}/ssh/ssh_host_ed25519_dunamis.base64"; + } + ]; }; + system.stateVersion = "25.05"; time.timeZone = "Europe/Kyiv"; diff --git a/hosts/sarien/sops.nix b/hosts/sarien/sops.nix index ec0ea0f..3e236a3 100644 --- a/hosts/sarien/sops.nix +++ b/hosts/sarien/sops.nix @@ -1,8 +1,8 @@ {inputs, ...}: let secretsPath = builtins.toString inputs.mysecrets; in { - imports = with inputs; [ - sops-nix.nixosModules.sops + imports = [ + inputs.sops-nix.nixosModules.sops ]; sops = { @@ -19,11 +19,36 @@ in { mode = "0400"; owner = "user"; }; - "ssh-private-sarien-user" = { + "ssh-sarien-user" = { path = "/home/user/.ssh/id_ed25519"; mode = "0400"; owner = "user"; }; + "ssh-sarien-user.pub" = { + path = "/home/user/.ssh/id_ed25519.pub"; + mode = "0400"; + owner = "user"; + }; + "ssh-unexplrd" = { + path = "/home/user/.ssh/id_unexplrd_ed25519"; + mode = "0400"; + owner = "user"; + }; + "ssh-unexplrd.pub" = { + path = "/home/user/.ssh/id_unexplrd_ed25519.pub"; + mode = "0400"; + owner = "user"; + }; + "ssh-uni" = { + path = "/home/user/.ssh/id_uni_ed25519"; + mode = "0400"; + owner = "user"; + }; + "ssh-uni.pub" = { + path = "/home/user/.ssh/id_uni_ed25519.pub"; + mode = "0400"; + owner = "user"; + }; }; }; } diff --git a/hosts/sarien/stylix-light.nix b/hosts/sarien/stylix-light.nix new file mode 100644 index 0000000..c130cc2 --- /dev/null +++ b/hosts/sarien/stylix-light.nix @@ -0,0 +1,50 @@ +{ + pkgs, + inputs, + config, + ... +}: { + imports = with inputs; [ + stylix.nixosModules.stylix + ]; + environment.systemPackages = with pkgs; [ + nerd-fonts.iosevka + ]; + stylix = { + enable = true; + base16Scheme = "${pkgs.base16-schemes}/share/themes/nord-light.yaml"; + polarity = "light"; + cursor = { + package = pkgs.bibata-cursors; + name = "Bibata-Modern-Ice"; + size = 24; + }; + image = builtins.fetchurl { + url = "https://w.wallhaven.cc/full/e7/wallhaven-e7djlk.png"; + name = "wallhaven-e7djlk.png"; + sha256 = "1mwvnmflp0z1biyyhfz7mjn7i1nna94n7jyns3na2shbfkaq7i0h"; + }; + opacity.terminal = 0.9; + fonts = { + sizes = { + applications = 13; + desktop = 14; + popups = 13; + terminal = 15; + }; + serif = { + package = pkgs.nerd-fonts.iosevka; + name = "Iosevka Nerd Font Propo"; + }; + sansSerif = config.stylix.fonts.serif; + monospace = { + package = pkgs.nerd-fonts.iosevka-term; + name = "IosevkaTerm Nerd Font Mono"; + }; + emoji = { + package = pkgs.noto-fonts-emoji; + name = "Noto Color Emoji"; + }; + }; + }; +} diff --git a/hosts/sarien/stylix.nix b/hosts/sarien/stylix.nix index 1f59a1e..522bff6 100644 --- a/hosts/sarien/stylix.nix +++ b/hosts/sarien/stylix.nix @@ -9,21 +9,20 @@ ]; environment.systemPackages = with pkgs; [ nerd-fonts.iosevka - nerd-fonts.iosevka-term ]; stylix = { enable = true; - base16Scheme = "${pkgs.base16-schemes}/share/themes/tomorrow.yaml"; - polarity = "light"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/nord.yaml"; + polarity = "dark"; cursor = { package = pkgs.bibata-cursors; - name = "Bibata-Modern-Ice"; + name = "Bibata-Modern-Classic"; size = 24; }; image = builtins.fetchurl { - url = "https://w.wallhaven.cc/full/jx/wallhaven-jxzjly.jpg"; - name = "wallhaven-jxzjly.jpg"; - sha256 = "581827e705c3b12ccecb6002e7f97d577b10c59d7806636af753e6f9d97bb6c1"; + url = "https://w.wallhaven.cc/full/l8/wallhaven-l8l9gq.png"; + name = "wallhaven-l8l9gq.png"; + sha256 = "0ypr44sg0fn55m1b52dgr1nnscpi2p6rfkjsm7vvrdqw7bafbx2z"; }; opacity.terminal = 0.9; fonts = {