Compare commits
46 Commits
1fef42e5d4
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
b89934d13f
|
|||
|
734dfcadfc
|
|||
|
2c959fdc0c
|
|||
|
e00c4f49f5
|
|||
|
61131ca598
|
|||
|
9c1a39d699
|
|||
|
32de6e24b7
|
|||
|
78e554cc30
|
|||
|
f65617deed
|
|||
|
aa3a881d58
|
|||
|
7f99b73635
|
|||
|
c1360e5c2c
|
|||
|
ca9e66bc35
|
|||
|
eac705bdfb
|
|||
|
69beab4812
|
|||
|
515110ff7d
|
|||
|
9a9bffd637
|
|||
|
f1b269e3ee
|
|||
|
f09dee5ad8
|
|||
|
f246eacdb3
|
|||
|
b7e2bba8f0
|
|||
|
25ae0f4b85
|
|||
|
d12b247368
|
|||
|
25e9128875
|
|||
|
eee28f57fc
|
|||
|
ea03e2266f
|
|||
|
5e422d05c9
|
|||
|
eaa36cfce2
|
|||
|
572d0bfe9e
|
|||
|
385ca27f8c
|
|||
|
4c18fd8c8e
|
|||
|
bf0c55669c
|
|||
|
86a5e79079
|
|||
|
7d429a4720
|
|||
|
2e9a4b13d1
|
|||
|
73eeff9a0e
|
|||
|
d216a8018d
|
|||
|
b09d854e50
|
|||
|
ff39dd1df2
|
|||
|
98c520e0bd
|
|||
|
7e3d3ca4a5
|
|||
|
c8a76751f3
|
|||
|
12a10bee82
|
|||
|
767309885a
|
|||
|
6d360ed782
|
|||
|
ddccd51b5a
|
@ -21,7 +21,7 @@ Contains all the system configurations.
|
||||
|
||||
- There is a common configuration used for all systems: `NixFlake/system/default.nix`
|
||||
- Every system has its own special configuration: `NixFlake/system/<hostname>/default.nix`
|
||||
- System modules are located in `NixFlake/system/modules`
|
||||
- System modules are located in `NixFlake/system/systemmodules`
|
||||
- Hosted services are located in `NixFlake/system/services`
|
||||
|
||||
When creating a NixOS configuration inside the `NixFlake/flake.nix` the common configuration is imported.
|
||||
@ -33,7 +33,7 @@ Contains all the home-manager configurations.
|
||||
|
||||
- There is a common configuration for each user: `NixFlake/home/<username>/default.nix`
|
||||
- There is a configuration for a single system of this user: `NixFlake/home/<username>/<hostname>/default.nix`
|
||||
- Home-Manager modules are located in `NixFlake/home/modules`
|
||||
- Home-Manager modules are located in `NixFlake/home/homemodules`
|
||||
|
||||
When creating a NixOS configuration inside the `NixFlake/flake.nix` the common configuration is imported.
|
||||
Because the hostname is propagated to the common configuration, it can import the host-specific config by itself.
|
||||
|
||||
555
config/dankmaterialshell/catppuccin-mauve.json
Normal file
555
config/dankmaterialshell/catppuccin-mauve.json
Normal file
@ -0,0 +1,555 @@
|
||||
{
|
||||
"id": "catppuccin",
|
||||
"name": "Catppuccin",
|
||||
"version": "1.0.0",
|
||||
"author": "Avenge Media",
|
||||
"description": "Soothing pastel theme for the high-spirited",
|
||||
"dark": {},
|
||||
"light": {},
|
||||
"variants": {
|
||||
"type": "multi",
|
||||
"defaults": {
|
||||
"dark": {
|
||||
"accent": "mauve",
|
||||
"flavor": "mocha"
|
||||
},
|
||||
"light": {
|
||||
"accent": "mauve",
|
||||
"flavor": "latte"
|
||||
}
|
||||
},
|
||||
"flavors": [
|
||||
{
|
||||
"id": "mocha",
|
||||
"name": "Mocha",
|
||||
"dark": {
|
||||
"surface": "#181825",
|
||||
"surfaceText": "#cdd6f4",
|
||||
"surfaceVariant": "#1e1e2e",
|
||||
"surfaceVariantText": "#a6adc8",
|
||||
"background": "#1e1e2e",
|
||||
"backgroundText": "#cdd6f4",
|
||||
"outline": "#6c7086",
|
||||
"surfaceContainer": "#1e1e2e",
|
||||
"surfaceContainerHigh": "#313244",
|
||||
"surfaceContainerHighest": "#45475a",
|
||||
"error": "#f38ba8",
|
||||
"warning": "#fab387",
|
||||
"info": "#89b4fa"
|
||||
},
|
||||
"light": {}
|
||||
},
|
||||
{
|
||||
"id": "macchiato",
|
||||
"name": "Macchiato",
|
||||
"dark": {
|
||||
"surface": "#1e2030",
|
||||
"surfaceText": "#cad3f5",
|
||||
"surfaceVariant": "#24273a",
|
||||
"surfaceVariantText": "#a5adcb",
|
||||
"background": "#24273a",
|
||||
"backgroundText": "#cad3f5",
|
||||
"outline": "#6e738d",
|
||||
"surfaceContainer": "#24273a",
|
||||
"surfaceContainerHigh": "#363a4f",
|
||||
"surfaceContainerHighest": "#494d64",
|
||||
"error": "#ed8796",
|
||||
"warning": "#f5a97f",
|
||||
"info": "#8aadf4"
|
||||
},
|
||||
"light": {}
|
||||
},
|
||||
{
|
||||
"id": "frappe",
|
||||
"name": "Frappé",
|
||||
"dark": {
|
||||
"surface": "#292c3c",
|
||||
"surfaceText": "#c6d0f5",
|
||||
"surfaceVariant": "#303446",
|
||||
"surfaceVariantText": "#a5adce",
|
||||
"background": "#303446",
|
||||
"backgroundText": "#c6d0f5",
|
||||
"outline": "#737994",
|
||||
"surfaceContainer": "#303446",
|
||||
"surfaceContainerHigh": "#414559",
|
||||
"surfaceContainerHighest": "#51576d",
|
||||
"error": "#e78284",
|
||||
"warning": "#ef9f76",
|
||||
"info": "#8caaee"
|
||||
},
|
||||
"light": {}
|
||||
},
|
||||
{
|
||||
"id": "latte",
|
||||
"name": "Latte",
|
||||
"dark": {},
|
||||
"light": {
|
||||
"surface": "#e6e9ef",
|
||||
"surfaceText": "#4c4f69",
|
||||
"surfaceVariant": "#eff1f5",
|
||||
"surfaceVariantText": "#6c6f85",
|
||||
"background": "#eff1f5",
|
||||
"backgroundText": "#4c4f69",
|
||||
"outline": "#9ca0b0",
|
||||
"surfaceContainer": "#e6e9ef",
|
||||
"surfaceContainerHigh": "#ccd0da",
|
||||
"surfaceContainerHighest": "#bcc0cc",
|
||||
"error": "#d20f39",
|
||||
"warning": "#fe640b",
|
||||
"info": "#1e66f5"
|
||||
}
|
||||
}
|
||||
],
|
||||
"accents": [
|
||||
{
|
||||
"frappe": {
|
||||
"primary": "#f2d5cf",
|
||||
"primaryText": "#303446",
|
||||
"primaryContainer": "#76534f",
|
||||
"secondary": "#eebebe",
|
||||
"surfaceTint": "#3a2f33"
|
||||
},
|
||||
"id": "rosewater",
|
||||
"latte": {
|
||||
"primary": "#dc8a78",
|
||||
"primaryText": "#eff1f5",
|
||||
"primaryContainer": "#f6e7e3",
|
||||
"secondary": "#dd7878",
|
||||
"surfaceTint": "#f6e7e3"
|
||||
},
|
||||
"macchiato": {
|
||||
"primary": "#f4dbd6",
|
||||
"primaryText": "#24273a",
|
||||
"primaryContainer": "#7a5853",
|
||||
"secondary": "#f0c6c6",
|
||||
"surfaceTint": "#3b3035"
|
||||
},
|
||||
"mocha": {
|
||||
"primary": "#f5e0dc",
|
||||
"primaryText": "#1e1e2e",
|
||||
"primaryContainer": "#7d5d56",
|
||||
"secondary": "#f2cdcd",
|
||||
"surfaceTint": "#3d3237"
|
||||
},
|
||||
"name": "Rosewater"
|
||||
},
|
||||
{
|
||||
"frappe": {
|
||||
"primary": "#eebebe",
|
||||
"primaryText": "#303446",
|
||||
"primaryContainer": "#744f52",
|
||||
"secondary": "#f2d5cf",
|
||||
"surfaceTint": "#392e31"
|
||||
},
|
||||
"id": "flamingo",
|
||||
"latte": {
|
||||
"primary": "#dd7878",
|
||||
"primaryText": "#eff1f5",
|
||||
"primaryContainer": "#f6e5e5",
|
||||
"secondary": "#dc8a78",
|
||||
"surfaceTint": "#f6e5e5"
|
||||
},
|
||||
"macchiato": {
|
||||
"primary": "#f0c6c6",
|
||||
"primaryText": "#24273a",
|
||||
"primaryContainer": "#775256",
|
||||
"secondary": "#f4dbd6",
|
||||
"surfaceTint": "#3a3033"
|
||||
},
|
||||
"mocha": {
|
||||
"primary": "#f2cdcd",
|
||||
"primaryText": "#1e1e2e",
|
||||
"primaryContainer": "#7a555a",
|
||||
"secondary": "#f5e0dc",
|
||||
"surfaceTint": "#3c3134"
|
||||
},
|
||||
"name": "Flamingo"
|
||||
},
|
||||
{
|
||||
"frappe": {
|
||||
"primary": "#f4b8e4",
|
||||
"primaryText": "#303446",
|
||||
"primaryContainer": "#793d65",
|
||||
"secondary": "#ca9ee6",
|
||||
"surfaceTint": "#3c2e37"
|
||||
},
|
||||
"id": "pink",
|
||||
"latte": {
|
||||
"primary": "#ea76cb",
|
||||
"primaryText": "#eff1f5",
|
||||
"primaryContainer": "#f7d7ee",
|
||||
"secondary": "#8839ef",
|
||||
"surfaceTint": "#f7d7ee"
|
||||
},
|
||||
"macchiato": {
|
||||
"primary": "#f5bde6",
|
||||
"primaryText": "#24273a",
|
||||
"primaryContainer": "#7a3e67",
|
||||
"secondary": "#c6a0f6",
|
||||
"surfaceTint": "#3d2f38"
|
||||
},
|
||||
"mocha": {
|
||||
"primary": "#f5c2e7",
|
||||
"primaryText": "#1e1e2e",
|
||||
"primaryContainer": "#7a3f69",
|
||||
"secondary": "#cba6f7",
|
||||
"surfaceTint": "#3d2f39"
|
||||
},
|
||||
"name": "Pink"
|
||||
},
|
||||
{
|
||||
"frappe": {
|
||||
"primary": "#ca9ee6",
|
||||
"primaryText": "#303446",
|
||||
"primaryContainer": "#542f79",
|
||||
"secondary": "#babbf1",
|
||||
"surfaceTint": "#33293c"
|
||||
},
|
||||
"id": "mauve",
|
||||
"latte": {
|
||||
"primary": "#8839ef",
|
||||
"primaryText": "#eff1f5",
|
||||
"primaryContainer": "#eadcff",
|
||||
"secondary": "#7287fd",
|
||||
"surfaceTint": "#eadcff"
|
||||
},
|
||||
"macchiato": {
|
||||
"primary": "#c6a0f6",
|
||||
"primaryText": "#24273a",
|
||||
"primaryContainer": "#532f7d",
|
||||
"secondary": "#b7bdf8",
|
||||
"surfaceTint": "#32293e"
|
||||
},
|
||||
"mocha": {
|
||||
"primary": "#cba6f7",
|
||||
"primaryText": "#1e1e2e",
|
||||
"primaryContainer": "#55307f",
|
||||
"secondary": "#b4befe",
|
||||
"surfaceTint": "#33293f"
|
||||
},
|
||||
"name": "Mauve"
|
||||
},
|
||||
{
|
||||
"frappe": {
|
||||
"primary": "#e78284",
|
||||
"primaryText": "#303446",
|
||||
"primaryContainer": "#692233",
|
||||
"secondary": "#ea999c",
|
||||
"surfaceTint": "#38272e"
|
||||
},
|
||||
"id": "red",
|
||||
"latte": {
|
||||
"primary": "#d20f39",
|
||||
"primaryText": "#eff1f5",
|
||||
"primaryContainer": "#f6d0d6",
|
||||
"secondary": "#e64553",
|
||||
"surfaceTint": "#f6d0d6"
|
||||
},
|
||||
"macchiato": {
|
||||
"primary": "#ed8796",
|
||||
"primaryText": "#24273a",
|
||||
"primaryContainer": "#6c2336",
|
||||
"secondary": "#ee99a0",
|
||||
"surfaceTint": "#3a2830"
|
||||
},
|
||||
"mocha": {
|
||||
"primary": "#f38ba8",
|
||||
"primaryText": "#1e1e2e",
|
||||
"primaryContainer": "#6f2438",
|
||||
"secondary": "#eba0ac",
|
||||
"surfaceTint": "#3c2930"
|
||||
},
|
||||
"name": "Red"
|
||||
},
|
||||
{
|
||||
"frappe": {
|
||||
"primary": "#ea999c",
|
||||
"primaryText": "#303446",
|
||||
"primaryContainer": "#69333d",
|
||||
"secondary": "#e78284",
|
||||
"surfaceTint": "#382a2f"
|
||||
},
|
||||
"id": "maroon",
|
||||
"latte": {
|
||||
"primary": "#e64553",
|
||||
"primaryText": "#eff1f5",
|
||||
"primaryContainer": "#f7d8dc",
|
||||
"secondary": "#d20f39",
|
||||
"surfaceTint": "#f7d8dc"
|
||||
},
|
||||
"macchiato": {
|
||||
"primary": "#ee99a0",
|
||||
"primaryText": "#24273a",
|
||||
"primaryContainer": "#6b343f",
|
||||
"secondary": "#ed8796",
|
||||
"surfaceTint": "#392b30"
|
||||
},
|
||||
"mocha": {
|
||||
"primary": "#eba0ac",
|
||||
"primaryText": "#1e1e2e",
|
||||
"primaryContainer": "#6d3641",
|
||||
"secondary": "#f38ba8",
|
||||
"surfaceTint": "#3a2c31"
|
||||
},
|
||||
"name": "Maroon"
|
||||
},
|
||||
{
|
||||
"frappe": {
|
||||
"primary": "#ef9f76",
|
||||
"primaryText": "#303446",
|
||||
"primaryContainer": "#6d3e24",
|
||||
"secondary": "#e5c890",
|
||||
"surfaceTint": "#382e27"
|
||||
},
|
||||
"id": "peach",
|
||||
"latte": {
|
||||
"primary": "#fe640b",
|
||||
"primaryText": "#eff1f5",
|
||||
"primaryContainer": "#ffe4d5",
|
||||
"secondary": "#df8e1d",
|
||||
"surfaceTint": "#ffe4d5"
|
||||
},
|
||||
"macchiato": {
|
||||
"primary": "#f5a97f",
|
||||
"primaryText": "#24273a",
|
||||
"primaryContainer": "#704025",
|
||||
"secondary": "#eed49f",
|
||||
"surfaceTint": "#3a2f28"
|
||||
},
|
||||
"mocha": {
|
||||
"primary": "#fab387",
|
||||
"primaryText": "#1e1e2e",
|
||||
"primaryContainer": "#734226",
|
||||
"secondary": "#f9e2af",
|
||||
"surfaceTint": "#3b3028"
|
||||
},
|
||||
"name": "Peach"
|
||||
},
|
||||
{
|
||||
"frappe": {
|
||||
"primary": "#e5c890",
|
||||
"primaryText": "#303446",
|
||||
"primaryContainer": "#68542c",
|
||||
"secondary": "#a6d189",
|
||||
"surfaceTint": "#383428"
|
||||
},
|
||||
"id": "yellow",
|
||||
"latte": {
|
||||
"primary": "#df8e1d",
|
||||
"primaryText": "#eff1f5",
|
||||
"primaryContainer": "#fff6d6",
|
||||
"secondary": "#40a02b",
|
||||
"surfaceTint": "#fff6d6"
|
||||
},
|
||||
"macchiato": {
|
||||
"primary": "#eed49f",
|
||||
"primaryText": "#24273a",
|
||||
"primaryContainer": "#6b572e",
|
||||
"secondary": "#a6da95",
|
||||
"surfaceTint": "#393529"
|
||||
},
|
||||
"mocha": {
|
||||
"primary": "#f9e2af",
|
||||
"primaryText": "#1e1e2e",
|
||||
"primaryContainer": "#6e5a2f",
|
||||
"secondary": "#a6e3a1",
|
||||
"surfaceTint": "#3a362a"
|
||||
},
|
||||
"name": "Yellow"
|
||||
},
|
||||
{
|
||||
"frappe": {
|
||||
"primary": "#a6d189",
|
||||
"primaryText": "#303446",
|
||||
"primaryContainer": "#2d5932",
|
||||
"secondary": "#81c8be",
|
||||
"surfaceTint": "#2a362b"
|
||||
},
|
||||
"id": "green",
|
||||
"latte": {
|
||||
"primary": "#40a02b",
|
||||
"primaryText": "#eff1f5",
|
||||
"primaryContainer": "#dff4e0",
|
||||
"secondary": "#179299",
|
||||
"surfaceTint": "#dff4e0"
|
||||
},
|
||||
"macchiato": {
|
||||
"primary": "#a6da95",
|
||||
"primaryText": "#24273a",
|
||||
"primaryContainer": "#2e5c34",
|
||||
"secondary": "#8bd5ca",
|
||||
"surfaceTint": "#2b372c"
|
||||
},
|
||||
"mocha": {
|
||||
"primary": "#a6e3a1",
|
||||
"primaryText": "#1e1e2e",
|
||||
"primaryContainer": "#2f5f36",
|
||||
"secondary": "#94e2d5",
|
||||
"surfaceTint": "#2b382c"
|
||||
},
|
||||
"name": "Green"
|
||||
},
|
||||
{
|
||||
"frappe": {
|
||||
"primary": "#81c8be",
|
||||
"primaryText": "#303446",
|
||||
"primaryContainer": "#2c5853",
|
||||
"secondary": "#99d1db",
|
||||
"surfaceTint": "#2a3634"
|
||||
},
|
||||
"id": "teal",
|
||||
"latte": {
|
||||
"primary": "#179299",
|
||||
"primaryText": "#eff1f5",
|
||||
"primaryContainer": "#daf3f1",
|
||||
"secondary": "#04a5e5",
|
||||
"surfaceTint": "#daf3f1"
|
||||
},
|
||||
"macchiato": {
|
||||
"primary": "#8bd5ca",
|
||||
"primaryText": "#24273a",
|
||||
"primaryContainer": "#2d5b56",
|
||||
"secondary": "#91d7e3",
|
||||
"surfaceTint": "#2b3735"
|
||||
},
|
||||
"mocha": {
|
||||
"primary": "#94e2d5",
|
||||
"primaryText": "#1e1e2e",
|
||||
"primaryContainer": "#2e5e59",
|
||||
"secondary": "#89dceb",
|
||||
"surfaceTint": "#2b3836"
|
||||
},
|
||||
"name": "Teal"
|
||||
},
|
||||
{
|
||||
"frappe": {
|
||||
"primary": "#99d1db",
|
||||
"primaryText": "#303446",
|
||||
"primaryContainer": "#245464",
|
||||
"secondary": "#85c1dc",
|
||||
"surfaceTint": "#283438"
|
||||
},
|
||||
"id": "sky",
|
||||
"latte": {
|
||||
"primary": "#04a5e5",
|
||||
"primaryText": "#eff1f5",
|
||||
"primaryContainer": "#dbf1fb",
|
||||
"secondary": "#209fb5",
|
||||
"surfaceTint": "#dbf1fb"
|
||||
},
|
||||
"macchiato": {
|
||||
"primary": "#91d7e3",
|
||||
"primaryText": "#24273a",
|
||||
"primaryContainer": "#245667",
|
||||
"secondary": "#7dc4e4",
|
||||
"surfaceTint": "#293539"
|
||||
},
|
||||
"mocha": {
|
||||
"primary": "#89dceb",
|
||||
"primaryText": "#1e1e2e",
|
||||
"primaryContainer": "#24586a",
|
||||
"secondary": "#74c7ec",
|
||||
"surfaceTint": "#29363a"
|
||||
},
|
||||
"name": "Sky"
|
||||
},
|
||||
{
|
||||
"frappe": {
|
||||
"primary": "#85c1dc",
|
||||
"primaryText": "#303446",
|
||||
"primaryContainer": "#1f4967",
|
||||
"secondary": "#8caaee",
|
||||
"surfaceTint": "#27323a"
|
||||
},
|
||||
"id": "sapphire",
|
||||
"latte": {
|
||||
"primary": "#209fb5",
|
||||
"primaryText": "#eff1f5",
|
||||
"primaryContainer": "#def3f8",
|
||||
"secondary": "#1e66f5",
|
||||
"surfaceTint": "#def3f8"
|
||||
},
|
||||
"macchiato": {
|
||||
"primary": "#7dc4e4",
|
||||
"primaryText": "#24273a",
|
||||
"primaryContainer": "#1f4b6b",
|
||||
"secondary": "#8aadf4",
|
||||
"surfaceTint": "#27333b"
|
||||
},
|
||||
"mocha": {
|
||||
"primary": "#74c7ec",
|
||||
"primaryText": "#1e1e2e",
|
||||
"primaryContainer": "#1f4d6f",
|
||||
"secondary": "#89b4fa",
|
||||
"surfaceTint": "#27343c"
|
||||
},
|
||||
"name": "Sapphire"
|
||||
},
|
||||
{
|
||||
"frappe": {
|
||||
"primary": "#8caaee",
|
||||
"primaryText": "#303446",
|
||||
"primaryContainer": "#243d6f",
|
||||
"secondary": "#babbf1",
|
||||
"surfaceTint": "#282f3b"
|
||||
},
|
||||
"id": "blue",
|
||||
"latte": {
|
||||
"primary": "#1e66f5",
|
||||
"primaryText": "#eff1f5",
|
||||
"primaryContainer": "#e0e9ff",
|
||||
"secondary": "#7287fd",
|
||||
"surfaceTint": "#e0e9ff"
|
||||
},
|
||||
"macchiato": {
|
||||
"primary": "#8aadf4",
|
||||
"primaryText": "#24273a",
|
||||
"primaryContainer": "#243e72",
|
||||
"secondary": "#b7bdf8",
|
||||
"surfaceTint": "#29303c"
|
||||
},
|
||||
"mocha": {
|
||||
"primary": "#89b4fa",
|
||||
"primaryText": "#1e1e2e",
|
||||
"primaryContainer": "#243f75",
|
||||
"secondary": "#b4befe",
|
||||
"surfaceTint": "#29313d"
|
||||
},
|
||||
"name": "Blue"
|
||||
},
|
||||
{
|
||||
"frappe": {
|
||||
"primary": "#babbf1",
|
||||
"primaryText": "#303446",
|
||||
"primaryContainer": "#3d427b",
|
||||
"secondary": "#ca9ee6",
|
||||
"surfaceTint": "#2e2f3e"
|
||||
},
|
||||
"id": "lavender",
|
||||
"latte": {
|
||||
"primary": "#7287fd",
|
||||
"primaryText": "#eff1f5",
|
||||
"primaryContainer": "#e5e8ff",
|
||||
"secondary": "#8839ef",
|
||||
"surfaceTint": "#e5e8ff"
|
||||
},
|
||||
"macchiato": {
|
||||
"primary": "#b7bdf8",
|
||||
"primaryText": "#24273a",
|
||||
"primaryContainer": "#3e437e",
|
||||
"secondary": "#c6a0f6",
|
||||
"surfaceTint": "#2f303f"
|
||||
},
|
||||
"mocha": {
|
||||
"primary": "#b4befe",
|
||||
"primaryText": "#1e1e2e",
|
||||
"primaryContainer": "#3f4481",
|
||||
"secondary": "#cba6f7",
|
||||
"surfaceTint": "#2f3140"
|
||||
},
|
||||
"name": "Lavender"
|
||||
}
|
||||
]
|
||||
},
|
||||
"sourceDir": "catppuccin"
|
||||
}
|
||||
@ -7,7 +7,7 @@
|
||||
...
|
||||
}: let
|
||||
# create a module that only contains the options, type can be home or system
|
||||
toModule = type: name: {options.modules.${name} = import ../../${type}/modules/${name}/options.nix {inherit lib mylib;};};
|
||||
toModule = type: name: {options.systemmodules.${name} = import ../../${type}/modules/${name}/options.nix {inherit lib mylib;};};
|
||||
|
||||
# evaluate a single module
|
||||
evalModule = type: name: (lib.evalModules {modules = [(toModule type name)];});
|
||||
|
||||
@ -10,11 +10,12 @@
|
||||
#
|
||||
pythonPkgs = pkgs.python313Packages.overrideScope (self: super: {
|
||||
typer = super.typer.overridePythonAttrs (old: {
|
||||
version = "0.20.0";
|
||||
version = "0.20.1";
|
||||
src = super.fetchPypi {
|
||||
inherit (old) pname;
|
||||
version = "0.20.0";
|
||||
sha256 = "sha256-Gq9klAMXk+SHb7C6z6apErVRz0PB5jyADfixqGZyDDc=";
|
||||
version = "0.20.1";
|
||||
# sha256 = "sha256-Gq9klAMXk+SHb7C6z6apErVRz0PB5jyADfixqGZyDDc="; # v0.20.0
|
||||
sha256 = "sha256-aFhesbASA2icQZm8RA1r5hbwhR6fDrQeSneIRcWg/Vs="; # v0.20.1
|
||||
};
|
||||
});
|
||||
|
||||
@ -48,30 +49,37 @@
|
||||
# doCheck = false;
|
||||
# });
|
||||
|
||||
# rich_14_2_0 = pkgs.python313Packages.rich.overridePythonAttrs (old: {
|
||||
# version = "14.2.0";
|
||||
# src = pkgs.fetchFromGitHub {
|
||||
# owner = "Textualize";
|
||||
# repo = "rich";
|
||||
# tag = "v14.2.0";
|
||||
# hash = "sha256-oQbxRbZnVr/Ln+i/hpBw5FlpUp3gcp/7xsxi6onPkn8=";
|
||||
# };
|
||||
# });
|
||||
|
||||
tidalDlNg = pythonPkgs.buildPythonApplication rec {
|
||||
pname = "tidal-dl-ng";
|
||||
version = "0.31.3";
|
||||
pname = "tidal_dl_ng";
|
||||
version = "0.33.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "exislow";
|
||||
repo = "tidal-dl-ng";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PUT0anx1yivgXwW21jah7Rv1/BabOT+KPoW446NFNyg=";
|
||||
# The official repo was deleted
|
||||
# src = pkgs.fetchFromGitHub {
|
||||
# owner = "exislow";
|
||||
# repo = "tidal-dl-ng";
|
||||
# rev = "v${version}";
|
||||
# sha256 = "sha256-PUT0anx1yivgXwW21jah7Rv1/BabOT+KPoW446NFNyg=";
|
||||
# };
|
||||
|
||||
# Alternative repo
|
||||
# src = pkgs.fetchFromGitHub {
|
||||
# owner = "rodvicj";
|
||||
# repo = "tidal_dl_ng-Project";
|
||||
# rev = "4573142c76ef045ebf8e80c34657dd2bec96f17d";
|
||||
# sha256 = "sha256-3sO2qj8V4KXOWK7vQsFAOYeTZo2rsc/M36SwRnC0oVg=";
|
||||
# };
|
||||
|
||||
# Package is still on PyPi
|
||||
src = pythonPkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-rOMyxnT7uVnMbn678DFtqAu4+Uc5VFGcqGI0jxplnpc=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
dontCheckRuntimeDeps = true;
|
||||
catchConflicts = false;
|
||||
strictDeps = false;
|
||||
|
||||
nativeBuildInputs = with pythonPkgs; [poetry-core setuptools];
|
||||
|
||||
@ -96,13 +104,6 @@
|
||||
typer
|
||||
rich
|
||||
];
|
||||
|
||||
# pythonOutputDistPhase = ''
|
||||
# echo "⚠️Skipping pythonOutputDistPhase"
|
||||
# '';
|
||||
# pythonCatchConflictsPhase = ''
|
||||
# echo "🛑 Skipping pythonCatchConflictsPhase"
|
||||
# '';
|
||||
};
|
||||
|
||||
#
|
||||
|
||||
317
flake.lock
generated
317
flake.lock
generated
@ -20,11 +20,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764714051,
|
||||
"narHash": "sha256-AjcMlM3UoavFoLzr0YrcvsIxALShjyvwe+o7ikibpCM=",
|
||||
"lastModified": 1767024902,
|
||||
"narHash": "sha256-sMdk6QkMDhIOnvULXKUM8WW8iyi551SWw2i6KQHbrrU=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "aquamarine",
|
||||
"rev": "a43bedcceced5c21ad36578ed823e6099af78214",
|
||||
"rev": "b8a0c5ba5a9fbd2c660be7dd98bdde0ff3798556",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -44,11 +44,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765071049,
|
||||
"narHash": "sha256-HIJtxkYaGxUFZ03wOzF4pWhKWAvFuYBN9jAdhCzZvnI=",
|
||||
"lastModified": 1768659593,
|
||||
"narHash": "sha256-Cjm5dbWWds9fLvOXHG5Co8Lfgv4/o3h7KhtfhLM28cU=",
|
||||
"owner": "caelestia-dots",
|
||||
"repo": "shell",
|
||||
"rev": "982d64d5e5b9295d12dec37d45442ed6a05fe284",
|
||||
"rev": "fd1165f1530b55c0751f8af7475d0c588b11488c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -68,11 +68,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764813773,
|
||||
"narHash": "sha256-vpgjBAER+aoMjq6z9xuv/jvniXkRRgP/xfZMP2LbNlk=",
|
||||
"lastModified": 1768010798,
|
||||
"narHash": "sha256-CmEy/t3CCDnUvn594sXtv0vRxt1JQaqj0nGdtQFU3mA=",
|
||||
"owner": "caelestia-dots",
|
||||
"repo": "cli",
|
||||
"rev": "1eead8615108e1977ac09ed428e1329adbb80f00",
|
||||
"rev": "70a8624eacfc1b90fe248aef722ae708e775a927",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -96,22 +96,19 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"dankMaterialShell": {
|
||||
"dank-material-shell": {
|
||||
"inputs": {
|
||||
"dgop": [
|
||||
"dgop"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"quickshell": "quickshell"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765557900,
|
||||
"narHash": "sha256-dJdst9aY9+ErvHdMzKunivMx9N5STkxzv4HpDn1ci2g=",
|
||||
"lastModified": 1768670844,
|
||||
"narHash": "sha256-6jntj2RVC3ceEFd1dWKUlLkV/UUkCfcv6KR+yBt7DgA=",
|
||||
"owner": "AvengeMedia",
|
||||
"repo": "DankMaterialShell",
|
||||
"rev": "df1a8f40666411cd9484c50b945db2aef726cdb8",
|
||||
"rev": "27f0df07af950c378054264eda384978d95c7f80",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -138,26 +135,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"dgop": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762835999,
|
||||
"narHash": "sha256-UykYGrGFOFTmDpKTLNxj1wvd1gbDG4TkqLNSbV0TYwk=",
|
||||
"owner": "AvengeMedia",
|
||||
"repo": "dgop",
|
||||
"rev": "799301991cd5dcea9b64245f9d500dcc76615653",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "AvengeMedia",
|
||||
"repo": "dgop",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"disko": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@ -228,15 +205,15 @@
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1761588595,
|
||||
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
|
||||
"owner": "edolstra",
|
||||
"lastModified": 1767039857,
|
||||
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
|
||||
"owner": "NixOS",
|
||||
"repo": "flake-compat",
|
||||
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
|
||||
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"owner": "NixOS",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
@ -259,11 +236,11 @@
|
||||
},
|
||||
"flake-compat_3": {
|
||||
"locked": {
|
||||
"lastModified": 1761588595,
|
||||
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
|
||||
"lastModified": 1767039857,
|
||||
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
|
||||
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -315,11 +292,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765495779,
|
||||
"narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=",
|
||||
"lastModified": 1765835352,
|
||||
"narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "5635c32d666a59ec9a55cab87e898889869f7b71",
|
||||
"rev": "a34fae9c08a15ad73f295041fec82323541400a9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -413,11 +390,11 @@
|
||||
},
|
||||
"hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1764440730,
|
||||
"narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
|
||||
"lastModified": 1768584846,
|
||||
"narHash": "sha256-IRPmIOV2tPwxbhP/I9M5AmwhTC0lMPtoPStC+8T6xl0=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
|
||||
"rev": "cce68f4a54fa4e3d633358364477f5cc1d782440",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -433,11 +410,32 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765480374,
|
||||
"narHash": "sha256-HlbvQAqLx7WqZFFQZ8nu5UUJAVlXiV/kqKbyueA8srw=",
|
||||
"lastModified": 1768598210,
|
||||
"narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "39cb677ed9e908e90478aa9fe5f3383dfc1a63f3",
|
||||
"rev": "c47b2cc64a629f8e075de52e4742de688f930dc6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"impermanence",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747978958,
|
||||
"narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "7419250703fd5eb50e99bdfb07a86671939103ea",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -456,11 +454,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765362362,
|
||||
"narHash": "sha256-qBJRhTq6rz8svbcgnqWVb3BpdkJk6u0OC3vBZqhMdcU=",
|
||||
"lastModified": 1768644786,
|
||||
"narHash": "sha256-0nfqa8f7/at2hQTq5rbz69S+nmp6RzAtX0kf8OiJBrU=",
|
||||
"owner": "VirtCode",
|
||||
"repo": "hypr-dynamic-cursors",
|
||||
"rev": "afe1295c8595a318072977d2eb41e6837c15a01c",
|
||||
"rev": "b92d2db9c9f045e50e4c0e97e96b88ea86f43cd3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -514,11 +512,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763733840,
|
||||
"narHash": "sha256-JnET78yl5RvpGuDQy3rCycOCkiKoLr5DN1fPhRNNMco=",
|
||||
"lastModified": 1766946335,
|
||||
"narHash": "sha256-MRD+Jr2bY11MzNDfenENhiK6pvN+nHygxdHoHbZ1HtE=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprgraphics",
|
||||
"rev": "8f1bec691b2d198c60cccabca7a94add2df4ed1a",
|
||||
"rev": "4af02a3925b454deb1c36603843da528b67ded6c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -546,11 +544,11 @@
|
||||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765543676,
|
||||
"narHash": "sha256-2qaLZ7kqerWXIZpICR/6lkR0J/EEwiS/uYkdhUXv8Sw=",
|
||||
"lastModified": 1768660279,
|
||||
"narHash": "sha256-ak7mm3HiluwyMXHadoEzhrzzMGz2T1UkOVL0N0sbYUc=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "Hyprland",
|
||||
"rev": "69db0bcae640410b6c587cb0ffd0c89bc8166ff0",
|
||||
"rev": "c99eb23869da2b80e3613a886aa1b99851367a3c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -592,11 +590,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764812575,
|
||||
"narHash": "sha256-1bK1yGgaR82vajUrt6z+BSljQvFn91D74WJ/vJsydtE=",
|
||||
"lastModified": 1767023960,
|
||||
"narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprland-guiutils",
|
||||
"rev": "fd321368a40c782cfa299991e5584ca338e36ebe",
|
||||
"rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -620,11 +618,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765207366,
|
||||
"narHash": "sha256-s0jO2kEj5cLLTgTblKnAKjqt3MjYFnmyrQT3SxiUugM=",
|
||||
"lastModified": 1767723101,
|
||||
"narHash": "sha256-jObY8O7OI+91hoE137APsDxm0235/Yx+HhFIip187zM=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprland-plugins",
|
||||
"rev": "e058ea23b80775cf20c675d064678416df2d9d04",
|
||||
"rev": "fef398ed5e4faf59bc43b915e46a75cfe8b16697",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -645,11 +643,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1759610243,
|
||||
"narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=",
|
||||
"lastModified": 1765214753,
|
||||
"narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprland-protocols",
|
||||
"rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622",
|
||||
"rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -695,11 +693,11 @@
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764820995,
|
||||
"narHash": "sha256-IMa4mvkF0w7OAy+yEzPFYs2an332K30lf5qfUOAS9Cw=",
|
||||
"lastModified": 1767871242,
|
||||
"narHash": "sha256-Gge7LY1lrPc2knDnyw8GBQ2sxRPzM7W2T6jNG1HY5bA=",
|
||||
"owner": "KZDKM",
|
||||
"repo": "Hyprspace",
|
||||
"rev": "0467be86b18cfc324fab04afbd40fe9ef80f7fa9",
|
||||
"rev": "bcd969224ffeb6266c6618c192949461135eef38",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -772,11 +770,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764962281,
|
||||
"narHash": "sha256-rGbEMhTTyTzw4iyz45lch5kXseqnqcEpmrHdy+zHsfo=",
|
||||
"lastModified": 1766253372,
|
||||
"narHash": "sha256-1+p4Kw8HdtMoFSmJtfdwjxM4bPxDK9yg27SlvUMpzWA=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprutils",
|
||||
"rev": "fe686486ac867a1a24f99c753bb40ffed338e4b0",
|
||||
"rev": "51a4f93ce8572e7b12b7284eb9e6e8ebf16b4be9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -826,11 +824,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764872015,
|
||||
"narHash": "sha256-INI9AVrQG5nJZFvGPSiUZ9FEUZJLfGdsqjF1QSak7Gc=",
|
||||
"lastModified": 1767473322,
|
||||
"narHash": "sha256-RGOeG+wQHeJ6BKcsSB8r0ZU77g9mDvoQzoTKj2dFHwA=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprwire",
|
||||
"rev": "7997451dcaab7b9d9d442f18985d514ec5891608",
|
||||
"rev": "d5e7d6b49fe780353c1cf9a1cf39fa8970bd9d11",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -840,12 +838,16 @@
|
||||
}
|
||||
},
|
||||
"impermanence": {
|
||||
"inputs": {
|
||||
"home-manager": "home-manager_2",
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737831083,
|
||||
"narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=",
|
||||
"lastModified": 1767822991,
|
||||
"narHash": "sha256-iyrn9AcPZCoyxX4OT8eMkBsjG7SRUQXXS/V1JzxS7rA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "impermanence",
|
||||
"rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170",
|
||||
"rev": "82e5bc4508cab9e8d5a136626276eb5bbce5e9c5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -883,7 +885,7 @@
|
||||
"naersk": {
|
||||
"inputs": {
|
||||
"fenix": "fenix",
|
||||
"nixpkgs": "nixpkgs_4"
|
||||
"nixpkgs": "nixpkgs_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763384566,
|
||||
@ -911,11 +913,11 @@
|
||||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765528203,
|
||||
"narHash": "sha256-DTs3VkvRjW/Quu7y9hzNUrddysBXbcqv5Rpo4rtQYQI=",
|
||||
"lastModified": 1768669983,
|
||||
"narHash": "sha256-OGl180QZ1QIirJ7Cy9Tqrgn/XEglaKGBeb5pys/sS7Y=",
|
||||
"owner": "sodiboo",
|
||||
"repo": "niri-flake",
|
||||
"rev": "8f74fd85c7b42f2d06347a9c9eaff6d4904854f3",
|
||||
"rev": "b90da048a6ae94b49ff489bacac4a49206670c18",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -944,11 +946,11 @@
|
||||
"niri-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1765524373,
|
||||
"narHash": "sha256-gi38XWhkb+H8iHhlXgv7MgUaQCuhmaTzKmq3yzYOg9g=",
|
||||
"lastModified": 1768653140,
|
||||
"narHash": "sha256-8/u6/KHghsTHb3zmw8hYbwRQIp7UgMyQyqn4zVFN1S0=",
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"rev": "c22d8358c293f5e66748d8ac20600e6b114f9743",
|
||||
"rev": "3ccb06f5644c4bcdf74ad2e4d388a13ac65207af",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -961,14 +963,14 @@
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_3",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764061716,
|
||||
"narHash": "sha256-xKnIoMPv2kIsWhjRhJayqMWU2xkjeq2pyPmR1dLFPHs=",
|
||||
"lastModified": 1768475717,
|
||||
"narHash": "sha256-185VOlWF4K9gzwr7M56ArjqDt6beN/5TxCYLEyVPOcs=",
|
||||
"owner": "thiagokokada",
|
||||
"repo": "nix-alien",
|
||||
"rev": "9bc9c1ab671eb1b610f549e15bc0b750ab987409",
|
||||
"rev": "a579610c67dc946f39c2a64656699eb29eb2ffb5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -979,11 +981,11 @@
|
||||
},
|
||||
"nix-flatpak": {
|
||||
"locked": {
|
||||
"lastModified": 1739444422,
|
||||
"narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=",
|
||||
"lastModified": 1767983141,
|
||||
"narHash": "sha256-7ZCulYUD9RmJIDULTRkGLSW1faMpDlPKcbWJLYHoXcs=",
|
||||
"owner": "gmodena",
|
||||
"repo": "nix-flatpak",
|
||||
"rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177",
|
||||
"rev": "440818969ac2cbd77bfe025e884d0aa528991374",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1001,11 +1003,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762660502,
|
||||
"narHash": "sha256-C9F1C31ys0V7mnp4EcDy7L1cLZw/sCTEXqqTtGnvu08=",
|
||||
"lastModified": 1765267181,
|
||||
"narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "15c5451c63f4c612874a43846bfe3fa828b03eee",
|
||||
"rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1032,11 +1034,11 @@
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1765311797,
|
||||
"narHash": "sha256-mSD5Ob7a+T2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo=",
|
||||
"lastModified": 1768484090,
|
||||
"narHash": "sha256-HBIfbB9MF9oqQTxs/W5440mzVaYDBWU9tuX95aZ8h64=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "09eb77e94fa25202af8f3e81ddc7353d9970ac1b",
|
||||
"rev": "d4fa45dc2d4d32c10cb7c6b530a6b4b7d2429442",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1048,11 +1050,11 @@
|
||||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1765363881,
|
||||
"narHash": "sha256-3C3xWn8/2Zzr7sxVBmpc1H1QfxjNfta5IMFe3O9ZEPw=",
|
||||
"lastModified": 1767313136,
|
||||
"narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d2b1213bf5ec5e62d96b003ab4b5cbc42abfc0d0",
|
||||
"rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1064,15 +1066,15 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1762977756,
|
||||
"narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
|
||||
"owner": "NixOS",
|
||||
"lastModified": 1748026106,
|
||||
"narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
|
||||
"rev": "063f43f2dbdef86376cc29ad646c45c46e93234c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
@ -1080,11 +1082,27 @@
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1765186076,
|
||||
"narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=",
|
||||
"lastModified": 1768305791,
|
||||
"narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1768564909,
|
||||
"narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8",
|
||||
"rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1094,7 +1112,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1752077645,
|
||||
"narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=",
|
||||
@ -1110,7 +1128,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1750776420,
|
||||
"narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=",
|
||||
@ -1135,11 +1153,11 @@
|
||||
"systems": "systems_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765549401,
|
||||
"narHash": "sha256-/7jUlBsI2DCm9LOF4upS7+kMYM4K78dPpHO5pCKYV6k=",
|
||||
"lastModified": 1768486009,
|
||||
"narHash": "sha256-I7ymDe6UQooHy9I9wrafKCCDnRbox/EMWAgJgpm7fGs=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "a80557e1425ad9438dde7652b12fd5a449df6f00",
|
||||
"rev": "03a638205b5cb04ba9c2ed6c604e137b15f07fa1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1155,11 +1173,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765548066,
|
||||
"narHash": "sha256-HEzdYU0EvLRikJvNgKIjVgcJ6ohKA99V6FI0pX2ig0A=",
|
||||
"lastModified": 1768675584,
|
||||
"narHash": "sha256-YcQRhf1AQv0jHey5DMek5UQvkqSs+Q/yktXEm8ymaRA=",
|
||||
"owner": "noctalia-dev",
|
||||
"repo": "noctalia-shell",
|
||||
"rev": "95a67718ad756b9ec4fdc8ab336a461e89c60d5e",
|
||||
"rev": "1d792b01b4cf2160000f7ef6e9388843cf5106d3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1199,11 +1217,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765558896,
|
||||
"narHash": "sha256-7uYwgjpvgJuDiWenXm52xWg+VNCFaD/X04Tkl3yV4hs=",
|
||||
"lastModified": 1768671781,
|
||||
"narHash": "sha256-kW4mzy7wzuW+od/o3Gfg5ONO7nb7U7uUxvEkAyFd9cY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "7a1574fc86564b2213d3f7870c519a60909cba70",
|
||||
"rev": "1e87169b18457a22e6ef372789e48cd86b81e2ba",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1222,11 +1240,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765016596,
|
||||
"narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=",
|
||||
"lastModified": 1767281941,
|
||||
"narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c",
|
||||
"rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1264,21 +1282,21 @@
|
||||
"quickshell": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"dankMaterialShell",
|
||||
"dank-material-shell",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764663772,
|
||||
"narHash": "sha256-sHqLmm0wAt3PC4vczJeBozI1/f4rv9yp3IjkClHDXDs=",
|
||||
"lastModified": 1766725085,
|
||||
"narHash": "sha256-O2aMFdDUYJazFrlwL7aSIHbUSEm3ADVZjmf41uBJfHs=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "26531fc46ef17e9365b03770edd3fb9206fcb460",
|
||||
"revCount": 713,
|
||||
"rev": "41828c4180fb921df7992a5405f5ff05d2ac2fff",
|
||||
"revCount": 715,
|
||||
"type": "git",
|
||||
"url": "https://git.outfoxxed.me/quickshell/quickshell"
|
||||
},
|
||||
"original": {
|
||||
"rev": "26531fc46ef17e9365b03770edd3fb9206fcb460",
|
||||
"rev": "41828c4180fb921df7992a5405f5ff05d2ac2fff",
|
||||
"type": "git",
|
||||
"url": "https://git.outfoxxed.me/quickshell/quickshell"
|
||||
}
|
||||
@ -1290,11 +1308,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764663772,
|
||||
"narHash": "sha256-sHqLmm0wAt3PC4vczJeBozI1/f4rv9yp3IjkClHDXDs=",
|
||||
"lastModified": 1768549203,
|
||||
"narHash": "sha256-DxN7v8g8DO8gGJmgBJMo3fsSR3HEs+DFCXeKeHq61zA=",
|
||||
"owner": "quickshell-mirror",
|
||||
"repo": "quickshell",
|
||||
"rev": "26531fc46ef17e9365b03770edd3fb9206fcb460",
|
||||
"rev": "d03c59768c680f052dff6e7a7918bbf990b0f743",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1306,9 +1324,8 @@
|
||||
"root": {
|
||||
"inputs": {
|
||||
"caelestia": "caelestia",
|
||||
"dankMaterialShell": "dankMaterialShell",
|
||||
"dank-material-shell": "dank-material-shell",
|
||||
"devshell": "devshell",
|
||||
"dgop": "dgop",
|
||||
"disko": "disko",
|
||||
"hardware": "hardware",
|
||||
"home-manager": "home-manager",
|
||||
@ -1321,7 +1338,7 @@
|
||||
"niri": "niri",
|
||||
"nix-alien": "nix-alien",
|
||||
"nix-flatpak": "nix-flatpak",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs-stable": "nixpkgs-stable_2",
|
||||
"nixvim": "nixvim",
|
||||
"noctalia": "noctalia",
|
||||
@ -1378,11 +1395,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765553226,
|
||||
"narHash": "sha256-Ii16Nq5jL2wURXpV3D3tOM3vPpbKh18roHLkyZCHK4Q=",
|
||||
"lastModified": 1768481291,
|
||||
"narHash": "sha256-NjKtkJraCZEnLHAJxLTI+BfdU//9coAz9p5TqveZwPU=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "496a6f625f63b780ce849891868f2fad22fd49c6",
|
||||
"rev": "e085e303dfcce21adcb5fec535d65aacb066f101",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1459,11 +1476,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763730250,
|
||||
"narHash": "sha256-OPlKRltdA2iIm70Nw/kWt5FnwxR1xmxC44tqGUX7Hro=",
|
||||
"lastModified": 1767427579,
|
||||
"narHash": "sha256-q9aFfPohbMS6ehkQHReMeIjtld0wGiUsxlHoPRRvsp4=",
|
||||
"owner": "adriankarlen",
|
||||
"repo": "textfox",
|
||||
"rev": "2f385d16abab56984b874627ca0dd4f3ca7ae4ac",
|
||||
"rev": "29c31979e5583d9367247f0af8675f88482ff481",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1474,7 +1491,7 @@
|
||||
},
|
||||
"waifu-cursors": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_5"
|
||||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1755614728,
|
||||
@ -1551,11 +1568,11 @@
|
||||
"xwayland-satellite-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1765343581,
|
||||
"narHash": "sha256-HtTPbV6z6AJPg2d0bHaJKFrnNha+SEbHvbJafKAQ614=",
|
||||
"lastModified": 1768106915,
|
||||
"narHash": "sha256-HlLo9zH4ULRXlmlIK948cHmdVhxyHgTHxGaoCRlW4k8=",
|
||||
"owner": "Supreeeme",
|
||||
"repo": "xwayland-satellite",
|
||||
"rev": "f0ad674b7009a6afd80cea59d4fbf975dd68ee95",
|
||||
"rev": "72245e108f3b03c3c4474d2de9de2d1830849603",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
10
flake.nix
10
flake.nix
@ -73,13 +73,13 @@
|
||||
# caelestia-cli.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
# DankMaterialShell
|
||||
dgop.url = "github:AvengeMedia/dgop";
|
||||
dgop.inputs.nixpkgs.follows = "nixpkgs";
|
||||
# dgop.url = "github:AvengeMedia/dgop";
|
||||
# dgop.inputs.nixpkgs.follows = "nixpkgs";
|
||||
# dms-cli.url = "github:AvengeMedia/danklinux";
|
||||
# dms-cli.inputs.nixpkgs.follows = "nixpkgs";
|
||||
dankMaterialShell.url = "github:AvengeMedia/DankMaterialShell";
|
||||
dankMaterialShell.inputs.nixpkgs.follows = "nixpkgs";
|
||||
dankMaterialShell.inputs.dgop.follows = "dgop";
|
||||
dank-material-shell.url = "github:AvengeMedia/DankMaterialShell";
|
||||
dank-material-shell.inputs.nixpkgs.follows = "nixpkgs";
|
||||
# dank-material-shell.inputs.dgop.follows = "dgop";
|
||||
|
||||
# Hyprland (use flake so plugins are not built from source)
|
||||
hyprland.url = "github:hyprwm/Hyprland";
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
headless,
|
||||
...
|
||||
}: let
|
||||
inherit (config.modules) color;
|
||||
inherit (config.homemodules) color;
|
||||
in
|
||||
# This is a HM module.
|
||||
# Because no imports/options/config is defined explicitly, everything is treated as config:
|
||||
@ -25,16 +25,6 @@ in
|
||||
# Every module (/function) is called with the same arguments as this module.
|
||||
# Arguments with matching names are "plugged in" into the right slots,
|
||||
# the case of different arity is handled by always providing ellipses (...) in module definitions.
|
||||
imports = [
|
||||
# Import the host-specific HM config.
|
||||
# It will be merged with the main config (like all different modules).
|
||||
# Settings regarding a specific host (e.g. desktop or laptop)
|
||||
# should only be made in the host-specific config.
|
||||
./${hostname}
|
||||
|
||||
# Import all of my custom HM modules.
|
||||
../modules
|
||||
];
|
||||
|
||||
# Enable and configure my custom HM modules.
|
||||
paths = rec {
|
||||
@ -42,7 +32,7 @@ in
|
||||
dotfiles = "${nixflake}/config";
|
||||
};
|
||||
|
||||
modules = {
|
||||
homemodules = {
|
||||
beets.enable = !headless;
|
||||
|
||||
btop.enable = true;
|
||||
@ -99,7 +89,7 @@ in
|
||||
|
||||
hyprland = {
|
||||
enable = nixosConfig.programs.hyprland.enable;
|
||||
dunst.enable = !config.modules.hyprpanel.enable; # Disable for hyprpanel
|
||||
dunst.enable = !config.homemodules.hyprpanel.enable; # Disable for hyprpanel
|
||||
bars.enable = false;
|
||||
dynamicCursor.enable = false;
|
||||
trails.enable = true;
|
||||
@ -112,14 +102,14 @@ in
|
||||
|
||||
bindings = lib.mergeAttrsList [
|
||||
# Use Rofi if we don't have caelestia
|
||||
(lib.optionalAttrs (!config.modules.hyprland.caelestia.enable) {
|
||||
(lib.optionalAttrs (!config.homemodules.hyprland.caelestia.enable) {
|
||||
"$mainMod, a" = ["exec, rofi -drun-show-actions -show drun"];
|
||||
"$mainMod, c" = ["exec, clipman pick --tool=rofi"];
|
||||
"$mainMod SHIFT, l" = ["exec, loginctl lock-session"];
|
||||
})
|
||||
|
||||
# Caelestia
|
||||
(lib.optionalAttrs (config.modules.hyprland.caelestia.enable) {
|
||||
(lib.optionalAttrs (config.homemodules.hyprland.caelestia.enable) {
|
||||
"$mainMod, a" = ["exec, caelestia shell drawers toggle launcher"];
|
||||
# "$mainMod, c" = ["exec, caelestia clipboard"];
|
||||
"$mainMod SHIFT, l" = ["exec, caelestia shell lock lock"];
|
||||
@ -318,10 +308,10 @@ in
|
||||
# as nixosConfig won't be available otherwise.
|
||||
xdg = {
|
||||
enable = true; # This only does xdg path management
|
||||
mime.enable = nixosConfig.modules.mime.enable;
|
||||
mime.enable = nixosConfig.systemmodules.mime.enable;
|
||||
|
||||
mimeApps = {
|
||||
enable = nixosConfig.modules.mime.enable;
|
||||
enable = nixosConfig.systemmodules.mime.enable;
|
||||
|
||||
associations.added = nixosConfig.xdg.mime.addedAssociations;
|
||||
associations.removed = nixosConfig.xdg.mime.removedAssociations;
|
||||
@ -392,7 +382,7 @@ in
|
||||
config.lib.file.mkOutOfStoreSymlink
|
||||
nixosConfig.sops.templates."nix.conf".path;
|
||||
}
|
||||
(lib.mkIf nixosConfig.modules.desktopportal.termfilechooser.enable {
|
||||
(lib.mkIf nixosConfig.systemmodules.desktopportal.termfilechooser.enable {
|
||||
".config/xdg-desktop-portal-termfilechooser/config".text = ''
|
||||
[filechooser]
|
||||
cmd=${pkgs.xdg-desktop-portal-termfilechooser}/share/xdg-desktop-portal-termfilechooser/yazi-wrapper.sh
|
||||
@ -402,7 +392,7 @@ in
|
||||
save_mode = last
|
||||
'';
|
||||
})
|
||||
(lib.mkIf config.modules.git.enable {
|
||||
(lib.mkIf config.homemodules.git.enable {
|
||||
".ssh/allowed_signers".text = "* ${publicKeys.${username}.ssh}";
|
||||
})
|
||||
(lib.mkIf config.programs.navi.enable {
|
||||
@ -487,6 +477,7 @@ in
|
||||
lazyjournal # Journalctl viewer
|
||||
systemctl-tui
|
||||
restic # Backups
|
||||
gnumake
|
||||
|
||||
# Hardware/Software info
|
||||
pciutils # lspci
|
||||
@ -526,7 +517,7 @@ in
|
||||
gping # ping with graph
|
||||
curlie # curl a'la httpie
|
||||
wget # download that shit
|
||||
dogdns # dns client
|
||||
doggo # dns client
|
||||
rsync # cp on steroids
|
||||
rclone # Rsync for cloud
|
||||
httpie # Cool http client
|
||||
@ -569,11 +560,8 @@ in
|
||||
audacity
|
||||
ferdium
|
||||
gparted
|
||||
tidal-hifi
|
||||
tidal-dl-ng
|
||||
picard
|
||||
handbrake
|
||||
teamspeak6-client
|
||||
# feishin # electron :(
|
||||
jellyfin-tui
|
||||
|
||||
# Office
|
||||
kdePackages.wacomtablet # For xournalpp/krita
|
||||
@ -654,7 +642,7 @@ in
|
||||
|
||||
eza = {
|
||||
enable = true;
|
||||
enableFishIntegration = config.modules.fish.enable;
|
||||
enableFishIntegration = config.homemodules.fish.enable;
|
||||
};
|
||||
|
||||
# TODO: Module
|
||||
@ -811,7 +799,7 @@ in
|
||||
|
||||
fzf = {
|
||||
enable = true;
|
||||
enableFishIntegration = config.modules.fish.enable;
|
||||
enableFishIntegration = config.homemodules.fish.enable;
|
||||
};
|
||||
|
||||
imv = {
|
||||
@ -829,7 +817,7 @@ in
|
||||
|
||||
keychain = {
|
||||
enable = true;
|
||||
enableFishIntegration = config.modules.fish.enable;
|
||||
enableFishIntegration = config.homemodules.fish.enable;
|
||||
enableXsessionIntegration = !headless;
|
||||
keys = ["id_ed25519"];
|
||||
};
|
||||
@ -843,12 +831,12 @@ in
|
||||
|
||||
navi = {
|
||||
enable = true;
|
||||
enableFishIntegration = config.modules.fish.enable;
|
||||
enableFishIntegration = config.homemodules.fish.enable;
|
||||
};
|
||||
|
||||
nix-index = {
|
||||
enable = true;
|
||||
enableFishIntegration = config.modules.fish.enable;
|
||||
enableFishIntegration = config.homemodules.fish.enable;
|
||||
};
|
||||
|
||||
nushell.enable = false;
|
||||
@ -940,7 +928,7 @@ in
|
||||
|
||||
zoxide = {
|
||||
enable = true;
|
||||
enableFishIntegration = config.modules.fish.enable;
|
||||
enableFishIntegration = config.homemodules.fish.enable;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -8,12 +8,8 @@
|
||||
username,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
../../modules
|
||||
];
|
||||
|
||||
config = {
|
||||
modules = {
|
||||
homemodules = {
|
||||
btop.cuda = true;
|
||||
|
||||
# This has been relocated here from the default config,
|
||||
@ -123,9 +119,10 @@
|
||||
# jetbrains.idea-ultimate
|
||||
# jetbrains.webstorm
|
||||
# jetbrains.rider
|
||||
zed-editor
|
||||
vscode
|
||||
|
||||
# Unity Stuff
|
||||
# TODO: Unity module
|
||||
# unityhub
|
||||
# rider-unity
|
||||
# dotnetCore
|
||||
@ -139,9 +136,15 @@
|
||||
krita
|
||||
makemkv
|
||||
lrcget
|
||||
msty
|
||||
# msty
|
||||
# jellyfin-media-player # CVE, can't install
|
||||
jellyfin-desktop
|
||||
jellyfin-mpv-shim
|
||||
# tidal-hifi
|
||||
tidal-dl-ng # TODO: Borked
|
||||
picard
|
||||
handbrake
|
||||
teamspeak6-client
|
||||
|
||||
steam-devices-udev-rules
|
||||
];
|
||||
@ -177,7 +180,7 @@
|
||||
|
||||
services = {
|
||||
ollama = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
acceleration = "cuda";
|
||||
# home = "/var/lib/ollama";
|
||||
|
||||
|
||||
@ -1,11 +1,7 @@
|
||||
# Here goes the stuff that will only be enabled on the laptop
|
||||
{...}: {
|
||||
imports = [
|
||||
../../modules
|
||||
];
|
||||
|
||||
config = {
|
||||
modules = {
|
||||
homemodules = {
|
||||
hyprland = {
|
||||
keyboard = {
|
||||
layout = "us";
|
||||
|
||||
@ -6,12 +6,8 @@
|
||||
username,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
../../modules
|
||||
];
|
||||
|
||||
config = {
|
||||
modules = {
|
||||
homemodules = {
|
||||
btop.cuda = true;
|
||||
};
|
||||
|
||||
|
||||
@ -6,10 +6,6 @@
|
||||
username,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
../../modules
|
||||
];
|
||||
|
||||
config = {
|
||||
home.packages = with pkgs; [
|
||||
docker-compose
|
||||
|
||||
14
home/homemodules/0_template/default.nix
Normal file
14
home/homemodules/0_template/default.nix
Normal file
@ -0,0 +1,14 @@
|
||||
{
|
||||
config,
|
||||
nixosConfig,
|
||||
lib,
|
||||
mylib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (config.homemodules) TEMPLATE color;
|
||||
in {
|
||||
options.homemodules.TEMPLATE = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = lib.mkIf TEMPLATE.enable {};
|
||||
}
|
||||
@ -6,9 +6,9 @@
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (config.modules) ags;
|
||||
inherit (config.homemodules) ags;
|
||||
in {
|
||||
options.modules.ags = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.ags = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = lib.mkIf ags.enable {
|
||||
programs.ags = {
|
||||
@ -68,7 +68,7 @@ in {
|
||||
# ".config/ags".source = config.lib.file.mkOutOfStoreSymlink "${config.paths.nixflake}/home/modules/ags/config";
|
||||
|
||||
# NOTE: Don't symlink to ~/.config/ags/colors.scss, since that is already used by configDir
|
||||
".config/_colors.scss".text = with config.modules.color.hex; ''
|
||||
".config/_colors.scss".text = with config.homemodules.color.hex; ''
|
||||
$dark-rosewater: #${dark.rosewater};
|
||||
$dark-flamingo: #${dark.flamingo};
|
||||
$dark-pink: #${dark.pink};
|
||||
@ -5,9 +5,9 @@
|
||||
...
|
||||
}:
|
||||
with mylib.modules; let
|
||||
cfg = config.modules.alacritty;
|
||||
cfg = config.homemodules.alacritty;
|
||||
in {
|
||||
options.modules.alacritty = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.alacritty = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
programs.alacritty = {
|
||||
@ -8,14 +8,14 @@
|
||||
}:
|
||||
with lib;
|
||||
with mylib.modules; let
|
||||
cfg = config.modules.audio;
|
||||
cfgfp = config.modules.flatpak;
|
||||
cfg = config.homemodules.audio;
|
||||
cfgfp = config.homemodules.flatpak;
|
||||
in {
|
||||
imports = [
|
||||
../flatpak
|
||||
];
|
||||
|
||||
options.modules.audio = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.audio = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [
|
||||
@ -12,13 +12,13 @@ with lib;
|
||||
with mylib.modules; let
|
||||
# This is the current state of the option that this module defines
|
||||
# We use it to determine if the config should be changed below
|
||||
cfg = config.modules.emacs;
|
||||
cfg = config.homemodules.emacs;
|
||||
in {
|
||||
imports = [];
|
||||
|
||||
# Options is a vector of options this module defines
|
||||
# This module defines only the "emacs" option and suboptions "enable" and "doom"
|
||||
options.modules.emacs = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.emacs = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
# Config is the merged set of all module configurations
|
||||
# Here we define what happens to the config if the module is active (but only if the module is active)
|
||||
@ -13,9 +13,9 @@
|
||||
}:
|
||||
with lib;
|
||||
with mylib.modules; let
|
||||
cfg = config.modules.email;
|
||||
cfg = config.homemodules.email;
|
||||
in {
|
||||
options.modules.email = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.email = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
# TODO: Add Maildir to nextcloud sync
|
||||
config = mkIf cfg.enable {
|
||||
@ -12,9 +12,9 @@ with mylib.modules;
|
||||
# It is important that every flatpak interaction is handled through this module
|
||||
# to prevent that anything is removed by a module although it is required by another one
|
||||
let
|
||||
cfg = config.modules.flatpak;
|
||||
cfg = config.homemodules.flatpak;
|
||||
in {
|
||||
options.modules.flatpak = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.flatpak = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [
|
||||
@ -7,11 +7,11 @@
|
||||
}:
|
||||
with lib;
|
||||
with mylib.modules; let
|
||||
cfg = config.modules.gaming;
|
||||
cfgfp = config.modules.flatpak;
|
||||
cfg = config.homemodules.gaming;
|
||||
cfgfp = config.homemodules.flatpak;
|
||||
in {
|
||||
imports = [
|
||||
# NOTE: I don't know if this is the right approach or if I should use config.modules.flatpak
|
||||
# NOTE: I don't know if this is the right approach or if I should use config.homemodules.flatpak
|
||||
../flatpak
|
||||
];
|
||||
|
||||
@ -19,7 +19,7 @@ in {
|
||||
# TODO: SteamTinkerLaunch option
|
||||
# TODO: Dolphin + SteamRomManager option
|
||||
|
||||
options.modules.gaming = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.gaming = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [
|
||||
@ -10,9 +10,9 @@
|
||||
}:
|
||||
with lib;
|
||||
with mylib.modules; let
|
||||
cfg = config.modules.helix;
|
||||
cfg = config.homemodules.helix;
|
||||
in {
|
||||
options.modules.helix = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.helix = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.sessionVariables = {
|
||||
@ -9,9 +9,9 @@
|
||||
# TODO: Remove this module, put protonmail into the email module
|
||||
with lib;
|
||||
with mylib.modules; let
|
||||
cfg = config.modules.misc;
|
||||
cfg = config.homemodules.misc;
|
||||
in {
|
||||
options.modules.misc = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.misc = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs;
|
||||
@ -12,9 +12,9 @@
|
||||
}:
|
||||
with lib;
|
||||
with mylib.modules; let
|
||||
cfg = config.modules.nextcloud;
|
||||
cfg = config.homemodules.nextcloud;
|
||||
in {
|
||||
options.modules.nextcloud = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.nextcloud = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [
|
||||
@ -8,9 +8,9 @@
|
||||
}:
|
||||
with lib;
|
||||
with mylib.modules; let
|
||||
cfg = config.modules.ranger;
|
||||
cfg = config.homemodules.ranger;
|
||||
in {
|
||||
options.modules.ranger = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.ranger = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs;
|
||||
@ -9,9 +9,9 @@
|
||||
}:
|
||||
with lib;
|
||||
with mylib.modules; let
|
||||
cfg = config.modules.vscode;
|
||||
cfg = config.homemodules.vscode;
|
||||
in {
|
||||
options.modules.vscode = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.vscode = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
programs.vscode = {
|
||||
@ -6,9 +6,9 @@
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (config.modules) beets;
|
||||
inherit (config.homemodules) beets;
|
||||
in {
|
||||
options.modules.beets = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.beets = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = lib.mkIf beets.enable {
|
||||
programs.beets = {
|
||||
@ -6,9 +6,9 @@
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (config.modules) btop color;
|
||||
inherit (config.homemodules) btop color;
|
||||
in {
|
||||
options.modules.btop = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.btop = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = lib.mkIf btop.enable {
|
||||
programs.btop = {
|
||||
@ -5,9 +5,9 @@
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (config.modules) chromium;
|
||||
inherit (config.homemodules) chromium;
|
||||
in {
|
||||
options.modules.chromium = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.chromium = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = lib.mkIf chromium.enable {
|
||||
home.packages = with pkgs;
|
||||
@ -5,9 +5,9 @@
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (config.modules) color;
|
||||
inherit (config.homemodules) color;
|
||||
in {
|
||||
options.modules.color = import ./options.nix {inherit lib mylib pkgs;};
|
||||
options.homemodules.color = import ./options.nix {inherit lib mylib pkgs;};
|
||||
|
||||
config = {
|
||||
home.packages = let
|
||||
@ -59,7 +59,7 @@ in {
|
||||
++ (lib.optionals color.installPackages color.extraPackages);
|
||||
|
||||
# This module sets its own options to the values specified in a colorscheme file.
|
||||
modules.color = let
|
||||
homemodules.color = let
|
||||
scheme = import ./schemes/${color.scheme}.nix;
|
||||
|
||||
# Add the aliases
|
||||
@ -35,8 +35,8 @@
|
||||
# inputs.niri.homeModules.niri # Imported by system module
|
||||
inputs.noctalia.homeModules.default
|
||||
inputs.caelestia.homeManagerModules.default
|
||||
inputs.dankMaterialShell.homeModules.dankMaterialShell.default
|
||||
inputs.dankMaterialShell.homeModules.dankMaterialShell.niri
|
||||
inputs.dank-material-shell.homeModules.dank-material-shell
|
||||
inputs.dank-material-shell.homeModules.niri
|
||||
|
||||
# NOTE: Do NOT use this, use the system module (the HM module has to rely on fuse)
|
||||
# inputs.impermanence.homeManagerModules.impermanence
|
||||
@ -5,9 +5,9 @@
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (config.modules) docs;
|
||||
inherit (config.homemodules) docs;
|
||||
in {
|
||||
options.modules.docs = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.docs = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = lib.mkIf docs.enable {
|
||||
home = {
|
||||
@ -5,9 +5,9 @@
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (config.modules) fcitx;
|
||||
inherit (config.homemodules) fcitx;
|
||||
in {
|
||||
options.modules.fcitx = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.fcitx = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = lib.mkIf fcitx.enable {
|
||||
i18n.inputMethod = {
|
||||
@ -6,15 +6,15 @@
|
||||
hostname,
|
||||
...
|
||||
}: let
|
||||
inherit (config.modules) firefox color;
|
||||
inherit (config.homemodules) firefox color;
|
||||
in {
|
||||
options.modules.firefox = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.firefox = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = lib.mkIf firefox.enable {
|
||||
textfox = {
|
||||
enable = firefox.textfox;
|
||||
useLegacyExtensions = false;
|
||||
profile = "default";
|
||||
profiles = ["default"];
|
||||
|
||||
config = {
|
||||
background = {
|
||||
@ -243,7 +243,7 @@ in {
|
||||
# catppuccin-web-file-icons
|
||||
clearurls
|
||||
# cookie-autodelete
|
||||
dark-background-light-text
|
||||
# dark-background-light-text
|
||||
display-_anchors # Easier linking to specific website parts
|
||||
don-t-fuck-with-paste
|
||||
# enhancer-for-youtube # Discontinued, use tweaks-for-youtube
|
||||
@ -7,9 +7,9 @@
|
||||
nixosConfig,
|
||||
...
|
||||
}: let
|
||||
inherit (config.modules) fish color;
|
||||
inherit (config.homemodules) fish color;
|
||||
in {
|
||||
options.modules.fish = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.fish = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = lib.mkIf fish.enable {
|
||||
# https://github.com/catppuccin/fish/blob/main/themes/Catppuccin%20Mocha.theme
|
||||
@ -47,7 +47,7 @@ in {
|
||||
generateCompletions = nixosConfig.programs.fish.generateCompletions;
|
||||
|
||||
functions = lib.mergeAttrsList [
|
||||
(lib.optionalAttrs config.modules.nnn.enable {
|
||||
(lib.optionalAttrs config.homemodules.nnn.enable {
|
||||
nnncd = {
|
||||
wraps = "nnn";
|
||||
description = "support nnn quit and change directory";
|
||||
@ -101,7 +101,7 @@ in {
|
||||
# Same as above but with args for bat
|
||||
batifyWithArgs = command: args: command + (lib.optionalString config.programs.bat.enable (" | bat " + args));
|
||||
|
||||
# These can be used for my config.modules and for HM config.programs,
|
||||
# These can be used for my config.homemodules and for HM config.programs,
|
||||
# as both of these add the package to home.packages
|
||||
hasHomePackage = package: (mylib.modules.contains config.home.packages package);
|
||||
|
||||
@ -167,15 +167,15 @@ in {
|
||||
gcl = "git clone";
|
||||
})
|
||||
|
||||
(lib.optionalAttrs config.modules.kitty.enable {ssh = "kitty +kitten ssh";})
|
||||
(lib.optionalAttrs config.homemodules.kitty.enable {ssh = "kitty +kitten ssh";})
|
||||
|
||||
(abbrify pkgs.lazygit {lg = "lazygit";})
|
||||
|
||||
(abbrify pkgs.nix-search-tv {search = "nix-search-tv print --indexes 'nixos,home-manager,nixpkgs,nur' | fzf --preview 'nix-search-tv preview {}' --scheme history";})
|
||||
|
||||
# Doesn't work with abbrify because I have nnn.override...
|
||||
(lib.optionalAttrs config.modules.nnn.enable {n = "nnncd -a";})
|
||||
(lib.optionalAttrs config.modules.nnn.enable {np = "nnncd -a -P p";})
|
||||
(lib.optionalAttrs config.homemodules.nnn.enable {n = "nnncd -a";})
|
||||
(lib.optionalAttrs config.homemodules.nnn.enable {np = "nnncd -a -P p";})
|
||||
|
||||
(abbrify pkgs.ranger {r = "ranger --choosedir=$HOME/.rangerdir; set LASTDIR (cat $HOME/.rangerdir); cd $LASTDIR";})
|
||||
|
||||
@ -184,7 +184,7 @@ in {
|
||||
# grep = rg;
|
||||
})
|
||||
|
||||
(lib.optionalAttrs config.modules.rmpc.enable {r = "rcmp";})
|
||||
(lib.optionalAttrs config.homemodules.rmpc.enable {r = "rcmp";})
|
||||
|
||||
(abbrify pkgs.rsync rec {
|
||||
rsync = "rsync -ahv --inplace --partial --info=progress2";
|
||||
@ -197,7 +197,7 @@ in {
|
||||
|
||||
programs.starship = {
|
||||
enable = true;
|
||||
enableFishIntegration = config.modules.fish.enable;
|
||||
enableFishIntegration = config.homemodules.fish.enable;
|
||||
settings = {
|
||||
# Other config here
|
||||
format = "$all"; # Remove this line to disable the default prompt format
|
||||
@ -6,9 +6,9 @@
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (config.modules) git;
|
||||
inherit (config.homemodules) git;
|
||||
in {
|
||||
options.modules.git = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.git = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = lib.mkIf git.enable {
|
||||
programs.diff-so-fancy = {
|
||||
@ -8,7 +8,7 @@
|
||||
username,
|
||||
...
|
||||
}: let
|
||||
inherit (config.modules) hyprland color;
|
||||
inherit (config.homemodules) hyprland color;
|
||||
|
||||
# Autostart programs
|
||||
always-exec = import ./autostart.nix {inherit lib pkgs config hyprland;};
|
||||
@ -22,7 +22,7 @@
|
||||
"$mainMod, mouse:273" = ["resizewindow"];
|
||||
};
|
||||
in {
|
||||
options.modules.hyprland = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.hyprland = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = lib.mkIf hyprland.enable {
|
||||
assertions = [
|
||||
@ -46,7 +46,7 @@ in {
|
||||
iconTheme.name = color.iconTheme;
|
||||
};
|
||||
|
||||
modules = {
|
||||
homemodules = {
|
||||
hyprpanel.enable = hyprland.hyprpanel.enable;
|
||||
};
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
settings = {
|
||||
global = {
|
||||
monitor = config.modules.waybar.monitor;
|
||||
monitor = config.homemodules.waybar.monitor;
|
||||
font = "${color.font} 11";
|
||||
offset = "10x10";
|
||||
background = color.hexS.base;
|
||||
@ -6,9 +6,9 @@
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (config.modules) hyprpanel color;
|
||||
inherit (config.homemodules) hyprpanel color;
|
||||
in {
|
||||
options.modules.hyprpanel = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.hyprpanel = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = lib.mkIf hyprpanel.enable {
|
||||
programs.hyprpanel = {
|
||||
@ -5,9 +5,9 @@
|
||||
mylib,
|
||||
...
|
||||
}: let
|
||||
inherit (config.modules) kitty color;
|
||||
inherit (config.homemodules) kitty color;
|
||||
in {
|
||||
options.modules.kitty = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.kitty = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = lib.mkIf kitty.enable {
|
||||
programs.kitty = {
|
||||
@ -15,7 +15,7 @@ in {
|
||||
shellIntegration.enableFishIntegration = true;
|
||||
|
||||
font = {
|
||||
name = "${config.modules.color.font}";
|
||||
name = "${config.homemodules.color.font}";
|
||||
size = 12;
|
||||
};
|
||||
|
||||
@ -6,9 +6,9 @@
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (config.modules) lazygit color;
|
||||
inherit (config.homemodules) lazygit color;
|
||||
in {
|
||||
options.modules.lazygit = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.lazygit = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = lib.mkIf lazygit.enable {
|
||||
programs.lazygit = {
|
||||
@ -6,9 +6,9 @@
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (config.modules) mpd;
|
||||
inherit (config.homemodules) mpd;
|
||||
in {
|
||||
options.modules.mpd = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.mpd = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = lib.mkIf mpd.enable {
|
||||
services = {
|
||||
@ -10,9 +10,9 @@
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
inherit (config.modules) neovim color;
|
||||
inherit (config.homemodules) neovim color;
|
||||
in {
|
||||
options.modules.neovim = import ./options.nix {inherit lib mylib;};
|
||||
options.homemodules.neovim = import ./options.nix {inherit lib mylib;};
|
||||
|
||||
config = lib.mkIf neovim.enable {
|
||||
home = {
|
||||
@ -38,7 +38,6 @@ in {
|
||||
ltex-ls # TODO: Only enable on-demand
|
||||
lua-language-server
|
||||
# nil
|
||||
nixd
|
||||
basedpyright
|
||||
pyrefly
|
||||
ty
|
||||
@ -50,6 +49,7 @@ in {
|
||||
tinymist
|
||||
typescript
|
||||
vscode-langservers-extracted # includes nodejs
|
||||
autotools-language-server
|
||||
|
||||
# Linters
|
||||
checkstyle # java
|
||||
@ -64,7 +64,6 @@ in {
|
||||
# statix # nix (doesn't recognize pipe operator)
|
||||
|
||||
# Formatters
|
||||
alejandra # nix
|
||||
cljfmt
|
||||
python313Packages.black
|
||||
google-java-format
|
||||
@ -83,6 +82,9 @@ in {
|
||||
# Dependencies
|
||||
lua54Packages.jsregexp # For tree-sitter
|
||||
# nodejs_latest
|
||||
|
||||
nixd
|
||||
alejandra # nix
|
||||
]
|
||||
];
|
||||
};
|
||||
@ -842,21 +844,14 @@ in {
|
||||
{
|
||||
name = "clangd";
|
||||
extraOptions = {
|
||||
root_dir.__raw = ''
|
||||
function(fname)
|
||||
-- return require("lspconfig.util").root_pattern(
|
||||
return vim.lsp.config.util.root_pattern(
|
||||
"Makefile",
|
||||
"CMakeLists.txt",
|
||||
".clang-format",
|
||||
".clang-tidy"
|
||||
-- )(fname) or require("lspconfig.util").root_pattern(
|
||||
)(fname) or vim.lsp.config.util.root_pattern(
|
||||
"compile_commands.json"
|
||||
-- )(fname) or require("lspconfig.util").find_git_ancestor(fname)
|
||||
)(fname) or vim.lsp.config.util.find_git_ancestor(fname)
|
||||
end
|
||||
'';
|
||||
# root_markers = [
|
||||
# "Makefile"
|
||||
# "CMakeLists.txt"
|
||||
# ".clang-format"
|
||||
# ".clang-tidy"
|
||||
# "compile_commands.json"
|
||||
# ];
|
||||
# workspace_required = true;
|
||||
|
||||
cmd = [
|
||||
"clangd"
|
||||
@ -893,12 +888,13 @@ in {
|
||||
};
|
||||
};
|
||||
}
|
||||
{name = "autotools-language-server";}
|
||||
# {name = "nil_ls";}
|
||||
{
|
||||
name = "nixd";
|
||||
extraOptions.cmd = [
|
||||
"nixd"
|
||||
"--inlay-hints=false"
|
||||
"--inlay-hints=true"
|
||||
"--semantic-tokens=true"
|
||||
];
|
||||
extraOptions.settings = {
|
||||
@ -1842,9 +1838,7 @@ in {
|
||||
# _treesitter-context # Ugly
|
||||
# _treesitter-refactor # Ugly
|
||||
];
|
||||
lazy = true;
|
||||
cmd = ["TSModuleInfo"];
|
||||
event = ["BufReadPost" "BufNewFile"];
|
||||
lazy = false;
|
||||
init = ''
|
||||
function()
|
||||
-- Fix treesitter grammars/parsers on nix
|
||||
@ -1854,7 +1848,10 @@ in {
|
||||
'';
|
||||
config = ''
|
||||
function(_, opts)
|
||||
require("nvim-treesitter.configs").setup(opts)
|
||||
-- require("nvim-treesitter.configs").setup(opts)
|
||||
require("nvim-treesitter").setup(opts)
|
||||
|
||||
-- TODO: Why is GLSL filetype in the treesitter setup???
|
||||
|
||||
-- GLSL filetypes
|
||||
vim.filetype.add {
|
||||
@ -1872,7 +1869,8 @@ in {
|
||||
opts = {
|
||||
auto_install = false;
|
||||
ensure_installed = [];
|
||||
parser_install_dir = "${treesitter-parsers}";
|
||||
# parser_install_dir = "${treesitter-parsers}";
|
||||
install_dir = "${treesitter-parsers}";
|
||||
|
||||
indent = {
|
||||
enable = true;
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user