diff --git a/common/fonts.nix b/common/fonts.nix
index 25f6c71..80d3a04 100644
--- a/common/fonts.nix
+++ b/common/fonts.nix
@@ -1,17 +1,28 @@
{ pkgs, ... }: {
stylix.fonts = {
+
+ # monospace = {
+ # name = "Cascadia Code";
+ # package = pkgs.cascadia-code;
+ # };
+
monospace = {
- name = "FiraCode Nerd Font";
- package = pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; };
+ name = "Iosevka";
+ package = pkgs.iosevka;
};
sansSerif = {
- name = "Fira Sans";
- package = pkgs.fira;
+ name = "CMUSansSerif";
+ package = pkgs.cm_unicode;
+ };
+
+ serif = {
+ name = "CMUSerif-Roman";
+ package = pkgs.cm_unicode;
};
# Why would you not want sansSerif
- # (that's what I used to think, but I somewhat changed my mind)
+ # (that's what I used to think, but I have since changed my mind)
# serif = sansSerif;
};
}
diff --git a/flake.lock b/flake.lock
index 111fc78..0af4393 100644
--- a/flake.lock
+++ b/flake.lock
@@ -9,11 +9,11 @@
]
},
"locked": {
- "lastModified": 1695384796,
- "narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=",
+ "lastModified": 1701216516,
+ "narHash": "sha256-jKSeJn+7hZ1dZdiH1L+NWUGT2i/BGomKAJ54B9kT06Q=",
"owner": "ryantm",
"repo": "agenix",
- "rev": "1f677b3e161d3bdbfd08a939e8f25de2568e0ef4",
+ "rev": "13ac9ac6d68b9a0896e3d43a082947233189e247",
"type": "github"
},
"original": {
@@ -30,11 +30,11 @@
]
},
"locked": {
- "lastModified": 1692476235,
- "narHash": "sha256-NGUDp/24HCIVWE0xZNHIdzz3q2WDk7MQz1wC7ub/e2U=",
+ "lastModified": 1701453400,
+ "narHash": "sha256-hI9+KBShsSfvWX7bmRa/1VI20WGat3lDXmbceMZzMS4=",
"owner": "Kirottu",
"repo": "anyrun",
- "rev": "76af3eb198f376303194c31a83f2399a043acf1b",
+ "rev": "e14da6c37337ffa3ee1bc66965d58ef64c1590e5",
"type": "github"
},
"original": {
@@ -67,11 +67,11 @@
"autodocodec": {
"flake": false,
"locked": {
- "lastModified": 1685692167,
- "narHash": "sha256-QMlis/+3BAhjhop9m6q3W+MBWg9Z1IhqVokdaWRDVQQ=",
+ "lastModified": 1700495536,
+ "narHash": "sha256-a71Ea0alRBJyQdb24HseEN3U7zc71PqqXBfWELAO6IA=",
"owner": "NorfairKing",
"repo": "autodocodec",
- "rev": "5f23727689555789389ae4fbf41f674d43325814",
+ "rev": "e7f4ec8d1d47e77c0f7fe83c8032abae5b082572",
"type": "github"
},
"original": {
@@ -83,11 +83,11 @@
"autodocodec_2": {
"flake": false,
"locked": {
- "lastModified": 1690787679,
- "narHash": "sha256-FsHc4T8PfO4Y0RxQ5IcYy1Nb1XRamfsoDiowzS3Wfzw=",
+ "lastModified": 1700495536,
+ "narHash": "sha256-a71Ea0alRBJyQdb24HseEN3U7zc71PqqXBfWELAO6IA=",
"owner": "NorfairKing",
"repo": "autodocodec",
- "rev": "f661ec72fd68ef40c1ae8b698e0411989abf8747",
+ "rev": "e7f4ec8d1d47e77c0f7fe83c8032abae5b082572",
"type": "github"
},
"original": {
@@ -115,11 +115,11 @@
"autodocodec_4": {
"flake": false,
"locked": {
- "lastModified": 1685692167,
- "narHash": "sha256-QMlis/+3BAhjhop9m6q3W+MBWg9Z1IhqVokdaWRDVQQ=",
+ "lastModified": 1700495536,
+ "narHash": "sha256-a71Ea0alRBJyQdb24HseEN3U7zc71PqqXBfWELAO6IA=",
"owner": "NorfairKing",
"repo": "autodocodec",
- "rev": "5f23727689555789389ae4fbf41f674d43325814",
+ "rev": "e7f4ec8d1d47e77c0f7fe83c8032abae5b082572",
"type": "github"
},
"original": {
@@ -178,6 +178,118 @@
"type": "github"
}
},
+ "base16-alacritty": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1674275109,
+ "narHash": "sha256-Adwx9yP70I6mJrjjODOgZJjt4OPPe8gJu7UuBboXO4M=",
+ "owner": "aarowill",
+ "repo": "base16-alacritty",
+ "rev": "63d8ae5dfefe5db825dd4c699d0cdc2fc2c3eaf7",
+ "type": "github"
+ },
+ "original": {
+ "owner": "aarowill",
+ "repo": "base16-alacritty",
+ "type": "github"
+ }
+ },
+ "base16-fish": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1622559957,
+ "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
+ "owner": "tomyun",
+ "repo": "base16-fish",
+ "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
+ "type": "github"
+ },
+ "original": {
+ "owner": "tomyun",
+ "repo": "base16-fish",
+ "type": "github"
+ }
+ },
+ "base16-foot": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1696725948,
+ "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=",
+ "owner": "tinted-theming",
+ "repo": "base16-foot",
+ "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce",
+ "type": "github"
+ },
+ "original": {
+ "owner": "tinted-theming",
+ "repo": "base16-foot",
+ "type": "github"
+ }
+ },
+ "base16-helix": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1696727917,
+ "narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=",
+ "owner": "tinted-theming",
+ "repo": "base16-helix",
+ "rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb",
+ "type": "github"
+ },
+ "original": {
+ "owner": "tinted-theming",
+ "repo": "base16-helix",
+ "type": "github"
+ }
+ },
+ "base16-kitty": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1665001328,
+ "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=",
+ "owner": "kdrag0n",
+ "repo": "base16-kitty",
+ "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805",
+ "type": "github"
+ },
+ "original": {
+ "owner": "kdrag0n",
+ "repo": "base16-kitty",
+ "type": "github"
+ }
+ },
+ "base16-tmux": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1696725902,
+ "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=",
+ "owner": "tinted-theming",
+ "repo": "base16-tmux",
+ "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7",
+ "type": "github"
+ },
+ "original": {
+ "owner": "tinted-theming",
+ "repo": "base16-tmux",
+ "type": "github"
+ }
+ },
+ "base16-vim": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1663659192,
+ "narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=",
+ "owner": "chriskempson",
+ "repo": "base16-vim",
+ "rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d",
+ "type": "github"
+ },
+ "original": {
+ "owner": "chriskempson",
+ "repo": "base16-vim",
+ "type": "github"
+ }
+ },
"catppuccin-base16": {
"flake": false,
"locked": {
@@ -194,6 +306,22 @@
"type": "github"
}
},
+ "conformance": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1699436367,
+ "narHash": "sha256-rO/q0r83N0zpQ6DO2EwGCg3P1+zjviyR7F0yuTPXoJ0=",
+ "owner": "NorfairKing",
+ "repo": "conformance",
+ "rev": "2c236fd28c4cef63cd40d04631c5462d1df37759",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NorfairKing",
+ "repo": "conformance",
+ "type": "github"
+ }
+ },
"cursor": {
"flake": false,
"locked": {
@@ -283,11 +411,11 @@
"dekking": {
"flake": false,
"locked": {
- "lastModified": 1685724806,
- "narHash": "sha256-UkuejkftSl6Xq878dlkBcJJReMAf5jA6l/Uyv2NA6l4=",
+ "lastModified": 1697914016,
+ "narHash": "sha256-f7GKRmZQMztuEHLdu3B29j+mldMunzwO03GcEFw+7eY=",
"owner": "NorfairKing",
"repo": "dekking",
- "rev": "005ef328e6f486d4d21a9fd1a42e0fb93d4936df",
+ "rev": "930252d59c3bb5c2d51cb02ecc6863d93e623c6a",
"type": "github"
},
"original": {
@@ -299,11 +427,11 @@
"dekking_2": {
"flake": false,
"locked": {
- "lastModified": 1685724806,
- "narHash": "sha256-UkuejkftSl6Xq878dlkBcJJReMAf5jA6l/Uyv2NA6l4=",
+ "lastModified": 1697914016,
+ "narHash": "sha256-f7GKRmZQMztuEHLdu3B29j+mldMunzwO03GcEFw+7eY=",
"owner": "NorfairKing",
"repo": "dekking",
- "rev": "005ef328e6f486d4d21a9fd1a42e0fb93d4936df",
+ "rev": "930252d59c3bb5c2d51cb02ecc6863d93e623c6a",
"type": "github"
},
"original": {
@@ -315,11 +443,11 @@
"dekking_3": {
"flake": false,
"locked": {
- "lastModified": 1685724806,
- "narHash": "sha256-UkuejkftSl6Xq878dlkBcJJReMAf5jA6l/Uyv2NA6l4=",
+ "lastModified": 1697914016,
+ "narHash": "sha256-f7GKRmZQMztuEHLdu3B29j+mldMunzwO03GcEFw+7eY=",
"owner": "NorfairKing",
"repo": "dekking",
- "rev": "005ef328e6f486d4d21a9fd1a42e0fb93d4936df",
+ "rev": "930252d59c3bb5c2d51cb02ecc6863d93e623c6a",
"type": "github"
},
"original": {
@@ -386,30 +514,62 @@
"type": "github"
}
},
- "feedback": {
+ "fast-myers-diff": {
"flake": false,
"locked": {
- "lastModified": 1685958424,
- "narHash": "sha256-CGWA7ipuTn72hLNlwea9SeQxZfQ+KDNgplV3Blu2eYk=",
+ "lastModified": 1696885120,
+ "narHash": "sha256-wqJ0/P3pXOISDhRHpEt11GVYllb+DFt46Mh+k/y1bYw=",
"owner": "NorfairKing",
- "repo": "feedback",
- "rev": "9b2b037be77805507928238ec3c34abec9133631",
+ "repo": "fast-myers-diff",
+ "rev": "c106ef803c69ef9440399247ec4ffd59c84f6fc7",
"type": "github"
},
"original": {
"owner": "NorfairKing",
- "repo": "feedback",
+ "repo": "fast-myers-diff",
"type": "github"
}
},
- "feedback_2": {
+ "fast-myers-diff_2": {
"flake": false,
"locked": {
- "lastModified": 1685958424,
- "narHash": "sha256-CGWA7ipuTn72hLNlwea9SeQxZfQ+KDNgplV3Blu2eYk=",
+ "lastModified": 1696885120,
+ "narHash": "sha256-wqJ0/P3pXOISDhRHpEt11GVYllb+DFt46Mh+k/y1bYw=",
+ "owner": "NorfairKing",
+ "repo": "fast-myers-diff",
+ "rev": "c106ef803c69ef9440399247ec4ffd59c84f6fc7",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NorfairKing",
+ "repo": "fast-myers-diff",
+ "type": "github"
+ }
+ },
+ "fast-myers-diff_3": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1696885120,
+ "narHash": "sha256-wqJ0/P3pXOISDhRHpEt11GVYllb+DFt46Mh+k/y1bYw=",
+ "owner": "NorfairKing",
+ "repo": "fast-myers-diff",
+ "rev": "c106ef803c69ef9440399247ec4ffd59c84f6fc7",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NorfairKing",
+ "repo": "fast-myers-diff",
+ "type": "github"
+ }
+ },
+ "feedback": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1699717881,
+ "narHash": "sha256-8PYJ5UBACkS56RW6Ewb8okt9fnspQascL5kWLapkeU4=",
"owner": "NorfairKing",
"repo": "feedback",
- "rev": "9b2b037be77805507928238ec3c34abec9133631",
+ "rev": "f891d19cd8bd1b6aebfca37f37261cc6c6ef2f27",
"type": "github"
},
"original": {
@@ -476,11 +636,11 @@
"flake-compat_3": {
"flake": false,
"locked": {
- "lastModified": 1673956053,
- "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+ "lastModified": 1696426674,
+ "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
- "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+ "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
@@ -592,11 +752,11 @@
]
},
"locked": {
- "lastModified": 1685662779,
- "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=",
+ "lastModified": 1696343447,
+ "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3",
+ "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4",
"type": "github"
},
"original": {
@@ -631,11 +791,11 @@
]
},
"locked": {
- "lastModified": 1685662779,
- "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=",
+ "lastModified": 1701473968,
+ "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3",
+ "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5",
"type": "github"
},
"original": {
@@ -645,6 +805,27 @@
}
},
"flake-parts_4": {
+ "inputs": {
+ "nixpkgs-lib": [
+ "neovim-nightly-overlay",
+ "hercules-ci-effects",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1696343447,
+ "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=",
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4",
+ "type": "github"
+ },
+ "original": {
+ "id": "flake-parts",
+ "type": "indirect"
+ }
+ },
+ "flake-parts_5": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_2"
},
@@ -656,28 +837,6 @@
"rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3",
"type": "github"
},
- "original": {
- "id": "flake-parts",
- "type": "indirect"
- }
- },
- "flake-parts_5": {
- "inputs": {
- "nixpkgs-lib": [
- "neovim-nightly-overlay",
- "hercules-ci-effects",
- "hercules-ci-agent",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1680392223,
- "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=",
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5",
- "type": "github"
- },
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
@@ -685,24 +844,6 @@
}
},
"flake-parts_6": {
- "inputs": {
- "nixpkgs-lib": "nixpkgs-lib_3"
- },
- "locked": {
- "lastModified": 1685662779,
- "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=",
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "type": "github"
- }
- },
- "flake-parts_7": {
"inputs": {
"nixpkgs-lib": [
"nixpkgs-wayland",
@@ -711,11 +852,11 @@
]
},
"locked": {
- "lastModified": 1693611461,
- "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=",
+ "lastModified": 1701473968,
+ "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca",
+ "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5",
"type": "github"
},
"original": {
@@ -775,6 +916,24 @@
"type": "github"
}
},
+ "flake-utils_12": {
+ "inputs": {
+ "systems": "systems_12"
+ },
+ "locked": {
+ "lastModified": 1694529238,
+ "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
@@ -834,11 +993,11 @@
"systems": "systems_5"
},
"locked": {
- "lastModified": 1685518550,
- "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
+ "lastModified": 1694529238,
+ "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+ "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
@@ -852,11 +1011,11 @@
"systems": "systems_6"
},
"locked": {
- "lastModified": 1694529238,
- "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+ "lastModified": 1701680307,
+ "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+ "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github"
},
"original": {
@@ -919,6 +1078,23 @@
"type": "github"
}
},
+ "freetype2": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1675923892,
+ "narHash": "sha256-dOm8VKYdclTLLkqWMLv7DQI0Qyjit7S4SOCszKEkG3o=",
+ "owner": "wez",
+ "repo": "freetype2",
+ "rev": "de8b92dd7ec634e9e2b25ef534c54a3537555c11",
+ "type": "github"
+ },
+ "original": {
+ "owner": "wez",
+ "repo": "freetype2",
+ "rev": "de8b92dd7ec634e9e2b25ef534c54a3537555c11",
+ "type": "github"
+ }
+ },
"fromYaml": {
"flake": false,
"locked": {
@@ -953,11 +1129,11 @@
},
"get-flake": {
"locked": {
- "lastModified": 1673819588,
- "narHash": "sha256-gRtwKAlu4htvS6dxyZnW3n+vMS1acqnMGVHqxUdETeY=",
+ "lastModified": 1694475786,
+ "narHash": "sha256-s5wDmPooMUNIAAsxxCMMh9g68AueGg63DYk2hVZJbc8=",
"owner": "ursi",
"repo": "get-flake",
- "rev": "e0917b6f564aa5acefb1484b5baf76da21746c3c",
+ "rev": "ac54750e3b95dab6ec0726d77f440efe6045bec1",
"type": "github"
},
"original": {
@@ -1098,6 +1274,23 @@
"type": "github"
}
},
+ "harfbuzz": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1677798343,
+ "narHash": "sha256-Lsd0Vrkrv67CMyV0ZveShfjUvqh/jDhI8rAK9ps+SZQ=",
+ "owner": "harfbuzz",
+ "repo": "harfbuzz",
+ "rev": "60841e26187576bff477c1a09ee2ffe544844abc",
+ "type": "github"
+ },
+ "original": {
+ "owner": "harfbuzz",
+ "repo": "harfbuzz",
+ "rev": "60841e26187576bff477c1a09ee2ffe544844abc",
+ "type": "github"
+ }
+ },
"haskell-dependency-graph-nix": {
"inputs": {
"nixpkgs": [
@@ -1173,56 +1366,20 @@
"type": "github"
}
},
- "haskell-flake": {
- "locked": {
- "lastModified": 1678745009,
- "narHash": "sha256-ujfwSrkxThmHJozibkCnJmlXLVyxm+Cbo2Q4wXPbCS4=",
- "owner": "srid",
- "repo": "haskell-flake",
- "rev": "26852ade574c712bc3912ad28de52b0c4cf7d4cb",
- "type": "github"
- },
- "original": {
- "owner": "srid",
- "ref": "0.2.0",
- "repo": "haskell-flake",
- "type": "github"
- }
- },
- "hercules-ci-agent": {
- "inputs": {
- "flake-parts": "flake-parts_5",
- "haskell-flake": "haskell-flake",
- "nixpkgs": "nixpkgs_5"
- },
- "locked": {
- "lastModified": 1686138353,
- "narHash": "sha256-e0wDTIySFCfZMSYQNVGY/d6jjwcua3y6igouI8CejQ8=",
- "owner": "hercules-ci",
- "repo": "hercules-ci-agent",
- "rev": "febf6540ed5fd55812933c159e59742743277b30",
- "type": "github"
- },
- "original": {
- "id": "hercules-ci-agent",
- "type": "indirect"
- }
- },
"hercules-ci-effects": {
"inputs": {
"flake-parts": "flake-parts_4",
- "hercules-ci-agent": "hercules-ci-agent",
"nixpkgs": [
"neovim-nightly-overlay",
"nixpkgs"
]
},
"locked": {
- "lastModified": 1686181431,
- "narHash": "sha256-S1IsZGwcMChJg3mgnKdFxh2c/D77B1NoOCd8s3tQQIg=",
+ "lastModified": 1701009247,
+ "narHash": "sha256-GuX16rzRze2y7CsewJLTV6qXkXWyEwp6VCZXi8HLruU=",
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
- "rev": "657935127398706754113c1cea5800798ecb99a7",
+ "rev": "31b6cd7569191bfcd0a548575b0e2ef953ed7d09",
"type": "github"
},
"original": {
@@ -1259,15 +1416,16 @@
]
},
"locked": {
- "lastModified": 1695550077,
- "narHash": "sha256-xoxR/iY69/3lTnnZDP6gf3J46DUKPcf+Y1jH03tfZXE=",
+ "lastModified": 1700814205,
+ "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "a88df2fb101778bfd98a17556b3a2618c6c66091",
+ "rev": "aeb2232d7a32530d3448318790534d196bf9427a",
"type": "github"
},
"original": {
"owner": "nix-community",
+ "ref": "release-23.11",
"repo": "home-manager",
"type": "github"
}
@@ -1277,11 +1435,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1685599623,
- "narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=",
+ "lastModified": 1700392168,
+ "narHash": "sha256-v5LprEFx3u4+1vmds9K0/i7sHjT0IYGs7u9v54iz/OA=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd",
+ "rev": "28535c3a34d79071f2ccb68671971ce0c0984d7e",
"type": "github"
},
"original": {
@@ -1293,14 +1451,14 @@
},
"home-manager_4": {
"inputs": {
- "nixpkgs": "nixpkgs_9"
+ "nixpkgs": "nixpkgs_8"
},
"locked": {
- "lastModified": 1695108154,
- "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=",
+ "lastModified": 1700392168,
+ "narHash": "sha256-v5LprEFx3u4+1vmds9K0/i7sHjT0IYGs7u9v54iz/OA=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "07682fff75d41f18327a871088d20af2710d4744",
+ "rev": "28535c3a34d79071f2ccb68671971ce0c0984d7e",
"type": "github"
},
"original": {
@@ -1341,11 +1499,11 @@
"xdph": "xdph"
},
"locked": {
- "lastModified": 1695558936,
- "narHash": "sha256-KcSkwSDlrt3Xwtit+NTu2aToiRm5Aho9joj2r6nb19w=",
+ "lastModified": 1702051336,
+ "narHash": "sha256-zfnvorPK5mQpbifc9rCqGH0fOeFMPaVnEsOOtm+NjH0=",
"owner": "hyprwm",
"repo": "Hyprland",
- "rev": "352ceb1117b79cd0bc3fa86ebe435b6909512ddb",
+ "rev": "11d1c50420cdeaa5426b837a6479455f47368f29",
"type": "github"
},
"original": {
@@ -1361,11 +1519,11 @@
]
},
"locked": {
- "lastModified": 1695455081,
- "narHash": "sha256-AtAMze2J5Maol28OLQoCFgppRWEy06Mn9RhduXNmhiI=",
+ "lastModified": 1700963402,
+ "narHash": "sha256-JhkanLmYRLekGOysO6JpCWKPlgRoemHPzUrARCGBqYA=",
"owner": "hyprwm",
"repo": "contrib",
- "rev": "33663f663e07b4ca52c9165f74e3d793f08b15e7",
+ "rev": "65e567a81176d39be7ce6513d1af23954f00cbec",
"type": "github"
},
"original": {
@@ -1402,11 +1560,11 @@
"ical": {
"flake": false,
"locked": {
- "lastModified": 1685727790,
- "narHash": "sha256-204vw2bMpUhoUzwYGJ3WP933sCy6T850dlX0avK8/Cs=",
+ "lastModified": 1698913802,
+ "narHash": "sha256-olsCs4X7+tJJrEutDuyN2VEKFDZT6brRqUesQY6mrjg=",
"owner": "NorfairKing",
"repo": "ical",
- "rev": "65b62d97b58665be51d93758b961050f9c19bdae",
+ "rev": "5d2ad0d37d04d0110d922dd88a4304e70d268dba",
"type": "github"
},
"original": {
@@ -1417,11 +1575,11 @@
},
"impermanence": {
"locked": {
- "lastModified": 1694622745,
- "narHash": "sha256-z397+eDhKx9c2qNafL1xv75lC0Q4nOaFlhaU1TINqb8=",
+ "lastModified": 1697303681,
+ "narHash": "sha256-caJ0rXeagaih+xTgRduYtYKL1rZ9ylh06CIrt1w5B4g=",
"owner": "nix-community",
"repo": "impermanence",
- "rev": "e9643d08d0d193a2e074a19d4d90c67a874d932e",
+ "rev": "0f317c2e9e56550ce12323eb39302d251618f5b5",
"type": "github"
},
"original": {
@@ -1434,7 +1592,7 @@
"inputs": {
"autodocodec": "autodocodec",
"dekking": "dekking",
- "feedback": "feedback",
+ "fast-myers-diff": "fast-myers-diff",
"haskell-dependency-graph-nix": "haskell-dependency-graph-nix",
"home-manager": "home-manager_3",
"linkcheck": "linkcheck",
@@ -1450,11 +1608,11 @@
"yesod-static-remote": "yesod-static-remote"
},
"locked": {
- "lastModified": 1687441900,
- "narHash": "sha256-3sgPhJKU+hyBwjv/lTGvq+hqsgU4cN0ktiEbmkroZWk=",
+ "lastModified": 1700650769,
+ "narHash": "sha256-uAMKf3hNVNCHJlo89ZQW/Pyk/gCCGSWm9jYT5lFP2I0=",
"owner": "NorfairKing",
"repo": "intray",
- "rev": "40a4ad6ab5cc6d710735095597124c3539c1809b",
+ "rev": "aaba614e7405699aa87d03e0d89319a08780d16d",
"type": "github"
},
"original": {
@@ -1466,14 +1624,14 @@
"lib-aggregate": {
"inputs": {
"flake-utils": "flake-utils_6",
- "nixpkgs-lib": "nixpkgs-lib_4"
+ "nixpkgs-lib": "nixpkgs-lib_3"
},
"locked": {
- "lastModified": 1695557304,
- "narHash": "sha256-HYoJE+KE6/zGHgRI496n9E1abDFaqsl9EnEfGIEEqLo=",
+ "lastModified": 1701901779,
+ "narHash": "sha256-niromWK2vW1p/pzbsMjpBq2wi/yR1UgYXplvIG2EoI4=",
"owner": "nix-community",
"repo": "lib-aggregate",
- "rev": "cb8bfd550aaaf32a330c1c8870a3d9a5bfa00954",
+ "rev": "967acb55282cb9fa9c3c91d4ca91c92b7befc7bb",
"type": "github"
},
"original": {
@@ -1482,6 +1640,23 @@
"type": "github"
}
},
+ "libpng": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1549245649,
+ "narHash": "sha256-1+cRp0Ungme/OGfc9kGJbklYIWAFxk8Il1M+NV4KSgw=",
+ "owner": "glennrp",
+ "repo": "libpng",
+ "rev": "8439534daa1d3a5705ba92e653eda9251246dd61",
+ "type": "github"
+ },
+ "original": {
+ "owner": "glennrp",
+ "repo": "libpng",
+ "rev": "8439534daa1d3a5705ba92e653eda9251246dd61",
+ "type": "github"
+ }
+ },
"linkcheck": {
"flake": false,
"locked": {
@@ -1587,11 +1762,11 @@
"mergeful": {
"flake": false,
"locked": {
- "lastModified": 1685956552,
- "narHash": "sha256-NAxASNNg6C8P+zH7AVU3BBnx2qVBa/VPmhrCyo2W1kc=",
+ "lastModified": 1697187634,
+ "narHash": "sha256-Ym2f40NdmyVfEV9CfgQuSxoNyakH+VVfqfcEONHoKjk=",
"owner": "NorfairKing",
"repo": "mergeful",
- "rev": "3d65752421c2fa49377540dfd95bb26eba19be10",
+ "rev": "0c1e0ea93b9db61e1f0b81a9f36db4810b061a65",
"type": "github"
},
"original": {
@@ -1603,11 +1778,11 @@
"mergeful_2": {
"flake": false,
"locked": {
- "lastModified": 1685956552,
- "narHash": "sha256-NAxASNNg6C8P+zH7AVU3BBnx2qVBa/VPmhrCyo2W1kc=",
+ "lastModified": 1697187634,
+ "narHash": "sha256-Ym2f40NdmyVfEV9CfgQuSxoNyakH+VVfqfcEONHoKjk=",
"owner": "NorfairKing",
"repo": "mergeful",
- "rev": "3d65752421c2fa49377540dfd95bb26eba19be10",
+ "rev": "0c1e0ea93b9db61e1f0b81a9f36db4810b061a65",
"type": "github"
},
"original": {
@@ -1619,11 +1794,11 @@
"mergeless": {
"flake": false,
"locked": {
- "lastModified": 1685956406,
- "narHash": "sha256-bqUma9T5ZGpeuE8YXqYM9TRo6T/YOdig4YP40zNq0r4=",
+ "lastModified": 1696885427,
+ "narHash": "sha256-s7EllBrL5snLincPywcBg1vQvu97Qy0KhBXKS8p2q1s=",
"owner": "NorfairKing",
"repo": "mergeless",
- "rev": "4dd2a655509fccff10183a90b376117a5c62761e",
+ "rev": "af70d2eb3055bdba54be960fa14ee5c55a60772e",
"type": "github"
},
"original": {
@@ -1635,11 +1810,11 @@
"mergeless_2": {
"flake": false,
"locked": {
- "lastModified": 1685956406,
- "narHash": "sha256-bqUma9T5ZGpeuE8YXqYM9TRo6T/YOdig4YP40zNq0r4=",
+ "lastModified": 1696885427,
+ "narHash": "sha256-s7EllBrL5snLincPywcBg1vQvu97Qy0KhBXKS8p2q1s=",
"owner": "NorfairKing",
"repo": "mergeless",
- "rev": "4dd2a655509fccff10183a90b376117a5c62761e",
+ "rev": "af70d2eb3055bdba54be960fa14ee5c55a60772e",
"type": "github"
},
"original": {
@@ -1658,11 +1833,11 @@
},
"locked": {
"dir": "contrib",
- "lastModified": 1686526357,
- "narHash": "sha256-zbBUpWhXEodDn6eD10osfvYwL3C34zYFiBtkoqgCx4s=",
+ "lastModified": 1701993627,
+ "narHash": "sha256-ubYKiw2RHzJsGonFodOh/FVQ6A+MHIRQTX9/HdOutJY=",
"owner": "neovim",
"repo": "neovim",
- "rev": "6e1fa16ddecca1b6e10563a75385cedea32f8911",
+ "rev": "3bb5d2f2192b63e368a4f573f66406eba3ee66b3",
"type": "github"
},
"original": {
@@ -1683,11 +1858,11 @@
]
},
"locked": {
- "lastModified": 1686528280,
- "narHash": "sha256-xwtaumDA9BWXo6pPjs0mepw+LEPbzyd3KHlq6Lo2zDY=",
+ "lastModified": 1701993865,
+ "narHash": "sha256-2BksxNhmUG+MFCejvXeIPivJ8273r6aS5sqC4W8pjw8=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
- "rev": "403e4544cbcbf406bcb258654fd0cfaecb14a174",
+ "rev": "3094e82f5b8b3ccf6ddd4917e881209faea35d90",
"type": "github"
},
"original": {
@@ -1698,16 +1873,17 @@
},
"nix-eval-jobs": {
"inputs": {
- "flake-parts": "flake-parts_7",
- "nixpkgs": "nixpkgs_8",
+ "flake-parts": "flake-parts_6",
+ "nix-github-actions": "nix-github-actions",
+ "nixpkgs": "nixpkgs_7",
"treefmt-nix": "treefmt-nix"
},
"locked": {
- "lastModified": 1695258303,
- "narHash": "sha256-5Ibd9qjkAk04y8GyweQF+ciIaPzRaet3xZAmTDOWCng=",
+ "lastModified": 1701852992,
+ "narHash": "sha256-9k+nGxwpxuyocsvitsx1Y2SGI/FScVzXjLyGsVjE/wo=",
"owner": "nix-community",
"repo": "nix-eval-jobs",
- "rev": "39657d146828157ef51c4f2d8bebb96a77075fc6",
+ "rev": "0f8e80f29287a7c01144603fb0030fdd7216dd98",
"type": "github"
},
"original": {
@@ -1716,17 +1892,39 @@
"type": "github"
}
},
- "nixd": {
+ "nix-github-actions": {
"inputs": {
- "flake-parts": "flake-parts_6",
- "nixpkgs": "nixpkgs_6"
+ "nixpkgs": [
+ "nixpkgs-wayland",
+ "nix-eval-jobs",
+ "nixpkgs"
+ ]
},
"locked": {
- "lastModified": 1699966122,
- "narHash": "sha256-zEN3ET7jfXpIKYeYh/z4xekOBOoaFS+n0q3oL3sVh+0=",
+ "lastModified": 1701208414,
+ "narHash": "sha256-xrQ0FyhwTZK6BwKhahIkUVZhMNk21IEI1nUcWSONtpo=",
+ "owner": "nix-community",
+ "repo": "nix-github-actions",
+ "rev": "93e39cc1a087d65bcf7a132e75a650c44dd2b734",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "repo": "nix-github-actions",
+ "type": "github"
+ }
+ },
+ "nixd": {
+ "inputs": {
+ "flake-parts": "flake-parts_5",
+ "nixpkgs": "nixpkgs_5"
+ },
+ "locked": {
+ "lastModified": 1695137077,
+ "narHash": "sha256-wJ8EpYjsqrR4GFAF67wJKmZd4q86KuODWAag4acQL5Q=",
"owner": "nix-community",
"repo": "nixd",
- "rev": "b3bb9ea7cd3c2f07c89779a474d6468b2c11e303",
+ "rev": "e8f144ca50fe71e74d247e5308ae7ce122f0a0e6",
"type": "github"
},
"original": {
@@ -1757,11 +1955,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1695541019,
- "narHash": "sha256-rs++zfk41K9ArWkDAlmBDlGlKO8qeRIRzdjo+9SmNFI=",
+ "lastModified": 1701656485,
+ "narHash": "sha256-xDFormrGCKKGqngHa2Bz1GTeKlFMMjLnHhTDRdMJ1hs=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "61283b30d11f27d5b76439d43f20d0c0c8ff5296",
+ "rev": "fa194fc484fd7270ab324bb985593f71102e84d1",
"type": "github"
},
"original": {
@@ -1773,16 +1971,16 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1684570954,
- "narHash": "sha256-FX5y4Sm87RWwfu9PI71XFvuRpZLowh00FQpIJ1WfXqE=",
+ "lastModified": 1687466461,
+ "narHash": "sha256-oupXI7g7RPzlpGUfAu1xG4KBK53GrZH8/xeKgKDB4+Q=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "3005f20ce0aaa58169cdee57c8aa12e5f1b6e1b3",
+ "rev": "ecb441f22067ba1d6312f4932a7c64efa8d19a7b",
"type": "github"
},
"original": {
"owner": "nixos",
- "ref": "nixos-unstable",
+ "ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
@@ -1825,29 +2023,11 @@
},
"nixpkgs-lib_3": {
"locked": {
- "dir": "lib",
- "lastModified": 1685564631,
- "narHash": "sha256-8ywr3AkblY4++3lIVxmrWZFzac7+f32ZEhH/A8pNscI=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "4f53efe34b3a8877ac923b9350c874e3dcd5dc0a",
- "type": "github"
- },
- "original": {
- "dir": "lib",
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs-lib_4": {
- "locked": {
- "lastModified": 1695516402,
- "narHash": "sha256-pL7m8iu1OLs/7ywhh+Q8ltPgmtwbMpi7484yr32zgYI=",
+ "lastModified": 1701564385,
+ "narHash": "sha256-um5ce7hnsQ8Do+oKf90zGKVmEqufr4Q6T8zfY9Hon38=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
- "rev": "01fc4cd75e577ac00e7c50b7e5f16cd9b6d633e8",
+ "rev": "152c00fc19bc45af5dd65bd41d1d020c2ba0b4ca",
"type": "github"
},
"original": {
@@ -1874,16 +2054,16 @@
},
"nixpkgs-stable_2": {
"locked": {
- "lastModified": 1685801374,
- "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
- "owner": "NixOS",
+ "lastModified": 1701952659,
+ "narHash": "sha256-TJv2srXt6fYPUjxgLAL0cy4nuf1OZD4KuA1TrCiQqg0=",
+ "owner": "nixos",
"repo": "nixpkgs",
- "rev": "c37ca420157f4abc31e26f436c1145f8951ff373",
+ "rev": "b4372c4924d9182034066c823df76d6eaf1f4ec4",
"type": "github"
},
"original": {
- "owner": "NixOS",
- "ref": "nixos-23.05",
+ "owner": "nixos",
+ "ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
@@ -1936,6 +2116,38 @@
"type": "github"
}
},
+ "nixpkgs-stable_6": {
+ "locked": {
+ "lastModified": 1685801374,
+ "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "c37ca420157f4abc31e26f436c1145f8951ff373",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-23.05",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs-unstable": {
+ "locked": {
+ "lastModified": 1701718080,
+ "narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
"nixpkgs-wayland": {
"inputs": {
"flake-compat": "flake-compat_4",
@@ -1946,11 +2158,11 @@
]
},
"locked": {
- "lastModified": 1695558343,
- "narHash": "sha256-DVqYDOuexsT3l11M78YCbbaq0Xg3YP/IBKGalCznK4w=",
+ "lastModified": 1701902161,
+ "narHash": "sha256-xi5JKgNaNl5XG/tstZ+bA3KpgB+qSGasJinSJP37PBg=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
- "rev": "83f9be7d9544e17cfb8adf06683d9f7695ad7925",
+ "rev": "916f946eb68f5ee3528c628752bd2e85366d8886",
"type": "github"
},
"original": {
@@ -1960,22 +2172,6 @@
}
},
"nixpkgs_10": {
- "locked": {
- "lastModified": 1699291058,
- "narHash": "sha256-5ggduoaAMPHUy4riL+OrlAZE14Kh7JWX4oLEs22ZqfU=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "41de143fda10e33be0f47eab2bfe08a50f234267",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-23.05",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_11": {
"locked": {
"lastModified": 1685865905,
"narHash": "sha256-XJZ/o17eOd2sEsGif+/MQBnfa2DKmndWgJyc7CWajFc=",
@@ -1991,7 +2187,7 @@
"type": "github"
}
},
- "nixpkgs_12": {
+ "nixpkgs_11": {
"locked": {
"lastModified": 1685866647,
"narHash": "sha256-4jKguNHY/edLYImB+uL8jKPL/vpfOvMmSlLAGfxSrnY=",
@@ -2007,7 +2203,7 @@
"type": "github"
}
},
- "nixpkgs_13": {
+ "nixpkgs_12": {
"locked": {
"lastModified": 1689261696,
"narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=",
@@ -2023,7 +2219,7 @@
"type": "github"
}
},
- "nixpkgs_14": {
+ "nixpkgs_13": {
"locked": {
"lastModified": 1685865905,
"narHash": "sha256-XJZ/o17eOd2sEsGif+/MQBnfa2DKmndWgJyc7CWajFc=",
@@ -2039,7 +2235,7 @@
"type": "github"
}
},
- "nixpkgs_15": {
+ "nixpkgs_14": {
"locked": {
"lastModified": 1685866647,
"narHash": "sha256-4jKguNHY/edLYImB+uL8jKPL/vpfOvMmSlLAGfxSrnY=",
@@ -2055,13 +2251,13 @@
"type": "github"
}
},
- "nixpkgs_16": {
+ "nixpkgs_15": {
"locked": {
- "lastModified": 1685866647,
- "narHash": "sha256-4jKguNHY/edLYImB+uL8jKPL/vpfOvMmSlLAGfxSrnY=",
+ "lastModified": 1689261696,
+ "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "a53a3bec10deef6e1cc1caba5bc60f53b959b1e8",
+ "rev": "df1eee2aa65052a18121ed4971081576b25d6b5c",
"type": "github"
},
"original": {
@@ -2073,11 +2269,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1685865905,
- "narHash": "sha256-XJZ/o17eOd2sEsGif+/MQBnfa2DKmndWgJyc7CWajFc=",
+ "lastModified": 1700403855,
+ "narHash": "sha256-Q0Uzjik9kUTN9pd/kp52XJi5kletBhy29ctBlAG+III=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "e7603eba51f2c7820c0a182c6bbb351181caa8e7",
+ "rev": "0c5678df521e1407884205fe3ce3cf1d7df297db",
"type": "github"
},
"original": {
@@ -2089,11 +2285,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1685866647,
- "narHash": "sha256-4jKguNHY/edLYImB+uL8jKPL/vpfOvMmSlLAGfxSrnY=",
+ "lastModified": 1689261696,
+ "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "a53a3bec10deef6e1cc1caba5bc60f53b959b1e8",
+ "rev": "df1eee2aa65052a18121ed4971081576b25d6b5c",
"type": "github"
},
"original": {
@@ -2120,22 +2316,6 @@
}
},
"nixpkgs_5": {
- "locked": {
- "lastModified": 1680213900,
- "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "e3652e0735fbec227f342712f180f4f21f0594f2",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_6": {
"locked": {
"lastModified": 1686398752,
"narHash": "sha256-nGWNQVhSw4VSL+S0D0cbrNR9vs9Bq7rlYR+1K5f5j6w=",
@@ -2151,29 +2331,29 @@
"type": "github"
}
},
- "nixpkgs_7": {
+ "nixpkgs_6": {
"locked": {
- "lastModified": 1695360818,
- "narHash": "sha256-JlkN3R/SSoMTa+CasbxS1gq+GpGxXQlNZRUh9+LIy/0=",
+ "lastModified": 1701952659,
+ "narHash": "sha256-TJv2srXt6fYPUjxgLAL0cy4nuf1OZD4KuA1TrCiQqg0=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "e35dcc04a3853da485a396bdd332217d0ac9054f",
+ "rev": "b4372c4924d9182034066c823df76d6eaf1f4ec4",
"type": "github"
},
"original": {
"owner": "nixos",
- "ref": "nixos-unstable",
+ "ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
- "nixpkgs_8": {
+ "nixpkgs_7": {
"locked": {
- "lastModified": 1695256509,
- "narHash": "sha256-Je+ZId+dYrx0NOZ8J6le7CwZZdVZAAP5dddxK9kZNfA=",
+ "lastModified": 1701847270,
+ "narHash": "sha256-ttPWHy1NZwJzSzY7OmofFNyrm9kWc+RFFHpJGeQ4kWw=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "ff7daa56614b083d3a87e2872917b676e9ba62a6",
+ "rev": "9ed8ade77aef706a03d8cc3a5ad4f60848ac59a7",
"type": "github"
},
"original": {
@@ -2183,7 +2363,7 @@
"type": "github"
}
},
- "nixpkgs_9": {
+ "nixpkgs_8": {
"locked": {
"lastModified": 1687466461,
"narHash": "sha256-oupXI7g7RPzlpGUfAu1xG4KBK53GrZH8/xeKgKDB4+Q=",
@@ -2199,13 +2379,29 @@
"type": "github"
}
},
+ "nixpkgs_9": {
+ "locked": {
+ "lastModified": 1700403855,
+ "narHash": "sha256-Q0Uzjik9kUTN9pd/kp52XJi5kletBhy29ctBlAG+III=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "0c5678df521e1407884205fe3ce3cf1d7df297db",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-23.05",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
"nur": {
"locked": {
- "lastModified": 1695588692,
- "narHash": "sha256-1ROivGLV1SfUVO9DQghI6mDkNoE5Q+GdaO+S6hoOKCs=",
+ "lastModified": 1702130780,
+ "narHash": "sha256-e2/mFkrc6uM8Qou7ISk7iZ2T9Olnd//WqjjOWNGdfV8=",
"owner": "nix-community",
"repo": "NUR",
- "rev": "ecfcc31148b2270e932799d80b8371eb4c3f41cb",
+ "rev": "6f28a02021733806f927894c1ee4660e3f9000e8",
"type": "github"
},
"original": {
@@ -2233,7 +2429,7 @@
"openapi-code-generator_2": {
"inputs": {
"autodocodec": "autodocodec_3",
- "nixpkgs": "nixpkgs_11",
+ "nixpkgs": "nixpkgs_10",
"pre-commit-hooks": "pre-commit-hooks_2",
"safe-coloured-text": "safe-coloured-text_2",
"sydtest": "sydtest_2",
@@ -2256,7 +2452,7 @@
"openapi-code-generator_3": {
"inputs": {
"autodocodec": "autodocodec_5",
- "nixpkgs": "nixpkgs_14",
+ "nixpkgs": "nixpkgs_13",
"pre-commit-hooks": "pre-commit-hooks_4",
"safe-coloured-text": "safe-coloured-text_4",
"sydtest": "sydtest_4",
@@ -2285,11 +2481,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1685970613,
- "narHash": "sha256-sMbR4zPciUfQ6YHt6GNVxT/yhWJKngvZo8qHzYkaU6E=",
+ "lastModified": 1700064067,
+ "narHash": "sha256-1ZWNDzhu8UlVCK7+DUN9dVQfiHX1bv6OQP9VxstY/gs=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
- "rev": "a117a1cd2c280bf8d499f26370fddfe1923e75e6",
+ "rev": "e558068cba67b23b4fbc5537173dbb43748a17e8",
"type": "github"
},
"original": {
@@ -2303,8 +2499,8 @@
"flake-compat": "flake-compat_5",
"flake-utils": "flake-utils_7",
"gitignore": "gitignore_2",
- "nixpkgs": "nixpkgs_12",
- "nixpkgs-stable": "nixpkgs-stable_2"
+ "nixpkgs": "nixpkgs_11",
+ "nixpkgs-stable": "nixpkgs-stable_3"
},
"locked": {
"lastModified": 1685970613,
@@ -2325,15 +2521,15 @@
"flake-compat": "flake-compat_6",
"flake-utils": "flake-utils_8",
"gitignore": "gitignore_3",
- "nixpkgs": "nixpkgs_13",
- "nixpkgs-stable": "nixpkgs-stable_3"
+ "nixpkgs": "nixpkgs_12",
+ "nixpkgs-stable": "nixpkgs-stable_4"
},
"locked": {
- "lastModified": 1692274144,
- "narHash": "sha256-BxTQuRUANQ81u8DJznQyPmRsg63t4Yc+0kcyq6OLz8s=",
+ "lastModified": 1700064067,
+ "narHash": "sha256-1ZWNDzhu8UlVCK7+DUN9dVQfiHX1bv6OQP9VxstY/gs=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
- "rev": "7e3517c03d46159fdbf8c0e5c97f82d5d4b0c8fa",
+ "rev": "e558068cba67b23b4fbc5537173dbb43748a17e8",
"type": "github"
},
"original": {
@@ -2347,8 +2543,8 @@
"flake-compat": "flake-compat_8",
"flake-utils": "flake-utils_10",
"gitignore": "gitignore_4",
- "nixpkgs": "nixpkgs_15",
- "nixpkgs-stable": "nixpkgs-stable_4"
+ "nixpkgs": "nixpkgs_14",
+ "nixpkgs-stable": "nixpkgs-stable_5"
},
"locked": {
"lastModified": 1685970613,
@@ -2369,15 +2565,15 @@
"flake-compat": "flake-compat_9",
"flake-utils": "flake-utils_11",
"gitignore": "gitignore_5",
- "nixpkgs": "nixpkgs_16",
- "nixpkgs-stable": "nixpkgs-stable_5"
+ "nixpkgs": "nixpkgs_15",
+ "nixpkgs-stable": "nixpkgs-stable_6"
},
"locked": {
- "lastModified": 1685970613,
- "narHash": "sha256-sMbR4zPciUfQ6YHt6GNVxT/yhWJKngvZo8qHzYkaU6E=",
+ "lastModified": 1700064067,
+ "narHash": "sha256-1ZWNDzhu8UlVCK7+DUN9dVQfiHX1bv6OQP9VxstY/gs=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
- "rev": "a117a1cd2c280bf8d499f26370fddfe1923e75e6",
+ "rev": "e558068cba67b23b4fbc5537173dbb43748a17e8",
"type": "github"
},
"original": {
@@ -2423,7 +2619,9 @@
"nixd": "nixd",
"nixinate": "nixinate",
"nixos-hardware": "nixos-hardware",
- "nixpkgs": "nixpkgs_7",
+ "nixpkgs": "nixpkgs_6",
+ "nixpkgs-stable": "nixpkgs-stable_2",
+ "nixpkgs-unstable": "nixpkgs-unstable",
"nixpkgs-wayland": "nixpkgs-wayland",
"nur": "nur",
"rosepine-base16": "rosepine-base16",
@@ -2431,7 +2629,8 @@
"smos": "smos",
"spicetify-nix": "spicetify-nix",
"stylix": "stylix",
- "tickler": "tickler"
+ "tickler": "tickler",
+ "wezterm": "wezterm"
}
},
"rosepine-base16": {
@@ -2469,14 +2668,39 @@
"type": "github"
}
},
+ "rust-overlay_2": {
+ "inputs": {
+ "flake-utils": [
+ "wezterm",
+ "flake-utils"
+ ],
+ "nixpkgs": [
+ "wezterm",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1701569797,
+ "narHash": "sha256-ObvQFAPpC5IVbI2GHedSTQVzYxht2qhBgHHQnh3mYTs=",
+ "owner": "oxalica",
+ "repo": "rust-overlay",
+ "rev": "516c9477757b628b157780d96d84e8c82b46dc99",
+ "type": "github"
+ },
+ "original": {
+ "owner": "oxalica",
+ "repo": "rust-overlay",
+ "type": "github"
+ }
+ },
"safe-coloured-text": {
"flake": false,
"locked": {
- "lastModified": 1685693835,
- "narHash": "sha256-9XKM/pWTgPtvOrCaoVFQY9pD5BUuRxN+KiY5kW0PWJY=",
+ "lastModified": 1696884906,
+ "narHash": "sha256-7CanCNOCB5gFwqhEPFIoOojoM1iVJZKF5YRy7unUDuo=",
"owner": "NorfairKing",
"repo": "safe-coloured-text",
- "rev": "b4fd34585472a8b5aaec942bb1bd0748fa3d5aa0",
+ "rev": "50abcbfa2a2ed15c6186fa2381fe818bd93a730b",
"type": "github"
},
"original": {
@@ -2504,11 +2728,11 @@
"safe-coloured-text_3": {
"flake": false,
"locked": {
- "lastModified": 1685693835,
- "narHash": "sha256-9XKM/pWTgPtvOrCaoVFQY9pD5BUuRxN+KiY5kW0PWJY=",
+ "lastModified": 1696884906,
+ "narHash": "sha256-7CanCNOCB5gFwqhEPFIoOojoM1iVJZKF5YRy7unUDuo=",
"owner": "NorfairKing",
"repo": "safe-coloured-text",
- "rev": "b4fd34585472a8b5aaec942bb1bd0748fa3d5aa0",
+ "rev": "50abcbfa2a2ed15c6186fa2381fe818bd93a730b",
"type": "github"
},
"original": {
@@ -2536,11 +2760,11 @@
"safe-coloured-text_5": {
"flake": false,
"locked": {
- "lastModified": 1685693835,
- "narHash": "sha256-9XKM/pWTgPtvOrCaoVFQY9pD5BUuRxN+KiY5kW0PWJY=",
+ "lastModified": 1696884906,
+ "narHash": "sha256-7CanCNOCB5gFwqhEPFIoOojoM1iVJZKF5YRy7unUDuo=",
"owner": "NorfairKing",
"repo": "safe-coloured-text",
- "rev": "b4fd34585472a8b5aaec942bb1bd0748fa3d5aa0",
+ "rev": "50abcbfa2a2ed15c6186fa2381fe818bd93a730b",
"type": "github"
},
"original": {
@@ -2621,13 +2845,15 @@
"inputs": {
"autodocodec": "autodocodec_2",
"autorecorder": "autorecorder",
+ "conformance": "conformance",
"cursor": "cursor",
"cursor-brick": "cursor-brick",
"cursor-dirforest": "cursor-dirforest",
"cursor-fuzzy-time": "cursor-fuzzy-time",
"dekking": "dekking_2",
"dirforest": "dirforest",
- "feedback": "feedback_2",
+ "fast-myers-diff": "fast-myers-diff_2",
+ "feedback": "feedback",
"fuzzy-time": "fuzzy-time",
"get-flake": "get-flake",
"haskell-dependency-graph-nix": "haskell-dependency-graph-nix_2",
@@ -2636,7 +2862,7 @@
"linkcheck": "linkcheck_2",
"looper": "looper",
"mergeful": "mergeful",
- "nixpkgs": "nixpkgs_10",
+ "nixpkgs": "nixpkgs_9",
"openapi-code-generator": "openapi-code-generator_2",
"pre-commit-hooks": "pre-commit-hooks_3",
"safe-coloured-text": "safe-coloured-text_3",
@@ -2649,11 +2875,11 @@
"yesod-static-remote": "yesod-static-remote_2"
},
"locked": {
- "lastModified": 1694525700,
- "narHash": "sha256-yqJiX1/XM+E5H3XsVse0V9q5wL6Mar5AE/cmfB8uzXg=",
+ "lastModified": 1700921883,
+ "narHash": "sha256-qcYlOYcUBugeMu3Rx1dUWaTLgpAQ0CG7GjjoPmES+oE=",
"owner": "NorfairKing",
"repo": "smos",
- "rev": "f7c22878389e4d641467e2b01a40f5a29e462442",
+ "rev": "ff112a35b90dabe9eafaa79cd4470e043670109f",
"type": "github"
},
"original": {
@@ -2665,11 +2891,11 @@
"smos-latest-release": {
"flake": false,
"locked": {
- "lastModified": 1679490515,
- "narHash": "sha256-Jl/8taWRRoD4bvuLvlZeb1I9v/WdMgGsUWsCjkjJoEg=",
+ "lastModified": 1694525700,
+ "narHash": "sha256-yqJiX1/XM+E5H3XsVse0V9q5wL6Mar5AE/cmfB8uzXg=",
"owner": "NorfairKing",
"repo": "smos",
- "rev": "806792c068543fc132a30c996dc1d6b452ea2893",
+ "rev": "f7c22878389e4d641467e2b01a40f5a29e462442",
"type": "github"
},
"original": {
@@ -2687,11 +2913,11 @@
]
},
"locked": {
- "lastModified": 1693075322,
- "narHash": "sha256-O/qmWiE23pzYMSKNhA74jfY1D5TyiJrHx35PYkRx9Gs=",
+ "lastModified": 1699986787,
+ "narHash": "sha256-eYlLWibKtHN/uWJQLzOMRXpoTbO6VcFTfVY4dpgdJcQ=",
"owner": "the-argus",
"repo": "spicetify-nix",
- "rev": "78495ade242ad155942c2e33e3930e4a05963f13",
+ "rev": "3c702af1f717b7876fac08809201b1368d0d956c",
"type": "github"
},
"original": {
@@ -2703,6 +2929,13 @@
"stylix": {
"inputs": {
"base16": "base16",
+ "base16-alacritty": "base16-alacritty",
+ "base16-fish": "base16-fish",
+ "base16-foot": "base16-foot",
+ "base16-helix": "base16-helix",
+ "base16-kitty": "base16-kitty",
+ "base16-tmux": "base16-tmux",
+ "base16-vim": "base16-vim",
"flake-compat": "flake-compat_7",
"home-manager": [
"home-manager"
@@ -2712,11 +2945,11 @@
]
},
"locked": {
- "lastModified": 1694375893,
- "narHash": "sha256-oJGESNjJ/6o6tfuUavBZ7go4Oun7g9YKv7OqaQaY/80=",
+ "lastModified": 1701532764,
+ "narHash": "sha256-Jrizp/nITbul2HBIraQRDw5lyJnzTsj0K9wZUFYX2gg=",
"owner": "danth",
"repo": "stylix",
- "rev": "c3c9f4784b4f08f6676340126858d936edbce1fa",
+ "rev": "17a452c5d58bb90057d49c7e3e613b5e6dc1c0f4",
"type": "github"
},
"original": {
@@ -2728,11 +2961,11 @@
"sydtest": {
"flake": false,
"locked": {
- "lastModified": 1685692408,
- "narHash": "sha256-2cuINpkl9UFyzaQMqQFAeZy1FPzaYpx8Og14HdcLHi0=",
+ "lastModified": 1696883645,
+ "narHash": "sha256-Yr5piSv96hgKC7z7aHqo8kMKJPyL8ZG2lbDb7oFUZxw=",
"owner": "NorfairKing",
"repo": "sydtest",
- "rev": "dcd230e48f164594a473925fa0dbbaf956eb6848",
+ "rev": "6313c1b211d14c1215cdf97b9933675cf9c2adb9",
"type": "github"
},
"original": {
@@ -2760,11 +2993,11 @@
"sydtest_3": {
"flake": false,
"locked": {
- "lastModified": 1690567576,
- "narHash": "sha256-vrcy9IpT88wU2JHgm563l1jV1VHNdLIZzfdp8lIScVY=",
+ "lastModified": 1696883645,
+ "narHash": "sha256-Yr5piSv96hgKC7z7aHqo8kMKJPyL8ZG2lbDb7oFUZxw=",
"owner": "NorfairKing",
"repo": "sydtest",
- "rev": "a3ba5f3096c3dcc58920f61ba8a45191d9020eb4",
+ "rev": "6313c1b211d14c1215cdf97b9933675cf9c2adb9",
"type": "github"
},
"original": {
@@ -2792,11 +3025,11 @@
"sydtest_5": {
"flake": false,
"locked": {
- "lastModified": 1685692408,
- "narHash": "sha256-2cuINpkl9UFyzaQMqQFAeZy1FPzaYpx8Og14HdcLHi0=",
+ "lastModified": 1696883645,
+ "narHash": "sha256-Yr5piSv96hgKC7z7aHqo8kMKJPyL8ZG2lbDb7oFUZxw=",
"owner": "NorfairKing",
"repo": "sydtest",
- "rev": "dcd230e48f164594a473925fa0dbbaf956eb6848",
+ "rev": "6313c1b211d14c1215cdf97b9933675cf9c2adb9",
"type": "github"
},
"original": {
@@ -2850,6 +3083,21 @@
"type": "github"
}
},
+ "systems_12": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
+ }
+ },
"systems_2": {
"locked": {
"lastModified": 1681028828,
@@ -2990,6 +3238,7 @@
"inputs": {
"autodocodec": "autodocodec_4",
"dekking": "dekking_3",
+ "fast-myers-diff": "fast-myers-diff_3",
"haskell-dependency-graph-nix": "haskell-dependency-graph-nix_3",
"intray": [
"intray"
@@ -3013,11 +3262,11 @@
"yesod-static-remote": "yesod-static-remote_3"
},
"locked": {
- "lastModified": 1687442271,
- "narHash": "sha256-unZaJCDQ0G+7F7DO73t2SlUqjKwLpbahwjsocilblUI=",
+ "lastModified": 1700660308,
+ "narHash": "sha256-Z6FrGdmkpNtP6PcFpnp/WWjpM5s9tdvlpTkYo0KDX6k=",
"owner": "NorfairKing",
"repo": "tickler",
- "rev": "b886b2db452c106697d4a682956a50325a9644c3",
+ "rev": "0a2ee157659524c73e4522c8c12c69ea640f67f3",
"type": "github"
},
"original": {
@@ -3035,11 +3284,11 @@
]
},
"locked": {
- "lastModified": 1694528738,
- "narHash": "sha256-aWMEjib5oTqEzF9f3WXffC1cwICo6v/4dYKjwNktV8k=",
+ "lastModified": 1701682826,
+ "narHash": "sha256-2lxeTUGs8Jzz/wjLgWYmZoXn60BYNRMzwHFtxNFUDLU=",
"owner": "numtide",
"repo": "treefmt-nix",
- "rev": "7a49c388d7a6b63bb551b1ddedfa4efab8f400d8",
+ "rev": "affe7fc3f5790e1d0b5ba51bcff0f7ebe465e92d",
"type": "github"
},
"original": {
@@ -3082,11 +3331,11 @@
"validity": {
"flake": false,
"locked": {
- "lastModified": 1685699735,
- "narHash": "sha256-cp9emk/u3KNlZrHj+2jyS1P8ypD7zNoDpTVztanOUjc=",
+ "lastModified": 1696884006,
+ "narHash": "sha256-w2dKXZrNxXm/hsYkef5ZLTDxm3IsIzdj3i2qc1GC+A8=",
"owner": "NorfairKing",
"repo": "validity",
- "rev": "20ddbd625304817694b7ae9dc8751f7456259dd6",
+ "rev": "34e17fe6d92765209f1db8127aee13c74285805d",
"type": "github"
},
"original": {
@@ -3114,11 +3363,11 @@
"validity_3": {
"flake": false,
"locked": {
- "lastModified": 1685699735,
- "narHash": "sha256-cp9emk/u3KNlZrHj+2jyS1P8ypD7zNoDpTVztanOUjc=",
+ "lastModified": 1696884006,
+ "narHash": "sha256-w2dKXZrNxXm/hsYkef5ZLTDxm3IsIzdj3i2qc1GC+A8=",
"owner": "NorfairKing",
"repo": "validity",
- "rev": "20ddbd625304817694b7ae9dc8751f7456259dd6",
+ "rev": "34e17fe6d92765209f1db8127aee13c74285805d",
"type": "github"
},
"original": {
@@ -3146,11 +3395,11 @@
"validity_5": {
"flake": false,
"locked": {
- "lastModified": 1685699735,
- "narHash": "sha256-cp9emk/u3KNlZrHj+2jyS1P8ypD7zNoDpTVztanOUjc=",
+ "lastModified": 1696884006,
+ "narHash": "sha256-w2dKXZrNxXm/hsYkef5ZLTDxm3IsIzdj3i2qc1GC+A8=",
"owner": "NorfairKing",
"repo": "validity",
- "rev": "20ddbd625304817694b7ae9dc8751f7456259dd6",
+ "rev": "34e17fe6d92765209f1db8127aee13c74285805d",
"type": "github"
},
"original": {
@@ -3159,22 +3408,51 @@
"type": "github"
}
},
+ "wezterm": {
+ "inputs": {
+ "flake-utils": "flake-utils_12",
+ "freetype2": "freetype2",
+ "harfbuzz": "harfbuzz",
+ "libpng": "libpng",
+ "nixpkgs": [
+ "nixpkgs"
+ ],
+ "rust-overlay": "rust-overlay_2",
+ "zlib": "zlib"
+ },
+ "locked": {
+ "dir": "nix",
+ "lastModified": 1701646233,
+ "narHash": "sha256-0YCkOFFZSyivYZv1Dwf9EZsUhQ1XjwOGg281HYGfUyw=",
+ "owner": "happenslol",
+ "repo": "wezterm",
+ "rev": "12fae0d739a16a59eafd501a51609e379677fa88",
+ "type": "github"
+ },
+ "original": {
+ "dir": "nix",
+ "owner": "happenslol",
+ "ref": "add-nix-flake",
+ "repo": "wezterm",
+ "type": "github"
+ }
+ },
"wlroots": {
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
- "lastModified": 1695277534,
- "narHash": "sha256-LEIUGXvKR5DYFQUTavC3yifcObvG4XZUUHfxXmu8nEM=",
+ "lastModified": 1701368958,
+ "narHash": "sha256-7kvyoA91etzVEl9mkA/EJfB6z/PltxX7Xc4gcr7/xlo=",
"owner": "wlroots",
"repo": "wlroots",
- "rev": "98a745d926d8048bc30aef11b421df207a01c279",
+ "rev": "5d639394f3e83b01596dcd166a44a9a1a2583350",
"type": "gitlab"
},
"original": {
"host": "gitlab.freedesktop.org",
"owner": "wlroots",
"repo": "wlroots",
- "rev": "98a745d926d8048bc30aef11b421df207a01c279",
+ "rev": "5d639394f3e83b01596dcd166a44a9a1a2583350",
"type": "gitlab"
}
},
@@ -3194,11 +3472,11 @@
]
},
"locked": {
- "lastModified": 1694628480,
- "narHash": "sha256-Qg9hstRw0pvjGu5hStkr2UX1D73RYcQ9Ns/KnZMIm9w=",
+ "lastModified": 1700508250,
+ "narHash": "sha256-X4o/mifI7Nhu0UKYlxx53wIC+gYDo3pVM9L2u3PE2bE=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
- "rev": "8f45a6435069b9e24ebd3160eda736d7a391cbf2",
+ "rev": "eb120ff25265ecacd0fc13d7dab12131b60d0f47",
"type": "github"
},
"original": {
@@ -3210,11 +3488,11 @@
"yesod-autoreload": {
"flake": false,
"locked": {
- "lastModified": 1685727743,
- "narHash": "sha256-fEg03VmYx8cymHnH0j2+0nSVDKOaPbBU4OakVkm4Ols=",
+ "lastModified": 1691567166,
+ "narHash": "sha256-+7sDs7yoxA4FY6qKzNVEIV+mIkp96IjwLZT5z5yLSH0=",
"owner": "NorfairKing",
"repo": "yesod-autoreload",
- "rev": "6901d54fc68cf6bf19d8b5af36874488141414a6",
+ "rev": "dfd89eaa65f77c1f1a5a38810d9513b3649971e4",
"type": "github"
},
"original": {
@@ -3242,11 +3520,11 @@
"yesod-autoreload_3": {
"flake": false,
"locked": {
- "lastModified": 1685727743,
- "narHash": "sha256-fEg03VmYx8cymHnH0j2+0nSVDKOaPbBU4OakVkm4Ols=",
+ "lastModified": 1691567166,
+ "narHash": "sha256-+7sDs7yoxA4FY6qKzNVEIV+mIkp96IjwLZT5z5yLSH0=",
"owner": "NorfairKing",
"repo": "yesod-autoreload",
- "rev": "6901d54fc68cf6bf19d8b5af36874488141414a6",
+ "rev": "dfd89eaa65f77c1f1a5a38810d9513b3649971e4",
"type": "github"
},
"original": {
@@ -3302,6 +3580,23 @@
"repo": "yesod-static-remote",
"type": "github"
}
+ },
+ "zlib": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1484501380,
+ "narHash": "sha256-j5b6aki1ztrzfCqu8y729sPar8GpyQWIrajdzpJC+ww=",
+ "owner": "madler",
+ "repo": "zlib",
+ "rev": "cacf7f1d4e3d44d871b605da3b647f07d718623f",
+ "type": "github"
+ },
+ "original": {
+ "owner": "madler",
+ "repo": "zlib",
+ "rev": "cacf7f1d4e3d44d871b605da3b647f07d718623f",
+ "type": "github"
+ }
}
},
"root": "root",
diff --git a/flake.nix b/flake.nix
index 5710c0e..4294ff8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,10 +4,12 @@
# {{{ Inputs
inputs = {
# Nixpkgs
- nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+ nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11";
+ nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
+ nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
# Home manager
- home-manager.url = "github:nix-community/home-manager";
+ home-manager.url = "github:nix-community/home-manager/release-23.11";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
# NUR
@@ -57,7 +59,7 @@
hyprland.url = "github:hyprwm/Hyprland";
hyprland.inputs.nixpkgs.follows = "nixpkgs";
- # Hyprland (available in nix unstable only atm)
+ # Hyprland-contrib
hyprland-contrib.url = "github:hyprwm/contrib";
hyprland-contrib.inputs.nixpkgs.follows = "nixpkgs";
@@ -101,6 +103,11 @@
matui.url = "github:pkulak/matui";
matui.inputs.nixpkgs.follows = "nixpkgs";
+ # Wezterm nightly
+ # https://github.com/happenslol/wezterm/blob/add-nix-flake/nix/flake.nix
+ wezterm.url = "github:happenslol/wezterm/add-nix-flake?dir=nix";
+ wezterm.inputs.nixpkgs.follows = "nixpkgs";
+
# {{{ Self management
# Smos
smos.url = "github:NorfairKing/smos";
@@ -134,6 +141,9 @@
specialArgs = system: {
inherit inputs outputs;
+
+ spkgs = inputs.nixpkgs-stable.legacyPackages.${system};
+ upkgs = inputs.nixpkgs-unstable.legacyPackages.${system};
};
# }}}
in
@@ -142,7 +152,22 @@
# Acessible through 'nix build', 'nix shell', etc
packages = forAllSystems (system:
let pkgs = nixpkgs.legacyPackages.${system};
- in import ./pkgs { inherit pkgs; }
+ in import ./pkgs { inherit pkgs; } // {
+ nix-tree = (pkgs.nix-tree.overrideAttrs (oldAttrs: {
+ patches =
+ (oldAttrs.patches or [])
+ ++ [
+ (pkgs.fetchpatch {
+ url = "https://github.com/utdemir/nix-tree/pull/68.patch";
+ hash = "sha256-70Xo88ZWzWUYM0qxbW64kYaVwHaYkS2dQWmBGCkL0oA=";
+ })
+ (pkgs.fetchpatch {
+ url = "https://github.com/utdemir/nix-tree/pull/69.patch";
+ hash = "sha256-8LdOKU2pc0tojmquCEqjnovkG3hD7YdTQoC4WSawdAQ=";
+ })
+ ];
+}));
+ }
);
# }}}
# {{{ Bootstrapping and other pinned devshells
@@ -233,6 +258,18 @@
};
in
{
+ nixd = home-manager.lib.homeManagerConfiguration {
+ pkgs = nixpkgs.legacyPackages."x86_64-linux";
+ modules = [
+ ({ lib, config, ... }: {
+ home = {
+ username = "adrielus";
+ homeDirectory = "/home/${config.home.username}";
+ stateVersion = "23.05";
+ };
+ })
+ ];
+ };
"adrielus@tethys" = mkHomeConfig {
system = "x86_64-linux";
hostname = "tethys";
diff --git a/home/features/desktop/spotify.nix b/home/features/desktop/spotify.nix
index 58f5040..abc77db 100644
--- a/home/features/desktop/spotify.nix
+++ b/home/features/desktop/spotify.nix
@@ -2,10 +2,20 @@
let
spicePkgs = inputs.spicetify-nix.packages.${pkgs.system}.default;
themeMap = lib.fix (self: {
- "Catppuccin Mocha" = spicePkgs.themes.catppuccin-mocha;
- "Catppuccin Latte" = spicePkgs.themes.catppuccin-latte;
- "Catppuccin Frappe" = spicePkgs.themes.catppuccin-frappe;
- "Catppuccin Macchiato" = spicePkgs.themes.catppuccin-macchiato;
+ "Catppuccin Mocha" = spicePkgs.themes.catppuccin;
+ "Catppuccin Latte" = spicePkgs.themes.catppuccin;
+ "Catppuccin Frappe" = spicePkgs.themes.catppuccin;
+ "Catppuccin Macchiato" = spicePkgs.themes.catppuccin;
+
+ default.light = self."Catppuccin Latte";
+ default.dark = self."Catppuccin Macchiato";
+ });
+
+ colorschemeMap = lib.fix (self: {
+ "Catppuccin Mocha" = "mocha";
+ "Catppuccin Latte" = "latte";
+ "Catppuccin Frappe" = "frappe";
+ "Catppuccin Macchiato" = "macchiato";
default.light = self."Catppuccin Latte";
default.dark = self."Catppuccin Macchiato";
@@ -16,6 +26,7 @@ in
enable = true;
theme = config.satellite.theming.get themeMap;
+ colorScheme = config.satellite.theming.get colorschemeMap;
enabledExtensions = with spicePkgs.extensions; [
fullAppDisplayMod
diff --git a/home/features/desktop/wezterm/default.nix b/home/features/desktop/wezterm/default.nix
index f17edf6..d9c3734 100644
--- a/home/features/desktop/wezterm/default.nix
+++ b/home/features/desktop/wezterm/default.nix
@@ -1,5 +1,6 @@
-{ pkgs, config, ... }: {
- home.packages = [ pkgs.wezterm ];
+{ inputs, pkgs, config, ... }: {
+ # REASON: the unstable version crashes on launch
+ home.packages = [ inputs.wezterm.packages.${pkgs.system}.default ];
# Create link to config
xdg.configFile."wezterm/colorscheme.lua".text = config.satellite.colorscheme.lua;
diff --git a/home/features/desktop/wezterm/wezterm.lua b/home/features/desktop/wezterm/wezterm.lua
index a8a1a87..99e2bb4 100644
--- a/home/features/desktop/wezterm/wezterm.lua
+++ b/home/features/desktop/wezterm/wezterm.lua
@@ -57,6 +57,7 @@ config.window_background_opacity = colorscheme.transparency.value
-- }}}
-- {{{ Main config options
config.automatically_reload_config = true
+config.check_for_updates = false
-- {{{ Fonts
config.adjust_window_size_when_changing_font_size = false -- Makes it work with fixed window sizes.
diff --git a/home/features/neovim/config/lazy-lock.json b/home/features/neovim/config/lazy-lock.json
index 50b7e11..004e89d 100644
--- a/home/features/neovim/config/lazy-lock.json
+++ b/home/features/neovim/config/lazy-lock.json
@@ -1,79 +1,87 @@
{
- "LuaSnip": { "branch": "master", "commit": "409535b8fc54c650eb845b0c35e0cc7f08810284" },
- "alpha-nvim": { "branch": "main", "commit": "63a860e7ed3ae41ee92481ea65a48fb35431ae21" },
- "catppuccin": { "branch": "main", "commit": "490078b1593c6609e6a50ad5001e7902ea601824" },
+ "LuaSnip": { "branch": "master", "commit": "118263867197a111717b5f13d954cd1ab8124387" },
+ "alpha-nvim": { "branch": "main", "commit": "29074eeb869a6cbac9ce1fbbd04f5f5940311b32" },
+ "catppuccin": { "branch": "main", "commit": "64dc309bc157779691be38bbfc5123584e0a4a85" },
"clipboard-image": { "branch": "main", "commit": "485de5493d196154db30f85665f8ac480ce116a2" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
"cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" },
"cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
- "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
- "conform": { "branch": "master", "commit": "5bf1405fd234d469243ea6f394e0aeec9ea53bd8" },
+ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
+ "conform": { "branch": "master", "commit": "48bc9996ebfe90e7766f46338360f75fd6ecb174" },
"crates": { "branch": "main", "commit": "b8ea20fda2e1029fbbb1bae7a9eab35c84037ca0" },
"dhall-vim": { "branch": "master", "commit": "68500ef46ff3706f46c99db3be7a0c8abcf6a3ae" },
- "dressing.nvim": { "branch": "master", "commit": "6bde51adabba06f7fd4a469885a85f36d78a5f52" },
+ "discord-rich-presence": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
+ "dressing.nvim": { "branch": "master", "commit": "8b7ae53d7f04f33be3439a441db8071c96092d19" },
+ "femaco": { "branch": "main", "commit": "6af458f0196215f397db31a6e1fb2df795811693" },
"fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
"flash": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" },
+ "ftft": { "branch": "master", "commit": "09a72f9adf8ee7c824c517ef8408c9e687453039" },
"github-actions-yaml.vim": { "branch": "master", "commit": "f2f16243447cea174daa6b4a9ffd3ff9213814ef" },
+ "gitlinker": { "branch": "master", "commit": "cc59f732f3d043b626c8702cb725c82e54d35c25" },
"gitlinker.nvim": { "branch": "master", "commit": "cc59f732f3d043b626c8702cb725c82e54d35c25" },
- "gitsigns.nvim": { "branch": "main", "commit": "af0f583cd35286dd6f0e3ed52622728703237e50" },
- "harpoon": { "branch": "master", "commit": "21f4c47c6803d64ddb934a5b314dcb1b8e7365dc" },
+ "gitsigns.nvim": { "branch": "main", "commit": "87640f5a877b18bdd49884dbcac220fed924b867" },
+ "harpoon": { "branch": "master", "commit": "867e212ac153e793f95b316d1731f3ca1894625e" },
"haskell-tools": { "branch": "master", "commit": "92e097c6832405fb64e4c44a7ce8bebe7836cae6" },
"hydra.nvim": { "branch": "master", "commit": "3ced42c0b6a6c85583ff0f221635a7f4c1ab0dd0" },
"hyprland-vim-syntax": { "branch": "main", "commit": "8488a24b50882da969979103b4d668c70e7995b9" },
- "idris2-nvim": { "branch": "main", "commit": "3a2b4d2b5ffeab9e47298456c59c31b4e1ddebc9" },
- "inc-rename.nvim": { "branch": "main", "commit": "ed0f6f2b917cac4eb3259f907da0a481b27a3b7e" },
+ "idris2-nvim": { "branch": "main", "commit": "8bff02984a33264437e70fd9fff4359679d910da" },
+ "inc-rename.nvim": { "branch": "main", "commit": "a48c7cec5c4f00d7438dce5fadb55f4d715ef9f2" },
+ "indent-blankline": { "branch": "master", "commit": "7206c77cb931f79885fc47f88ae18f99148392eb" },
"iron.nvim": { "branch": "master", "commit": "7f876ee3e1f4ea1e5284b1b697cdad5b256e8046" },
"kmonad-vim": { "branch": "master", "commit": "37978445197ab00edeb5b731e9ca90c2b141723f" },
"kotlin-vim": { "branch": "master", "commit": "53fe045906df8eeb07cb77b078fc93acda6c90b8" },
- "lazy.nvim": { "branch": "main", "commit": "dac844ed617dda4f9ec85eb88e9629ad2add5e05" },
- "lean.nvim": { "branch": "main", "commit": "67580fab5bed73920fa3fdd712fc8e805c389c3d" },
+ "lastplace": { "branch": "main", "commit": "0bb6103c506315044872e0f84b1f736c4172bb20" },
+ "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
+ "lean.nvim": { "branch": "main", "commit": "360908674890f3bd92eb41c5b362510dca8fc4cb" },
"live-command.nvim": { "branch": "main", "commit": "d460067d47948725a6f25b20f31ea8bbfdfe4622" },
"lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" },
"lualine": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" },
"magma-nvim": { "branch": "main", "commit": "ff3deba8a879806a51c005e50782130246143d06" },
- "mini.files": { "branch": "main", "commit": "dea80a8147aa4e3025c34d2e2aaa6f2aeb7b21dd" },
- "mini.operators": { "branch": "main", "commit": "15f137f28412517e2248d39cf0663bd3a87aa24a" },
- "mini.surround": { "branch": "main", "commit": "9d1956b576d7051da3a483b251dfc778121c60db" },
+ "mini.comment": { "branch": "main", "commit": "3d9c8009615857e982f09bc5357fc95f2a2175f3" },
+ "mini.files": { "branch": "main", "commit": "173d73f5d0b2a9abbb2d6533a3770fdbbd0c4dcc" },
+ "mini.operators": { "branch": "main", "commit": "7a97e2528a4c274e9da8953d3ba22f493c360a9f" },
+ "mini.surround": { "branch": "main", "commit": "af8129efcabe95fc08a233e9f91569829bed031f" },
"neoconf": { "branch": "main", "commit": "64437787dba70fce50dad7bfbb97d184c5bc340f" },
- "neoconf.nvim": { "branch": "main", "commit": "08f146d53e075055500dca35e93281faff95716b" },
- "neodev.nvim": { "branch": "main", "commit": "9a5c0f0de5c15fba52d4fb83d425d3f4fa7abfa1" },
- "neogit": { "branch": "master", "commit": "e4c428239928425829cb5247e430f26d25d5788e" },
- "neorg": { "branch": "main", "commit": "f296a22864bbac0d94ad00fa18cc8231dbeaa1e3" },
- "neorg-telescope": { "branch": "main", "commit": "1310d4aaefd8149c9839bbe1d5610e94389e2f0e" },
- "nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" },
+ "neoconf.nvim": { "branch": "main", "commit": "64437787dba70fce50dad7bfbb97d184c5bc340f" },
+ "neodev.nvim": { "branch": "main", "commit": "c4ce017bd4bacf60bf59330cec9e93c5d5e104a6" },
+ "neogit": { "branch": "master", "commit": "761e9be2aa7cc4c8ca87f10c8c37108a687b928e" },
+ "neorg": { "branch": "main", "commit": "baaf13a3145534144b795ad37db22bfffd2ad343" },
+ "neorg-telescope": { "branch": "main", "commit": "6a7a677c40fa3c348924a4e2a06a513e0b34c056" },
+ "nui": { "branch": "main", "commit": "c9b4de623d19a85b353ff70d2ae9c77143abe69c" },
"null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
- "nvim-autopairs": { "branch": "master", "commit": "ae5b41ce880a6d850055e262d6dfebd362bb276e" },
- "nvim-cmp": { "branch": "main", "commit": "51f1e11a89ec701221877532ee1a23557d291dd5" },
- "nvim-comment": { "branch": "main", "commit": "e9ac16ab056695cad6461173693069ec070d2b23" },
- "nvim-lspconfig": { "branch": "master", "commit": "a981d4447b92c54a4d464eb1a76b799bc3f9a771" },
+ "nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" },
+ "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" },
+ "nvim-lspconfig": { "branch": "master", "commit": "511609ae0311abfcfaed3c398429a147e895ce2c" },
"nvim-tree": { "branch": "master", "commit": "7d1760f892951dd6a118dae1d7a1d8df5f029edf" },
- "nvim-treesitter": { "branch": "master", "commit": "0791b5ebb590a2d44e20640c52679df1fc42e8ab" },
- "nvim-treesitter-context": { "branch": "master", "commit": "a17c31268b56d53624fdc9cb03a225d4a17cabdb" },
- "nvim-treesitter-textobjects": { "branch": "master", "commit": "9e519b6146512c8e2e702faf8ac48420f4f5deec" },
- "nvim-web-devicons": { "branch": "master", "commit": "ab899311f8ae00a47eae8e0879506cead8eb1561" },
- "nvim_context_vt": { "branch": "master", "commit": "f44f46ecad6e6983fd04dac84c5a5c03815d3427" },
- "paperplanes.nvim": { "branch": "master", "commit": "d704b2e1e594b32d454cc7e0c5f2cf9b391e3cc1" },
- "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" },
- "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
+ "nvim-treesitter": { "branch": "master", "commit": "180e1ca385442e35e1d18420221a148c5e045671" },
+ "nvim-treesitter-context": { "branch": "master", "commit": "cfa8ee19ac9bae9b7fb2958eabe2b45b70c56ccb" },
+ "nvim-treesitter-textobjects": { "branch": "master", "commit": "ec1c5bdb3d87ac971749fa6c7dbc2b14884f1f6a" },
+ "nvim-web-devicons": { "branch": "master", "commit": "5efb8bd06841f91f97c90e16de85e96d57e9c862" },
+ "nvim_context_vt": { "branch": "master", "commit": "a14f9292b4bd68ceed433fc513f287641816dc6d" },
+ "paperlanes": { "branch": "master", "commit": "bd52c54c36ad2e9ac563ae1c6a4f6ed1f5faacd2" },
+ "plenary": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" },
+ "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" },
"purescript-vim": { "branch": "main", "commit": "82348352e6568fcc0385bd7c99a8ead3a479feea" },
"rasi.vim": { "branch": "main", "commit": "eac9969cf935cd4380987dc99bfa10d69d3f34a6" },
"rust-tools": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" },
"rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" },
- "scrap.nvim": { "branch": "main", "commit": "16db44ae9403ec9c4b140394f294475d1af80a18" },
- "smart-splits.nvim": { "branch": "master", "commit": "7aad6019dee974a01333523a5b8e122b7e7da454" },
- "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" },
- "telescope.nvim": { "branch": "master", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" },
- "typst.vim": { "branch": "main", "commit": "6a99324a138c2da69589a8ab2e49375774e43d77" },
- "undotree": { "branch": "master", "commit": "0e11ba7325efbbb3f3bebe06213afa3e7ec75131" },
- "venn.nvim": { "branch": "main", "commit": "c114563960b8fb1197695d42798d1f3e7190b798" },
+ "scrap.nvim": { "branch": "main", "commit": "0f833d8dccaabe49c1ed7a2b24cfd887d9d5003f" },
+ "smart-splits.nvim": { "branch": "master", "commit": "c970c7a3cc7ba635fd73d43c81b40f04c00f5058" },
+ "ssr": { "branch": "main", "commit": "bb323ba621ac647b4ac5638b47666e3ef3c279e1" },
+ "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
+ "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
+ "typst.vim": { "branch": "main", "commit": "5b11b42de1703838ca1bb31dc66e73c002698e49" },
+ "undotree": { "branch": "master", "commit": "36ff7abb6b60980338344982ad4cdf03f7961ecd" },
+ "venn.nvim": { "branch": "main", "commit": "e4d68341a73dd56c64955058821a58295fb337b1" },
"vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
"vim-teal": { "branch": "master", "commit": "d2aa107b257879e774680792a2aebaf9cd5742e0" },
- "vim-tmux-navigator": { "branch": "master", "commit": "cdd66d6a37d991bba7997d593586fc51a5b37aa8" },
- "vim-wakatime": { "branch": "master", "commit": "018fa9a80c27ccf2a8967b9e27890372e5c2fb4f" },
+ "vim-tmux-navigator": { "branch": "master", "commit": "7db70e08ea03b3e4d91f63713d76134512e28d7e" },
"vimux": { "branch": "master", "commit": "616fcb4799674a7a809b14ca2dc155bb6ba25788" },
- "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" },
+ "wakatime": { "branch": "master", "commit": "8c8856327815a077cbebeba8c7456312a3d2c39c" },
+ "web-devicons": { "branch": "master", "commit": "5efb8bd06841f91f97c90e16de85e96d57e9c862" },
+ "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" },
"winbar": { "branch": "main", "commit": "13739fdb31be51a1000486189662596f07a59a31" },
"yuck.vim": { "branch": "master", "commit": "9b5e0370f70cc30383e1dabd6c215475915fe5c3" }
}
\ No newline at end of file
diff --git a/home/features/neovim/config/lua/my/keymaps.lua b/home/features/neovim/config/lua/my/keymaps.lua
index 65a93fd..ef53462 100644
--- a/home/features/neovim/config/lua/my/keymaps.lua
+++ b/home/features/neovim/config/lua/my/keymaps.lua
@@ -89,7 +89,7 @@ function M.setup()
-- In the future, I might get this on my keyboard firmware.
vim.keymap.set({ "i", "v" }, "<f10>", "<Esc>", { desc = "Exit insert mode" }) -- Exit inset mode using *jk*
vim.keymap.set({ "n", "v" }, "<f11>", '"+', { desc = "Use global clipboard" }) -- Use global clipboard with *cp*
- M.nmap("<f12>", ":silent write<cr>", "Save current file") -- Save using *ji*
+ M.nmap("<f12>", "<cmd>silent write<cr>", "Save current file", true) -- Save using *ji*
-- }}}
-- {{{ Shift-Enter for not continuing the current comment
-- This does not preserve intendation. Not sure what a better solution would look like.
diff --git a/home/features/neovim/config/lua/my/plugins/init.lua b/home/features/neovim/config/lua/my/plugins/init.lua
index e1be4ed..39e6191 100644
--- a/home/features/neovim/config/lua/my/plugins/init.lua
+++ b/home/features/neovim/config/lua/my/plugins/init.lua
@@ -95,14 +95,6 @@ return {
end,
},
- -- Helper libs
- {
- "nvim-lua/plenary.nvim",
- -- Autoload when running tests
- cmd = { "PlenaryBustedDirectory", "PlenaryBustedFile" },
- },
- "MunifTanjim/nui.nvim",
- "nvim-tree/nvim-web-devicons", -- nice looking icons
{
"mateiadrielrafael/scrap.nvim",
event = "InsertEnter",
@@ -111,14 +103,6 @@ return {
end,
}, -- vim-abolish rewrite
- {
- "terrortylor/nvim-comment",
- keys = { "gc", "gcc", { "gc", mode = "v" } },
- config = function()
- require("nvim_comment").setup()
- end,
- },
-
{
-- easly switch between tmux and vim panes
"christoomey/vim-tmux-navigator",
@@ -128,13 +112,6 @@ return {
and env.firenvim.not_active(),
},
- {
- -- track time usage
- "wakatime/vim-wakatime",
- event = "VeryLazy",
- cond = env.vscode.not_active() and env.firenvim.not_active(),
- },
-
{
-- show progress for lsp stuff
"j-hui/fidget.nvim",
@@ -144,15 +121,6 @@ return {
config = true,
},
- {
- -- export to pastebin like services
- "rktjmp/paperplanes.nvim",
- opts = {
- provider = "paste.rs",
- },
- cmd = "PP",
- },
-
{
-- case switching + the subvert command
"tpope/vim-abolish",
@@ -187,16 +155,6 @@ return {
keys = "<leader>yg",
},
- {
- -- discord rich presence
- "andweeb/presence.nvim",
- cond = env.vscode.not_active() and env.firenvim.not_active(),
- config = function()
- require("presence"):setup()
- end,
- event = "VeryLazy",
- },
-
-- Live command preview for stuff like :norm
{
"smjonas/live-command.nvim",
@@ -210,16 +168,4 @@ return {
event = "VeryLazy",
-- cond = false,
},
- {
- "mbbill/undotree",
- cmd = "UndotreeToggle",
- init = function()
- vim.keymap.set(
- "n",
- "<leader>u",
- "<cmd>UndotreeToggle<cr>",
- { desc = "[U]ndo tree" }
- )
- end,
- },
}
diff --git a/home/features/neovim/config/lua/my/plugins/luasnip.lua b/home/features/neovim/config/lua/my/plugins/luasnip.lua
index 1499d97..e589e80 100644
--- a/home/features/neovim/config/lua/my/plugins/luasnip.lua
+++ b/home/features/neovim/config/lua/my/plugins/luasnip.lua
@@ -2,6 +2,7 @@ local env = require("my.helpers.env")
local M = {
"L3MON4D3/LuaSnip", -- snippeting engine
+ version = "v2",
cond = env.vscode.not_active(),
}
diff --git a/home/features/neovim/config/lua/my/plugins/mini-files.lua b/home/features/neovim/config/lua/my/plugins/mini-files.lua
index 5dd04f5..aba31d8 100644
--- a/home/features/neovim/config/lua/my/plugins/mini-files.lua
+++ b/home/features/neovim/config/lua/my/plugins/mini-files.lua
@@ -3,8 +3,7 @@ local env = require("my.helpers.env")
local M = {
"echasnovski/mini.files",
- version = "main",
- event = "VeryLazy",
+ keys = { "<C-S-F>" },
cond = env.vscode.not_active() and env.firenvim.not_active(),
}
diff --git a/home/features/neovim/config/lua/my/plugins/mini-operators.lua b/home/features/neovim/config/lua/my/plugins/mini-operators.lua
index 73d3075..d1f13c8 100644
--- a/home/features/neovim/config/lua/my/plugins/mini-operators.lua
+++ b/home/features/neovim/config/lua/my/plugins/mini-operators.lua
@@ -1,6 +1,5 @@
local M = {
"echasnovski/mini.operators",
- version = false,
event = "VeryLazy",
opts = {},
}
diff --git a/home/features/neovim/config/lua/my/plugins/mini-surround.lua b/home/features/neovim/config/lua/my/plugins/mini-surround.lua
index 83d38b7..fc3c31e 100644
--- a/home/features/neovim/config/lua/my/plugins/mini-surround.lua
+++ b/home/features/neovim/config/lua/my/plugins/mini-surround.lua
@@ -1,6 +1,5 @@
local M = {
"echasnovski/mini.surround",
- version = "main",
event = "VeryLazy",
}
diff --git a/home/features/neovim/config/lua/my/runtime.lua b/home/features/neovim/config/lua/my/runtime.lua
index 5bc1401..3edec99 100644
--- a/home/features/neovim/config/lua/my/runtime.lua
+++ b/home/features/neovim/config/lua/my/runtime.lua
@@ -68,8 +68,7 @@ end
-- {{{ Main config runtime
local function recursive_assign(source, destination)
for key, value in pairs(source) do
- if type(value) == "table" then
- destination[key] = destination[key] or {}
+ if type(value) == "table" and type(destination[key]) == "table" then
recursive_assign(value, destination[key])
else
destination[key] = value
@@ -79,7 +78,7 @@ end
function M.configure(opts, context)
if type(opts.vim) == "table" then
- recursive_assign(opts, vim)
+ recursive_assign(opts.vim, vim)
end
if type(opts.keys) == "table" then
@@ -117,10 +116,14 @@ function M.configure(opts, context)
if
type(context) == "table"
and context.opts ~= nil
+ and vim.inspect(context.opts) ~= "{}"
and context.lazy ~= nil
then
-- This is a terrible way to do it :/
- require(context.lazy.name).setup(context.opts)
+ local status, module = pcall(require, context.lazy.name)
+ if status then
+ module.setup(context.opts)
+ end
end
if type(opts.callback) == "function" then
diff --git a/home/features/neovim/default.nix b/home/features/neovim/default.nix
index e39f159..edfc51f 100644
--- a/home/features/neovim/default.nix
+++ b/home/features/neovim/default.nix
@@ -10,23 +10,23 @@ let
rnix-lsp # nix
nil # nix
inputs.nixd.packages.${system}.nixd # nix
- haskell-language-server # haskell
+ # haskell-language-server # haskell
# REASON: marked as broken
# dhall-lsp-server # dhall
- tectonic # something related to latex (?)
+ # tectonic # something related to latex (?)
texlab # latex
nodePackages_latest.vscode-langservers-extracted # web stuff
- python310Packages.python-lsp-server # python
- pyright # python
+ # python310Packages.python-lsp-server # python
+ # pyright # python
rust-analyzer # rust
typst-lsp # typst
# Formatters
- luaformatter # Lua
+ # luaformatter # Lua
stylua # Lua
- black # Python
- yapf # Python
- isort # Reorder python imports
+ # black # Python
+ # yapf # Python
+ # isort # Reorder python imports
nodePackages_latest.purs-tidy # Purescript
nodePackages_latest.prettier # Js & friends
nodePackages_latest.prettier_d_slim # Js & friends
@@ -34,7 +34,7 @@ let
# Linters
ruff # Python linter
- mypy # Python typechecking
+ # mypy # Python typechecking
# Languages
nodePackages.typescript # typescript
@@ -48,20 +48,20 @@ let
update-nix-fetchgit # Useful for nix stuff
tree-sitter # Syntax highlighting
libstdcxx5 # Required by treesitter aparently
- python310Packages.jupytext # Convert between jupyter notebooks and python files
- graphviz # For rust crate graph
+ # python310Packages.jupytext # Convert between jupyter notebooks and python files
+ # graphviz # For rust crate graph
haskellPackages.hoogle # For haskell search
# Preview
- zathura # Pdf reader
- xdotool # For zathura reverse search or whatever it's called
- glow # Md preview in terminal
- pandoc # Md processing
- libsForQt5.falkon # Needed for one of the md preview plugins I tried
+ # zathura # Pdf reader
+ # xdotool # For zathura reverse search or whatever it's called
+ # glow # Md preview in terminal
+ # pandoc # Md processing
+ # libsForQt5.falkon # Needed for one of the md preview plugins I tried
# Latex setup
- texlive.combined.scheme-full # Latex stuff
- python38Packages.pygments # required for latex syntax highlighting
+ # texlive.combined.scheme-full # Latex stuff
+ # python38Packages.pygments # required for latex syntax highlighting
# sage
# sagetex # sage in latex
@@ -146,6 +146,7 @@ let
# }}}
nlib = config.satellite.neovim.lib;
+ lazy = config.satellite.neovim.lazy;
in
{
# {{{ Basic config
@@ -216,6 +217,21 @@ in
tempest = "my.runtime";
};
+ # {{{ libraries
+ # {{{ plenary
+ satellite.neovim.lazy.plenary = {
+ package = "nvim-lua/plenary.nvim";
+ # Autoload when running tests
+ cmd = [ "PlenaryBustedDirectory" "PlenaryBustedFile" ];
+ };
+ # }}}
+ # {{{ nui
+ satellite.neovim.lazy.nui.package = "MunifTanjim/nui.nvim";
+ # }}}
+ # {{{ web-devicons
+ satellite.neovim.lazy.web-devicons.package = "nvim-tree/nvim-web-devicons";
+ # }}}
+ # }}}
# {{{ ui
# {{{ nvim-tree
satellite.neovim.lazy.nvim-tree = {
@@ -232,6 +248,7 @@ in
# {{{ lualine
satellite.neovim.lazy.lualine = {
package = "nvim-lualine/lualine.nvim";
+ dependencies.lua = [ lazy.web-devicons.package ];
env.blacklist = [ "vscode" "firenvim" ];
event = "VeryLazy";
@@ -305,7 +322,22 @@ in
};
# }}}
# }}}
- # {{{ editing
+ # {{{ visual
+ # The line between `ui` and `visual is a bit rought. I currenlty mostly judge
+ # it by vibe.
+ # {{{ indent-blankline
+ satellite.neovim.lazy.indent-blankline = {
+ package = "lukas-reineke/indent-blankline.nvim";
+ main = "ibl";
+ setup = true;
+
+ env.blacklist = [ "vscode" ];
+ event = "BufReadPost";
+ };
+ # }}}
+ # }}}
+ # {{{ editing
+ # {{{ text navigation
# {{{ flash
satellite.neovim.lazy.flash = {
package = "folke/flash.nvim";
@@ -329,6 +361,16 @@ in
opts.modes.char.enabled = false;
};
# }}}
+ # {{{ ftft (quickscope but written in lua)
+ satellite.neovim.lazy.ftft = {
+ package = "gukz/ftFT.nvim";
+
+ env.blacklist = [ "vscode" ];
+ keys = [ "f" "F" "t" "T" ];
+ setup = true;
+ };
+ # }}}
+ # }}}
# {{{ clipboard-image
satellite.neovim.lazy.clipboard-image = {
package = "postfen/clipboard-image.nvim";
@@ -353,6 +395,71 @@ in
};
};
# }}}
+ # {{{ lastplace
+ satellite.neovim.lazy.lastplace = {
+ package = "ethanholz/nvim-lastplace";
+
+ env.blacklist = [ "vscode" ];
+ event = "BufReadPre";
+
+ opts.lastplace_ignore_buftype = [ "quickfix" "nofile" "help" ];
+ };
+ # }}}
+ # {{{ undotree
+ satellite.neovim.lazy.undotree = {
+ package = "mbbill/undotree";
+
+ env.blacklist = [ "vscode" ];
+ cmd = "UndotreeToggle";
+ keys = {
+ mapping = "<leader>u";
+ action = "<cmd>UndoTreeToggle<cr>";
+ desc = "[U]ndo tree";
+ };
+ };
+ # }}}
+ # {{{ ssr (structured search & replace)
+ satellite.neovim.lazy.ssr = {
+ package = "cshuaimin/ssr.nvim";
+
+ env.blacklist = [ "vscode" ];
+ keys = {
+ mode = "nx";
+ mapping = "<leader>rt";
+ action = nlib.thunk /* lua */ ''require("ssr").open()'';
+ desc = "[r]eplace [t]emplate";
+ };
+
+ opts.keymaps.replace_all = "<s-cr>";
+ };
+ # }}}
+ # {{{ edit-code-block (edit injections in separate buffers)
+ satellite.neovim.lazy.edit-code-block = {
+ package = "dawsers/edit-code-block.nvim";
+ dependencies.lua = [ "nvim-treesitter/nvim-treesitter" ];
+ main = "ecb";
+
+ env.blacklist = [ "vscode" ];
+ setup = true;
+ keys = {
+ mapping = "<leader>e";
+ action = "<cmd>EditCodeBlock<cr>";
+ desc = "[e]dit injection";
+ };
+ };
+ # }}}
+ # {{{ mini.comment
+ satellite.neovim.lazy.mini-comment = {
+ package = "echasnovski/mini.comment";
+ name = "mini.comment";
+
+ setup = true;
+ keys = [
+ { mapping = "gc"; mode = "nxv"; }
+ { mapping = "gcc"; }
+ ];
+ };
+ # }}}
# }}}
# {{{ ide
# {{{ conform
@@ -396,7 +503,7 @@ in
# {{{ haskell
satellite.neovim.lazy.haskell-tools = {
package = "mrcjkb/haskell-tools.nvim";
- dependencies.lua = [ "nvim-lua/plenary.nvim" ];
+ dependencies.lua = [ lazy.plenary.package ];
version = "^2";
env.blacklist = [ "vscode" ];
@@ -439,7 +546,7 @@ in
# {{{ crates
satellite.neovim.lazy.crates = {
package = "saecki/crates.nvim";
- dependencies.lua = [ "nvim-lua/plenary.nvim" ];
+ dependencies.lua = [ lazy.plenary.package ];
env.blacklist = [ "vscode" ];
event = "BufReadPost Cargo.toml";
@@ -483,7 +590,7 @@ in
# {{{ Keymap helpers
keymap = mapping: action: desc: {
inherit mapping desc;
- action = nlib.lua ''require("crates").${action}'';
+ action = nlib.lua /* lua */ ''require("crates").${action}'';
};
keyroot = "<leader>lc";
@@ -512,5 +619,47 @@ in
# }}}
# }}}
# }}}
+ # {{{ external
+ # These plugins integrate neovim with external services
+ # {{{ wakatime
+ satellite.neovim.lazy.wakatime = {
+ package = "wakatime/vim-wakatime";
+ env.blacklist = [ "vscode" "firenvim" ];
+ event = "VeryLazy";
+ };
+ # }}}
+ # {{{ discord rich presence
+ satellite.neovim.lazy.discord-rich-presence = {
+ package = "andweeb/presence.nvim";
+ main = "presence";
+
+ env.blacklist = [ "vscode" "firenvim" ];
+ event = "VeryLazy";
+ setup = true;
+ };
+ # }}}
+ # {{{ gitlinker
+ # generate permalinks for code
+ satellite.neovim.lazy.gitlinker =
+ let mapping = "<leader>yg";
+ in
+ {
+ package = "ruifm/gitlinker.nvim";
+ dependencies.lua = [ lazy.plenary.package ];
+
+ env.blacklist = [ "vscode" "firenvim" ];
+ opts.mappings = mapping;
+ keys = mapping;
+ };
+ # }}}
+ # {{{ paperplanes
+ # export to pastebin like services
+ satellite.neovim.lazy.paperlanes = {
+ package = "rktjmp/paperplanes.nvim";
+ cmd = "PP";
+ opts.provider = "paste.rs";
+ };
+ # }}}
+ # }}}
# }}}
}
diff --git a/home/features/persistence.nix b/home/features/persistence.nix
index c20156f..340405e 100644
--- a/home/features/persistence.nix
+++ b/home/features/persistence.nix
@@ -101,7 +101,6 @@
satellite.persistence.at.state.apps.Steam = {
directories = [
".factorio" # TODO: perhaps this should have it's own file?
-
# A couple of games don't play well with bindfs
{
directory = "${config.xdg.dataHome}/Steam";
diff --git a/home/features/wayland/hyprland/default.nix b/home/features/wayland/hyprland/default.nix
index 6dc8265..b71843e 100644
--- a/home/features/wayland/hyprland/default.nix
+++ b/home/features/wayland/hyprland/default.nix
@@ -11,7 +11,7 @@ in
wayland.windowManager.hyprland = {
enable = true;
- package = inputs.hyprland.packages.${pkgs.system}.hyprland;
+ package = pkgs.hyprland;
settings = { };
extraConfig = ''
${builtins.readFile ./hyprland.conf}
diff --git a/home/tethys.nix b/home/tethys.nix
index bf7e2c1..c2c5e3d 100644
--- a/home/tethys.nix
+++ b/home/tethys.nix
@@ -1,4 +1,4 @@
-{ inputs, pkgs, ... }: {
+{ pkgs, ... }: {
imports = [
./global.nix
@@ -7,7 +7,6 @@
./features/desktop/firefox
./features/desktop/discord
./features/cli/productivity
- ./features/cli/khal.nix
./features/cli/pass.nix
./features/neovim
@@ -19,33 +18,32 @@
home.packages = with pkgs; [
# Desktop apps
# {{{ Communication
- signal-desktop # Signal client
+ # signal-desktop # Signal client
element-desktop # Matrix client
- zoom-us # Zoom client 🤮
- inputs.matui.packages.${pkgs.system}.matui # Matrix TUi
+ # zoom-us # Zoom client 🤮
+ # inputs.matui.packages.${pkgs.system}.matui # Matrix TUi
# }}}
# {{{ Editors for different formats
- gimp # Image editing
- lmms # Music software
+ # gimp # Image editing
+ # lmms # Music software
# kicad # PCB editing
- libreoffice # Free office suite
+ # libreoffice # Free office suite
# }}}
# {{{ Gaming
- wine # Windows compat layer or whatever
- lutris # Game launcher
+ # wine # Windows compat layer or whatever
+ # lutris # Game launcher
# }}}
# {{{ Clis
- sherlock # Search for usernames across different websites
+ # sherlock # Search for usernames across different websites
# }}}
# {{{ Misc
obsidian # Notes
- peek # GIF recorder
- mpv # Video player
+ # peek # GIF recorder
+ # mpv # Video player
# plover.dev # steno engine
- qbittorrent # Torrent client
+ # qbittorrent # Torrent client
# google-chrome # Not my primary browser, but sometimes needed in webdev
# obs-studio # video recorder
-
# }}}
];
@@ -66,7 +64,7 @@
# App state I want to keep
at.state.path = "/persist/state";
- # App state which I should be able to delete at any point
+ # App state which I should be able to delete on a whim
at.cache.path = "/persist/local/cache";
};
diff --git a/hosts/nixos/common/global/default.nix b/hosts/nixos/common/global/default.nix
index 4ea608e..69f892e 100644
--- a/hosts/nixos/common/global/default.nix
+++ b/hosts/nixos/common/global/default.nix
@@ -3,7 +3,7 @@
let
# {{{ Imports
imports = [
- inputs.hyprland.nixosModules.default
+ # inputs.hyprland.nixosModules.default
inputs.disko.nixosModules.default
inputs.agenix.nixosModules.default
inputs.stylix.nixosModules.stylix
diff --git a/hosts/nixos/common/global/nix.nix b/hosts/nixos/common/global/nix.nix
index fea353c..a4098d6 100644
--- a/hosts/nixos/common/global/nix.nix
+++ b/hosts/nixos/common/global/nix.nix
@@ -29,7 +29,13 @@
settings = {
# Enable flakes and new 'nix' command
- experimental-features = [ "nix-command" "flakes" "repl-flake" ];
+ experimental-features = [
+ "nix-command"
+ "flakes"
+ "repl-flake"
+ "auto-allocate-uids"
+ # "configurable-impure-env"
+ ];
# Disable warning when rebuilding before commiting
warn-dirty = false;
@@ -39,7 +45,6 @@
# TODO: what is a trusted user?
trusted-users = [ "root" "@wheel" ];
-
};
};
}
diff --git a/hosts/nixos/common/optional/hyprland.nix b/hosts/nixos/common/optional/hyprland.nix
index 790612c..57684d4 100644
--- a/hosts/nixos/common/optional/hyprland.nix
+++ b/hosts/nixos/common/optional/hyprland.nix
@@ -1,6 +1,5 @@
# The main configuration is specified by home-manager
{ inputs, pkgs, ... }: {
programs.hyprland.enable = true;
- programs.hyprland.package =
- inputs.hyprland.packages.${pkgs.system}.hyprland;
+ programs.hyprland.package = pkgs.hyprland;
}
diff --git a/hosts/nixos/common/optional/syncthing.nix b/hosts/nixos/common/optional/syncthing.nix
index 6a6348b..39d4c89 100644
--- a/hosts/nixos/common/optional/syncthing.nix
+++ b/hosts/nixos/common/optional/syncthing.nix
@@ -22,11 +22,7 @@ in
tethys.id = "NGHX5G4-IY3ZXL2-NQMMRQV-2GDQLC6-LIDWSNG-DAJUAQH-KBAP64V-55K2LQ6";
};
- extraOptions = {
- options = {
- crashReportingEnabled = false;
- };
- };
+ extraOptions.options.crashReportingEnabled = false;
};
};
}
diff --git a/hosts/nixos/common/optional/xdg-portal.nix b/hosts/nixos/common/optional/xdg-portal.nix
index e449bb6..c9e68c8 100644
--- a/hosts/nixos/common/optional/xdg-portal.nix
+++ b/hosts/nixos/common/optional/xdg-portal.nix
@@ -3,7 +3,7 @@
xdg.portal = {
enable = true;
xdgOpenUsePortal = true;
- extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+ configPackages = [ pkgs.xdg-desktop-portal-gtk ];
};
environment.systemPackages = [ pkgs.xdg-utils ];
diff --git a/hosts/nixos/tethys/default.nix b/hosts/nixos/tethys/default.nix
index e5600a5..4800519 100644
--- a/hosts/nixos/tethys/default.nix
+++ b/hosts/nixos/tethys/default.nix
@@ -12,7 +12,7 @@
../common/optional/xdg-portal.nix
../common/optional/hyprland.nix
../common/optional/quietboot.nix
- ../common/optional/gitea.nix
+ # ../common/optional/gitea.nix
./hardware
./services/syncthing.nix
diff --git a/modules/common/neovim.nix b/modules/common/neovim.nix
index a24ffec..1a5b154 100644
--- a/modules/common/neovim.nix
+++ b/modules/common/neovim.nix
@@ -46,6 +46,7 @@ let
};
options.action = lib.mkOption {
+ default = null;
type = types.nullOr (types.oneOf [
types.str
myTypes.luaLiteral