diff --git a/common/themes/default.nix b/common/themes/default.nix
index 4bccea8..d99330b 100644
--- a/common/themes/default.nix
+++ b/common/themes/default.nix
@@ -13,7 +13,7 @@ let
catppuccin-latte = {
stylix = {
- image = ./wallpapers/watercag.png;
+ image = ./wallpapers/needygirloverdose.jpg;
base16Scheme = "${inputs.catppuccin-base16}/base16/latte.yaml";
polarity = "light";
};
diff --git a/dotfiles/neovim/ftplugin/tex.lua b/dotfiles/neovim/ftplugin/tex.lua
index d374665..628bd20 100644
--- a/dotfiles/neovim/ftplugin/tex.lua
+++ b/dotfiles/neovim/ftplugin/tex.lua
@@ -33,106 +33,106 @@ vim.opt.foldmethod = "expr"
local abbreviations = {
-- {{{ Greek chars
- { "eps", "\\epsilon" },
- { "delta", "\\delta" },
- { "Delta", "\\Delta" },
- { "pi", "\\pi" },
- { "psi", "\\psi" },
- { "alpha", "\\alpha" },
- { "beta", "\\beta" },
- { "theta", "\\theta" },
- { "gamma", "\\gamma" },
- { "lam", "\\lambda" },
+ { "eps", "\\epsilon" },
+ { "delta", "\\delta" },
+ { "Delta", "\\Delta" },
+ { "pi", "\\pi" },
+ { "psi", "\\psi" },
+ { "alpha", "\\alpha" },
+ { "beta", "\\beta" },
+ { "theta", "\\theta" },
+ { "gamma", "\\gamma" },
+ { "lam", "\\lambda" },
{ "lambda", "\\lambda" },
- { "omega", "\\omega" },
- { "Omega", "\\Omega" },
- { "nuls", "\\varnothing" },
+ { "omega", "\\omega" },
+ { "Omega", "\\Omega" },
+ { "nuls", "\\varnothing" },
-- }}}
-- Other fancy symvols
- { "tmat", "^T" }, -- Tranpose of a matrix
- { "cmat", "^*" }, -- Conjugate of a matrix
- { "sneg", "^C" }, -- Set complement
- { "ortco", "^{\\bot}" }, -- Orthogonal complement
- { "sinter", "^{\\circ}" }, -- Interior of a set
+ { "tmat", "^T" }, -- Tranpose of a matrix
+ { "cmat", "^*" }, -- Conjugate of a matrix
+ { "sneg", "^C" }, -- Set complement
+ { "ortco", "^\\bot" }, -- Orthogonal complement
+ { "sinter", "^\\circ" }, -- Interior of a set
-- Basic commands
{ "mangle", "\\measuredangle" },
{ "aangle", "\\angle" },
- { "sdiff", "\\setminus" },
- { "sst", "\\subset" },
- { "spt", "\\supset" },
- { "sseq", "\\subseteq" },
- { "speq", "\\supseteq" },
- { "nin", "\\not\\in" },
- { "iin", "\\in" },
- { "tto", "\\to" },
- { "land", "\\land" },
- { "lor", "\\lor" },
- { "ssin", "\\sin" },
- { "ccos", "\\cos" },
- { "ttan", "\\ttan" },
- { "ssec", "\\sec" },
- { "lln", "\\ln" },
- { "frl", "\\forall" },
- { "exs", "\\exists" },
- { "iinf", "\\infty" },
- { "ninf", "-\\infty" },
- { "nlnl", "\\pm" }, -- had this as npnp first but it was hard-ish to type
- { "ccup", "\\cup" },
- { "ccap", "\\cap" },
- { "nope", "\\bot" },
- { "yee", "\\top" },
- { "ccan", "\\cancel" },
- { "com", "\\circ" },
- { "mul", "\\cdot" },
- { "smul", "\\times" },
- { "card", "\\#" },
- { "div", "\\|" },
- { "ndiv", "\\not\\|\\:" },
- { "perp", "\\perp" },
+ { "sdiff", "\\setminus" },
+ { "sst", "\\subset" },
+ { "spt", "\\supset" },
+ { "sseq", "\\subseteq" },
+ { "speq", "\\supseteq" },
+ { "nin", "\\not\\in" },
+ { "iin", "\\in" },
+ { "tto", "\\to" },
+ { "land", "\\land" },
+ { "lor", "\\lor" },
+ { "ssin", "\\sin" },
+ { "ccos", "\\cos" },
+ { "ttan", "\\ttan" },
+ { "ssec", "\\sec" },
+ { "lln", "\\ln" },
+ { "frl", "\\forall" },
+ { "exs", "\\exists" },
+ { "iinf", "\\infty" },
+ { "ninf", "-\\infty" },
+ { "nlnl", "\\pm" }, -- had this as npnp first but it was hard-ish to type
+ { "ccup", "\\cup" },
+ { "ccap", "\\cap" },
+ { "nope", "\\bot" },
+ { "yee", "\\top" },
+ { "ccan", "\\cancel" },
+ { "com", "\\circ" },
+ { "mul", "\\cdot" },
+ { "smul", "\\times" },
+ { "card", "\\#" },
+ { "div", "\\|" },
+ { "ndiv", "\\not\\|\\:" },
+ { "perp", "\\perp" },
-- Custom commands
- { "abs", "\\abs" }, -- custom abs command
- { "norm", "\\norm" }, -- custom norm command
- { "iprod", "\\iprod" }, -- custom inner product command
+ { "abs", "\\abs" }, -- custom abs command
+ { "norm", "\\norm" }, -- custom norm command
+ { "iprod", "\\iprod" }, -- custom inner product command
{ "diprod", "\\dprod" }, -- custom self inner product command
- { "prob", "\\prob" }, -- custom probability function
- { "dist", "\\dist" }, -- custom dist function
- { "diam", "\\diam" }, -- custom diam operator
- { "gen", "\\gen" }, -- custom command for group generated by element
- { "ord", "\\ordop" }, -- order of a group
- { "vsm", "\\vecspace" }, -- custom math vector space
+ { "prob", "\\prob" }, -- custom probability function
+ { "dist", "\\dist" }, -- custom dist function
+ { "diam", "\\diam" }, -- custom diam operator
+ { "gen", "\\gen" }, -- custom command for group generated by element
+ { "ord", "\\ordop" }, -- order of a group
+ { "vsm", "\\vecspace" }, -- custom math vector space
}
-- Todo: convert exponents and subscripts
-- to use this more concise notation.
local abolishAbbreviations = {
-- {{{ General phrases
- { "thrf", "therefore" },
- { "bcla", "by contradiction let's assume" },
- { "wlg", "without loss of generality" },
- { "tits", "that is to say," },
- { "wpbd", "we will prove the statement in both directions." },
- { "stam{,s}", "statement{}" },
- { "{ww,tt}{m,i}", "{which,this} {means,implies}" },
- { "cex{,s}", "counterexample{}" },
- { "er{t,s,r}", "{transitivity,symmetry,reflexivity}" },
+ { "thrf", "therefore" },
+ { "bcla", "by contradiction let's assume" },
+ { "wlg", "without loss of generality" },
+ { "tits", "that is to say," },
+ { "wpbd", "we will prove the statement in both directions." },
+ { "stam{,s}", "statement{}" },
+ { "{ww,tt}{m,i}", "{which,this} {means,implies}" },
+ { "cex{,s}", "counterexample{}" },
+ { "er{t,s,r}", "{transitivity,symmetry,reflexivity}" },
-- }}}
-- {{{ Calculus & analysis
- { "ib{p,s}", "integration by {parts,substitution}" },
- { "nb{,h}{,s}", "neighbour{,hood}{}" },
+ { "ib{p,s}", "integration by {parts,substitution}" },
+ { "nb{,h}{,s}", "neighbour{,hood}{}" },
-- }}}
-- {{{ Linear algebra
- { "rref", "reduced row echalon form" },
+ { "rref", "reduced row echalon form" },
{ "eg{va,ve,p}{,s}", "eigen{value,vector,pair}{}" },
- { "mx{,s}", "matri{x,ces}" },
- { "dete{,s}", "determinant{}" },
- { "ort{n,g}", "orto{normal,gonal}" },
- { "l{in,de}", "linearly {independent,dependent}" },
- { "lcon{,s}", "linear combination{}" },
- { "vst{,s}", "vector space{}" }, -- text vector space
+ { "mx{,s}", "matri{x,ces}" },
+ { "dete{,s}", "determinant{}" },
+ { "ort{n,g}", "orto{normal,gonal}" },
+ { "l{in,de}", "linearly {independent,dependent}" },
+ { "lcon{,s}", "linear combination{}" },
+ { "vst{,s}", "vector space{}" }, -- text vector space
{
- "rizz", -- ok please ignore this one 💀
+ "rizz", -- ok please ignore this one 💀
"Riesz vector",
options = A.no_capitalization,
},
@@ -145,7 +145,7 @@ local abolishAbbreviations = {
},
-- }}}
-- {{{ Graph theory
- { "vx{,s}", "vert{ex,ices}" },
+ { "vx{,s}", "vert{ex,ices}" },
{ "edg{,s}", "edge{}" },
-- Graph theory function syntax:
diff --git a/dotfiles/neovim/lua/my/plugins/obsidian.lua b/dotfiles/neovim/lua/my/plugins/obsidian.lua
index f72d987..eb2db2c 100644
--- a/dotfiles/neovim/lua/my/plugins/obsidian.lua
+++ b/dotfiles/neovim/lua/my/plugins/obsidian.lua
@@ -21,6 +21,7 @@ return {
prepend_note_id = true,
},
mappings = {},
+ disable_frontmatter = true,
},
keys = {
{ "<C-O>", "<cmd>ObsidianQuickSwitch<cr>" },
diff --git a/flake.lock b/flake.lock
index 848b38d..5045412 100644
--- a/flake.lock
+++ b/flake.lock
@@ -9,11 +9,11 @@
]
},
"locked": {
- "lastModified": 1684153753,
- "narHash": "sha256-PVbWt3qrjYAK+T5KplFcO+h7aZWfEj1UtyoKlvcDxh0=",
+ "lastModified": 1695384796,
+ "narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=",
"owner": "ryantm",
"repo": "agenix",
- "rev": "db5637d10f797bb251b94ef9040b237f4702cde3",
+ "rev": "1f677b3e161d3bdbfd08a939e8f25de2568e0ef4",
"type": "github"
},
"original": {
@@ -30,11 +30,11 @@
]
},
"locked": {
- "lastModified": 1692117840,
- "narHash": "sha256-BT2URpn3zzcKaOv9RqSASZzOrIMrQdvpIAeBJLz8CZo=",
+ "lastModified": 1692476235,
+ "narHash": "sha256-NGUDp/24HCIVWE0xZNHIdzz3q2WDk7MQz1wC7ub/e2U=",
"owner": "Kirottu",
"repo": "anyrun",
- "rev": "d4b16a7c2b92332dba34af45956cf726e40ec400",
+ "rev": "76af3eb198f376303194c31a83f2399a043acf1b",
"type": "github"
},
"original": {
@@ -83,11 +83,11 @@
"autodocodec_2": {
"flake": false,
"locked": {
- "lastModified": 1678548067,
- "narHash": "sha256-k+D2WEbUrUlwXtiP6FPk/tuX2IEp8+FZOID316nEmJk=",
+ "lastModified": 1690787679,
+ "narHash": "sha256-FsHc4T8PfO4Y0RxQ5IcYy1Nb1XRamfsoDiowzS3Wfzw=",
"owner": "NorfairKing",
"repo": "autodocodec",
- "rev": "fa4d53e6c7694427c9d777b883fc446c4f3651b0",
+ "rev": "f661ec72fd68ef40c1ae8b698e0411989abf8747",
"type": "github"
},
"original": {
@@ -99,16 +99,15 @@
"autodocodec_3": {
"flake": false,
"locked": {
- "lastModified": 1666331698,
- "narHash": "sha256-VrONoycKv3lOwN/oKet3Pix96aFNgK+PmLevzBgSsgY=",
+ "lastModified": 1685692167,
+ "narHash": "sha256-QMlis/+3BAhjhop9m6q3W+MBWg9Z1IhqVokdaWRDVQQ=",
"owner": "NorfairKing",
"repo": "autodocodec",
- "rev": "fdc5171d0f904613b6a8b986a909c7a8ade4d2f1",
+ "rev": "5f23727689555789389ae4fbf41f674d43325814",
"type": "github"
},
"original": {
"owner": "NorfairKing",
- "ref": "flake",
"repo": "autodocodec",
"type": "github"
}
@@ -148,16 +147,15 @@
"autorecorder": {
"flake": false,
"locked": {
- "lastModified": 1667054428,
- "narHash": "sha256-r70uDYTEJ/cn59ldR1f6M5x6OrOXQQzq9QtK6tpTEew=",
+ "lastModified": 1685957501,
+ "narHash": "sha256-UZLjkcEE5FVNvWYSwv9vPkLY9S85W2nlTI01Lrp//y8=",
"owner": "NorfairKing",
"repo": "autorecorder",
- "rev": "ad63034ea9ab05f980e48536a7281f337a498acc",
+ "rev": "0d420b307621575cae04ddbc4000606693349770",
"type": "github"
},
"original": {
"owner": "NorfairKing",
- "ref": "flake",
"repo": "autorecorder",
"type": "github"
}
@@ -199,16 +197,15 @@
"cursor": {
"flake": false,
"locked": {
- "lastModified": 1666975590,
- "narHash": "sha256-jq4Lx3vCaoT30CfsxbLnwYyaH3FynylspOPhAhoDbVo=",
+ "lastModified": 1685977767,
+ "narHash": "sha256-T3B2VUBvCvNGZ2Toa1FnvregOP2tFS3KnGr0GAF7nm4=",
"owner": "NorfairKing",
"repo": "cursor",
- "rev": "967dba32b9362351600c91afc29a270b0e529fe6",
+ "rev": "ae8727c0109d0706019413b36095b50541f37e5a",
"type": "github"
},
"original": {
"owner": "NorfairKing",
- "ref": "flake",
"repo": "cursor",
"type": "github"
}
@@ -216,16 +213,15 @@
"cursor-brick": {
"flake": false,
"locked": {
- "lastModified": 1667047484,
- "narHash": "sha256-wS4loDxhV6T45qdaDvFl1gDEheiY9The2KJIVlWcD/o=",
+ "lastModified": 1692622254,
+ "narHash": "sha256-56FVSv3bnrytmf8CDmGTh3evrYU5Hl7NV6BX/Vs7tHA=",
"owner": "NorfairKing",
"repo": "cursor-brick",
- "rev": "8b7c37e5ec452ada46d86ffef8255c6802b0aeb6",
+ "rev": "7f682cdbf4d79c6aadd10a8141461f177dc8f027",
"type": "github"
},
"original": {
"owner": "NorfairKing",
- "ref": "flake",
"repo": "cursor-brick",
"type": "github"
}
@@ -233,16 +229,15 @@
"cursor-dirforest": {
"flake": false,
"locked": {
- "lastModified": 1667048336,
- "narHash": "sha256-tu04jtSdnHoBquSzKg6m9cEXGXimcTDaiaF3ogL4fVs=",
+ "lastModified": 1692622594,
+ "narHash": "sha256-DmUWMm+JFMTWD1M9Fs5bzkPsf2V84iXpEReyug+c42k=",
"owner": "NorfairKing",
"repo": "cursor-dirforest",
- "rev": "9c38f93c3ca1858a0ec9c59034a53e9df2dbb6c7",
+ "rev": "af4d9b313752021c5f7a220b35829638bca8ce93",
"type": "github"
},
"original": {
"owner": "NorfairKing",
- "ref": "flake",
"repo": "cursor-dirforest",
"type": "github"
}
@@ -250,16 +245,15 @@
"cursor-fuzzy-time": {
"flake": false,
"locked": {
- "lastModified": 1667049333,
- "narHash": "sha256-crcnh28c1JHxLURD1bEg/HrPSuJtIQ2buiBFjFUoxN0=",
+ "lastModified": 1692623616,
+ "narHash": "sha256-mNsDqtDPhkxSqV6SHGDLbC5ZPUM2zaYZmXJB4RYNUuc=",
"owner": "NorfairKing",
"repo": "cursor-fuzzy-time",
- "rev": "af5583fb4ccb9de6107ba7e907f733a37befbb6a",
+ "rev": "46ceb8b78f49c076818569d4d9a178b18bb0376a",
"type": "github"
},
"original": {
"owner": "NorfairKing",
- "ref": "flake",
"repo": "cursor-fuzzy-time",
"type": "github"
}
@@ -305,11 +299,11 @@
"dekking_2": {
"flake": false,
"locked": {
- "lastModified": 1678377090,
- "narHash": "sha256-NFWscfnX7YBi1cNbvqsjmxIZj8rlkUtw6xt7TFYpWg8=",
+ "lastModified": 1685724806,
+ "narHash": "sha256-UkuejkftSl6Xq878dlkBcJJReMAf5jA6l/Uyv2NA6l4=",
"owner": "NorfairKing",
"repo": "dekking",
- "rev": "c097084b56865cc227837340b6084a0582e959f6",
+ "rev": "005ef328e6f486d4d21a9fd1a42e0fb93d4936df",
"type": "github"
},
"original": {
@@ -343,11 +337,11 @@
"utils": "utils"
},
"locked": {
- "lastModified": 1686747123,
- "narHash": "sha256-XUQK9kwHpTeilHoad7L4LjMCCyY13Oq383CoFADecRE=",
+ "lastModified": 1695052866,
+ "narHash": "sha256-agn7F9Oww4oU6nPiw+YiYI9Xb4vOOE73w8PAoBRP4AA=",
"owner": "serokell",
"repo": "deploy-rs",
- "rev": "724463b5a94daa810abfc64a4f87faef4e00f984",
+ "rev": "e3f41832680801d0ee9e2ed33eb63af398b090e9",
"type": "github"
},
"original": {
@@ -359,11 +353,11 @@
"dirforest": {
"flake": false,
"locked": {
- "lastModified": 1678116579,
- "narHash": "sha256-kgWuivFcjm9WDyLlmyE2SGD9jMJE07whLHcgPWu0bL0=",
+ "lastModified": 1692622519,
+ "narHash": "sha256-duFdCU0gRapwDus0KU5z6fv6dEEfV79LsUdjoGpA79o=",
"owner": "NorfairKing",
"repo": "dirforest",
- "rev": "76d09379fd8e58c6d5c7287aeddd5a2d3d281562",
+ "rev": "afa8b27feaabdfd584ed3200d6cc53dab94b29aa",
"type": "github"
},
"original": {
@@ -379,11 +373,11 @@
]
},
"locked": {
- "lastModified": 1689324677,
- "narHash": "sha256-83DCDJwBkulQFQESe37+tG0qUb8JkQLJHJ3Qn7iGx7Q=",
+ "lastModified": 1695380190,
+ "narHash": "sha256-v1TwBU/mKroZZPWYXujAfOHfIaQw44swa50Jgdkr7OE=",
"owner": "nix-community",
"repo": "disko",
- "rev": "7eb09408393faa5b8f3b3524c39cb93d938e8d04",
+ "rev": "98a6ab9b52f8b06db9c3116b1761bbeaf9484408",
"type": "github"
},
"original": {
@@ -411,11 +405,11 @@
"feedback_2": {
"flake": false,
"locked": {
- "lastModified": 1674569327,
- "narHash": "sha256-gFjlU7OTdv+J61F+gfQMwysrXIh7VT/lO/7psEbB7rs=",
+ "lastModified": 1685958424,
+ "narHash": "sha256-CGWA7ipuTn72hLNlwea9SeQxZfQ+KDNgplV3Blu2eYk=",
"owner": "NorfairKing",
"repo": "feedback",
- "rev": "2a9b01b677fe2a272c15e63b10c8ed3d0b8faed8",
+ "rev": "9b2b037be77805507928238ec3c34abec9133631",
"type": "github"
},
"original": {
@@ -497,11 +491,11 @@
},
"flake-compat_4": {
"locked": {
- "lastModified": 1680531544,
- "narHash": "sha256-8qbiDTYb1kGaDADRXTItpcMKQ1TeQVkuof6oEwHUvVA=",
+ "lastModified": 1688025799,
+ "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=",
"owner": "nix-community",
"repo": "flake-compat",
- "rev": "95e78dc12268c5e4878621845c511077f3798729",
+ "rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c",
"type": "github"
},
"original": {
@@ -574,6 +568,22 @@
"type": "github"
}
},
+ "flake-compat_9": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1673956053,
+ "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+ "type": "github"
+ },
+ "original": {
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "type": "github"
+ }
+ },
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
@@ -701,11 +711,11 @@
]
},
"locked": {
- "lastModified": 1685662779,
- "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=",
+ "lastModified": 1693611461,
+ "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3",
+ "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca",
"type": "github"
},
"original": {
@@ -729,24 +739,6 @@
"type": "github"
}
},
- "flake-utils_10": {
- "inputs": {
- "systems": "systems_7"
- },
- "locked": {
- "lastModified": 1685518550,
- "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
@@ -788,11 +780,11 @@
"systems": "systems_4"
},
"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": {
@@ -802,51 +794,6 @@
}
},
"flake-utils_5": {
- "locked": {
- "lastModified": 1659877975,
- "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
- "flake-utils_6": {
- "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_7": {
- "locked": {
- "lastModified": 1667395993,
- "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
- "flake-utils_8": {
"inputs": {
"systems": "systems_5"
},
@@ -864,7 +811,7 @@
"type": "github"
}
},
- "flake-utils_9": {
+ "flake-utils_6": {
"inputs": {
"systems": "systems_6"
},
@@ -882,6 +829,60 @@
"type": "github"
}
},
+ "flake-utils_7": {
+ "inputs": {
+ "systems": "systems_7"
+ },
+ "locked": {
+ "lastModified": 1685518550,
+ "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
+ "flake-utils_8": {
+ "inputs": {
+ "systems": "systems_8"
+ },
+ "locked": {
+ "lastModified": 1685518550,
+ "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
+ "flake-utils_9": {
+ "inputs": {
+ "systems": "systems_9"
+ },
+ "locked": {
+ "lastModified": 1685518550,
+ "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
"fromYaml": {
"flake": false,
"locked": {
@@ -901,16 +902,15 @@
"fuzzy-time": {
"flake": false,
"locked": {
- "lastModified": 1667048935,
- "narHash": "sha256-ZePXuoJZhABvASK7eO8GLpbfcdVF2Rh6KMyAHBTYPA0=",
+ "lastModified": 1692622961,
+ "narHash": "sha256-Vni6YvO59UDmTRuIdXryT5m5EBYUyya9d4wnYXoXM5Q=",
"owner": "NorfairKing",
"repo": "fuzzy-time",
- "rev": "aa3412d157da89b9f21dcda92b5c91a53b36ddd1",
+ "rev": "a1c1d07a861ad984ed5b0fe6f5da74f373e814e6",
"type": "github"
},
"original": {
"owner": "NorfairKing",
- "ref": "flake",
"repo": "fuzzy-time",
"type": "github"
}
@@ -956,6 +956,7 @@
"inputs": {
"nixpkgs": [
"smos",
+ "openapi-code-generator",
"pre-commit-hooks",
"nixpkgs"
]
@@ -975,6 +976,28 @@
}
},
"gitignore_3": {
+ "inputs": {
+ "nixpkgs": [
+ "smos",
+ "pre-commit-hooks",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1660459072,
+ "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "type": "github"
+ }
+ },
+ "gitignore_4": {
"inputs": {
"nixpkgs": [
"tickler",
@@ -997,7 +1020,7 @@
"type": "github"
}
},
- "gitignore_4": {
+ "gitignore_5": {
"inputs": {
"nixpkgs": [
"tickler",
@@ -1026,11 +1049,11 @@
]
},
"locked": {
- "lastModified": 1681571100,
- "narHash": "sha256-Lw6LCn0tVF8f/v47RRthl0ZA/UgFGEEZOUXz5YjPgYM=",
+ "lastModified": 1694949342,
+ "narHash": "sha256-KYwOOYAWsFNM5EGdauew5HOVj9HdWWGcjGy7mLX+V6w=",
"owner": "vinceliuice",
"repo": "grub2-themes",
- "rev": "8cd0ea9b4a3d3cd1b59a4342277f563413fb98d1",
+ "rev": "000171da277b8d0219f90782708d42c700081a44",
"type": "github"
},
"original": {
@@ -1200,16 +1223,15 @@
]
},
"locked": {
- "lastModified": 1692099905,
- "narHash": "sha256-/pSusGhmIdSdAaywQRFA5dVbfdIzlWQTecM+E46+cJ0=",
+ "lastModified": 1695550077,
+ "narHash": "sha256-xoxR/iY69/3lTnnZDP6gf3J46DUKPcf+Y1jH03tfZXE=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "2a6679aa9cc3872c29ba2a57fe1b71b3e3c5649f",
+ "rev": "a88df2fb101778bfd98a17556b3a2618c6c66091",
"type": "github"
},
"original": {
"owner": "nix-community",
- "ref": "release-23.05",
"repo": "home-manager",
"type": "github"
}
@@ -1219,11 +1241,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1693208669,
- "narHash": "sha256-hHFaaUsZ860wvppPeiu7nJn/nXZjJfnqAQEu9SPFE9I=",
+ "lastModified": 1685599623,
+ "narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "5bac4a1c06cd77cf8fc35a658ccb035a6c50cd2c",
+ "rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd",
"type": "github"
},
"original": {
@@ -1235,20 +1257,19 @@
},
"home-manager_4": {
"inputs": {
- "nixpkgs": "nixpkgs_8",
- "utils": "utils_2"
+ "nixpkgs": "nixpkgs_8"
},
"locked": {
- "lastModified": 1685325875,
- "narHash": "sha256-tevlLIMPeVNNYPd9UgjHApAUoFAnw9iohqUyj+LPp88=",
+ "lastModified": 1692099905,
+ "narHash": "sha256-/pSusGhmIdSdAaywQRFA5dVbfdIzlWQTecM+E46+cJ0=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "b372d7f8d5518aaba8a4058a453957460481afbc",
+ "rev": "2a6679aa9cc3872c29ba2a57fe1b71b3e3c5649f",
"type": "github"
},
"original": {
"owner": "nix-community",
- "ref": "release-22.11",
+ "ref": "release-23.05",
"repo": "home-manager",
"type": "github"
}
@@ -1284,11 +1305,11 @@
"xdph": "xdph"
},
"locked": {
- "lastModified": 1691842957,
- "narHash": "sha256-3sS7r5N9PFHBOpw07KphilCY6UMR/UCuvoZ1zTGi9LQ=",
+ "lastModified": 1695558936,
+ "narHash": "sha256-KcSkwSDlrt3Xwtit+NTu2aToiRm5Aho9joj2r6nb19w=",
"owner": "hyprwm",
"repo": "Hyprland",
- "rev": "d20837bef8a41d6bf1732b0e8968b7f2feb9a93f",
+ "rev": "352ceb1117b79cd0bc3fa86ebe435b6909512ddb",
"type": "github"
},
"original": {
@@ -1304,11 +1325,11 @@
]
},
"locked": {
- "lastModified": 1686564083,
- "narHash": "sha256-fBstj/fGsIuy05aBT2djyRsreIkGdjqslVBDtLlzpGs=",
+ "lastModified": 1695455081,
+ "narHash": "sha256-AtAMze2J5Maol28OLQoCFgppRWEy06Mn9RhduXNmhiI=",
"owner": "hyprwm",
"repo": "contrib",
- "rev": "f698ac5c135498224198687b32a524248b9f4e61",
+ "rev": "33663f663e07b4ca52c9165f74e3d793f08b15e7",
"type": "github"
},
"original": {
@@ -1345,11 +1366,11 @@
"ical": {
"flake": false,
"locked": {
- "lastModified": 1679386625,
- "narHash": "sha256-Y/TgKFgM53jSGYbFhXf0QcuhlpLcQAEVAoTVWr/CxPw=",
+ "lastModified": 1685727790,
+ "narHash": "sha256-204vw2bMpUhoUzwYGJ3WP933sCy6T850dlX0avK8/Cs=",
"owner": "NorfairKing",
"repo": "ical",
- "rev": "43776baa8816246519be9703abe8cb0136d00808",
+ "rev": "65b62d97b58665be51d93758b961050f9c19bdae",
"type": "github"
},
"original": {
@@ -1360,11 +1381,11 @@
},
"impermanence": {
"locked": {
- "lastModified": 1684264534,
- "narHash": "sha256-K0zr+ry3FwIo3rN2U/VWAkCJSgBslBisvfRIPwMbuCQ=",
+ "lastModified": 1694622745,
+ "narHash": "sha256-z397+eDhKx9c2qNafL1xv75lC0Q4nOaFlhaU1TINqb8=",
"owner": "nix-community",
"repo": "impermanence",
- "rev": "89253fb1518063556edd5e54509c30ac3089d5e6",
+ "rev": "e9643d08d0d193a2e074a19d4d90c67a874d932e",
"type": "github"
},
"original": {
@@ -1412,11 +1433,11 @@
"nixpkgs-lib": "nixpkgs-lib_4"
},
"locked": {
- "lastModified": 1686485342,
- "narHash": "sha256-LatxRWrB6eQ/m4ymFPkDk64i+/+1SWYRPt/vaJVDiwM=",
+ "lastModified": 1695557304,
+ "narHash": "sha256-HYoJE+KE6/zGHgRI496n9E1abDFaqsl9EnEfGIEEqLo=",
"owner": "nix-community",
"repo": "lib-aggregate",
- "rev": "d3a21fbd3fe5b4b204b8834905cccc513e8567c2",
+ "rev": "cb8bfd550aaaf32a330c1c8870a3d9a5bfa00954",
"type": "github"
},
"original": {
@@ -1444,16 +1465,15 @@
"linkcheck_2": {
"flake": false,
"locked": {
- "lastModified": 1666446235,
- "narHash": "sha256-ZKZJZ7CtVT8PnrZQeyQZGRNhMlmAbeC+lxxbIh0U0ck=",
+ "lastModified": 1685701263,
+ "narHash": "sha256-h6Pw8X+Bd61S/WMPbMYCQl6R7C2intDDEHedI6DPfS4=",
"owner": "NorfairKing",
"repo": "linkcheck",
- "rev": "bb0c6567379232fd9e6d5ae56214804200a63ce0",
+ "rev": "4ce1fd2b63db1401acb6ac87f5696af66837d9df",
"type": "github"
},
"original": {
"owner": "NorfairKing",
- "ref": "flake",
"repo": "linkcheck",
"type": "github"
}
@@ -1477,11 +1497,11 @@
"looper": {
"flake": false,
"locked": {
- "lastModified": 1678379009,
- "narHash": "sha256-zH9KqFkjqKhNy99uavmFCYJEE+CV/P3BcBUJcxFLpWs=",
+ "lastModified": 1685975312,
+ "narHash": "sha256-e5l8bU8c9QIO4H/INtPxwyuIZuVRbvswTaHCZlj383A=",
"owner": "NorfairKing",
"repo": "looper",
- "rev": "65975dd100b162bb1e297be69099ba3ce73d1862",
+ "rev": "a395be4d2edd17d81655baca20b3f68f954f4ce6",
"type": "github"
},
"original": {
@@ -1509,11 +1529,11 @@
"mergeful": {
"flake": false,
"locked": {
- "lastModified": 1666635739,
- "narHash": "sha256-nadbMT/+iGEEeyL1qnSyTS7ZgzsszN9OqJvRp44Gp80=",
+ "lastModified": 1685956552,
+ "narHash": "sha256-NAxASNNg6C8P+zH7AVU3BBnx2qVBa/VPmhrCyo2W1kc=",
"owner": "NorfairKing",
"repo": "mergeful",
- "rev": "63ad193c17e2f5fd403869d1b539684b1a6c5d88",
+ "rev": "3d65752421c2fa49377540dfd95bb26eba19be10",
"type": "github"
},
"original": {
@@ -1621,14 +1641,15 @@
"nix-eval-jobs": {
"inputs": {
"flake-parts": "flake-parts_7",
- "nixpkgs": "nixpkgs_7"
+ "nixpkgs": "nixpkgs_7",
+ "treefmt-nix": "treefmt-nix"
},
"locked": {
- "lastModified": 1686545330,
- "narHash": "sha256-CavS2Zyh9EVZ6Owo1VIaACVIHmxkjQ2QwVOG6y1NSPI=",
+ "lastModified": 1695258303,
+ "narHash": "sha256-5Ibd9qjkAk04y8GyweQF+ciIaPzRaet3xZAmTDOWCng=",
"owner": "nix-community",
"repo": "nix-eval-jobs",
- "rev": "6e321530c2b0eadc175d7733352a9808e139932d",
+ "rev": "39657d146828157ef51c4f2d8bebb96a77075fc6",
"type": "github"
},
"original": {
@@ -1643,11 +1664,11 @@
"nixpkgs": "nixpkgs_5"
},
"locked": {
- "lastModified": 1686489854,
- "narHash": "sha256-kn6mgHOMroQOVAD0fmDsvltua4Qzw6035R51Hj3DZKs=",
+ "lastModified": 1695137077,
+ "narHash": "sha256-wJ8EpYjsqrR4GFAF67wJKmZd4q86KuODWAag4acQL5Q=",
"owner": "nix-community",
"repo": "nixd",
- "rev": "7e320f960ed66ae6447d41202c88557746e771c7",
+ "rev": "e8f144ca50fe71e74d247e5308ae7ce122f0a0e6",
"type": "github"
},
"original": {
@@ -1678,11 +1699,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1691871742,
- "narHash": "sha256-6yDNjfbAMpwzWL4y75fxs6beXHRANfYX8BNSPjYehck=",
+ "lastModified": 1695541019,
+ "narHash": "sha256-rs++zfk41K9ArWkDAlmBDlGlKO8qeRIRzdjo+9SmNFI=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "430a56dd16fe583a812b2df44dca002acab2f4f6",
+ "rev": "61283b30d11f27d5b76439d43f20d0c0c8ff5296",
"type": "github"
},
"original": {
@@ -1694,16 +1715,16 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1687466461,
- "narHash": "sha256-oupXI7g7RPzlpGUfAu1xG4KBK53GrZH8/xeKgKDB4+Q=",
+ "lastModified": 1684570954,
+ "narHash": "sha256-FX5y4Sm87RWwfu9PI71XFvuRpZLowh00FQpIJ1WfXqE=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "ecb441f22067ba1d6312f4932a7c64efa8d19a7b",
+ "rev": "3005f20ce0aaa58169cdee57c8aa12e5f1b6e1b3",
"type": "github"
},
"original": {
"owner": "nixos",
- "ref": "nixos-23.05",
+ "ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
@@ -1764,11 +1785,11 @@
},
"nixpkgs-lib_4": {
"locked": {
- "lastModified": 1686445117,
- "narHash": "sha256-QfbAtKFmh92rv0j1e9d7EDgPLDERn1EY6FGXwKG09SM=",
+ "lastModified": 1695516402,
+ "narHash": "sha256-pL7m8iu1OLs/7ywhh+Q8ltPgmtwbMpi7484yr32zgYI=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
- "rev": "a08e40a9bc625b7ee428bd7b64cdcff516023c5d",
+ "rev": "01fc4cd75e577ac00e7c50b7e5f16cd9b6d633e8",
"type": "github"
},
"original": {
@@ -1795,16 +1816,16 @@
},
"nixpkgs-stable_2": {
"locked": {
- "lastModified": 1678872516,
- "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=",
+ "lastModified": 1685801374,
+ "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8",
+ "rev": "c37ca420157f4abc31e26f436c1145f8951ff373",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-22.11",
+ "ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
@@ -1841,13 +1862,29 @@
"type": "github"
}
},
+ "nixpkgs-stable_5": {
+ "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": 1691654369,
- "narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=",
+ "lastModified": 1695145219,
+ "narHash": "sha256-Eoe9IHbvmo5wEDeJXKFOpKUwxYJIOxKUesounVccNYk=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e",
+ "rev": "5ba549eafcf3e33405e5f66decd1a72356632b96",
"type": "github"
},
"original": {
@@ -1867,11 +1904,11 @@
]
},
"locked": {
- "lastModified": 1686582979,
- "narHash": "sha256-mW81AT6wJK3gCfH+5TaxkbJuLjOPZo6hnGy06i5o9d0=",
+ "lastModified": 1695558343,
+ "narHash": "sha256-DVqYDOuexsT3l11M78YCbbaq0Xg3YP/IBKGalCznK4w=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
- "rev": "202718bda9a95fa4a5a26e3719d4dcb996d4dd64",
+ "rev": "83f9be7d9544e17cfb8adf06683d9f7695ad7925",
"type": "github"
},
"original": {
@@ -1882,46 +1919,48 @@
},
"nixpkgs_10": {
"locked": {
- "lastModified": 1666249138,
- "narHash": "sha256-CzK8NA8xEMKAhvHXB8UMODckcH97sZXm6lziKNWLv0M=",
+ "lastModified": 1685865905,
+ "narHash": "sha256-XJZ/o17eOd2sEsGif+/MQBnfa2DKmndWgJyc7CWajFc=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "44fc3cb097324c9f9f93313dd3f103e78d722968",
+ "rev": "e7603eba51f2c7820c0a182c6bbb351181caa8e7",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-22.05",
+ "ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_11": {
"locked": {
- "lastModified": 1645655918,
- "narHash": "sha256-ZfbEFRW7o237+A1P7eTKhXje435FCAoe0blj2n20Was=",
- "owner": "nixos",
+ "lastModified": 1685866647,
+ "narHash": "sha256-4jKguNHY/edLYImB+uL8jKPL/vpfOvMmSlLAGfxSrnY=",
+ "owner": "NixOS",
"repo": "nixpkgs",
- "rev": "77a7a4197740213879b9a1d2e1788c6c8ade4274",
+ "rev": "a53a3bec10deef6e1cc1caba5bc60f53b959b1e8",
"type": "github"
},
"original": {
- "id": "nixpkgs",
- "type": "indirect"
+ "owner": "NixOS",
+ "ref": "nixpkgs-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
}
},
"nixpkgs_12": {
"locked": {
- "lastModified": 1678898370,
- "narHash": "sha256-xTICr1j+uat5hk9FyuPOFGxpWHdJRibwZC+ATi0RbtE=",
+ "lastModified": 1689261696,
+ "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "ac718d02867a84b42522a0ece52d841188208f2c",
+ "rev": "df1eee2aa65052a18121ed4971081576b25d6b5c",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-unstable",
+ "ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
@@ -1976,11 +2015,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1693636127,
- "narHash": "sha256-ZlS/lFGzK7BJXX2YVGnP3yZi3T9OLOEtBCyMJsb91U8=",
+ "lastModified": 1685865905,
+ "narHash": "sha256-XJZ/o17eOd2sEsGif+/MQBnfa2DKmndWgJyc7CWajFc=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "9075cba53e86dc318d159aee55dc9a7c9a4829c1",
+ "rev": "e7603eba51f2c7820c0a182c6bbb351181caa8e7",
"type": "github"
},
"original": {
@@ -2040,27 +2079,27 @@
},
"nixpkgs_6": {
"locked": {
- "lastModified": 1691693223,
- "narHash": "sha256-9t8ZY1XNAsWqxAJmXgg+GXqF5chORMVnBT6PSHaRV3I=",
+ "lastModified": 1695360818,
+ "narHash": "sha256-JlkN3R/SSoMTa+CasbxS1gq+GpGxXQlNZRUh9+LIy/0=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "18784aac1013da9b442adf29b6c7c228518b5d3f",
+ "rev": "e35dcc04a3853da485a396bdd332217d0ac9054f",
"type": "github"
},
"original": {
"owner": "nixos",
- "ref": "nixos-23.05",
+ "ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_7": {
"locked": {
- "lastModified": 1686544600,
- "narHash": "sha256-QRSZuGex5W+41zqm7NHXcokkgev8WULS8xGyQEpMXtI=",
+ "lastModified": 1695256509,
+ "narHash": "sha256-Je+ZId+dYrx0NOZ8J6le7CwZZdVZAAP5dddxK9kZNfA=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "c1944ee51b8d6885aaa5470fbb010b86c01d6470",
+ "rev": "ff7daa56614b083d3a87e2872917b676e9ba62a6",
"type": "github"
},
"original": {
@@ -2072,43 +2111,43 @@
},
"nixpkgs_8": {
"locked": {
- "lastModified": 1667629849,
- "narHash": "sha256-P+v+nDOFWicM4wziFK9S/ajF2lc0N2Rg9p6Y35uMoZI=",
+ "lastModified": 1687466461,
+ "narHash": "sha256-oupXI7g7RPzlpGUfAu1xG4KBK53GrZH8/xeKgKDB4+Q=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "3bacde6273b09a21a8ccfba15586fb165078fb62",
+ "rev": "ecb441f22067ba1d6312f4932a7c64efa8d19a7b",
"type": "github"
},
"original": {
"owner": "nixos",
- "ref": "nixos-unstable",
+ "ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_9": {
"locked": {
- "lastModified": 1688392541,
- "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=",
+ "lastModified": 1692525914,
+ "narHash": "sha256-MUgZ9/9mE/EbEQA6JPdcQHkjoR5fgvaKhpy6UO67uEc=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b",
+ "rev": "475d5ae2c4cb87b904545bdb547af05681198fcc",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-22.11",
+ "ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": {
"locked": {
- "lastModified": 1686588370,
- "narHash": "sha256-PiyR7aK3FtcYXN1uMdjeqNNFfZnjg8E9fPTisMWwXWA=",
+ "lastModified": 1695588692,
+ "narHash": "sha256-1ROivGLV1SfUVO9DQghI6mDkNoE5Q+GdaO+S6hoOKCs=",
"owner": "nix-community",
"repo": "NUR",
- "rev": "b7cd60c7b638706d99bda1568edc8acb675fa0a3",
+ "rev": "ecfcc31148b2270e932799d80b8371eb4c3f41cb",
"type": "github"
},
"original": {
@@ -2136,7 +2175,6 @@
"openapi-code-generator_2": {
"inputs": {
"autodocodec": "autodocodec_3",
- "flake-utils": "flake-utils_5",
"nixpkgs": "nixpkgs_10",
"pre-commit-hooks": "pre-commit-hooks_2",
"safe-coloured-text": "safe-coloured-text_2",
@@ -2144,16 +2182,15 @@
"validity": "validity_2"
},
"locked": {
- "lastModified": 1666818406,
- "narHash": "sha256-uYjZ5M+NeJV5Q4Ps/TicSJJgpzVIJMsEOopBYO5AhmE=",
+ "lastModified": 1687352838,
+ "narHash": "sha256-2P3MZISa6qiwMGrt0Rsc+lPKzFYdvARwUzhvxvj6k3Y=",
"owner": "Haskell-OpenAPI-Code-Generator",
"repo": "Haskell-OpenAPI-Client-Code-Generator",
- "rev": "b37f645f7305c4e1d205db47debb498cb698ee8c",
+ "rev": "aca57e0134f6322ecfaed226b2b4698f60f5a7f6",
"type": "github"
},
"original": {
"owner": "Haskell-OpenAPI-Code-Generator",
- "ref": "flake",
"repo": "Haskell-OpenAPI-Client-Code-Generator",
"type": "github"
}
@@ -2205,15 +2242,18 @@
},
"pre-commit-hooks_2": {
"inputs": {
- "flake-utils": "flake-utils_6",
- "nixpkgs": "nixpkgs_11"
+ "flake-compat": "flake-compat_5",
+ "flake-utils": "flake-utils_5",
+ "gitignore": "gitignore_2",
+ "nixpkgs": "nixpkgs_11",
+ "nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
- "lastModified": 1666160137,
- "narHash": "sha256-8bQu+6poMzUyS2n3C1v3hkO6ZhRzj8Pf3CDCNckqQE4=",
+ "lastModified": 1685970613,
+ "narHash": "sha256-sMbR4zPciUfQ6YHt6GNVxT/yhWJKngvZo8qHzYkaU6E=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
- "rev": "e6c8efee1c108bb27522b9fd25b1cd0eb3288681",
+ "rev": "a117a1cd2c280bf8d499f26370fddfe1923e75e6",
"type": "github"
},
"original": {
@@ -2224,18 +2264,18 @@
},
"pre-commit-hooks_3": {
"inputs": {
- "flake-compat": "flake-compat_5",
- "flake-utils": "flake-utils_7",
- "gitignore": "gitignore_2",
+ "flake-compat": "flake-compat_6",
+ "flake-utils": "flake-utils_6",
+ "gitignore": "gitignore_3",
"nixpkgs": "nixpkgs_12",
- "nixpkgs-stable": "nixpkgs-stable_2"
+ "nixpkgs-stable": "nixpkgs-stable_3"
},
"locked": {
- "lastModified": 1678976941,
- "narHash": "sha256-skNr08frCwN9NO+7I77MjOHHAw+L410/37JknNld+W4=",
+ "lastModified": 1692274144,
+ "narHash": "sha256-BxTQuRUANQ81u8DJznQyPmRsg63t4Yc+0kcyq6OLz8s=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
- "rev": "32b1dbedfd77892a6e375737ef04d8efba634e9e",
+ "rev": "7e3517c03d46159fdbf8c0e5c97f82d5d4b0c8fa",
"type": "github"
},
"original": {
@@ -2246,11 +2286,11 @@
},
"pre-commit-hooks_4": {
"inputs": {
- "flake-compat": "flake-compat_7",
- "flake-utils": "flake-utils_9",
- "gitignore": "gitignore_3",
+ "flake-compat": "flake-compat_8",
+ "flake-utils": "flake-utils_8",
+ "gitignore": "gitignore_4",
"nixpkgs": "nixpkgs_14",
- "nixpkgs-stable": "nixpkgs-stable_3"
+ "nixpkgs-stable": "nixpkgs-stable_4"
},
"locked": {
"lastModified": 1685970613,
@@ -2268,11 +2308,11 @@
},
"pre-commit-hooks_5": {
"inputs": {
- "flake-compat": "flake-compat_8",
- "flake-utils": "flake-utils_10",
- "gitignore": "gitignore_4",
+ "flake-compat": "flake-compat_9",
+ "flake-utils": "flake-utils_9",
+ "gitignore": "gitignore_5",
"nixpkgs": "nixpkgs_15",
- "nixpkgs-stable": "nixpkgs-stable_4"
+ "nixpkgs-stable": "nixpkgs-stable_5"
},
"locked": {
"lastModified": 1685970613,
@@ -2371,16 +2411,15 @@
"safe-coloured-text_2": {
"flake": false,
"locked": {
- "lastModified": 1666332070,
- "narHash": "sha256-Jvx1599QUkgzPhdvSOrxEKKBXF42eYv26EgXwM+RguU=",
+ "lastModified": 1685693835,
+ "narHash": "sha256-9XKM/pWTgPtvOrCaoVFQY9pD5BUuRxN+KiY5kW0PWJY=",
"owner": "NorfairKing",
"repo": "safe-coloured-text",
- "rev": "df6d65d1afb0140d081b685b411dcfe03ae6f789",
+ "rev": "b4fd34585472a8b5aaec942bb1bd0748fa3d5aa0",
"type": "github"
},
"original": {
"owner": "NorfairKing",
- "ref": "flake",
"repo": "safe-coloured-text",
"type": "github"
}
@@ -2388,11 +2427,11 @@
"safe-coloured-text_3": {
"flake": false,
"locked": {
- "lastModified": 1669817722,
- "narHash": "sha256-2RTGykR47BhFYXc0bk9Btrik3t39kS5jr9CUxMlDpUg=",
+ "lastModified": 1685693835,
+ "narHash": "sha256-9XKM/pWTgPtvOrCaoVFQY9pD5BUuRxN+KiY5kW0PWJY=",
"owner": "NorfairKing",
"repo": "safe-coloured-text",
- "rev": "f18578151d579c495eda46b8eeafcddb69adea07",
+ "rev": "b4fd34585472a8b5aaec942bb1bd0748fa3d5aa0",
"type": "github"
},
"original": {
@@ -2452,16 +2491,15 @@
"seocheck_2": {
"flake": false,
"locked": {
- "lastModified": 1666446550,
- "narHash": "sha256-wX5T3XDlhVnrl8+WYhewb5KTLHKvZFwXFqkFhz+xAAw=",
+ "lastModified": 1685701315,
+ "narHash": "sha256-H3i9ng2kO+FYtVoEG07CBS8gLB+qvLnyazwFpCSu5oE=",
"owner": "NorfairKing",
"repo": "seocheck",
- "rev": "274c97eb1f2947d4b0392bf3b98d3d2c44138242",
+ "rev": "6226a03a68c0504cd36870a0859a0f88e058e9d7",
"type": "github"
},
"original": {
"owner": "NorfairKing",
- "ref": "flake",
"repo": "seocheck",
"type": "github"
}
@@ -2534,11 +2572,11 @@
"yesod-static-remote": "yesod-static-remote_2"
},
"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": {
@@ -2550,11 +2588,11 @@
"smos-latest-release": {
"flake": false,
"locked": {
- "lastModified": 1668531566,
- "narHash": "sha256-yn8sFOf0lsOcwVBejvsIUqv32uHzypPY6WTaS1Z63Ho=",
+ "lastModified": 1679490515,
+ "narHash": "sha256-Jl/8taWRRoD4bvuLvlZeb1I9v/WdMgGsUWsCjkjJoEg=",
"owner": "NorfairKing",
"repo": "smos",
- "rev": "82b5121c1f1462159c20d8012b5a89b4c772dcb3",
+ "rev": "806792c068543fc132a30c996dc1d6b452ea2893",
"type": "github"
},
"original": {
@@ -2566,17 +2604,17 @@
},
"spicetify-nix": {
"inputs": {
- "flake-utils": "flake-utils_8",
+ "flake-utils": "flake-utils_7",
"nixpkgs": [
"nixpkgs-unstable"
]
},
"locked": {
- "lastModified": 1686173678,
- "narHash": "sha256-aYzl34xb3u9I57sqkvSldQKltCnxhjvvLABjgFRxOVE=",
+ "lastModified": 1693075322,
+ "narHash": "sha256-O/qmWiE23pzYMSKNhA74jfY1D5TyiJrHx35PYkRx9Gs=",
"owner": "the-argus",
"repo": "spicetify-nix",
- "rev": "f024752b691ac2dcb2ad378d72a2e3084ce83b79",
+ "rev": "78495ade242ad155942c2e33e3930e4a05963f13",
"type": "github"
},
"original": {
@@ -2588,7 +2626,7 @@
"stylix": {
"inputs": {
"base16": "base16",
- "flake-compat": "flake-compat_6",
+ "flake-compat": "flake-compat_7",
"home-manager": [
"home-manager"
],
@@ -2597,11 +2635,11 @@
]
},
"locked": {
- "lastModified": 1690905065,
- "narHash": "sha256-7RP7PJlHlK7yTsKBwvzzin8TX0Iiu4YcRWCr633wApM=",
+ "lastModified": 1694375893,
+ "narHash": "sha256-oJGESNjJ/6o6tfuUavBZ7go4Oun7g9YKv7OqaQaY/80=",
"owner": "danth",
"repo": "stylix",
- "rev": "5f7b55cc690b5ca02d1dc19175cab2ccdd408811",
+ "rev": "c3c9f4784b4f08f6676340126858d936edbce1fa",
"type": "github"
},
"original": {
@@ -2629,16 +2667,15 @@
"sydtest_2": {
"flake": false,
"locked": {
- "lastModified": 1666335564,
- "narHash": "sha256-RUAQuAaCCF+bFXWKQV9lx3Caj9pHp7l5NGnMfBaK05I=",
+ "lastModified": 1685692408,
+ "narHash": "sha256-2cuINpkl9UFyzaQMqQFAeZy1FPzaYpx8Og14HdcLHi0=",
"owner": "NorfairKing",
"repo": "sydtest",
- "rev": "56eb625a7603652f475d0cfd4af50b700e9a5d1e",
+ "rev": "dcd230e48f164594a473925fa0dbbaf956eb6848",
"type": "github"
},
"original": {
"owner": "NorfairKing",
- "ref": "flake",
"repo": "sydtest",
"type": "github"
}
@@ -2646,11 +2683,11 @@
"sydtest_3": {
"flake": false,
"locked": {
- "lastModified": 1676299852,
- "narHash": "sha256-mw0JWNB8SW4H0pYSn1fw8DyMJa7cf7KhedZ1M5TnWJ8=",
+ "lastModified": 1690567576,
+ "narHash": "sha256-vrcy9IpT88wU2JHgm563l1jV1VHNdLIZzfdp8lIScVY=",
"owner": "NorfairKing",
"repo": "sydtest",
- "rev": "2375dbc3b8cc34788dca2baea779f148c173f5b0",
+ "rev": "a3ba5f3096c3dcc58920f61ba8a45191d9020eb4",
"type": "github"
},
"original": {
@@ -2796,19 +2833,48 @@
"type": "github"
}
},
+ "systems_8": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
+ }
+ },
+ "systems_9": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
+ }
+ },
"template-haskell-reload": {
"flake": false,
"locked": {
- "lastModified": 1666974999,
- "narHash": "sha256-TrA3FkupCmo7qE29OydbO/7NQ/JCEgQerrEHBIpSjXc=",
+ "lastModified": 1685954967,
+ "narHash": "sha256-50GE3cFrZsp7x2evD1klatjSa4pmFF+z1az4CP+AVX8=",
"owner": "NorfairKing",
"repo": "template-haskell-reload",
- "rev": "196dd03ac43d1c1bc65fb99d9b93eab7e4b898fe",
+ "rev": "b37bb9bceb03c69620ca30aa8e911912c3e74713",
"type": "github"
},
"original": {
"owner": "NorfairKing",
- "ref": "flake",
"repo": "template-haskell-reload",
"type": "github"
}
@@ -2853,6 +2919,28 @@
"type": "github"
}
},
+ "treefmt-nix": {
+ "inputs": {
+ "nixpkgs": [
+ "nixpkgs-wayland",
+ "nix-eval-jobs",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1694528738,
+ "narHash": "sha256-aWMEjib5oTqEzF9f3WXffC1cwICo6v/4dYKjwNktV8k=",
+ "owner": "numtide",
+ "repo": "treefmt-nix",
+ "rev": "7a49c388d7a6b63bb551b1ddedfa4efab8f400d8",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "treefmt-nix",
+ "type": "github"
+ }
+ },
"typed-uuid": {
"flake": false,
"locked": {
@@ -2884,21 +2972,6 @@
"type": "github"
}
},
- "utils_2": {
- "locked": {
- "lastModified": 1667395993,
- "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
"validity": {
"flake": false,
"locked": {
@@ -2918,16 +2991,15 @@
"validity_2": {
"flake": false,
"locked": {
- "lastModified": 1666331942,
- "narHash": "sha256-xKqunzWw3w7OaKSatckNxn7gCKtusjaj9szhgBWQwAc=",
+ "lastModified": 1685699735,
+ "narHash": "sha256-cp9emk/u3KNlZrHj+2jyS1P8ypD7zNoDpTVztanOUjc=",
"owner": "NorfairKing",
"repo": "validity",
- "rev": "dc24b655564beaa6750e390e37e64f8b0b67e18f",
+ "rev": "20ddbd625304817694b7ae9dc8751f7456259dd6",
"type": "github"
},
"original": {
"owner": "NorfairKing",
- "ref": "flake",
"repo": "validity",
"type": "github"
}
@@ -2935,11 +3007,11 @@
"validity_3": {
"flake": false,
"locked": {
- "lastModified": 1669817739,
- "narHash": "sha256-9b+ZlM5HnTa9naN95QWVwVsssFdX71GA02JFmGxBayA=",
+ "lastModified": 1685699735,
+ "narHash": "sha256-cp9emk/u3KNlZrHj+2jyS1P8ypD7zNoDpTVztanOUjc=",
"owner": "NorfairKing",
"repo": "validity",
- "rev": "a251897dc1eb7e851fd4d3dbc6fa976d22388f27",
+ "rev": "20ddbd625304817694b7ae9dc8751f7456259dd6",
"type": "github"
},
"original": {
@@ -2984,18 +3056,18 @@
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
- "lastModified": 1691073628,
- "narHash": "sha256-LlxE3o3UzRY7APYVLGNKM30DBMcDifCRIQiMVSbYLIc=",
+ "lastModified": 1695277534,
+ "narHash": "sha256-LEIUGXvKR5DYFQUTavC3yifcObvG4XZUUHfxXmu8nEM=",
"owner": "wlroots",
"repo": "wlroots",
- "rev": "c74f89d4f84bfed0284d3908aee5d207698c70c5",
+ "rev": "98a745d926d8048bc30aef11b421df207a01c279",
"type": "gitlab"
},
"original": {
"host": "gitlab.freedesktop.org",
"owner": "wlroots",
"repo": "wlroots",
- "rev": "c74f89d4f84bfed0284d3908aee5d207698c70c5",
+ "rev": "98a745d926d8048bc30aef11b421df207a01c279",
"type": "gitlab"
}
},
@@ -3015,11 +3087,11 @@
]
},
"locked": {
- "lastModified": 1691841170,
- "narHash": "sha256-RCTm1/MVWYPnReMgyp7tr2ogGYo/pvw38jZaFwemgPU=",
+ "lastModified": 1694628480,
+ "narHash": "sha256-Qg9hstRw0pvjGu5hStkr2UX1D73RYcQ9Ns/KnZMIm9w=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
- "rev": "57a3a41ba6b358109e4fc25c6a4706b5f7d93c6b",
+ "rev": "8f45a6435069b9e24ebd3160eda736d7a391cbf2",
"type": "github"
},
"original": {
@@ -3047,11 +3119,11 @@
"yesod-autoreload_2": {
"flake": false,
"locked": {
- "lastModified": 1679385620,
- "narHash": "sha256-/MpCcZQl2wrSL9wM+zWT1SfTNdi8oQ4zJKHYC0QwI4c=",
+ "lastModified": 1691567166,
+ "narHash": "sha256-+7sDs7yoxA4FY6qKzNVEIV+mIkp96IjwLZT5z5yLSH0=",
"owner": "NorfairKing",
"repo": "yesod-autoreload",
- "rev": "1bf9e7188e68ac97c8c0a57310fae2918adffc43",
+ "rev": "dfd89eaa65f77c1f1a5a38810d9513b3649971e4",
"type": "github"
},
"original": {
@@ -3095,11 +3167,11 @@
"yesod-static-remote_2": {
"flake": false,
"locked": {
- "lastModified": 1679385626,
- "narHash": "sha256-459IIlqlE5PV9ZrQxdZDZXTSXXt/ZjTRXNmK11RcmPA=",
+ "lastModified": 1685727661,
+ "narHash": "sha256-4mTiQQtrDsiV2KwYHX/8UHlbDr/oayj+nqJXoTlaPZw=",
"owner": "NorfairKing",
"repo": "yesod-static-remote",
- "rev": "31c66610453058a7be79a0517017dc1e51475f67",
+ "rev": "f3a65a0012b0a82c963ec027732be18d45c0c991",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index eaf9b5c..000ed97 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,13 +4,13 @@
# {{{ Inputs
inputs = {
# Nixpkgs
- nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
+ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
# Nixpkgs-unstable
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
# Home manager
- home-manager.url = "github:nix-community/home-manager/release-23.05";
+ home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
# NUR
diff --git a/home/features/cli/default.nix b/home/features/cli/default.nix
index cfc8591..6f6706b 100644
--- a/home/features/cli/default.nix
+++ b/home/features/cli/default.nix
@@ -1,6 +1,6 @@
{ pkgs, inputs, ... }: {
imports = [
- ./exa.nix
+ ./eza.nix
./bat.nix
./ssh.nix
./gpg.nix
diff --git a/home/features/cli/exa.nix b/home/features/cli/eza.nix
similarity index 56%
rename from home/features/cli/exa.nix
rename to home/features/cli/eza.nix
index bbac9d1..22b0b3d 100644
--- a/home/features/cli/exa.nix
+++ b/home/features/cli/eza.nix
@@ -1,16 +1,17 @@
-{ pkgs, ... }: {
- home.packages = [ pkgs.exa ];
+{ upkgs, lib, ... }: {
+ # REASON: not yet in nixpkgs-stable
+ home.packages = [ upkgs.eza ];
# TODO: generalize alias creation to all shells
programs.fish.shellAliases =
- let exa = "${pkgs.exa}/bin/exa";
+ let eza = lib.getExe upkgs.eza;
in
rec {
- ls = "${exa} --icons --long";
+ ls = "${eza} --icons --long";
la = "${ls} --all";
lt = "${ls} --tree"; # Similar to tree, but also has --long!
# I am used to using pkgs.tree, so this is nice to have!
- tree = "${exa} --icons --tree";
+ tree = "${eza} --icons --tree";
};
}
diff --git a/home/features/neovim/default.nix b/home/features/neovim/default.nix
index 96c0404..2ed45f3 100644
--- a/home/features/neovim/default.nix
+++ b/home/features/neovim/default.nix
@@ -12,7 +12,8 @@ let
nil # nix
inputs.nixd.packages.${system}.nixd # nix
haskell-language-server # haskell
- dhall-lsp-server # dhall
+ # REASON: marked as broken
+ # dhall-lsp-server # dhall
tectonic # something related to latex (?)
texlab # latex
nodePackages_latest.vscode-langservers-extracted # web stuff
diff --git a/home/features/wayland/hyprland/default.nix b/home/features/wayland/hyprland/default.nix
index e6264eb..40098ea 100644
--- a/home/features/wayland/hyprland/default.nix
+++ b/home/features/wayland/hyprland/default.nix
@@ -14,7 +14,8 @@ in
wayland.windowManager.hyprland = {
enable = true;
- recommendedEnvironment = true;
+ package = inputs.hyprland.packages.${pkgs.system}.hyprland;
+ settings = { };
extraConfig = ''
${builtins.readFile ./hyprland.conf}
${hyprland-monitors}
diff --git a/home/global/default.nix b/home/global/default.nix
index 6002a06..e0bfcc7 100644
--- a/home/global/default.nix
+++ b/home/global/default.nix
@@ -6,7 +6,6 @@ let
inputs.homeage.homeManagerModules.homeage
inputs.nur.nixosModules.nur
inputs.impermanence.nixosModules.home-manager.impermanence
- inputs.hyprland.homeManagerModules.default
inputs.spicetify-nix.homeManagerModules.spicetify
inputs.anyrun.homeManagerModules.default
diff --git a/hosts/nixos/common/global/openssh.nix b/hosts/nixos/common/global/openssh.nix
index 2c5a604..4ddae5e 100644
--- a/hosts/nixos/common/global/openssh.nix
+++ b/hosts/nixos/common/global/openssh.nix
@@ -40,7 +40,7 @@ in
# Passwordless sudo when SSH'ing with keys
# TODO: is this safe? Can we ssh back and gain root access this way?
- security.pam.enableSSHAgentAuth = true;
+ # security.pam.enableSSHAgentAuth = true;
# SSH on slow connections
programs.mosh.enable = true;
diff --git a/hosts/nixos/common/optional/hyprland.nix b/hosts/nixos/common/optional/hyprland.nix
index 98dfe35..a71950b 100644
--- a/hosts/nixos/common/optional/hyprland.nix
+++ b/hosts/nixos/common/optional/hyprland.nix
@@ -1,3 +1,6 @@
-{
+{ inputs, pkgs, ... }: {
+
programs.hyprland.enable = true;
+ programs.hyprland.package =
+ inputs.hyprland.packages.${pkgs.system}.hyprland;
}
diff --git a/hosts/nixos/common/optional/syncthing.nix b/hosts/nixos/common/optional/syncthing.nix
index 19551ab..6a6348b 100644
--- a/hosts/nixos/common/optional/syncthing.nix
+++ b/hosts/nixos/common/optional/syncthing.nix
@@ -15,15 +15,17 @@ in
overrideDevices = true;
overrideFolders = true;
- devices = {
- enceladus.id = "QWOAERM-V2FNXPI-TB7NFUS-LKW7JTB-IZY4OEZ-FYDPJNP-6IKPW4Y-YREXDQM";
- lapetus.id = "VVHM7RC-ZSDOZJI-EGBIJR4-2DOGAXG-OEJZWSH-OYUK5XT-7CDMWSL-3AVM2AZ";
- tethys.id = "NGHX5G4-IY3ZXL2-NQMMRQV-2GDQLC6-LIDWSNG-DAJUAQH-KBAP64V-55K2LQ6";
- };
+ settings = {
+ devices = {
+ enceladus.id = "QWOAERM-V2FNXPI-TB7NFUS-LKW7JTB-IZY4OEZ-FYDPJNP-6IKPW4Y-YREXDQM";
+ lapetus.id = "VVHM7RC-ZSDOZJI-EGBIJR4-2DOGAXG-OEJZWSH-OYUK5XT-7CDMWSL-3AVM2AZ";
+ tethys.id = "NGHX5G4-IY3ZXL2-NQMMRQV-2GDQLC6-LIDWSNG-DAJUAQH-KBAP64V-55K2LQ6";
+ };
- extraOptions = {
- options = {
- crashReportingEnabled = false;
+ extraOptions = {
+ options = {
+ crashReportingEnabled = false;
+ };
};
};
};
diff --git a/hosts/nixos/common/users/adrielus.nix b/hosts/nixos/common/users/adrielus.nix
index 18818c8..5f2fb6e 100644
--- a/hosts/nixos/common/users/adrielus.nix
+++ b/hosts/nixos/common/users/adrielus.nix
@@ -13,7 +13,7 @@
isNormalUser = true;
# File containing my password, managed by agenix
- passwordFile = config.age.secrets.adrielusPassword.path;
+ hashedPasswordFile = config.age.secrets.adrielusPassword.path;
# Set default shell
shell = pkgs.fish;
diff --git a/hosts/nixos/lapetus/services/syncthing.nix b/hosts/nixos/lapetus/services/syncthing.nix
index b6412e9..4f520a3 100644
--- a/hosts/nixos/lapetus/services/syncthing.nix
+++ b/hosts/nixos/lapetus/services/syncthing.nix
@@ -6,6 +6,6 @@
services.syncthing = {
guiAddress = "0.0.0.0:8384"; # TODO: put this behind nginx
- folders = { };
+ settings.folders = { };
};
}
diff --git a/hosts/nixos/tethys/services/syncthing.nix b/hosts/nixos/tethys/services/syncthing.nix
index 5dacd63..6462d71 100644
--- a/hosts/nixos/tethys/services/syncthing.nix
+++ b/hosts/nixos/tethys/services/syncthing.nix
@@ -1,7 +1,7 @@
{
imports = [ ../../common/optional/syncthing.nix ];
- services.syncthing.folders = {
+ services.syncthing.settings.folders = {
"mythical-vault" = {
path = "/home/adrielus/.password-store";
devices = [ "enceladus" "lapetus" ];
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index df3579f..238f0cd 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -2,5 +2,4 @@
{
# example = import ./example.nix;
- font-compat = import ./font-compat.nix;
}
diff --git a/modules/nixos/font-compat.nix b/modules/nixos/font-compat.nix
deleted file mode 100644
index 636714c..0000000
--- a/modules/nixos/font-compat.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ lib, config, ... }: {
- options.fonts.packages = lib.mkOption {
- type = lib.types.listOf lib.types.package;
- };
-
- config.fonts.fonts = config.fonts.packages;
-}
diff --git a/pkgs/vimclip.nix b/pkgs/vimclip.nix
index 60a7b86..4b34123 100644
--- a/pkgs/vimclip.nix
+++ b/pkgs/vimclip.nix
@@ -15,13 +15,15 @@ let vimclip = pkgs.stdenv.mkDerivation rec {
cp ./vimclip $out/bin/vimclip
chmod +x $out/bin/vimclip
'';
+
+ meta.mainProgram = "vimclip";
}; in
pkgs.writeShellScriptBin "vimclip" ''
if [ "wayland" = $XDG_SESSION_TYPE ]
then
export VIMCLIP_CLIPBOARD_COMMAND=${pkgs.wl-clipboard}/bin/wl-copy
else
- export VIMCLIP_CLIPBOARD_COMMAND=${lib.getExe pkgs.xsel}
+ export VIMCLIP_CLIPBOARD_COMMAND=${pkgs.xsel}/bin/xsel
fi
${lib.getExe vimclip}