From 76b2dcc15a1d9e69f37baa38d04738228f3312c8 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Thu, 6 Apr 2023 12:44:39 +0200 Subject: [PATCH] some changes --- flake.lock | 8 ++++---- flake.nix | 1 + nixos/components/gui/browser.nix | 7 +++++++ nixos/components/gui/home-manager/ssh.nix | 6 ------ nixos/machines/cream/packages.nix | 1 + 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 3a203e4..fa5e546 100644 --- a/flake.lock +++ b/flake.lock @@ -827,11 +827,11 @@ }, "private_assets": { "locked": { - "lastModified": 1678382806, - "narHash": "sha256-E0PsUulg0FMF1IbXKRxzZ4ynpLHS1criJGabSuUb6ao=", + "lastModified": 1680777836, + "narHash": "sha256-/yLbKJK3awAx7wEeMJ6YbHSz3IWN7dOWTJ2nMXQzTpw=", "ref": "main", - "rev": "5d995fa3c7a3018f16373523b61c61e8cd179c8e", - "revCount": 6, + "rev": "c082e0fb10707ed80161326495cdb0a676f1d26b", + "revCount": 8, "type": "git", "url": "ssh://gitea@git.ingolf-wagner.de/palo/nixos-private-assets.git" }, diff --git a/flake.nix b/flake.nix index 9692ddc..d06878a 100644 --- a/flake.nix +++ b/flake.nix @@ -56,6 +56,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; private_assets = { + #url = "git+file:///home/palo/dev/nixos/nixos-private-assets"; url = "git+ssh://gitea@git.ingolf-wagner.de/palo/nixos-private-assets.git?ref=main"; flake = true; }; diff --git a/nixos/components/gui/browser.nix b/nixos/components/gui/browser.nix index b1aff5e..b182b72 100644 --- a/nixos/components/gui/browser.nix +++ b/nixos/components/gui/browser.nix @@ -39,6 +39,13 @@ in homeBackup = "${backupFolder}/jobrad-browser"; gpu = false; }; + jobrad-google= { + browserType = "google"; + home = "${homeFolder}/jobrad"; + user = "jobrad"; + homeBackup = "${backupFolder}/jobrad-browser"; + gpu = false; + }; firefox-tmp = { browserType = "firefox"; home = "${homeFolder}/firefox-tmp"; diff --git a/nixos/components/gui/home-manager/ssh.nix b/nixos/components/gui/home-manager/ssh.nix index 785120d..987fc33 100644 --- a/nixos/components/gui/home-manager/ssh.nix +++ b/nixos/components/gui/home-manager/ssh.nix @@ -9,12 +9,6 @@ identityFile = "~/.ssh/palo_rsa.pub"; identitiesOnly = true; }; - "*.jobrad.org" = { - user = "iwagner"; - identityFile = "~/.ssh/jobrad_ed25519"; - identitiesOnly = true; - extraOptions.IdentityAgent = "/run/user/1337/jobrad.ssh"; - }; "lassul.us" = { user = "download"; port = 45621; diff --git a/nixos/machines/cream/packages.nix b/nixos/machines/cream/packages.nix index 3a45e5f..1b9c8fc 100644 --- a/nixos/machines/cream/packages.nix +++ b/nixos/machines/cream/packages.nix @@ -106,6 +106,7 @@ in sensu-go-cli yq-go + unstable.yt-dlp ]; home-manager.users.mainUser = {