diff --git a/hosts/homelab/home-assistant.nix b/hosts/homelab/home-assistant.nix index 0b71526..853bd86 100644 --- a/hosts/homelab/home-assistant.nix +++ b/hosts/homelab/home-assistant.nix @@ -1,5 +1,4 @@ { - pkgsUnstable, pkgs, config, ... diff --git a/legacy_modules/desktop/niri.nix b/legacy_modules/desktop/niri.nix index be1858c..e11589c 100644 --- a/legacy_modules/desktop/niri.nix +++ b/legacy_modules/desktop/niri.nix @@ -41,7 +41,7 @@ in { color: #DAD8CE; border-bottom: 2px solid #CF6A4C; } - + #workspaces button.focused { background: #CF6A4C; color: #1C1B1A; @@ -296,7 +296,7 @@ in { }; outputs = lib.mkIf (config.monitors != []) ( - lib.listToAttrs (map (monitor: { + lib.listToAttrs (map (monitor: { inherit (monitor) name; value = { inherit (monitor) position; diff --git a/legacy_modules/dev/python.nix b/legacy_modules/dev/python.nix index 7dde218..28242cf 100644 --- a/legacy_modules/dev/python.nix +++ b/legacy_modules/dev/python.nix @@ -6,8 +6,8 @@ environment.systemPackages = [ (pkgs.symlinkJoin { name = "uv"; - paths = [ pkgsUnstable.uv ]; - nativeBuildInputs = [ pkgs.makeWrapper ]; + paths = [pkgsUnstable.uv]; + nativeBuildInputs = [pkgs.makeWrapper]; postBuild = '' wrapProgram $out/bin/uv \ --run "export LD_LIBRARY_PATH=\$NIX_LD_LIBRARY_PATH" diff --git a/legacy_modules/hardware/monitors.nix b/legacy_modules/hardware/monitors.nix index 5a35637..ad77ec9 100644 --- a/legacy_modules/hardware/monitors.nix +++ b/legacy_modules/hardware/monitors.nix @@ -1,9 +1,5 @@ # https://github.com/ChangeCaps/nixos-config/tree/0cec356abc0e46ca6ba27b3cf01cd51273bd4a69 -{ - lib, - config, - ... -}: { +{lib, ...}: { options.monitors = lib.mkOption { type = lib.types.listOf (lib.types.submodule { options = { diff --git a/modules/base/ssh.nix b/modules/base/ssh.nix index d52e17d..014ec9c 100644 --- a/modules/base/ssh.nix +++ b/modules/base/ssh.nix @@ -21,7 +21,7 @@ in { mode = "0600"; owner = username; }; - + fireproof.home-manager = { home.file.".ssh/id_ed25519.pub".source = ../../secrets/hosts + ("/" + hostname) + "/id_ed25519.pub"; programs.ssh = { @@ -55,6 +55,7 @@ in { }; "scw.ao" = { user = "nij"; + hostname = "51.15.81.1"; proxyJump = lib.mkDefault "dev.ao"; identityFile = "${config.age.secrets.ssh-key-ao.path}"; }; @@ -83,13 +84,13 @@ in { systemd.user.services."add-ssh-keys" = { description = "Add SSH keys to ssh-agent"; - after = [ "network.target" "ssh-agent.service" ]; - requires = [ "ssh-agent.service" ]; - wantedBy = [ "default.target" ]; + after = ["network.target" "ssh-agent.service"]; + requires = ["ssh-agent.service"]; + wantedBy = ["default.target"]; serviceConfig = { Type = "oneshot"; - ExecStartPre='' - ${pkgs.coreutils}/bin/sleep 5 + ExecStartPre = '' + ${pkgs.coreutils}/bin/sleep 5 ''; ExecStart = '' ${pkgs.openssh}/bin/ssh-add -q ${config.age.secrets.ssh-key-ao.path} diff --git a/modules/programs/jujutsu.nix b/modules/programs/jujutsu.nix index d6f4d8d..1e1342d 100644 --- a/modules/programs/jujutsu.nix +++ b/modules/programs/jujutsu.nix @@ -1,7 +1,4 @@ -{ - pkgsUnstable, - ... -}: { +{pkgsUnstable, ...}: { environment.systemPackages = with pkgsUnstable; [ jujutsu jjui