Compare commits

..

No commits in common. "852e9fbf9b551574683410847ef77da3bc036649" and "5ed5698587e1918505ebda1c4281fdfdee063aa4" have entirely different histories.

5 changed files with 8 additions and 15 deletions

View file

@ -91,11 +91,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1738816619, "lastModified": 1738391520,
"narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", "narHash": "sha256-6HI58PKjddsC0RA0gBQlt6ox47oH//jLUHwx05RO8g0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "2eccff41bab80839b1d25b303b53d339fbb07087", "rev": "34b64e4e1ddb14e3ffc7db8d4a781396dbbab773",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -107,11 +107,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1739357830, "lastModified": 1738277201,
"narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=", "narHash": "sha256-6L+WXKCw5mqnUIExvqkD99pJQ41xgyCk6z/H9snClwk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a", "rev": "666e1b3f09c267afd66addebe80fb05a5ef2b554",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -10,7 +10,6 @@ inputs@{ pkgs, ... }:
git = import ./git.nix; git = import ./git.nix;
vscode = import ./vscode.nix inputs; vscode = import ./vscode.nix inputs;
ssh = import ./ssh.nix; ssh = import ./ssh.nix;
git-credential-oauth.enable = true;
direnv = { direnv = {
enable = true; enable = true;

View file

@ -12,7 +12,6 @@
pull.ff = "only"; pull.ff = "only";
merge.tool = "kdiff3"; merge.tool = "kdiff3";
push.autoSetupRemote = "true"; push.autoSetupRemote = "true";
credential.credentialStore = "cache";
}; };
ignores = [ ignores = [

View file

@ -17,8 +17,7 @@
# tokenFile should be in format TOKEN=<secret>, since it's EnvironmentFile for systemd # tokenFile should be in format TOKEN=<secret>, since it's EnvironmentFile for systemd
tokenFile = "/etc/forgejo-runner/registration_token"; tokenFile = "/etc/forgejo-runner/registration_token";
labels = [ labels = [
"ubuntu-latest:docker://ghcr.io/catthehacker/ubuntu:rust-24.04" "ubuntu-latest:docker://ghcr.io/catthehacker/ubuntu:rust-latest"
"ubuntu-24.04:docker://ghcr.io/catthehacker/ubuntu:rust-24.04"
]; ];
settings = { settings = {
container.network = "bridge"; container.network = "bridge";

View file

@ -99,11 +99,7 @@
fonts = { fonts = {
enableDefaultPackages = true; enableDefaultPackages = true;
fontconfig.defaultFonts.monospace = [ "FiraCode Nerd Font" ]; fontconfig.defaultFonts.monospace = [ "FiraCode Nerd Font" ];
packages = with pkgs; [ packages = with pkgs; [ (nerdfonts.override { fonts = [ "FiraCode" ]; }) roboto-mono ];
(nerdfonts.override { fonts = [ "FiraCode" ]; })
roboto-mono
recursive
];
}; };
hardware.logitech.wireless = { hardware.logitech.wireless = {