This commit is contained in:
Sridhar Ratnakumar 2022-03-30 14:04:29 -04:00
parent 770a591071
commit c56141af59
8 changed files with 179 additions and 606 deletions

View file

@ -2,10 +2,5 @@
"nixEnvSelector.nixFile": "${workspaceRoot}/shell.nix",
"editor.defaultFormatter": "B4dM4n.nixpkgs-fmt",
"editor.formatOnSave": true,
"editor.formatOnType": true,
"workbench.colorCustomizations": {
"activityBar.background": "#33038C",
"titleBar.activeBackground": "#4804C4",
"titleBar.activeForeground": "#FCFBFF"
}
"editor.formatOnType": true
}

View file

@ -1,10 +1,10 @@
# https://github.com/claymager/idris2-pkgs
{ pkgs, ... }: {
nix.binaryCachePublicKeys = [
nix.settings.trusted-public-keys = [
"cm-idris2-pkgs.cachix.org-1:YB2oJSEsD5oMJjAESxolC2GQtE6B5I6jkWhte2gtXjk="
"srid.cachix.org-1:MTQ6ksbfz3LBMmjyPh0PLmos+1x+CdtJxA/J2W+PQxI="
];
nix.binaryCaches = [
nix.settings.substituters = [
"https://cm-idris2-pkgs.cachix.org"
"https://srid.cachix.org"
];

View file

@ -1,8 +1,8 @@
{ pkgs, ... }: {
nix.binaryCachePublicKeys = [
nix.settings.trusted-public-keys = [
"hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
];
nix.binaryCaches = [
nix.settings.substituters = [
"https://hydra.iohk.io"
];
}

View file

@ -23,6 +23,6 @@
];
};
};
nix.allowedUsers = [ "root" "srid" ];
nix.trustedUsers = [ "root" "srid" ];
nix.settings.allowed-users = [ "root" "srid" ];
nix.settings.trusted-users = [ "root" "srid" ];
}

684
flake.lock generated
View file

@ -54,50 +54,6 @@
"type": "github"
}
},
"ema": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs",
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
"lastModified": 1646661767,
"narHash": "sha256-5zxUr3nO4r04K5WGrW/+nW84qbOW8wNJLt902yQmyF4=",
"owner": "srid",
"repo": "ema",
"rev": "bcabc170b7de9cdd83b4bbcf59130b54933602ea",
"type": "github"
},
"original": {
"owner": "srid",
"ref": "master",
"repo": "ema",
"type": "github"
}
},
"ema_2": {
"inputs": {
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_3",
"pre-commit-hooks": "pre-commit-hooks_2"
},
"locked": {
"lastModified": 1646661767,
"narHash": "sha256-5zxUr3nO4r04K5WGrW/+nW84qbOW8wNJLt902yQmyF4=",
"owner": "srid",
"repo": "ema",
"rev": "bcabc170b7de9cdd83b4bbcf59130b54933602ea",
"type": "github"
},
"original": {
"owner": "srid",
"ref": "master",
"repo": "ema",
"type": "github"
}
},
"emacs-overlay": {
"locked": {
"lastModified": 1646643944,
@ -145,35 +101,6 @@
"type": "github"
}
},
"emanote": {
"inputs": {
"ema": "ema_2",
"flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_5",
"heist": "heist",
"nixpkgs": [
"emanote",
"ema",
"nixpkgs"
],
"pathtree": "pathtree",
"tailwind-haskell": "tailwind-haskell"
},
"locked": {
"lastModified": 1646661989,
"narHash": "sha256-uiEyfsNZpR7PuqhSjxVs8ZJ4Bzj7Qkw3CmNiFVP/VNQ=",
"owner": "srid",
"repo": "emanote",
"rev": "196b8dcabeff606874f5f3c1c9f301e34fe2eee6",
"type": "github"
},
"original": {
"owner": "srid",
"ref": "master",
"repo": "emanote",
"type": "github"
}
},
"evil-markdown": {
"flake": false,
"locked": {
@ -257,11 +184,11 @@
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1641205782,
"narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=",
"lastModified": 1627913399,
"narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7",
"rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2",
"type": "github"
},
"original": {
@ -286,108 +213,34 @@
"type": "github"
}
},
"flake-compat_4": {
"flake": false,
"flake-modules-core": {
"inputs": {
"nixpkgs": [
"hercules-ci-agent",
"nixos-unstable"
]
},
"locked": {
"lastModified": 1641205782,
"narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7",
"lastModified": 1647368891,
"narHash": "sha256-czmhnXovaf7Qsg1ASXIfr8WOkRPWYVfI7Mc7V9QzvGE=",
"owner": "hercules-ci",
"repo": "flake-modules-core",
"rev": "fd84881e00ea7d070f8a11689ae333d15c317213",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_5": {
"flake": false,
"locked": {
"lastModified": 1641205782,
"narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_6": {
"flake": false,
"locked": {
"lastModified": 1606424373,
"narHash": "sha256-oq8d4//CJOrVj+EcOaSXvMebvuTkmBJuT5tzlfewUnQ=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "99f1c2157fba4bfe6211a321fd0ee43199025dbf",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_7": {
"flake": false,
"locked": {
"lastModified": 1627913399,
"narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_8": {
"flake": false,
"locked": {
"lastModified": 1641205782,
"narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"owner": "hercules-ci",
"repo": "flake-modules-core",
"type": "github"
}
},
"flake-utils": {
"locked": {
"lastModified": 1642700792,
"narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
"lastModified": 1619345332,
"narHash": "sha256-qHnQkEp1uklKTpx3MvKtY6xzgcqXDsz5nLilbbuL+3A=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_10": {
"locked": {
"lastModified": 1623875721,
"narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "f7e004a55b120c02ecb6219596820fcd32ca8772",
"rev": "2ebf2558e5bf978c7fb8ea927dfaed8fefab2e28",
"type": "github"
},
"original": {
@ -397,96 +250,6 @@
}
},
"flake-utils_2": {
"locked": {
"lastModified": 1619345332,
"narHash": "sha256-qHnQkEp1uklKTpx3MvKtY6xzgcqXDsz5nLilbbuL+3A=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "2ebf2558e5bf978c7fb8ea927dfaed8fefab2e28",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_3": {
"locked": {
"lastModified": 1642700792,
"narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"locked": {
"lastModified": 1619345332,
"narHash": "sha256-qHnQkEp1uklKTpx3MvKtY6xzgcqXDsz5nLilbbuL+3A=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "2ebf2558e5bf978c7fb8ea927dfaed8fefab2e28",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_5": {
"locked": {
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_6": {
"locked": {
"lastModified": 1642700792,
"narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_7": {
"locked": {
"lastModified": 1642700792,
"narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_8": {
"locked": {
"lastModified": 1637014545,
"narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
@ -501,7 +264,7 @@
"type": "github"
}
},
"flake-utils_9": {
"flake-utils_3": {
"locked": {
"lastModified": 1629481132,
"narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
@ -516,51 +279,49 @@
"type": "github"
}
},
"heist": {
"flake": false,
"flake-utils_4": {
"locked": {
"lastModified": 1624205223,
"narHash": "sha256-+bcrEKjB/kDRAqOunCD/cKBBVOJUTmY9RoCQ++I42oM=",
"owner": "srid",
"repo": "heist",
"rev": "a8be6f93656f87199e03b9dfb9979dc061614108",
"lastModified": 1623875721,
"narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "f7e004a55b120c02ecb6219596820fcd32ca8772",
"type": "github"
},
"original": {
"owner": "srid",
"ref": "emanote",
"repo": "heist",
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"hercules-ci-agent": {
"inputs": {
"flake-compat": "flake-compat_6",
"flake-compat": "flake-compat",
"flake-modules-core": "flake-modules-core",
"nix-darwin": "nix-darwin",
"nixos-20_09": "nixos-20_09",
"nixos-unstable": "nixos-unstable",
"pre-commit-hooks-nix": "pre-commit-hooks-nix"
},
"locked": {
"lastModified": 1638731476,
"narHash": "sha256-9/21mkGXngMIMkY3dKGZUq7UkDRJnKbcimx6SO+QstA=",
"lastModified": 1648137830,
"narHash": "sha256-sWnsQoCRXgfvxiwSiTcaR5+pYLl5C2VU8fEYWaeMHUg=",
"owner": "hercules-ci",
"repo": "hercules-ci-agent",
"rev": "81ad6448f41367c8ec89ee541df54419b24f4c53",
"rev": "2414d3ef99c43068af18bf1ab307dc32f08aac69",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"ref": "stable",
"ref": "master",
"repo": "hercules-ci-agent",
"type": "github"
}
},
"himalaya": {
"inputs": {
"flake-compat": "flake-compat_7",
"flake-compat": "flake-compat_2",
"naersk": "naersk",
"nixpkgs": "nixpkgs_8",
"nixpkgs": "nixpkgs_4",
"rust-overlay": "rust-overlay",
"utils": "utils"
},
@ -600,7 +361,7 @@
},
"naersk": {
"inputs": {
"nixpkgs": "nixpkgs_7"
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1639947939,
@ -618,8 +379,8 @@
},
"neovim-flake": {
"inputs": {
"flake-utils": "flake-utils_9",
"nixpkgs": "nixpkgs_10"
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_6"
},
"locked": {
"dir": "contrib",
@ -639,9 +400,9 @@
},
"neovim-nightly-overlay": {
"inputs": {
"flake-compat": "flake-compat_8",
"flake-compat": "flake-compat_3",
"neovim-flake": "neovim-flake",
"nixpkgs": "nixpkgs_11"
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1646641035,
@ -659,14 +420,14 @@
},
"nix-darwin": {
"inputs": {
"nixpkgs": "nixpkgs_6"
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1634994402,
"narHash": "sha256-xmlCVVOYGpZoxgOqsDOVF0B0ASrnbNGVAEzID9qh2xo=",
"lastModified": 1647173930,
"narHash": "sha256-8oca3Pc68VrCp8HeOtHmzs5g0rdQnPO9beDEEZJ02W0=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "44da835ac40dab5fd231298b59d83487382d2fab",
"rev": "17fbc68a6110edbff67e55f7450230a697ecb17e",
"type": "github"
},
"original": {
@ -685,9 +446,9 @@
"evil-org-mode": "evil-org-mode",
"evil-quick-diff": "evil-quick-diff",
"explain-pause-mode": "explain-pause-mode",
"flake-utils": "flake-utils_10",
"flake-utils": "flake-utils_4",
"nix-straight": "nix-straight",
"nixpkgs": "nixpkgs_12",
"nixpkgs": "nixpkgs_8",
"nose": "nose",
"ob-racket": "ob-racket",
"org": "org",
@ -728,22 +489,6 @@
"type": "github"
}
},
"nixos-20_09": {
"locked": {
"lastModified": 1623585158,
"narHash": "sha256-AjK7M1/six8IBPOI28nm7yC2k8mZIR2F9QrOwFYHAS0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "115dbbe82eb4ec8aabf959068286468a68e0b244",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-20.09",
"repo": "nixpkgs",
"type": "github"
}
},
"nixos-hardware": {
"locked": {
"lastModified": 1646647249,
@ -762,23 +507,23 @@
},
"nixos-unstable": {
"locked": {
"lastModified": 1636800699,
"narHash": "sha256-SwbyVxXffu3G2ulJIbTf0iQfqhbGbdml4Dyv5j9BiAI=",
"owner": "NixOS",
"lastModified": 1647445921,
"narHash": "sha256-lNPvVxLLSN6V9nbEzh1XJpusI4W1M1QHBQVEVqkg1+Q=",
"owner": "hercules-ci",
"repo": "nixpkgs",
"rev": "2fa862644fc15ecb525eb8cd0a60276f1c340c7c",
"rev": "70e6eb9ec8d548b836f8dedbf63d86a6bd737dc3",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"owner": "hercules-ci",
"ref": "haskell-updates-ghc-9.0-stack",
"repo": "nixpkgs",
"type": "github"
}
},
"nixos-vscode-server": {
"inputs": {
"nixpkgs": "nixpkgs_13"
"nixpkgs": "nixpkgs_9"
},
"locked": {
"lastModified": 1621309617,
@ -797,84 +542,19 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1646470760,
"narHash": "sha256-dQISyucVCCPaFioUhy5ZgfBz8rOMKGI8k13aPDFTqEs=",
"owner": "nixos",
"lastModified": 1602411953,
"narHash": "sha256-gbupmxRpoQZqL5NBQCJN2GI5G7XDEHHHYKhVwEj5+Ps=",
"owner": "LnL7",
"repo": "nixpkgs",
"rev": "1fc7212a2c3992eedc6eedf498955c321ad81cc2",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"rev": "1fc7212a2c3992eedc6eedf498955c321ad81cc2",
"type": "github"
}
},
"nixpkgs_10": {
"locked": {
"lastModified": 1646497237,
"narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_11": {
"locked": {
"lastModified": 1646497237,
"narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_12": {
"locked": {
"lastModified": 1626852498,
"narHash": "sha256-lOXUJvi0FJUXHTVSiC5qsMRtEUgqM4mGZpMESLuGhmo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "16105403bdd843540cbef9c63fc0f16c1c6eaa70",
"rev": "f780534ea2d0c12e62607ff254b6b45f46653f7a",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixpkgs-unstable",
"type": "indirect"
}
},
"nixpkgs_13": {
"locked": {
"lastModified": 1621073999,
"narHash": "sha256-Cp99YreSFedcWovxNmO8g8qFYltQQJPRLfuot6Z7iGE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "83d907fd760d9ee4f49b4b7e4b1c6682f137b573",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_14": {
"nixpkgs_10": {
"locked": {
"lastModified": 1646939531,
"narHash": "sha256-bxOjVqcsccCNm+jSmEh/bm0tqfE3SdjwS+p+FZja3ho=",
@ -906,27 +586,25 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1646470760,
"narHash": "sha256-dQISyucVCCPaFioUhy5ZgfBz8rOMKGI8k13aPDFTqEs=",
"owner": "nixos",
"lastModified": 1640418986,
"narHash": "sha256-a8GGtxn2iL3WAkY5H+4E0s3Q7XJt6bTOvos9qqxT5OQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1fc7212a2c3992eedc6eedf498955c321ad81cc2",
"rev": "5c37ad87222cfc1ec36d6cd1364514a9efc2f7f2",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"rev": "1fc7212a2c3992eedc6eedf498955c321ad81cc2",
"type": "github"
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1619531122,
"narHash": "sha256-ovm5bo6PkZzNKh2YGXbRKYIjega0EjiEP0YDwyeXEYU=",
"lastModified": 1640418986,
"narHash": "sha256-a8GGtxn2iL3WAkY5H+4E0s3Q7XJt6bTOvos9qqxT5OQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "bb80d578e8ad3cb5a607f468ac00cc546d0396dc",
"rev": "5c37ad87222cfc1ec36d6cd1364514a9efc2f7f2",
"type": "github"
},
"original": {
@ -935,64 +613,6 @@
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1645937171,
"narHash": "sha256-n9f9GZBNMe8UMhcgmmaXNObkH01jjgp7INMrUgBgcy4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "22dc22f8cedc58fcb11afe1acb08e9999e78be9c",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"rev": "22dc22f8cedc58fcb11afe1acb08e9999e78be9c",
"type": "github"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1602411953,
"narHash": "sha256-gbupmxRpoQZqL5NBQCJN2GI5G7XDEHHHYKhVwEj5+Ps=",
"owner": "LnL7",
"repo": "nixpkgs",
"rev": "f780534ea2d0c12e62607ff254b6b45f46653f7a",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1640418986,
"narHash": "sha256-a8GGtxn2iL3WAkY5H+4E0s3Q7XJt6bTOvos9qqxT5OQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5c37ad87222cfc1ec36d6cd1364514a9efc2f7f2",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_8": {
"locked": {
"lastModified": 1640418986,
"narHash": "sha256-a8GGtxn2iL3WAkY5H+4E0s3Q7XJt6bTOvos9qqxT5OQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5c37ad87222cfc1ec36d6cd1364514a9efc2f7f2",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_9": {
"locked": {
"lastModified": 1637453606,
"narHash": "sha256-Gy6cwUswft9xqsjWxFYEnx/63/qzaFUwatcbV5GF/GQ=",
@ -1008,6 +628,69 @@
"type": "github"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1646497237,
"narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1646497237,
"narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_8": {
"locked": {
"lastModified": 1626852498,
"narHash": "sha256-lOXUJvi0FJUXHTVSiC5qsMRtEUgqM4mGZpMESLuGhmo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "16105403bdd843540cbef9c63fc0f16c1c6eaa70",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixpkgs-unstable",
"type": "indirect"
}
},
"nixpkgs_9": {
"locked": {
"lastModified": 1621073999,
"narHash": "sha256-Cp99YreSFedcWovxNmO8g8qFYltQQJPRLfuot6Z7iGE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "83d907fd760d9ee4f49b4b7e4b1c6682f137b573",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nose": {
"flake": false,
"locked": {
@ -1088,30 +771,6 @@
"type": "github"
}
},
"pathtree": {
"inputs": {
"flake-compat": "flake-compat_4",
"flake-utils": "flake-utils_6",
"nixpkgs": [
"emanote",
"ema",
"nixpkgs"
]
},
"locked": {
"lastModified": 1644018894,
"narHash": "sha256-aPzercxeSfWDdJ8CcyA6tBN83DnzUVLWG+atkWdPkuc=",
"owner": "srid",
"repo": "pathtree",
"rev": "ff594e51b6b97e9158f0a4dc5c4c720fb72aadf0",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "pathtree",
"type": "github"
}
},
"php-extras": {
"flake": false,
"locked": {
@ -1128,56 +787,22 @@
"type": "github"
}
},
"pre-commit-hooks": {
"pre-commit-hooks-nix": {
"inputs": {
"flake-utils": "flake-utils_2",
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1639823344,
"narHash": "sha256-jlsQb2y6A5dB1R0wVPLOfDGM0wLyfYqEJNzMtXuzCXw=",
"owner": "cachix",
"lastModified": 1638351750,
"narHash": "sha256-90OHC+11DIHD1QyMIPUuM3n6zjH5Mhc8RBZa0h8969A=",
"owner": "hercules-ci",
"repo": "pre-commit-hooks.nix",
"rev": "ff9c0b459ddc4b79c06e19d44251daa8e9cd1746",
"rev": "3bb289628867ac40fc9e7c514f8266b1ce8c0910",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"type": "github"
}
},
"pre-commit-hooks-nix": {
"flake": false,
"locked": {
"lastModified": 1622650193,
"narHash": "sha256-qSzUpJDv04ajS9FXoCq6NjVF3qOt9IiGIiGh0P8amyw=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "0398f0649e0a741660ac5e8216760bae5cc78579",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"type": "github"
}
},
"pre-commit-hooks_2": {
"inputs": {
"flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1639823344,
"narHash": "sha256-jlsQb2y6A5dB1R0wVPLOfDGM0wLyfYqEJNzMtXuzCXw=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "ff9c0b459ddc4b79c06e19d44251daa8e9cd1746",
"type": "github"
},
"original": {
"owner": "cachix",
"owner": "hercules-ci",
"ref": "flakeModule",
"repo": "pre-commit-hooks.nix",
"type": "github"
}
@ -1201,9 +826,7 @@
"root": {
"inputs": {
"darwin": "darwin",
"ema": "ema",
"emacs-overlay": "emacs-overlay",
"emanote": "emanote",
"hercules-ci-agent": "hercules-ci-agent",
"himalaya": "himalaya",
"home-manager": "home-manager",
@ -1211,7 +834,7 @@
"nix-doom-emacs": "nix-doom-emacs",
"nixos-hardware": "nixos-hardware",
"nixos-vscode-server": "nixos-vscode-server",
"nixpkgs": "nixpkgs_14"
"nixpkgs": "nixpkgs_10"
}
},
"rotate-text": {
@ -1232,8 +855,8 @@
},
"rust-overlay": {
"inputs": {
"flake-utils": "flake-utils_8",
"nixpkgs": "nixpkgs_9"
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1642838864,
@ -1249,27 +872,6 @@
"type": "github"
}
},
"tailwind-haskell": {
"inputs": {
"flake-compat": "flake-compat_5",
"flake-utils": "flake-utils_7",
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1645986656,
"narHash": "sha256-Bo9bjvCmxd8M0DLwjY6cfRYP48GI07Pi0p06I8328ZY=",
"owner": "srid",
"repo": "tailwind-haskell",
"rev": "e471ced826d9192ac8b25a893e1b65cab56ad192",
"type": "github"
},
"original": {
"owner": "srid",
"ref": "master",
"repo": "tailwind-haskell",
"type": "github"
}
},
"utils": {
"locked": {
"lastModified": 1623875721,

View file

@ -20,9 +20,7 @@
emacs-overlay.url = "github:nix-community/emacs-overlay";
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
nix-doom-emacs.url = "github:vlaci/nix-doom-emacs";
ema.url = "github:srid/ema/master";
emanote.url = "github:srid/emanote/master";
hercules-ci-agent.url = "github:hercules-ci/hercules-ci-agent/stable";
hercules-ci-agent.url = "github:hercules-ci/hercules-ci-agent/master";
};
outputs = inputs@{ self, home-manager, nixpkgs, darwin, ... }:
@ -36,34 +34,31 @@
(import inputs.emacs-overlay)
];
};
mkComputer = configurationNix: extraModules: nixpkgs.lib.nixosSystem {
# Configuration common to all of my systems (servers, desktops, laptops)
commonFeatures = [
./features/self-ide.nix
./features/takemessh
./features/caches
./features/current-location.nix
#./features/passwordstore.nix
];
homeFeatures = [
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.srid = import ./home.nix
{
inherit inputs system pkgs;
};
}
];
mkComputer = extraModules: nixpkgs.lib.nixosSystem {
inherit system pkgs;
# Arguments to pass to all modules.
specialArgs = { inherit system inputs; };
modules = (
[
# System configuration for this host
configurationNix
# Configuration common to all of my systems (servers, desktops, laptops)
./features/self-ide.nix
./features/takemessh
./features/caches
./features/current-location.nix
#./features/passwordstore.nix
# home-manager configuration
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.srid = import ./home.nix
{
inherit inputs system pkgs;
};
}
] ++ extraModules
);
modules =
commonFeatures ++ homeFeatures ++ extraModules;
};
in
{
@ -71,36 +66,18 @@
#
nixosConfigurations = {
thick = mkComputer
./hosts/thick.nix
[
./hosts/thick.nix
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-p53
./features/server/harden.nix
#./features/server/unlaptop.nix
./features/server/wakeonlan.nix
#./features/server/devserver.nix
./features/gnome.nix
./features/desktopish/guiapps.nix
#./features/desktopish/fonts.nix
#./features/protonvpn.nix
./features/lxd.nix
./features/docker.nix
./features/postgres.nix
];
thin = mkComputer
./hosts/thin.nix
[
./hosts/thin.nix
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x1-7th-gen
./features/server/harden.nix
./features/distributed-build.nix
./features/gnome.nix
./features/desktopish/guiapps.nix
./features/desktopish/fonts.nix
./features/protonvpn.nix
#./features/desktopish
];
now = mkComputer
./hosts/hetzner/ax101.nix
[
./hosts/hetzner/ax101.nix
./features/server/harden.nix
./features/server/devserver.nix
./features/hercules.nix

View file

@ -3,7 +3,6 @@ let
#himalayaSrc = inputs.himalaya;
#himalaya = import ./features/email/himalaya.nix { inherit pkgs inputs system; };
neovim-nightly = inputs.neovim-nightly-overlay.packages.${system}.neovim;
emanote = inputs.emanote.outputs.defaultPackage.${system};
in
rec {
@ -16,7 +15,6 @@ rec {
lsof
# psutils -- collides with tex
usbutils
emanote
git-crypt
ghcid

View file

@ -19,7 +19,7 @@
swapDevices = [ ];
nix.maxJobs = lib.mkDefault 32;
nix.settings.max-jobs = lib.mkDefault 32;
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
@ -95,7 +95,7 @@
};
nix = {
package = pkgs.nixUnstable;
# package = pkgs.nixUnstable;
extraOptions = ''
experimental-features = nix-command flakes
'';
@ -114,6 +114,7 @@
user = "srid";
dataDir = "/home/srid/priv/syncthing";
};
services.tailscale.enable = true;
# Define a user account. Don't forget to set a password with passwd.
users.users.srid = {