prescientmoon/satellite
1
Fork 0
Code Activity

Backup

Browse source
This commit is contained in:
Matei Adriel 2023-06-15 20:08:20 +02:00
parent 2533fa1c43
commit 70bbc27dbb
No known key found for this signature in database
17 changed files with 419 additions and 242 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dotfiles/neovim/lazy-lock.json
View file

@ -46,7 +46,7 @@
"nvim-autopairs": { "branch": "master", "commit": "59df87a84c80a357ca8d8fe86e451b93ac476ccc" }, "nvim-autopairs": { "branch": "master", "commit": "59df87a84c80a357ca8d8fe86e451b93ac476ccc" },
"nvim-cmp": { "branch": "main", "commit": "fc0f694af1a742ada77e5b1c91ff405c746f4a26" }, "nvim-cmp": { "branch": "main", "commit": "fc0f694af1a742ada77e5b1c91ff405c746f4a26" },
"nvim-comment": { "branch": "main", "commit": "e9ac16ab056695cad6461173693069ec070d2b23" }, "nvim-comment": { "branch": "main", "commit": "e9ac16ab056695cad6461173693069ec070d2b23" },
"nvim-lspconfig": { "branch": "master", "commit": "9166622781a39a829878d1fd24c174529d996838" }, "nvim-lspconfig": { "branch": "master", "commit": "fefba589c56a5568a089299e36a4c8242502faaa" },
"nvim-tree.lua": { "branch": "master", "commit": "e2a4c9d09d205ebe5f071264f43f73a0077c43a3" }, "nvim-tree.lua": { "branch": "master", "commit": "e2a4c9d09d205ebe5f071264f43f73a0077c43a3" },
"nvim-treesitter": { "branch": "master", "commit": "62146fe415193879290c523b54cb5072e1f5dbbc" }, "nvim-treesitter": { "branch": "master", "commit": "62146fe415193879290c523b54cb5072e1f5dbbc" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "95b76b95eff25e1e64f363938cd853852355d70a" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "95b76b95eff25e1e64f363938cd853852355d70a" },

13
dotfiles/neovim/lua/my/plugins/lspconfig.lua
View file

@ -167,23 +167,30 @@ local servers = {
}, },
}, },
-- }}} -- }}}
-- {{{ Nix
rnix = {}, rnix = {},
nil_ls = {}, nil_ls = {},
nixd = {},
-- }}}
cssls = {}, cssls = {},
jsonls = {}, jsonls = {},
dhall_lsp_server = {}, dhall_lsp_server = {},
typst_lsp = {}, typst_lsp = {},
-- {{{ Inactive
-- pylsp = {}, -- pylsp = {},
-- pyright = {}, -- pyright = {},
-- }}}
} }
-- }}} -- }}}
-- {{{ Capabilities -- {{{ Capabilities
M.capabilities = function() M.capabilities = function()
-- require("lazy").load({ plugins = "hrsh7th/cmp-nvim-lsp" })
local c = require("cmp_nvim_lsp").default_capabilities() local c = require("cmp_nvim_lsp").default_capabilities()
-- Add folding capabilities -- Add folding capabilities
c.textDocument.foldingRange = c.textDocument.foldingRange = {
{ dynamicRegistration = false, lineFoldingOnly = true } dynamicRegistration = false,
lineFoldingOnly = true,
}
return c return c
end end
-- }}} -- }}}

494
flake.lock
View file

