diff --git a/flake.lock b/flake.lock index 5e75a41..2fdb298 100644 --- a/flake.lock +++ b/flake.lock @@ -39,6 +39,22 @@ "type": "github" } }, + "commonmark-wikilink": { + "flake": false, + "locked": { + "lastModified": 1667660916, + "narHash": "sha256-ZyYSsihq5nqP/YmkL2Tlr+XVwUu+3MquThpyc0yx65c=", + "owner": "srid", + "repo": "commonmark-wikilink", + "rev": "72c880b5dbe8521f8c424c7bd39cb11b26e8dbb8", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "commonmark-wikilink", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -60,6 +76,46 @@ "type": "github" } }, + "ema": { + "flake": false, + "locked": { + "lastModified": 1668883024, + "narHash": "sha256-fftvlkkAZgtExQ3vIiUPJbxIkMPDuvTi0XAZqo7jtNM=", + "owner": "EmaApps", + "repo": "ema", + "rev": "7cc73addf8191c4a2fbe157e6c02d9fed9644c3b", + "type": "github" + }, + "original": { + "owner": "EmaApps", + "repo": "ema", + "type": "github" + } + }, + "emanote": { + "inputs": { + "commonmark-wikilink": "commonmark-wikilink", + "ema": "ema", + "flake-parts": "flake-parts", + "haskell-flake": "haskell-flake", + "heist": "heist", + "heist-extra": "heist-extra", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1669586795, + "narHash": "sha256-WUuADWLqlSTHKCMPSG2SbFA3JlM7y+VkjOPdijQ0FAs=", + "owner": "EmaApps", + "repo": "emanote", + "rev": "24ca8d95ac2aec8a02a128382081ac076451d018", + "type": "github" + }, + "original": { + "owner": "EmaApps", + "repo": "emanote", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -77,6 +133,24 @@ } }, "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1668450977, + "narHash": "sha256-cfLhMhnvXn6x1vPm+Jow3RiFAUSCw/l1utktCw5rVA4=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "d591857e9d7dd9ddbfba0ea02b43b927c3c0f1fa", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { "inputs": { "nixpkgs": [ "hercules-ci-agent", @@ -127,11 +201,58 @@ "type": "github" } }, + "haskell-flake": { + "locked": { + "lastModified": 1668167720, + "narHash": "sha256-5wDTR6xt9BB3BjgKR+YOjOkZgMyDXKaX79g42sStzDU=", + "owner": "srid", + "repo": "haskell-flake", + "rev": "4fc511d93a55fedf815c1647ad146c26d7a2054e", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "haskell-flake", + "type": "github" + } + }, + "heist": { + "flake": false, + "locked": { + "lastModified": 1668478922, + "narHash": "sha256-HVIRUx90r0pvJKfLU6fM51/SdzvNOzv0466xIOeSFlo=", + "owner": "snapframework", + "repo": "heist", + "rev": "a23f0b5d70556742644189d71d694f379738cdbc", + "type": "github" + }, + "original": { + "owner": "snapframework", + "repo": "heist", + "type": "github" + } + }, + "heist-extra": { + "flake": false, + "locked": { + "lastModified": 1668486579, + "narHash": "sha256-VmyGntVH/tVosftplC4O0JhYA34kXeq1Wu/RbJr132Y=", + "owner": "srid", + "repo": "heist-extra", + "rev": "da94abfa68f67933baef9b529fe8d2a4edc572d5", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "heist-extra", + "type": "github" + } + }, "hercules-ci-agent": { "inputs": { - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "pre-commit-hooks-nix": "pre-commit-hooks-nix" }, "locked": { @@ -157,11 +278,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1669562132, - "narHash": "sha256-ooDSmyf7a8qJF/e5qowTa5FDvOBtpIS7TXCF+ER0UOQ=", + "lastModified": 1669573161, + "narHash": "sha256-UAOXq+LIX+goAAY2MiC0+zCxdNPaO7NAPTvCQExpIBs=", "owner": "nix-community", "repo": "home-manager", - "rev": "1bdbebc3f83a7b6a69f84797d5cda9ece8ca3c37", + "rev": "50c9bccb6abc52811a59db620606e016fcde32bd", "type": "github" }, "original": { @@ -215,23 +336,22 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1656933710, - "narHash": "sha256-SVG8EqY1OTJWBRY4hpct2ZR2Rk0L8hCFkug3m0ABoZE=", + "lastModified": 1669146234, + "narHash": "sha256-HEby7EG1yaq1oT2Ze6Cvok9CFju1XHkSvVHmkptLW9U=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3bf48d3587d3f34f745a19ebc968b002ef5b5c5a", + "rev": "0099253ad0b5283f06ffe31cf010af3f9ad7837d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "master", "repo": "nixos-hardware", "type": "github" } }, "nixos-shell": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1646257415, @@ -264,6 +384,40 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1668443372, + "narHash": "sha256-lXNlVyNWwO22/JUdBtUWz68jZB3DM+Jq/irlsbwncI0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "dad4de1694cd92d9a0e123bfdf134d0047b836a5", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib": { + "locked": { + "dir": "lib", + "lastModified": 1665349835, + "narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "34c5293a71ffdb2fe054eb5288adc1882c1eb0b1", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1658161305, "narHash": "sha256-X/nhnMCa1Wx4YapsspyAs6QYz6T/85FofrI6NpdPDHg=", @@ -279,7 +433,7 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_3": { "locked": { "lastModified": 1628465643, "narHash": "sha256-QSNw9bDq9uGUniQQtakRuw4m21Jxugm23SXLVgEV4DM=", @@ -294,7 +448,7 @@ "type": "indirect" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1669411043, "narHash": "sha256-LfPd3+EY+jaIHTRIEOUtHXuanxm59YKgUacmSzaqMLc=", @@ -338,13 +492,14 @@ "coc-rust-analyzer": "coc-rust-analyzer", "comma": "comma", "darwin": "darwin", + "emanote": "emanote", "flake-utils": "flake-utils", "hercules-ci-agent": "hercules-ci-agent", "home-manager": "home-manager", "nixos-hardware": "nixos-hardware", "nixos-shell": "nixos-shell", "nixos-vscode-server": "nixos-vscode-server", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "zk-nvim": "zk-nvim" } }, diff --git a/flake.nix b/flake.nix index 7a1ec91..06117de 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,7 @@ # Supportive inputs flake-utils.url = "github:numtide/flake-utils"; nixos-shell.url = "github:Mic92/nixos-shell"; - nixos-hardware.url = github:NixOS/nixos-hardware/master; + nixos-hardware.url = "github:NixOS/nixos-hardware"; # Software inputs nixos-vscode-server.url = "github:msteen/nixos-vscode-server"; @@ -20,6 +20,7 @@ hercules-ci-agent.url = "github:hercules-ci/hercules-ci-agent/master"; comma.url = "github:nix-community/comma"; comma.inputs.nixpkgs.follows = "nixpkgs"; + emanote.url = "github:EmaApps/emanote"; # Vim & its plugins (not in nixpkgs) zk-nvim.url = "github:mickael-menu/zk-nvim"; diff --git a/systems/darwin.nix b/systems/darwin.nix index cd58e0c..fc3216e 100644 --- a/systems/darwin.nix +++ b/systems/darwin.nix @@ -1,4 +1,4 @@ -{ config, pkgs, inputs, system, rosettaPkgs, ... }: +{ config, pkgs, lib, inputs, system, rosettaPkgs, ... }: { # List packages installed in system profile. To search by name, run: @@ -55,9 +55,22 @@ } ]; }; - nixpkgs.config.allowBroken = true; + # TODO: Upstream to emanote + # launchctl start org.nixos.emanote + launchd.user.agents.emanote = { + serviceConfig.ProgramArguments = [ + (lib.getExe inputs.emanote.packages.${system}.default) + "-L" + "/Users/srid/Keybase/Notes" + "run" + "-p" + "7000" + ]; + serviceConfig.RunAtLoad = true; + }; + security.pam.enableSudoTouchIdAuth = true; # For home-manager to work.