Compare commits

..

No commits in common. "02ba6aaf29d55ab592150f7c2a94b54af63f6df5" and "b51ed19d1692cd364af1fc59c68e7602409866e4" have entirely different histories.

3 changed files with 29 additions and 27 deletions

30
flake.lock generated
View file

@ -8,11 +8,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712136515, "lastModified": 1701453400,
"narHash": "sha256-LpjQJYC24S5P5XhJsZX6HqsQT1pohcFzM6N42I6qo/U=", "narHash": "sha256-hI9+KBShsSfvWX7bmRa/1VI20WGat3lDXmbceMZzMS4=",
"owner": "Kirottu", "owner": "Kirottu",
"repo": "anyrun", "repo": "anyrun",
"rev": "be6728884d543665e7bd137bbef62dc1d04a210b", "rev": "e14da6c37337ffa3ee1bc66965d58ef64c1590e5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -192,11 +192,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1712108714, "lastModified": 1712021653,
"narHash": "sha256-QzrcwGuuAP1octIcUw/d+Yi5BEXYt1NOwNLpeUrqKTk=", "narHash": "sha256-Yr+cDDESdm2E9C/nj1nlhrMpyYt1/Va9yXvlRYD9SyA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "5d0a10938c32f3cb95d1f1f18127948d239c6720", "rev": "5dee04f5269dffad92faf3a8210c03e639d86db2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -520,11 +520,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712093955, "lastModified": 1712016346,
"narHash": "sha256-94I0sXz6fiVBvUAk2tg6t3UpM5rOImj4JTSTNFbg64s=", "narHash": "sha256-O2nO7pD+krq+4HgkLB4VThRtAucIPfXDs/jJqCGlK1w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "80546b220e95a575c66c213af1b09fe255299438", "rev": "4be0464472675212654dedf3e021bd5f1d58b92f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -795,11 +795,11 @@
"nixpkgs-stable": "nixpkgs-stable_3" "nixpkgs-stable": "nixpkgs-stable_3"
}, },
"locked": { "locked": {
"lastModified": 1712055707, "lastModified": 1712033542,
"narHash": "sha256-4XLvuSIDZJGS17xEwSrNuJLL7UjDYKGJSbK1WWX2AK8=", "narHash": "sha256-werD6WtgYo+ZGopbLENP0phwoWyd73CWz01VgrFOSL0=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "e35aed5fda3cc79f88ed7f1795021e559582093a", "rev": "642dce09c85b1478b509416f83e72bd59b6b3ac2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -870,11 +870,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712110341, "lastModified": 1712024007,
"narHash": "sha256-8LU2IM4ctHz043hlzoFUwQS1QIdhiMGEH/oIfPCxoWU=", "narHash": "sha256-52cf+mHZJbSaDFdsBj6vN1hH52AXsMgEpS/ajzc9yQE=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "74deb67494783168f5b6d2071d73177e6bccab65", "rev": "d45d957dc3c48792af7ce58eec5d84407655e8fa",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -85,20 +85,23 @@ in
}; };
extraConfig = { extraConfig = {
# credential.helper = "${config.programs.git.package.override {withLibsecret = true;}}/bin/git-credential-libsecret";
credential = { credential = {
helper = [ helper = "${pkgs.git-credential-manager}/bin/git-credential-manager";
"cache --timeout 7200" credentialStore = "secretservice";
"${pkgs.git-credential-oauth}/bin/git-credential-oauth"
];
"https://dev.azure.com" = { "https://dev.azure.com" = {
useHttpPath = true; useHttpPath = true;
}; };
"https://git.datarift.nl" = { "https://git.datarift.nl" = {
oauthClientId = "a4792ccc-144e-407e-86c9-5e7d8d9c3269"; provider = "generic";
oauthAuthURL = "/login/oauth/authorize"; oauthClientId = "3ae2eee7-1c52-4950-846e-17de716cfe77";
oauthTokenURL = "/login/oauth/access_token"; oauthClientSecret = "gto_tgalquoafnphcly4meztaxnfb3p2sq2aajksp7a2d4iu66c3ro2a";
oauthRedirectUri = "http://127.0.0.1:42069/";
oauthAuthorizeEndpoint = "/login/oauth/authorize";
oauthTokenEndpoint = "/login/oauth/access_token";
oauthScopes = "read:user repo";
}; };
}; };
init = { init = {
@ -181,6 +184,9 @@ in
}; };
}; };
home.packages = [ pkgs.gitu ]; home.packages = [
pkgs.git-credential-manager
pkgs.gitu
];
}; };
} }

View file

@ -93,10 +93,6 @@
hw-address = "d0:21:f9:e7:fd:c8"; hw-address = "d0:21:f9:e7:fd:c8";
ip-address = "10.0.0.20"; ip-address = "10.0.0.20";
} }
{
hw-address = "48:b0:2d:bc:8e:21";
ip-address = "10.0.0.21";
}
{ {
hostname = "reolink-deurbel"; hostname = "reolink-deurbel";
hw-address = "ec:71:db:5a:e3:21"; hw-address = "ec:71:db:5a:e3:21";