@ -2,16 +2,18 @@
"nodes": { "nodes": {
"agenix": { "agenix": {
"inputs": { "inputs": {
"darwin": "darwin",
"home-manager": "home-manager",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1665870395, "lastModified": 1684153753,
"narHash": "sha256-Tsbqb27LDNxOoPLh0gw2hIb6L/6Ow/6lIBvqcHzEKBI=", "narHash": "sha256-PVbWt3qrjYAK+T5KplFcO+h7aZWfEj1UtyoKlvcDxh0=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "a630400067c6d03c9b3e0455347dc8559db14288", "rev": "db5637d10f797bb251b94ef9040b237f4702cde3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -57,6 +59,28 @@
"type": "github" "type": "github"
} }
}, },
"darwin": {
"inputs": {
"nixpkgs": [
"agenix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1673295039,
"narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
"type": "github"
},
"original": {
"owner": "lnl7",
"ref": "master",
"repo": "nix-darwin",
"type": "github"
}
},
"firefox-addons": { "firefox-addons": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
@ -66,18 +90,18 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1678050445, "lastModified": 1686838518,
"narHash": "sha256-hb5npDiqf7JjrBzLxjT537n4cQ3Doc4HFdJsdDbY8QE=", "narHash": "sha256-MqwA95DbSSCmk1mgL12TEdc1rQ7uyqxUDGLikrfj9yw=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "fdf844be089a42aa3a2c9450bc769b33de5856a2", "rev": "c063e239e617477b89a320349bfbf6c1a243c642",
"revCount": 2738, "revCount": 2928,
"type": "git", "type": "git",
"url": "https://gitlab.com/rycee/nur-expressions?dir=pkgs%2ffirefox-addons" "url": "https://gitlab.com/rycee/nur-expressions?dir=pkgs/firefox-addons"
}, },
"original": { "original": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"type": "git", "type": "git",
"url": "https://gitlab.com/rycee/nur-expressions?dir=pkgs%2ffirefox-addons" "url": "https://gitlab.com/rycee/nur-expressions?dir=pkgs/firefox-addons"
} }
}, },
"flake-compat": { "flake-compat": {
@ -130,8 +154,47 @@
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"nixpkgs-wayland", "neovim-nightly-overlay",
"nix-eval-jobs", "nixpkgs"
]
},
"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_2": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1685662779,
"narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3",
"type": "github"
},
"original": {
"id": "flake-parts",
"type": "indirect"
}
},
"flake-parts_3": {
"inputs": {
"nixpkgs-lib": [
"neovim-nightly-overlay",
"hercules-ci-effects",
"hercules-ci-agent",
"nixpkgs" "nixpkgs"
] ]
}, },
@ -149,6 +212,46 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_4": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_2"
},
"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_5": {
"inputs": {
"nixpkgs-lib": [
"nixpkgs-wayland",
"nix-eval-jobs",
"nixpkgs"
]
},
"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-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1629284811, "lastModified": 1629284811,
@ -165,12 +268,15 @@
} }
}, },
"flake-utils_2": { "flake-utils_2": {
"inputs": {
"systems": "systems"
},
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1685518550,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -181,14 +287,14 @@
}, },
"flake-utils_3": { "flake-utils_3": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1681202837, "lastModified": 1685518550,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401", "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -204,11 +310,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1674015718, "lastModified": 1681571100,
"narHash": "sha256-cBgjWD/mR1tiPyVky9Bl5kUrDX6RnARJ+0cEJ4VhbRg=", "narHash": "sha256-Lw6LCn0tVF8f/v47RRthl0ZA/UgFGEEZOUXz5YjPgYM=",
"owner": "vinceliuice", "owner": "vinceliuice",
"repo": "grub2-themes", "repo": "grub2-themes",
"rev": "7c0d8eb7849cd5a4cf6a26c8750dcf71c26f2b0f", "rev": "8cd0ea9b4a3d3cd1b59a4342277f563413fb98d1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -217,19 +323,77 @@
"type": "github" "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_3",
"haskell-flake": "haskell-flake",
"nixpkgs": "nixpkgs"
},
"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_2",
"hercules-ci-agent": "hercules-ci-agent",
"nixpkgs": [
"neovim-nightly-overlay",
"nixpkgs"
]
},
"locked": {
"lastModified": 1686181431,
"narHash": "sha256-S1IsZGwcMChJg3mgnKdFxh2c/D77B1NoOCd8s3tQQIg=",
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"rev": "657935127398706754113c1cea5800798ecb99a7",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"agenix",
"nixpkgs" "nixpkgs"
], ]
"utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1678019241, "lastModified": 1682203081,
"narHash": "sha256-ntj0u3guaIu9dT8aZ3HtnEVhIsibtM7EaG/2VteKaTw=", "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e314f6cf211e480ab8fa101a017e593a9bb9f21b", "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -241,21 +405,20 @@
"home-manager_2": { "home-manager_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"stylix",
"nixpkgs" "nixpkgs"
], ]
"utils": "utils_2"
}, },
"locked": { "locked": {
"lastModified": 1680000368, "lastModified": 1686582345,
"narHash": "sha256-TlgC4IJ7aotynUdkGRtaAVxquaiddO38Ws89nB7VGY8=", "narHash": "sha256-z4wLfa++k1d7Y/tQpQYub1D0K0OO9Wju0FZ8U53KUE0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "765e4007b6f9f111469a25d1df6540e8e0ca73a6", "rev": "e753d659c64c7d158433d87ef7d6151ca1d1817a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -290,11 +453,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1684332077, "lastModified": 1686588433,
"narHash": "sha256-briamwodIZsYolceEjX41mqw/VkKiHuIEprw0u5wioY=", "narHash": "sha256-qWuFScv2cokEaH1As3iH5J7fQeYoww6GghrtB96sS0g=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "79b8576df9630ea1c0fb1c6e399a424c3dcdcd47", "rev": "528cfc28891431be116bcaed7e72d4f8497ed009",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -310,11 +473,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1684479483, "lastModified": 1686564083,
"narHash": "sha256-NCkOkgR7PtkAQmYgeYd6vOzkulQjxlf+vWGUmrQu4uw=", "narHash": "sha256-fBstj/fGsIuy05aBT2djyRsreIkGdjqslVBDtLlzpGs=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "contrib", "repo": "contrib",
"rev": "805bedf51a2f75a2279b6fc75b3066ff21f235ee", "rev": "f698ac5c135498224198687b32a524248b9f4e61",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -331,11 +494,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1681065697, "lastModified": 1684265364,
"narHash": "sha256-QPzwwlGKX95tl6ZEshboZbEwwAXww6lNLdVYd6T9Mrc=", "narHash": "sha256-AxNnWbthsuNx73HDQr0eBxrcE3+yfl/WsaXZqUFmkpQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "4d29e48433270a2af06b8bc711ca1fe5109746cd", "rev": "8c279b9fb0f2b031427dc5ef4eab53f2ed835530",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -346,11 +509,11 @@
}, },
"impermanence": { "impermanence": {
"locked": { "locked": {
"lastModified": 1668668915, "lastModified": 1684264534,
"narHash": "sha256-QjY4ZZbs9shwO4LaLpvlU2bO9J1juYhO9NtV3nrbnYQ=", "narHash": "sha256-K0zr+ry3FwIo3rN2U/VWAkCJSgBslBisvfRIPwMbuCQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "5df9108b346f8a42021bf99e50de89c9caa251c3", "rev": "89253fb1518063556edd5e54509c30ac3089d5e6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -362,14 +525,14 @@
"lib-aggregate": { "lib-aggregate": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib_3"
}, },
"locked": { "locked": {
"lastModified": 1681214977, "lastModified": 1686485342,
"narHash": "sha256-pBaG4iKzF/YJQA06f87IZokB15Z13DYd6zsT/wlbWfI=", "narHash": "sha256-LatxRWrB6eQ/m4ymFPkDk64i+/+1SWYRPt/vaJVDiwM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "19d70ca7a81956bd01a768297b84798f301e150f", "rev": "d3a21fbd3fe5b4b204b8834905cccc513e8567c2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -388,11 +551,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1679261557, "lastModified": 1686526357,
"narHash": "sha256-NCWm1gDG7RABdg2uyNn1oEv8oUkWgQZkE189L+SE5p4=", "narHash": "sha256-zbBUpWhXEodDn6eD10osfvYwL3C34zYFiBtkoqgCx4s=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "84027f7515b8ee6f818462f105882fc0052783c4", "rev": "6e1fa16ddecca1b6e10563a75385cedea32f8911",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -405,17 +568,19 @@
"neovim-nightly-overlay": { "neovim-nightly-overlay": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-parts": "flake-parts",
"hercules-ci-effects": "hercules-ci-effects",
"neovim-flake": "neovim-flake", "neovim-flake": "neovim-flake",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1679300129, "lastModified": 1686528280,
"narHash": "sha256-o+2LoOq2bKAAaneMCmsWGqvzhwNkb5OyNm5sQOm2adw=", "narHash": "sha256-xwtaumDA9BWXo6pPjs0mepw+LEPbzyd3KHlq6Lo2zDY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "18c8b70ac8793009bb22bb5c53817ff9c27bdc12", "rev": "403e4544cbcbf406bcb258654fd0cfaecb14a174",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -426,15 +591,15 @@
}, },
"nix-eval-jobs": { "nix-eval-jobs": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts_5",
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1685435187, "lastModified": 1686545330,
"narHash": "sha256-2tSrjl16iHdG6FYMNKS+MdsIDrCWXuKQ0XRWcdbMdFg=", "narHash": "sha256-CavS2Zyh9EVZ6Owo1VIaACVIHmxkjQ2QwVOG6y1NSPI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-eval-jobs", "repo": "nix-eval-jobs",
"rev": "a0e0808280535bc22ffde7d34ecad11014edd6a9", "rev": "6e321530c2b0eadc175d7733352a9808e139932d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -443,29 +608,84 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixd": {
"inputs": {
"flake-parts": "flake-parts_4",
"nixpkgs": "nixpkgs_2"
},
"locked": { "locked": {
"lastModified": 1684171562, "lastModified": 1686489854,
"narHash": "sha256-BMUWjVWAUdyMWKk0ATMC9H0Bv4qAV/TXwwPUvTiC5IQ=", "narHash": "sha256-kn6mgHOMroQOVAD0fmDsvltua4Qzw6035R51Hj3DZKs=",
"owner": "nixos", "owner": "nix-community",
"repo": "nixpkgs", "repo": "nixd",
"rev": "55af203d468a6f5032a519cba4f41acf5a74b638", "rev": "7e320f960ed66ae6447d41202c88557746e771c7",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nix-community",
"ref": "nixos-22.11", "repo": "nixd",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1680213900,
"narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e3652e0735fbec227f342712f180f4f21f0594f2",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1681001314, "dir": "lib",
"narHash": "sha256-5sDnCLdrKZqxLPK4KA8+f4A3YKO/u6ElpMILvX0g72c=", "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_2": {
"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_3": {
"locked": {
"lastModified": 1686445117,
"narHash": "sha256-QfbAtKFmh92rv0j1e9d7EDgPLDERn1EY6FGXwKG09SM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "367c0e1086a4eb4502b24d872cea2c7acdd557f4", "rev": "a08e40a9bc625b7ee428bd7b64cdcff516023c5d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -476,11 +696,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1683408522, "lastModified": 1686501370,
"narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=", "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7", "rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -500,11 +720,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1685496381, "lastModified": 1686582979,
"narHash": "sha256-cWOujDYwKw/zs+FEuD3+/X6A5IGEFO4CXFrEvdKlM6o=", "narHash": "sha256-mW81AT6wJK3gCfH+5TaxkbJuLjOPZo6hnGy06i5o9d0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "b978b691f2ef33b6416cea3cd91db65e2419fd18", "rev": "202718bda9a95fa4a5a26e3719d4dcb996d4dd64",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -515,27 +735,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1681347147, "lastModified": 1686398752,
"narHash": "sha256-B+hTioRc3Jdf4SJyeCiO0fW5ShIznJk2OTiW2vOV+mc=", "narHash": "sha256-nGWNQVhSw4VSL+S0D0cbrNR9vs9Bq7rlYR+1K5f5j6w=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1a9d9175ecc48ecd033062fa09b1834d13ae9c69", "rev": "a30520bf8eabf8a5c37889d661e67a2dbcaa59e6",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1679793451,
"narHash": "sha256-JafTtgMDATE8dZOImBhWMA9RCn9AP8FVOpN+9K/tTlg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0cd51a933d91078775b300cf0f29aa3495231aa2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -545,13 +749,45 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": {
"locked": {
"lastModified": 1686431482,
"narHash": "sha256-oPVQ/0YP7yC2ztNsxvWLrV+f0NQ2QAwxbrZ+bgGydEM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "d3bb401dcfc5a46ce51cdfb5762e70cc75d082d2",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1686544600,
"narHash": "sha256-QRSZuGex5W+41zqm7NHXcokkgev8WULS8xGyQEpMXtI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c1944ee51b8d6885aaa5470fbb010b86c01d6470",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1678056369, "lastModified": 1686588370,
"narHash": "sha256-uTm5WNE6u3cjSmAbqV3WVt7vIYkJ8Tg6fgYmjYRPYtA=", "narHash": "sha256-PiyR7aK3FtcYXN1uMdjeqNNFfZnjg8E9fPTisMWwXWA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "716074f750700c6e2917017c9d51e494babf58ff", "rev": "b7cd60c7b638706d99bda1568edc8acb675fa0a3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -566,13 +802,14 @@
"catppuccin-base16": "catppuccin-base16", "catppuccin-base16": "catppuccin-base16",
"firefox-addons": "firefox-addons", "firefox-addons": "firefox-addons",
"grub2-themes": "grub2-themes", "grub2-themes": "grub2-themes",
"home-manager": "home-manager", "home-manager": "home-manager_2",
"homeage": "homeage", "homeage": "homeage",
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprland-contrib": "hyprland-contrib", "hyprland-contrib": "hyprland-contrib",
"impermanence": "impermanence", "impermanence": "impermanence",
"neovim-nightly-overlay": "neovim-nightly-overlay", "neovim-nightly-overlay": "neovim-nightly-overlay",
"nixpkgs": "nixpkgs", "nixd": "nixd",
"nixpkgs": "nixpkgs_3",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nixpkgs-wayland": "nixpkgs-wayland", "nixpkgs-wayland": "nixpkgs-wayland",
"nur": "nur", "nur": "nur",
@ -621,15 +858,19 @@
"inputs": { "inputs": {
"base16": "base16", "base16": "base16",
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
"home-manager": "home-manager_2", "home-manager": [
"nixpkgs": "nixpkgs_3" "home-manager"
],
"nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1684436450, "lastModified": 1686044491,
"narHash": "sha256-P0QN0cJl2+dxymCAnXR2Q89aIXHn0xf8hB+IkYhQ/38=", "narHash": "sha256-AX+iGW94aEXJDVog9oR7sejDbnEnK9JFqxuZ7luS2eI=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "1c953ad0dc9d7f0a8e0dd52b286d2d25dd43f0b5", "rev": "7bcf3ce6c9e9225e87d4e3b0c2e7d27a39954c02",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -653,33 +894,18 @@
"type": "github" "type": "github"
} }
}, },
"utils": { "systems_2": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1681028828,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "numtide", "owner": "nix-systems",
"repo": "flake-utils", "repo": "default",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "numtide", "owner": "nix-systems",
"repo": "flake-utils", "repo": "default",
"type": "github"
}
},
"utils_2": {
"locked": {
"lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github" "type": "github"
} }
}, },
@ -687,11 +913,11 @@
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"lastModified": 1682436395, "lastModified": 1686573751,
"narHash": "sha256-GGEjkQO9m7YLYIXIXM76HWdhjg4Ye+oafOtyaFAYKI4=", "narHash": "sha256-5vnFxEMvn4wzT+XKR5Jo8VSn1hXrdf/mWuTmdHhRFBs=",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "6830bfc17fd94709e2cdd4da0af989f102a26e59", "rev": "6e8fb5509f2c94d09d4efa0f9b1f40b37bf73863",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -713,11 +939,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1682439384, "lastModified": 1685385764,
"narHash": "sha256-zHDa8LCZs05TZHQSIZ3ucwyMPglBGHcqTBzfkLjYXTM=", "narHash": "sha256-r+XMyOoRXq+hlfjayb+fyi9kq2JK48TrwuNIAXqlj7U=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "c0e233955568fbea4e859336f6d3d14d51294d7c", "rev": "4d9ff0c17716936e0b5ca577a39e263633901ed1",
"type": "github" "type": "github"
}, },
"original": { "original": {

17
flake.nix
View file

@ -4,11 +4,15 @@
# {{{ Inputs # {{{ Inputs
inputs = { inputs = {
# Nixpkgs # Nixpkgs
nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
# Nixpkgs-unstable # Nixpkgs-unstable
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
# Home manager
home-manager.url = "github:nix-community/home-manager/release-23.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
# NUR # NUR
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
@ -16,10 +20,6 @@
firefox-addons.url = "git+https://gitlab.com/rycee/nur-expressions?dir=pkgs/firefox-addons"; firefox-addons.url = "git+https://gitlab.com/rycee/nur-expressions?dir=pkgs/firefox-addons";
firefox-addons.inputs.nixpkgs.follows = "nixpkgs"; firefox-addons.inputs.nixpkgs.follows = "nixpkgs";
# Home manager
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
# Agenix # Agenix
agenix.url = "github:ryantm/agenix"; agenix.url = "github:ryantm/agenix";
agenix.inputs.nixpkgs.follows = "nixpkgs"; agenix.inputs.nixpkgs.follows = "nixpkgs";
@ -34,6 +34,8 @@
# Stylix # Stylix
stylix.url = "github:danth/stylix"; stylix.url = "github:danth/stylix";
stylix.inputs.nixpkgs.follows = "nixpkgs";
stylix.inputs.home-manager.follows = "home-manager";
# Catpuccin base16 color schemes # Catpuccin base16 color schemes
catppuccin-base16.url = "github:catppuccin/base16"; catppuccin-base16.url = "github:catppuccin/base16";
@ -65,6 +67,11 @@
# Contains a bunch of wayland stuff not on nixpkgs # Contains a bunch of wayland stuff not on nixpkgs
nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
nixpkgs-wayland.inputs.nixpkgs.follows = "nixpkgs-unstable"; nixpkgs-wayland.inputs.nixpkgs.follows = "nixpkgs-unstable";
# Nix language server
# [the docs](https://github.com/nix-community/nixd/blob/main/docs/user-guide.md#installation)
# tell me not to override the nixpkgs input.
nixd.url = "github:nix-community/nixd";
}; };
# }}} # }}}

4
home/features/desktop/batsignal.nix Normal file
View file

@ -0,0 +1,4 @@
# Notify on low battery percentages.
{
services.batsignal.enable = true;
}

1
home/features/neovim/default.nix
View file

@ -10,6 +10,7 @@ let
upkgs.lua-language-server # lua upkgs.lua-language-server # lua
rnix-lsp # nix rnix-lsp # nix
nil # nix nil # nix
inputs.nixd.packages.${system}.nixd # nix
haskell-language-server # haskell haskell-language-server # haskell
dhall-lsp-server # dhall dhall-lsp-server # dhall
tectonic # something related to latex (?) tectonic # something related to latex (?)

1
home/features/wayland/default.nix
View file

@ -6,6 +6,7 @@
./dunst.nix ./dunst.nix
./wlsunset.nix ./wlsunset.nix
../desktop/wezterm # Default hyprland terminal ../desktop/wezterm # Default hyprland terminal
../desktop/batsignal.nix
]; ];
# Makes some stuff run on wayland (?) # Makes some stuff run on wayland (?)

2
home/features/wayland/hyprland/hyprland.conf
View file

@ -64,7 +64,7 @@ bind = $mod, Q, exec, wlogout # Show logout menu
bind = $mod, L, exec, loginctl lock-session # Lock screen bind = $mod, L, exec, loginctl lock-session # Lock screen
bind = $mod, P, exec, wofi --show drun # Launch app bind = $mod, P, exec, wofi --show drun # Launch app
bind = $mod, B, exec, wlsunset-toggle # Toggle blue light filter thingy bind = $mod, B, exec, wlsunset-toggle # Toggle blue light filter thingy
bind = $mod, V, exec, vimclip # Vim anywhere! bind = $mod, V, exec, wezterm start vimclip # Vim anywhere!
# Work with the special workspace # Work with the special workspace
bind = $mod, x, togglespecialworkspace, bind = $mod, x, togglespecialworkspace,

1
home/features/xorg/default.nix
View file

@ -1,6 +1,7 @@
{ pkgs, ... }: { { pkgs, ... }: {
imports = [ imports = [
../desktop/eww ../desktop/eww
../desktop/batsignal.nix
./rofi ./rofi
./polybar ./polybar
./feh.nix ./feh.nix

3
home/global/default.nix
View file

@ -17,7 +17,6 @@ let
# {{{ Overlays # {{{ Overlays
overlays = [ overlays = [
# inputs.neovim-nightly-overlay.overlay # inputs.neovim-nightly-overlay.overlay
inputs.agenix.overlay
]; ];
# }}} # }}}
in in
@ -51,7 +50,7 @@ in
home = { home = {
username = lib.mkDefault "adrielus"; username = lib.mkDefault "adrielus";
homeDirectory = lib.mkDefault "/home/${config.home.username}"; homeDirectory = lib.mkDefault "/home/${config.home.username}";
stateVersion = lib.mkDefault "22.11"; stateVersion = lib.mkDefault "23.05";
}; };
# Where homeage should look for our ssh key # Where homeage should look for our ssh key

4
home/tethys.nix
View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { { pkgs, inputs, ... }: {
imports = [ imports = [
./global ./global
@ -31,7 +31,7 @@
# obs-studio # video recorder # obs-studio # video recorder
# Clis # Clis
agenix # Secret encryption inputs.agenix.packages.${pkgs.system}.agenix # Secret encryption
sherlock # Search for usernames across different websites sherlock # Search for usernames across different websites
]; ];

6
hosts/nixos/common/global/default.nix
View file

@ -2,12 +2,12 @@
{ inputs, outputs, lib, ... }: { inputs, outputs, lib, ... }:
let let
imports = [ imports = [
inputs.agenix.nixosModule inputs.hyprland.nixosModules.default
inputs.agenix.nixosModules.default
inputs.stylix.nixosModules.stylix inputs.stylix.nixosModules.stylix
inputs.slambda.nixosModule
inputs.nur.nixosModules.nur inputs.nur.nixosModules.nur
inputs.impermanence.nixosModule inputs.impermanence.nixosModule
inputs.hyprland.nixosModules.default inputs.slambda.nixosModule
./nix.nix ./nix.nix
./openssh.nix ./openssh.nix

11
hosts/nixos/common/global/openssh.nix
View file

@ -14,21 +14,20 @@ in
services.openssh = { services.openssh = {
enable = true; enable = true;
settings = {
# Forbid root login through SSH. # Forbid root login through SSH.
permitRootLogin = "no"; PermitRootLogin = "no";
# Use keys only. Remove if you want to SSH using password (not recommended) # Use keys only. Remove if you want to SSH using password (not recommended)
passwordAuthentication = false; PasswordAuthentication = false;
};
# Automatically remove stale sockets # Automatically remove stale sockets
extraConfig = '' extraConfig = ''
StreamLocalBindUnlink yes StreamLocalBindUnlink yes
''; '';
# TODO: look into what this does
# Allow forwarding ports to everywhere
gatewayPorts = "clientspecified";
# Generate ssh key # Generate ssh key
hostKeys = hostKeys =
let mkKey = type: path: extra: { inherit type path; } // extra; let mkKey = type: path: extra: { inherit type path; } // extra;

1
hosts/nixos/tethys/boot.nix
View file

@ -33,7 +33,6 @@
chainloader /EFI/Microsoft/Boot/bootmgfw.efi chainloader /EFI/Microsoft/Boot/bootmgfw.efi
} }
''; '';
version = 2;
}; };
}; };
} }

5
modules/home-manager/default.nix
View file

@ -5,14 +5,11 @@
# Personal things # Personal things
firefox = import ./firefox; firefox = import ./firefox;
monitors = import ./monitors.nix;
satellite-dev = import ./satellite-dev.nix; satellite-dev = import ./satellite-dev.nix;
satellite-persistence = import ./persistence.nix; satellite-persistence = import ./persistence.nix;
monitors = import ./monitors.nix;
# Should upstream # Should upstream
discord = import ./discord.nix; discord = import ./discord.nix;
hyprpaper = import ./hyprpaper.nix; hyprpaper = import ./hyprpaper.nix;
# Temporary
wofi = import ./wofi.nix;
} }

78
modules/home-manager/wofi.nix
View file

@ -1,78 +0,0 @@
# Temporary copy of [this](https://github.com/nix-community/home-manager/blob/master/modules/programs/wofi.nix)
# until the next home manager relase.
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.programs.wofi;
toConfig = attrs:
''
# Generated by Home Manager.
'' + generators.toKeyValue { }
(filterAttrs (name: value: value != null) attrs);
in {
meta.maintainers = [ maintainers.christoph-heiss ];
options.programs.wofi = {
enable = mkEnableOption
"wofi: a launcher/menu program for wlroots based wayland compositors such as sway";
package = mkPackageOption pkgs "wofi" { };
settings = mkOption {
default = { };
type = types.attrs;
description = ''
Configuration options for wofi. See
<citerefentry>
<refentrytitle>wofi</refentrytitle>
<manvolnum>5</manvolnum>
</citerefentry>.
'';
example = literalExpression ''
{
location = "bottom-right";
allow_markup = true;
width = 250;
}
'';
};
style = mkOption {
default = null;
type = types.nullOr types.str;
description = ''
CSS style for wofi to use as a stylesheet. See
<citerefentry>
<refentrytitle>wofi</refentrytitle>
<manvolnum>7</manvolnum>
</citerefentry>.
'';
example = ''
* {
font-family: monospace;
}
window {
background-color: #7c818c;
}
'';
};
};
config = mkIf cfg.enable {
assertions =
[ (hm.assertions.assertPlatform "programs.wofi" pkgs platforms.linux) ];
home.packages = [ cfg.package ];
xdg.configFile = mkMerge [
(mkIf (cfg.settings != { }) {
"wofi/config".text = toConfig cfg.settings;
})
(mkIf (cfg.style != null) { "wofi/style.css".text = cfg.style; })
];
};
}

14
overlays/default.nix
View file

@ -9,6 +9,20 @@
# example = prev.example.overrideAttrs (oldAttrs: rec { # example = prev.example.overrideAttrs (oldAttrs: rec {
# ... # ...
# }); # });
# {{{ Wezterm
# REASON: https://github.com/wez/wezterm/issues/3529 doesn't seem to be fixed on stable
wezterm = prev.wezterm.overrideAttrs (_: {
version = "unstable-2023-06-12";
src = prev.fetchFromGitHub {
owner = "wez";
repo = "wezterm";
rev = "baf9d970816e015bee41ed5eb9186ef7f71c454c";
hash = "sha256-0pqfpn12963hfwdhgdwx9fwjngv6j2i6w9d20hcp1saxfd7q5l7m";
fetchSubmodules = true;
};
});
# }}}
}; };
# Wayland version of plover # Wayland version of plover