diff --git a/flake.lock b/flake.lock index 330dced..e616973 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1738816619, - "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", + "lastModified": 1738391520, + "narHash": "sha256-6HI58PKjddsC0RA0gBQlt6ox47oH//jLUHwx05RO8g0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2eccff41bab80839b1d25b303b53d339fbb07087", + "rev": "34b64e4e1ddb14e3ffc7db8d4a781396dbbab773", "type": "github" }, "original": { @@ -107,11 +107,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739357830, - "narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", + "lastModified": 1738277201, + "narHash": "sha256-6L+WXKCw5mqnUIExvqkD99pJQ41xgyCk6z/H9snClwk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", + "rev": "666e1b3f09c267afd66addebe80fb05a5ef2b554", "type": "github" }, "original": { diff --git a/home/vinzenz/default.nix b/home/vinzenz/default.nix index 5352918..0b06468 100644 --- a/home/vinzenz/default.nix +++ b/home/vinzenz/default.nix @@ -10,7 +10,6 @@ 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 3aee6da..f219d60 100644 --- a/home/vinzenz/git.nix +++ b/home/vinzenz/git.nix @@ -12,7 +12,6 @@ pull.ff = "only"; merge.tool = "kdiff3"; push.autoSetupRemote = "true"; - credential.credentialStore = "cache"; }; ignores = [ diff --git a/hosts/forgejo-runner-1/forgejo-runner.nix b/hosts/forgejo-runner-1/forgejo-runner.nix index 4edc17e..e9f634e 100644 --- a/hosts/forgejo-runner-1/forgejo-runner.nix +++ b/hosts/forgejo-runner-1/forgejo-runner.nix @@ -17,8 +17,7 @@ # 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-24.04" - "ubuntu-24.04:docker://ghcr.io/catthehacker/ubuntu:rust-24.04" + "ubuntu-latest:docker://ghcr.io/catthehacker/ubuntu:rust-latest" ]; settings = { container.network = "bridge"; diff --git a/modules/desktop-environment.nix b/modules/desktop-environment.nix index 9d4fcd8..b480f67 100644 --- a/modules/desktop-environment.nix +++ b/modules/desktop-environment.nix @@ -99,11 +99,7 @@ fonts = { enableDefaultPackages = true; fontconfig.defaultFonts.monospace = [ "FiraCode Nerd Font" ]; - packages = with pkgs; [ - (nerdfonts.override { fonts = [ "FiraCode" ]; }) - roboto-mono - recursive - ]; + packages = with pkgs; [ (nerdfonts.override { fonts = [ "FiraCode" ]; }) roboto-mono ]; }; hardware.logitech.wireless = {