diff --git a/flake.lock b/flake.lock index be44ad1..b481664 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1694611702, - "narHash": "sha256-lMf0iLYHKJqclNYI9JkWpw1VKBL0WnOMeENuChKFIB0=", + "lastModified": 1694795069, + "narHash": "sha256-Y0BlJ3DMxABXbqcHXuOcqkC2LfjmOhVcW9GtGWSTSoU=", "owner": "ryanccn", "repo": "am", - "rev": "3fcc5fece4831e8461429bfa0111b2b039a677e2", + "rev": "a1eb614655eb16d837671cff1e2de8dd3aee0d04", "type": "github" }, "original": { @@ -127,11 +127,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1694672497, - "narHash": "sha256-vOW9rupO3zxmRMXNx4K2TXNP8BN3/7rcE4NVQjzw0UI=", + "lastModified": 1694931580, + "narHash": "sha256-S05uPvgL4TyE8CWSv9H65F1Fsh0kz6BmrGRUI1K1C8s=", "owner": "nix-community", "repo": "fenix", - "rev": "6cfe8bcc4995a58e04159c301a1d90f3e8582aa1", + "rev": "9f7ae8cf9a4886627b4db257183231d372690012", "type": "github" }, "original": { @@ -164,7 +164,7 @@ }, "original": { "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/fh/%2A.tar.gz" + "url": "https://flakehub.com/f/DeterminateSystems/fh/%3D0.1.3.tar.gz" } }, "flake-compat": { @@ -268,11 +268,11 @@ ] }, "locked": { - "lastModified": 1694497842, - "narHash": "sha256-z03v/m0OwcLBok97KcUgMl8ZFw5Xwsi2z+n6nL7JdXY=", + "lastModified": 1694810318, + "narHash": "sha256-LuvrVj2oj9TzdnnwtQUClqcXjpgwCP01FFVBM7azGV8=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "4496ab26628c5f43d2a5c577a06683c753e32fe2", + "rev": "80bb201f4925cdda5a7a3c7b1900fb26bb2af2e8", "type": "github" }, "original": { @@ -283,11 +283,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1694593561, - "narHash": "sha256-WSaIQZ5s9N9bDFkEMTw6P9eaZ9bv39ZhsiW12GtTNM0=", + "lastModified": 1694760568, + "narHash": "sha256-3G07BiXrp2YQKxdcdms22MUx6spc6A++MSePtatCYuI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1697b7d480449b01111e352021f46e5879e47643", + "rev": "46688f8eb5cd6f1298d873d4d2b9cf245e09e88e", "type": "github" }, "original": { @@ -338,11 +338,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1694635326, - "narHash": "sha256-oYA1HZCoxHS1i5qMja1j/kx/UjShCqzQMB6Z3nIHOaI=", + "lastModified": 1694882901, + "narHash": "sha256-ps6eZmuSXV48jzwBB3c0jiS5FKQAxdKLeo3Zc2Nuh5M=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "089ae47ebe58faf749b952f5d064078c74ea1e29", + "rev": "9d0ccf01a16f4ab72417a804c5a7414f312d95a0", "type": "github" }, "original": { @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1694657451, - "narHash": "sha256-cRZa9ZmUi0EFKcmzpsOXLVhiMQD8XLrku8v+U1YiGm8=", + "lastModified": 1694916722, + "narHash": "sha256-DBxuPOyhaHw3WY6s2KsaGyGrOkvmuiORC4DjIz8XTbM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7c4f46f0b3597e3c4663285e6794194e55574879", + "rev": "9d34219b9788fb5cde6f5b5759211d606f5131ec", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index fd7166d..aa3a2dc 100644 --- a/flake.nix +++ b/flake.nix @@ -47,7 +47,7 @@ }; fh = { - url = "https://flakehub.com/f/DeterminateSystems/fh/*.tar.gz"; + url = "https://flakehub.com/f/DeterminateSystems/fh/=0.1.3.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; inputs.fenix.follows = "fenix"; inputs.naersk.follows = "naersk"; diff --git a/icons/obsidian.icns b/icons/obsidian.icns new file mode 100644 index 0000000..f9d91fb Binary files /dev/null and b/icons/obsidian.icns differ diff --git a/icons/things.icns b/icons/things.icns new file mode 100644 index 0000000..85d94df Binary files /dev/null and b/icons/things.icns differ diff --git a/overlays/ctp-glamour.nix b/overlays/ctp-glamour.nix index d504f92..7a8640f 100644 --- a/overlays/ctp-glamour.nix +++ b/overlays/ctp-glamour.nix @@ -2,25 +2,25 @@ flavors = [ { flavor = "latte"; - sha256 = "sha256-V0LsRStF1vL+Tz8G6VaKiwiY/ZIsSkMc+f1WJAITYXU="; + hash = "sha256-V0LsRStF1vL+Tz8G6VaKiwiY/ZIsSkMc+f1WJAITYXU="; } { flavor = "frappe"; - sha256 = "sha256-YOatgYCJKuesVERHZVmF1xtzuLjyxCYstoWYqATq+NU="; + hash = "sha256-YOatgYCJKuesVERHZVmF1xtzuLjyxCYstoWYqATq+NU="; } { flavor = "macchiato"; - sha256 = "sha256-CeSJvhjzHVTtlqgQLKOrdLXtp2OQlMh24IaA1QQiQCk="; + hash = "sha256-CeSJvhjzHVTtlqgQLKOrdLXtp2OQlMh24IaA1QQiQCk="; } { flavor = "mocha"; - sha256 = "sha256-Tx2fQteL4wxhV+qHYZibakiYoEhS4HjyMO0yBcU/F6Q="; + hash = "sha256-Tx2fQteL4wxhV+qHYZibakiYoEhS4HjyMO0yBcU/F6Q="; } ]; in { ctp-glamour = builtins.listToAttrs (builtins.map ({ flavor, - sha256, + hash, }: { name = flavor; value = prev.callPackage ( @@ -34,7 +34,7 @@ in { src = fetchurl { url = "https://github.com/catppuccin/glamour/releases/download/v${version}/${flavor}.json"; - inherit sha256; + inherit hash; }; unpackPhase = '' diff --git a/system.nix b/system.nix index 631ec53..2a6ad93 100644 --- a/system.nix +++ b/system.nix @@ -25,6 +25,14 @@ path = "/Applications/Notion.app"; icon = ./icons/notion.icns; } + { + path = "/Applications/Things.app"; + icon = ./icons/things.icns; + } + { + path = "/Applications/Obsidian.app"; + icon = ./icons/obsidian.icns; + } ]; };