From 04522f424d2d869d591e2d4c1a9c3d729c15e853 Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Sun, 2 Jul 2023 20:37:03 -0400 Subject: [PATCH] switched spicetify themes fixed builders --- flake.lock | 30 +++++++++++++++--------------- hosts/gerg-desktop/spicetify.nix | 2 +- modules/builders.nix | 19 +++++++++++++++---- modules/keys.nix | 12 ++++++------ 4 files changed, 37 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index 9c11731..7c5d75a 100644 --- a/flake.lock +++ b/flake.lock @@ -74,11 +74,11 @@ }, "master": { "locked": { - "lastModified": 1688270854, - "narHash": "sha256-GLH4R4BseIDNrs6TukaXgzjKgFT0mSrYwS2bc+WZ0lM=", + "lastModified": 1688340214, + "narHash": "sha256-QKnnAJc7nYHBnLb6fhkSGkXlb1maQ4Y7umCFPHeg2Tg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3454e7a9c8c78ee815bd2d5d3ff8a977f4d419f3", + "rev": "60fa9e3f4f266dcdbb39de4dcc687ee94deeeb24", "type": "github" }, "original": { @@ -291,11 +291,11 @@ ] }, "locked": { - "lastModified": 1688272989, - "narHash": "sha256-chqWze799IZhOy8p2KlPc4Agr2nEWYdoFDo4RUQPDwE=", + "lastModified": 1688341779, + "narHash": "sha256-j5CfeNo0P/vxp3orB7Q2iH4+xLOLpN/4Y2fpWIp/ixE=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "b9087dda5ced8d55ec5cb69b9ba57adbbbf38407", + "rev": "76e9a662a34cde2a22d7a50cc277da6a8b147861", "type": "github" }, "original": { @@ -307,11 +307,11 @@ }, "stable": { "locked": { - "lastModified": 1688109178, - "narHash": "sha256-BSdeYp331G4b1yc7GIRgAnfUyaktW2nl7k0C577Tttk=", + "lastModified": 1688177999, + "narHash": "sha256-JZ5nk90Ym79b4J593xYb0mI79QxU0efJLuCU3sXDalQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b72aa95f7f096382bff3aea5f8fde645bca07422", + "rev": "0de86059128947b2438995450f2c2ca08cc783d5", "type": "github" }, "original": { @@ -328,11 +328,11 @@ ] }, "locked": { - "lastModified": 1688270082, - "narHash": "sha256-lx053lNJZy16NqeFe3Gqn/ePIiEVrU+TjBwLhMxxhmw=", + "lastModified": 1688272335, + "narHash": "sha256-r+Q9Hn2LHMyHY5ZTxI+0C2s8q6OHy4oJnedUHnkjNu8=", "owner": "gerg-L", "repo": "suckless", - "rev": "99103d012b56965005aabb9619c73e5a802b4284", + "rev": "3d2514c27d34b18e310d80d2b33b0e175e9d915a", "type": "github" }, "original": { @@ -343,11 +343,11 @@ }, "unstable": { "locked": { - "lastModified": 1688049487, - "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=", + "lastModified": 1688231357, + "narHash": "sha256-ZOn16X5jZ6X5ror58gOJAxPfFLAQhZJ6nOUeS4tfFwo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9", + "rev": "645ff62e09d294a30de823cb568e9c6d68e92606", "type": "github" }, "original": { diff --git a/hosts/gerg-desktop/spicetify.nix b/hosts/gerg-desktop/spicetify.nix index 47c3df9..e6b0c29 100644 --- a/hosts/gerg-desktop/spicetify.nix +++ b/hosts/gerg-desktop/spicetify.nix @@ -11,7 +11,7 @@ in { ex.hidePodcasts ex.shuffle ]; - theme = spicePkgs.themes.Dribbblish; + theme = spicePkgs.themes.Comfy; colorScheme = "custom"; customColorScheme = { text = "f8f8f8"; diff --git a/modules/builders.nix b/modules/builders.nix index b78c27f..0abafbc 100644 --- a/modules/builders.nix +++ b/modules/builders.nix @@ -16,8 +16,14 @@ _: { keep-derivations = false; builders-use-substitutes = true; max-jobs = 0; - substituters = ["ssh-ng://nix-ssh@gerg-desktop" "https://cache.nixos.org/"]; - trusted-public-keys = ["gerg-desktop:6p1+h6jQnb1MOt3ra3PlQpfgEEF4zRrQWiEuAqcjBj8=" "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="]; + substituters = [ + "ssh-ng://nix-ssh@gerg-desktop" + "https://cache.nixos.org/" + ]; + trusted-public-keys = [ + "gerg-desktop:6p1+h6jQnb1MOt3ra3PlQpfgEEF4zRrQWiEuAqcjBj8=" + "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" + ]; }; distributedBuilds = true; buildMachines = [ @@ -33,6 +39,12 @@ _: { } ]; }; + programs.ssh.knownHosts = { + gerg-desktop = { + extraHostNames = ["gerg-desktop.lan"]; + publicKey = config.local.keys.root_gerg-desktop; + }; + }; } ) @@ -43,8 +55,7 @@ _: { config.local.keys.root_game-laptop ]; in - lib.mkIf - config.local.remoteBuild.isBuilder + lib.mkIf config.local.remoteBuild.isBuilder { sops.secrets.store_key = {}; users = { diff --git a/modules/keys.nix b/modules/keys.nix index f758b8a..9550ecb 100644 --- a/modules/keys.nix +++ b/modules/keys.nix @@ -6,13 +6,13 @@ _: {lib, ...}: { }; config = { local.keys = { - gerg_gerg-phone = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDU6BnoHIgMLgZVGuvi03J9l5Z1yP1P5Q8QPyjRHyi77 gerg@gerg-phone"; - gerg_gerg-windows = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILpYY2uw0OH1Re+3BkYFlxn0O/D8ryqByJB/ljefooNc gerg@gerg-windows"; - root_moms-laptop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIq9YTf4jlVCKBKn44m4yJvj94C7pTOyaa4VjZFohNqD root@moms-laptop"; - root_game-laptop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJUKHZasYQUAmRBiqtx1drDxfq18/N4rKydCtPHx461I root@game-laptop"; - root_gerg-desktop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIeHsGcmOdIMzV+SNe4WFcA3CPHCNb1aqxThkXtm7G/1 root@gerg-desktop"; + gerg_gerg-phone = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDU6BnoHIgMLgZVGuvi03J9l5Z1yP1P5Q8QPyjRHyi77"; + gerg_gerg-windows = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILpYY2uw0OH1Re+3BkYFlxn0O/D8ryqByJB/ljefooNc"; + root_moms-laptop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIq9YTf4jlVCKBKn44m4yJvj94C7pTOyaa4VjZFohNqD"; + root_game-laptop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJUKHZasYQUAmRBiqtx1drDxfq18/N4rKydCtPHx461I"; + root_gerg-desktop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIeHsGcmOdIMzV+SNe4WFcA3CPHCNb1aqxThkXtm7G/1"; gerg-desktop_fingerprint = "BQxvBOWsTw1gdNDR0KzrSRmbVhDrJdG05vYXkVmw8yA"; - gerg_gerg-desktop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJWbwkFJmRBgyWyWU+w3ksZ+KuFw9uXJN3PwqqE7Z/i8 gerg@gerg-desktop"; + gerg_gerg-desktop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJWbwkFJmRBgyWyWU+w3ksZ+KuFw9uXJN3PwqqE7Z/i8"; }; }; }