From f8b1e0ca3b6bebf4a9f35fdc565725ae91765820 Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Sat, 8 Feb 2025 18:50:10 +0100 Subject: [PATCH 1/4] add recursive font --- modules/desktop-environment.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/desktop-environment.nix b/modules/desktop-environment.nix index b480f67..9d4fcd8 100644 --- a/modules/desktop-environment.nix +++ b/modules/desktop-environment.nix @@ -99,7 +99,11 @@ fonts = { enableDefaultPackages = true; fontconfig.defaultFonts.monospace = [ "FiraCode Nerd Font" ]; - packages = with pkgs; [ (nerdfonts.override { fonts = [ "FiraCode" ]; }) roboto-mono ]; + packages = with pkgs; [ + (nerdfonts.override { fonts = [ "FiraCode" ]; }) + roboto-mono + recursive + ]; }; hardware.logitech.wireless = { From 3acaf5d98a12b73fe5ca57643dcff6350a85eb63 Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Thu, 13 Feb 2025 19:03:52 +0100 Subject: [PATCH 2/4] set ubuntu-latest to mean 24.04 instead of ancient 22.04 --- hosts/forgejo-runner-1/forgejo-runner.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/forgejo-runner-1/forgejo-runner.nix b/hosts/forgejo-runner-1/forgejo-runner.nix index e9f634e..4edc17e 100644 --- a/hosts/forgejo-runner-1/forgejo-runner.nix +++ b/hosts/forgejo-runner-1/forgejo-runner.nix @@ -17,7 +17,8 @@ # tokenFile should be in format TOKEN=, since it's EnvironmentFile for systemd tokenFile = "/etc/forgejo-runner/registration_token"; labels = [ - "ubuntu-latest:docker://ghcr.io/catthehacker/ubuntu:rust-latest" + "ubuntu-latest:docker://ghcr.io/catthehacker/ubuntu:rust-24.04" + "ubuntu-24.04:docker://ghcr.io/catthehacker/ubuntu:rust-24.04" ]; settings = { container.network = "bridge"; From 2f19ef4f5f3d5209b5344f4d4558aa408d7c983f Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Thu, 13 Feb 2025 19:04:14 +0100 Subject: [PATCH 3/4] add git oauth and cache --- home/vinzenz/default.nix | 1 + home/vinzenz/git.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/home/vinzenz/default.nix b/home/vinzenz/default.nix index 0b06468..5352918 100644 --- a/home/vinzenz/default.nix +++ b/home/vinzenz/default.nix @@ -10,6 +10,7 @@ inputs@{ pkgs, ... }: git = import ./git.nix; vscode = import ./vscode.nix inputs; ssh = import ./ssh.nix; + git-credential-oauth.enable = true; direnv = { enable = true; diff --git a/home/vinzenz/git.nix b/home/vinzenz/git.nix index f219d60..3aee6da 100644 --- a/home/vinzenz/git.nix +++ b/home/vinzenz/git.nix @@ -12,6 +12,7 @@ pull.ff = "only"; merge.tool = "kdiff3"; push.autoSetupRemote = "true"; + credential.credentialStore = "cache"; }; ignores = [ From 852e9fbf9b551574683410847ef77da3bc036649 Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Thu, 13 Feb 2025 19:27:17 +0100 Subject: [PATCH 4/4] update flake --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index e616973..330dced 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1738391520, - "narHash": "sha256-6HI58PKjddsC0RA0gBQlt6ox47oH//jLUHwx05RO8g0=", + "lastModified": 1738816619, + "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "34b64e4e1ddb14e3ffc7db8d4a781396dbbab773", + "rev": "2eccff41bab80839b1d25b303b53d339fbb07087", "type": "github" }, "original": { @@ -107,11 +107,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738277201, - "narHash": "sha256-6L+WXKCw5mqnUIExvqkD99pJQ41xgyCk6z/H9snClwk=", + "lastModified": 1739357830, + "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "666e1b3f09c267afd66addebe80fb05a5ef2b554", + "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", "type": "github" }, "original": {