diff --git a/flake.lock b/flake.lock index a7b438d..143a06b 100644 --- a/flake.lock +++ b/flake.lock @@ -382,11 +382,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1757256385, - "narHash": "sha256-WK7tOhWwr15mipcckhDg2no/eSpM1nIh4C9le8HgHhk=", + "lastModified": 1762204486, + "narHash": "sha256-W7Db8gIAxMsaogJWqFBNSpYSFER8hJLGanEyl8PhC+k=", "owner": "nix-community", "repo": "home-manager", - "rev": "f35703b412c67b48e97beb6e27a6ab96a084cd37", + "rev": "95d65dddae7ae6300b22cf1d61cb5e71dca8da5b", "type": "github" }, "original": { @@ -420,11 +420,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1757363972, - "narHash": "sha256-b5OwbYpkjpMTfTSNoHbfLmPUodNq49OlkD/cL4hW5kU=", + "lastModified": 1762194159, + "narHash": "sha256-VoePQ5iYfnYYqRLGC6F6Q0bmNNCiAsw369se+xOeb6g=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "bd1d13d781896562409b57c26744c27342614e21", + "rev": "164d48e15914f35fda52f4216b475199cae9ac1a", "type": "github" }, "original": { @@ -453,11 +453,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1757358784, - "narHash": "sha256-UNeUJW3c10z0aMJ87QKS85C/JgK9ng6pdRS0EwY6OLg=", + "lastModified": 1762146685, + "narHash": "sha256-anRlNG6t7esBbF1+ALDeathVBSclA0PEL52Vo0WnN5g=", "owner": "YaLTeR", "repo": "niri", - "rev": "bdee1a657699a77bc4cdb050f7355f37f64c45a6", + "rev": "a2ca2b3c866bc781b12c334a9f949b3db6d7c943", "type": "github" }, "original": { @@ -595,11 +595,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1757341549, - "narHash": "sha256-fRnT+bwP1sB6ne7BLw4aXkVYjr+QCZZ+e4MhbokHyd4=", + "lastModified": 1761999846, + "narHash": "sha256-IYlYnp4O4dzEpL77BD/lj5NnJy2J8qbHkNSFiPBCbqo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9d1fa9fa266631335618373f8faad570df6f9ede", + "rev": "3de8f8d73e35724bf9abef41f1bdbedda1e14a31", "type": "github" }, "original": { @@ -691,11 +691,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1757068644, - "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", + "lastModified": 1761907660, + "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", + "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", "type": "github" }, "original": { @@ -707,11 +707,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1757068644, - "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", + "lastModified": 1762111121, + "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", + "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", "type": "github" }, "original": { @@ -739,11 +739,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1757034884, - "narHash": "sha256-PgLSZDBEWUHpfTRfFyklmiiLBE1i1aGCtz4eRA3POao=", + "lastModified": 1762156382, + "narHash": "sha256-Yg7Ag7ov5+36jEFC1DaZh/12SEXo6OO3/8rqADRxiqs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ca77296380960cd497a765102eeb1356eb80fed0", + "rev": "7241bcbb4f099a66aafca120d37c65e8dda32717", "type": "github" }, "original": { @@ -1210,11 +1210,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1757179758, - "narHash": "sha256-TIvyWzRt1miQj6Cf5Wy8Qz43XIZX7c4vTVwRLAT5S4Y=", + "lastModified": 1761622056, + "narHash": "sha256-fBrUszJXmB4MY+wf3QsCnqWHcz7u7fLq0QMAWCltIQg=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "970728d0d9d1eada342bb8860af214b601139e58", + "rev": "0728d59ff6463a502e001fb090f6eb92dbc04756", "type": "github" }, "original": { diff --git a/modules/home/glab.nix b/modules/home/glab.nix deleted file mode 100644 index 30f6509..0000000 --- a/modules/home/glab.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let cfg = config.programs.glab; -in { - options = { - programs.glab = { - enable = mkEnableOption "the GitLab CLI tool"; - }; - }; - - config = mkIf cfg.enable { - # TODO: Everything else. }:) - home.packages = [ pkgs.glab ]; - }; -} diff --git a/modules/home/users/crumb/anki.nix b/modules/home/users/crumb/anki.nix index 83cfd69..23a9cf6 100644 --- a/modules/home/users/crumb/anki.nix +++ b/modules/home/users/crumb/anki.nix @@ -26,7 +26,7 @@ in { syncMedia = true; url = "https://anki.deertopia.net/"; usernameFile = config.sops.secrets.anki-username.path; - passwordFile = config.sops.secrets.anki-sync-key.path; + keyFile = config.sops.secrets.anki-sync-key.path; }; }; }; diff --git a/modules/home/users/crumb/git.nix b/modules/home/users/crumb/git.nix index 0bcff43..b41009b 100644 --- a/modules/home/users/crumb/git.nix +++ b/modules/home/users/crumb/git.nix @@ -19,9 +19,11 @@ in { ### Git programs.git = { enable = true; - userEmail = my-email; - userName = my-name; - extraConfig = { + settings = { + user = { + name = my-name; + email = my-email; + }; diff = { tool = "ediff"; guitool = "ediff";