Compare commits
82 Commits
master
...
89739e3af0
| Author | SHA1 | Date | |
|---|---|---|---|
89739e3af0
|
|||
|
52a99db8e0
|
|||
|
7848fb7274
|
|||
|
397d1b014c
|
|||
|
7f1ce57994
|
|||
|
a1f495f138
|
|||
|
4e9003e0c5
|
|||
|
380e11edb2
|
|||
|
a2153c4418
|
|||
|
abdcbe2ce9
|
|||
|
fa286dce16
|
|||
|
c4454daab6
|
|||
|
a03c9d8227
|
|||
|
9db5d91da6
|
|||
|
72716230ea
|
|||
|
2919e797ed
|
|||
|
86d669c2ab
|
|||
|
77ac5b70b8
|
|||
|
54839be395
|
|||
|
714e3e0683
|
|||
|
a8d7d1e666
|
|||
|
40bcc14304
|
|||
|
fa5bd0eefd
|
|||
|
6182ada581
|
|||
|
4acddcec09
|
|||
|
5c14817464
|
|||
|
38920bd3d7
|
|||
|
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
|
|||
|
1fef42e5d4
|
|||
|
0d20883f4f
|
|||
|
cec5ec5493
|
|||
|
5833dff19e
|
|||
|
7b4c2df7af
|
|||
|
1643f30906
|
|||
|
79c617cc91
|
|||
|
474a8badf4
|
|||
|
17368396cf
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -11,3 +11,4 @@ config/neovim/store
|
||||
home/modules/ags/config/types
|
||||
home/modules/ags/config/tsconfig.json
|
||||
system/modules/agenix/secrets.nix
|
||||
config/neovim/nvim_bundle
|
||||
|
||||
@ -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"
|
||||
}
|
||||
219
config/flake.nix
219
config/flake.nix
@ -68,7 +68,7 @@ rec {
|
||||
# bintools = pkgs.bintools.bintools; # Unwrapped bintools
|
||||
# libc = pkgs.glibc;
|
||||
# };
|
||||
# gcc = pkgs.hiPrio (pkgs.wrapCCWith {
|
||||
# gcc = lib.hiPrio (pkgs.wrapCCWith {
|
||||
# cc = pkgs.gcc.cc; # Unwrapped gcc
|
||||
# libc = pkgs.glibc;
|
||||
# bintools = bintools;
|
||||
@ -84,7 +84,7 @@ rec {
|
||||
# bintools = pkgs.bintools.bintools; # Unwrapped bintools
|
||||
# libc = pkgs.glibc_multi;
|
||||
# };
|
||||
# gcc_multilib = pkgs.hiPrio (pkgs.wrapCCWith {
|
||||
# gcc_multilib = lib.hiPrio (pkgs.wrapCCWith {
|
||||
# cc = pkgs.gcc.cc; # Unwrapped gcc
|
||||
# libc = pkgs.glibc_multi;
|
||||
# bintools = bintools_multilib;
|
||||
@ -190,128 +190,131 @@ rec {
|
||||
# drv = defaultPackage;
|
||||
# };
|
||||
|
||||
# Provide environment for "nix develop"
|
||||
devShell = pkgs.mkShell {
|
||||
inherit nativeBuildInputs buildInputs;
|
||||
name = description;
|
||||
devShells = {
|
||||
# Provide default environment for "nix develop".
|
||||
# Other environments can be added below.
|
||||
default = pkgs.mkShell {
|
||||
inherit nativeBuildInputs buildInputs;
|
||||
name = description;
|
||||
|
||||
# =========================================================================================
|
||||
# Define environment variables
|
||||
# =========================================================================================
|
||||
# =========================================================================================
|
||||
# Define environment variables
|
||||
# =========================================================================================
|
||||
|
||||
# Rust stdlib source:
|
||||
# RUST_SRC_PATH = "${rust}/lib/rustlib/src/rust/library";
|
||||
# Rust stdlib source:
|
||||
# RUST_SRC_PATH = "${rust}/lib/rustlib/src/rust/library";
|
||||
|
||||
# Custom dynamic libraries:
|
||||
# LD_LIBRARY_PATH = builtins.concatStringsSep ":" [
|
||||
# # Rust Bevy GUI app:
|
||||
# # "${pkgs.xorg.libX11}/lib"
|
||||
# # "${pkgs.xorg.libXcursor}/lib"
|
||||
# # "${pkgs.xorg.libXrandr}/lib"
|
||||
# # "${pkgs.xorg.libXi}/lib"
|
||||
# # "${pkgs.libGL}/lib"
|
||||
#
|
||||
# # JavaFX app:
|
||||
# # "${pkgs.libGL}/lib"
|
||||
# # "${pkgs.gtk3}/lib"
|
||||
# # "${pkgs.glib.out}/lib"
|
||||
# # "${pkgs.xorg.libXtst}/lib"
|
||||
# ];
|
||||
# Custom dynamic libraries:
|
||||
# LD_LIBRARY_PATH = builtins.concatStringsSep ":" [
|
||||
# # Rust Bevy GUI app:
|
||||
# # "${pkgs.libx11}/lib"
|
||||
# # "${pkgs.libxcursor}/lib"
|
||||
# # "${pkgs.libxrandr}/lib"
|
||||
# # "${pkgs.libxi}/lib"
|
||||
# # "${pkgs.libGL}/lib"
|
||||
#
|
||||
# # JavaFX app:
|
||||
# # "${pkgs.libGL}/lib"
|
||||
# # "${pkgs.gtk3}/lib"
|
||||
# # "${pkgs.glib.out}/lib"
|
||||
# # "${pkgs.xorg.libXtst}/lib"
|
||||
# ];
|
||||
|
||||
# Dynamic libraries from buildinputs:
|
||||
# LD_LIBRARY_PATH = nixpkgs.lib.makeLibraryPath buildInputs;
|
||||
# Dynamic libraries from buildinputs:
|
||||
# LD_LIBRARY_PATH = nixpkgs.lib.makeLibraryPath buildInputs;
|
||||
|
||||
# QT imports to use with "qmlls -E"
|
||||
# QML_IMPORT_PATH = "${pkgs.qt6.full}/lib/qt-6/qml";
|
||||
# QT imports to use with "qmlls -E"
|
||||
# QML_IMPORT_PATH = "${pkgs.qt6.full}/lib/qt-6/qml";
|
||||
|
||||
# Set PYTHONPATH
|
||||
# PYTHONPATH = ".";
|
||||
# Set PYTHONPATH
|
||||
# PYTHONPATH = ".";
|
||||
|
||||
# Set matplotlib backend
|
||||
# MPLBACKEND = "TkAgg";
|
||||
# Set matplotlib backend
|
||||
# MPLBACKEND = "TkAgg";
|
||||
|
||||
# =========================================================================================
|
||||
# Define shell environment
|
||||
# =========================================================================================
|
||||
# =========================================================================================
|
||||
# Define shell environment
|
||||
# =========================================================================================
|
||||
|
||||
# Setup the shell when entering the "nix develop" environment (bash script).
|
||||
shellHook = let
|
||||
mkCmakeScript = type: let
|
||||
typeLower = lib.toLower type;
|
||||
in
|
||||
pkgs.writers.writeFish "cmake-${typeLower}.fish" ''
|
||||
cd $FLAKE_PROJECT_ROOT
|
||||
# Setup the shell when entering the "nix develop" environment (bash script).
|
||||
shellHook = let
|
||||
mkCmakeScript = type: let
|
||||
typeLower = lib.toLower type;
|
||||
in
|
||||
pkgs.writers.writeFish "cmake-${typeLower}.fish" ''
|
||||
cd $FLAKE_PROJECT_ROOT
|
||||
|
||||
echo "Removing build directory ./cmake-build-${typeLower}/"
|
||||
rm -rf ./cmake-build-${typeLower}
|
||||
echo "Removing build directory ./cmake-build-${typeLower}/"
|
||||
rm -rf ./cmake-build-${typeLower}
|
||||
|
||||
echo "Creating build directory"
|
||||
mkdir cmake-build-${typeLower}
|
||||
cd cmake-build-${typeLower}
|
||||
echo "Creating build directory"
|
||||
mkdir cmake-build-${typeLower}
|
||||
cd cmake-build-${typeLower}
|
||||
|
||||
echo "Running cmake"
|
||||
cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE="${type}" -DCMAKE_EXPORT_COMPILE_COMMANDS="On" ..
|
||||
echo "Running cmake"
|
||||
cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE="${type}" -DCMAKE_EXPORT_COMPILE_COMMANDS="On" ..
|
||||
|
||||
echo "Linking compile_commands.json"
|
||||
cd ..
|
||||
ln -sf ./cmake-build-${typeLower}/compile_commands.json ./compile_commands.json
|
||||
echo "Linking compile_commands.json"
|
||||
cd ..
|
||||
ln -sf ./cmake-build-${typeLower}/compile_commands.json ./compile_commands.json
|
||||
'';
|
||||
|
||||
cmakeDebug = mkCmakeScript "Debug";
|
||||
cmakeRelease = mkCmakeScript "Release";
|
||||
|
||||
mkBuildScript = type: let
|
||||
typeLower = lib.toLower type;
|
||||
in
|
||||
pkgs.writers.writeFish "cmake-build.fish" ''
|
||||
cd $FLAKE_PROJECT_ROOT/cmake-build-${typeLower}
|
||||
|
||||
echo "Running cmake"
|
||||
cmake --build .
|
||||
'';
|
||||
|
||||
buildDebug = mkBuildScript "Debug";
|
||||
buildRelease = mkBuildScript "Release";
|
||||
|
||||
# Use this to specify commands that should be ran after entering fish shell
|
||||
initProjectShell = pkgs.writers.writeFish "init-shell.fish" ''
|
||||
echo "Entering \"${description}\" environment..."
|
||||
|
||||
# Determine the project root, used e.g. in cmake scripts
|
||||
set -g -x FLAKE_PROJECT_ROOT (git rev-parse --show-toplevel)
|
||||
|
||||
# Rust Bevy:
|
||||
# abbr -a build-release-windows "CARGO_FEATURE_PURE=1 cargo xwin build --release --target x86_64-pc-windows-msvc"
|
||||
|
||||
# C/C++:
|
||||
# abbr -a cmake-debug "${cmakeDebug}"
|
||||
# abbr -a cmake-release "${cmakeRelease}"
|
||||
# abbr -a build-debug "${buildDebug}"
|
||||
# abbr -a build-release "${buildRelease}"
|
||||
|
||||
# Clojure:
|
||||
# abbr -a clojure-deps "deps-lock --lein"
|
||||
|
||||
# Python:
|
||||
# abbr -a run "python ./app/main.py"
|
||||
# abbr -a profile "py-spy record -o profile.svg -- python ./app/main.py && firefox profile.svg"
|
||||
# abbr -a ptop "py-spy top -- python ./app/main.py"
|
||||
'';
|
||||
|
||||
cmakeDebug = mkCmakeScript "Debug";
|
||||
cmakeRelease = mkCmakeScript "Release";
|
||||
|
||||
mkBuildScript = type: let
|
||||
typeLower = lib.toLower type;
|
||||
in
|
||||
pkgs.writers.writeFish "cmake-build.fish" ''
|
||||
cd $FLAKE_PROJECT_ROOT/cmake-build-${typeLower}
|
||||
builtins.concatStringsSep "\n" [
|
||||
# Launch into pure fish shell
|
||||
''
|
||||
exec "$(type -p fish)" -C "source ${initProjectShell} && abbr -a menu '${pkgs.bat}/bin/bat "${initProjectShell}"'"
|
||||
''
|
||||
|
||||
echo "Running cmake"
|
||||
cmake --build .
|
||||
'';
|
||||
|
||||
buildDebug = mkBuildScript "Debug";
|
||||
buildRelease = mkBuildScript "Release";
|
||||
|
||||
# Use this to specify commands that should be ran after entering fish shell
|
||||
initProjectShell = pkgs.writers.writeFish "init-shell.fish" ''
|
||||
echo "Entering \"${description}\" environment..."
|
||||
|
||||
# Determine the project root, used e.g. in cmake scripts
|
||||
set -g -x FLAKE_PROJECT_ROOT (git rev-parse --show-toplevel)
|
||||
|
||||
# Rust Bevy:
|
||||
# abbr -a build-release-windows "CARGO_FEATURE_PURE=1 cargo xwin build --release --target x86_64-pc-windows-msvc"
|
||||
|
||||
# C/C++:
|
||||
# abbr -a cmake-debug "${cmakeDebug}"
|
||||
# abbr -a cmake-release "${cmakeRelease}"
|
||||
# abbr -a build-debug "${buildDebug}"
|
||||
# abbr -a build-release "${buildRelease}"
|
||||
|
||||
# Clojure:
|
||||
# abbr -a clojure-deps "deps-lock --lein"
|
||||
|
||||
# Python:
|
||||
# abbr -a run "python ./app/main.py"
|
||||
# abbr -a profile "py-spy record -o profile.svg -- python ./app/main.py && firefox profile.svg"
|
||||
# abbr -a ptop "py-spy top -- python ./app/main.py"
|
||||
'';
|
||||
in
|
||||
builtins.concatStringsSep "\n" [
|
||||
# Launch into pure fish shell
|
||||
''
|
||||
exec "$(type -p fish)" -C "source ${initProjectShell} && abbr -a menu '${pkgs.bat}/bin/bat "${initProjectShell}"'"
|
||||
''
|
||||
|
||||
# Qt: Launch into wrapped fish shell
|
||||
# https://nixos.org/manual/nixpkgs/stable/#sec-language-qt
|
||||
# ''
|
||||
# fishdir=$(mktemp -d)
|
||||
# makeWrapper "$(type -p fish)" "$fishdir/fish" "''${qtWrapperArgs[@]}"
|
||||
# exec "$fishdir/fish" -C "source ${initProjectShell} && abbr -a menu '${pkgs.bat}/bin/bat "${initProjectShell}"'"
|
||||
# ''
|
||||
];
|
||||
# Qt: Launch into wrapped fish shell
|
||||
# https://nixos.org/manual/nixpkgs/stable/#sec-language-qt
|
||||
# ''
|
||||
# fishdir=$(mktemp -d)
|
||||
# makeWrapper "$(type -p fish)" "$fishdir/fish" "''${qtWrapperArgs[@]}"
|
||||
# exec "$fishdir/fish" -C "source ${initProjectShell} && abbr -a menu '${pkgs.bat}/bin/bat "${initProjectShell}"'"
|
||||
# ''
|
||||
];
|
||||
};
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
@ -210,6 +210,10 @@ Convert line endings to dos format
|
||||
unix2dos <file>
|
||||
$ file: eza -1
|
||||
|
||||
% tiddl
|
||||
Download stuff from tidal
|
||||
tiddl download --track-quality max --path ~/Downloads/Beet/Albums --videos none url "<url>"
|
||||
|
||||
; ===========================
|
||||
; SECRETS
|
||||
; ===========================
|
||||
|
||||
204
config/neovim/bundle.py
Normal file
204
config/neovim/bundle.py
Normal file
@ -0,0 +1,204 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
import argparse
|
||||
import os
|
||||
import re
|
||||
import shutil
|
||||
import subprocess
|
||||
from typing import cast
|
||||
from urllib.request import urlretrieve
|
||||
|
||||
INIT_LUA: str = "/home/christoph/.config/nvim/init.lua"
|
||||
|
||||
|
||||
def patch_paths(text: str, mappings: dict[str, str]) -> str:
|
||||
"""Patches /nix/store paths in init.lua"""
|
||||
|
||||
patched = text
|
||||
|
||||
for old, new in mappings.items():
|
||||
print(f"Patching init.lua: {old} -> {new}")
|
||||
patched = patched.replace(old, new)
|
||||
|
||||
return patched
|
||||
|
||||
|
||||
def patch_various(text: str) -> str:
|
||||
"""Patches various incompatibilities with NixVim init.lua"""
|
||||
|
||||
# Install lazy
|
||||
print("Patching init.lua: Bootstrap lazy.nvim")
|
||||
patched = (
|
||||
"""-- Bootstrap lazy.nvim
|
||||
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
||||
if not (vim.uv or vim.loop).fs_stat(lazypath) then
|
||||
local lazyrepo = "https://github.com/folke/lazy.nvim.git"
|
||||
local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
|
||||
if vim.v.shell_error ~= 0 then
|
||||
vim.api.nvim_echo({
|
||||
{ "Failed to clone lazy.nvim:\\n", "ErrorMsg" },
|
||||
{ out, "WarningMsg" },
|
||||
{ "\\nPress any key to exit..." },
|
||||
}, true, {})
|
||||
vim.fn.getchar()
|
||||
os.exit(1)
|
||||
end
|
||||
end
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
|
||||
"""
|
||||
+ text
|
||||
)
|
||||
|
||||
# print("Patching init.lua: Disabling vim.loader")
|
||||
# patched = patched.replace("vim.loader.enable(true)", "vim.loader.enable(false)")
|
||||
|
||||
return patched
|
||||
|
||||
|
||||
def copy_plugins(text: str, path: str) -> dict[str, str]:
|
||||
"""Copies NeoVim plugins from the Nix Store"""
|
||||
|
||||
os.makedirs(path, exist_ok=True)
|
||||
|
||||
plugins_path: str = re.findall(r"\"(/nix/store/.*-lazy-plugins)\"", text)[0]
|
||||
print(f"Copying: {plugins_path} -> {path}/plugins")
|
||||
_ = shutil.copytree(plugins_path, f"{path}/plugins")
|
||||
|
||||
treesitter_path: str = re.findall(
|
||||
r"\"(/nix/store/.*-vimplugin-nvim-treesitter.*)\"", text
|
||||
)[0]
|
||||
print(f"Copying: {treesitter_path} -> {path}/treesitter")
|
||||
_ = shutil.copytree(treesitter_path, f"{path}/treesitter")
|
||||
|
||||
parsers_path: str = re.findall(r"\"(/nix/store/.*-treesitter-parsers)\"", text)[0]
|
||||
print(f"Copying: {parsers_path} -> {path}/parsers")
|
||||
_ = shutil.copytree(parsers_path, f"{path}/parsers")
|
||||
|
||||
return {
|
||||
plugins_path: "./plugins",
|
||||
treesitter_path: "./treesitter",
|
||||
parsers_path: "./parsers",
|
||||
}
|
||||
|
||||
|
||||
def write_file(text: str, path: str) -> None:
|
||||
"""Write text to a file"""
|
||||
|
||||
with open(path, "w") as file:
|
||||
_ = file.write(text)
|
||||
|
||||
|
||||
# TODO: Could add etc. nvim/lsp/formatter/linter binaries here
|
||||
# TODO: Needs "install recipe", as in most cases the download will be an archive
|
||||
DOWNLOADS: list[tuple[str, str]] = [
|
||||
# (
|
||||
# "https://github.com/neovim/neovim/releases/download/v0.11.6/nvim-linux-x86_64.tar.gz",
|
||||
# "nvim",
|
||||
# ),
|
||||
]
|
||||
|
||||
|
||||
def download_binaries(path: str, urls: list[tuple[str, str]]) -> None:
|
||||
"""Download required binaries"""
|
||||
|
||||
os.makedirs(f"{path}/bin", exist_ok=True)
|
||||
|
||||
def download(url: str, path: str) -> None:
|
||||
"""Download from URL"""
|
||||
|
||||
print(f"Downloading: {url}")
|
||||
_ = urlretrieve(url, path)
|
||||
|
||||
for url, name in urls:
|
||||
download(url, f"{path}/bin/{name}")
|
||||
|
||||
|
||||
def build_nvim(path: str) -> None:
|
||||
"""Builds a static nvim binary against musl"""
|
||||
|
||||
# TODO: Build etc. is working, but on the target system there are
|
||||
# lua-ffi errors from noice.nvim with the static binary.
|
||||
# This does not happen with nvim from system package repository.
|
||||
|
||||
def run(command: list[str]) -> None:
|
||||
"""Run a subprocess"""
|
||||
|
||||
print(f"Running: {' '.join(command)}")
|
||||
_ = subprocess.run(command)
|
||||
|
||||
os.makedirs(f"{path}/nvim-build", exist_ok=True)
|
||||
|
||||
with open(f"{path}/nvim-build/build-nvim.sh", "w") as file:
|
||||
_ = file.write(
|
||||
"\n".join(
|
||||
[
|
||||
"#!/bin/sh",
|
||||
"git clone https://github.com/neovim/neovim",
|
||||
"cd neovim",
|
||||
"git checkout stable",
|
||||
'make -j$(nproc) CMAKE_BUILD_TYPE=Release CMAKE_EXTRA_FLAGS="-DSTATIC_BUILD=1"',
|
||||
"make CMAKE_INSTALL_PREFIX=/workdir/install install",
|
||||
]
|
||||
)
|
||||
)
|
||||
|
||||
run(
|
||||
[
|
||||
"docker",
|
||||
"run",
|
||||
"--rm",
|
||||
"-it",
|
||||
"-v",
|
||||
f"{os.path.abspath(path)}/nvim-build:/workdir",
|
||||
"-w",
|
||||
"/workdir",
|
||||
"alpine:3.23.3",
|
||||
"/bin/sh",
|
||||
"-c",
|
||||
"apk add build-base cmake coreutils curl gettext-tiny-dev git && chmod +x ./build-nvim.sh && ./build-nvim.sh",
|
||||
]
|
||||
)
|
||||
|
||||
_ = shutil.copytree(f"{path}/nvim-build/install/bin", f"{path}/bin")
|
||||
_ = shutil.copytree(f"{path}/nvim-build/install/lib", f"{path}/lib")
|
||||
_ = shutil.copytree(f"{path}/nvim-build/install/share", f"{path}/share")
|
||||
|
||||
_ = shutil.rmtree(f"{path}/nvim-build")
|
||||
|
||||
|
||||
def bundle() -> None:
|
||||
"""Creates a standalone NeoVim bundle from the NixVim configuration"""
|
||||
|
||||
parser = argparse.ArgumentParser()
|
||||
_ = parser.add_argument(
|
||||
"--config",
|
||||
type=str,
|
||||
default=INIT_LUA,
|
||||
help="init.lua or other config file",
|
||||
)
|
||||
_ = parser.add_argument(
|
||||
"--out",
|
||||
type=str,
|
||||
default="./nvim_bundle",
|
||||
help="destination folder",
|
||||
)
|
||||
|
||||
args = parser.parse_args()
|
||||
args.config = cast(str, args.config)
|
||||
args.out = cast(str, args.out)
|
||||
|
||||
with open(args.config, "r") as file:
|
||||
patched_init_lua: str = file.read()
|
||||
|
||||
path_mappings = copy_plugins(patched_init_lua, args.out)
|
||||
patched_init_lua = patch_paths(patched_init_lua, path_mappings)
|
||||
patched_init_lua = patch_various(patched_init_lua)
|
||||
write_file(patched_init_lua, f"{args.out}/init.lua")
|
||||
|
||||
# build_nvim(args.out)
|
||||
# download_binaries(args.out, DOWNLOADS)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
bundle()
|
||||
6
config/neovim/info.md
Normal file
6
config/neovim/info.md
Normal file
@ -0,0 +1,6 @@
|
||||
# NeoVim Portable
|
||||
|
||||
## Requirements
|
||||
|
||||
- Base packages: `sudo apt install neovim git direnv ripgrep curl fzf`
|
||||
- Link or copy the generated `nvim_bundle` to `~/.config/nvim` on the target machine
|
||||
@ -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)];});
|
||||
|
||||
@ -9,4 +9,5 @@
|
||||
msty = pkgs.callPackage ./msty {};
|
||||
unityhub = pkgs.callPackage ./unityhub {};
|
||||
tidal-dl-ng = pkgs.callPackage ./tidal-dl-ng {};
|
||||
tiddl = pkgs.callPackage ./tiddl {};
|
||||
}
|
||||
|
||||
@ -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,33 @@
|
||||
# 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_for_dj";
|
||||
version = "0.33.2";
|
||||
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=";
|
||||
# };
|
||||
|
||||
# Package now also deleted from PyPi
|
||||
# src = pythonPkgs.fetchPypi {
|
||||
# inherit pname version;
|
||||
# sha256 = "sha256-rOMyxnT7uVnMbn678DFtqAu4+Uc5VFGcqGI0jxplnpc=";
|
||||
# };
|
||||
|
||||
# TODO: Borked
|
||||
# "For DJ"-Fork
|
||||
src = pythonPkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-605cgBqZV6L7sxWtEa4Ki+9hBqX4m3Rk+X5oY5bv/FQ=";
|
||||
};
|
||||
|
||||
doCheck = false;
|
||||
catchConflicts = false;
|
||||
dontCheckRuntimeDeps = true;
|
||||
|
||||
nativeBuildInputs = with pythonPkgs; [poetry-core setuptools];
|
||||
|
||||
@ -96,13 +100,6 @@
|
||||
typer
|
||||
rich
|
||||
];
|
||||
|
||||
# pythonOutputDistPhase = ''
|
||||
# echo "⚠️Skipping pythonOutputDistPhase"
|
||||
# '';
|
||||
# pythonCatchConflictsPhase = ''
|
||||
# echo "🛑 Skipping pythonCatchConflictsPhase"
|
||||
# '';
|
||||
};
|
||||
|
||||
#
|
||||
@ -131,7 +128,7 @@
|
||||
|
||||
tidal-dl-ng-gui-desktopfile = pkgs.stdenv.mkDerivation {
|
||||
pname = "tdng";
|
||||
version = "0.31.3";
|
||||
version = "0.33.2";
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [pkgs.makeWrapper];
|
||||
|
||||
60
derivations/tiddl/default.nix
Normal file
60
derivations/tiddl/default.nix
Normal file
@ -0,0 +1,60 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
pkgs,
|
||||
}: let
|
||||
pythonPkgs = pkgs.python314Packages.overrideScope (self: super: {
|
||||
typer = super.typer.overridePythonAttrs (old: {
|
||||
version = "0.20.1";
|
||||
src = pkgs.fetchPypi {
|
||||
pname = "typer";
|
||||
version = "0.20.0";
|
||||
sha256 = "sha256-Gq9klAMXk+SHb7C6z6apErVRz0PB5jyADfixqGZyDDc=";
|
||||
};
|
||||
});
|
||||
|
||||
aiofiles = super.aiofiles.overridePythonAttrs (old: {
|
||||
version = "25.1.0";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "Tinche";
|
||||
repo = "aiofiles";
|
||||
tag = "v25.1.0";
|
||||
hash = "sha256-NBmzoUb2una3+eWqR1HraVPibaRb9I51aYwskrjxskQ=";
|
||||
};
|
||||
# Build system changed in this version
|
||||
build-system = with pythonPkgs; [
|
||||
hatchling
|
||||
hatch-vcs
|
||||
];
|
||||
});
|
||||
});
|
||||
in
|
||||
pythonPkgs.buildPythonApplication rec {
|
||||
pname = "tiddl";
|
||||
version = "3.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = pythonPkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-uLkGyIScYPqFgQdPAOYJDJG0jp+nDAwIl2kFkaJZFco=";
|
||||
};
|
||||
|
||||
dontCheckRuntimeDeps = true;
|
||||
|
||||
build-system = with pythonPkgs; [
|
||||
poetry-core
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with pythonPkgs; [
|
||||
# Nixpkgs
|
||||
aiofiles
|
||||
aiohttp
|
||||
m3u8
|
||||
mutagen
|
||||
pydantic
|
||||
requests
|
||||
requests-cache
|
||||
typer
|
||||
];
|
||||
}
|
||||
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
with pkgs;
|
||||
[
|
||||
# Unity Hub binary dependencies
|
||||
xorg.libXrandr
|
||||
libxrandr
|
||||
xdg-utils
|
||||
|
||||
# GTK filepicker
|
||||
@ -72,14 +72,14 @@ stdenv.mkDerivation rec {
|
||||
dbus
|
||||
at-spi2-core
|
||||
pango
|
||||
xorg.libXcomposite
|
||||
xorg.libXext
|
||||
xorg.libXdamage
|
||||
xorg.libXfixes
|
||||
xorg.libxcb
|
||||
xorg.libxshmfence
|
||||
xorg.libXScrnSaver
|
||||
xorg.libXtst
|
||||
libxcomposite
|
||||
libxext
|
||||
libxdamage
|
||||
libxfixes
|
||||
libxcb
|
||||
libxshmfence
|
||||
libxScrnSaver
|
||||
libxtst
|
||||
|
||||
# Unity Hub additional dependencies
|
||||
libva
|
||||
@ -97,8 +97,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# Unity Editor dependencies
|
||||
libglvnd # provides ligbl
|
||||
xorg.libX11
|
||||
xorg.libXcursor
|
||||
libx11
|
||||
libxcursor
|
||||
glib
|
||||
gdk-pixbuf
|
||||
libxml2-legacy
|
||||
@ -111,8 +111,8 @@ stdenv.mkDerivation rec {
|
||||
vulkan-loader
|
||||
|
||||
# Unity Bug Reporter specific dependencies
|
||||
xorg.libICE
|
||||
xorg.libSM
|
||||
libICE
|
||||
libSM
|
||||
|
||||
# Fonts used by built-in and third party editor tools
|
||||
corefonts
|
||||
|
||||
551
flake.lock
generated
551
flake.lock
generated
@ -20,11 +20,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762356719,
|
||||
"narHash": "sha256-qwd/xdoOya1m8FENle+4hWnydCtlXUWLAW/Auk6WL7s=",
|
||||
"lastModified": 1770895474,
|
||||
"narHash": "sha256-JBcrq1Y0uw87VZdYsByVbv+GBuT6ECaCNb9txLX9UuU=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "aquamarine",
|
||||
"rev": "6d0b3567584691bf9d8fedb5d0093309e2f979c7",
|
||||
"rev": "a494d50d32b5567956b558437ceaa58a380712f7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -44,11 +44,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763974329,
|
||||
"narHash": "sha256-8bljTh08KrIzTwzJEM8rGCg56hGtIH6/oT0LctCPTOQ=",
|
||||
"lastModified": 1771120934,
|
||||
"narHash": "sha256-CnE8v42+SU7uLjTit453knxuwsMxZixEPU4s/6JANjs=",
|
||||
"owner": "caelestia-dots",
|
||||
"repo": "shell",
|
||||
"rev": "11282f6abe32f9671dc0a7ce49d64bc4f2d79e6b",
|
||||
"rev": "3a7309294cd4575e60aeb5e153d346313b16f7d9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -68,11 +68,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763517499,
|
||||
"narHash": "sha256-N5y55DwDNT+0kLFck2sy1+DcnLOZ/N05UEvZ2R5pmWo=",
|
||||
"lastModified": 1771075454,
|
||||
"narHash": "sha256-5GlUpibCTqcXq/kCwkLHQGfjuBk2r+ZlWY0MjZo0xtE=",
|
||||
"owner": "caelestia-dots",
|
||||
"repo": "cli",
|
||||
"rev": "1cfd405eaa74e66f33e7790c5c6586676f03a395",
|
||||
"rev": "d890f7c3af4e7a900338bdf6400c2cf76de89a19",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -96,16 +96,57 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"dank-material-shell": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"quickshell": "quickshell"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1771307672,
|
||||
"narHash": "sha256-mCSP9umAD05fp4y49rCvaNgzNol1eiQ39pNmyf5jikw=",
|
||||
"owner": "AvengeMedia",
|
||||
"repo": "DankMaterialShell",
|
||||
"rev": "ef19568dd7260c07ba7ba1ca793117da28251407",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "AvengeMedia",
|
||||
"repo": "DankMaterialShell",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"danksearch": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1771177088,
|
||||
"narHash": "sha256-n6e4e0iHNwtdGOlkJlDR9lbFhYalLMuqeQ3jDfp1CaA=",
|
||||
"owner": "AvengeMedia",
|
||||
"repo": "danksearch",
|
||||
"rev": "3b3b79514acf349c166ae53db2225470a28be9e6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "AvengeMedia",
|
||||
"repo": "danksearch",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"devshell": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762521437,
|
||||
"narHash": "sha256-RXN+lcx4DEn3ZS+LqEJSUu/HH+dwGvy0syN7hTo/Chg=",
|
||||
"lastModified": 1768818222,
|
||||
"narHash": "sha256-460jc0+CZfyaO8+w8JNtlClB2n4ui1RbHfPTLkpwhU8=",
|
||||
"owner": "numtide",
|
||||
"repo": "devshell",
|
||||
"rev": "07bacc9531f5f4df6657c0a02a806443685f384a",
|
||||
"rev": "255a2b1725a20d060f566e4755dbf571bbbb5f76",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -121,11 +162,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1746728054,
|
||||
"narHash": "sha256-eDoSOhxGEm2PykZFa/x9QG5eTH0MJdiJ9aR00VAofXE=",
|
||||
"lastModified": 1768920986,
|
||||
"narHash": "sha256-CNzzBsRhq7gg4BMBuTDObiWDH/rFYHEuDRVOwCcwXw4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "ff442f5d1425feb86344c028298548024f21256d",
|
||||
"rev": "de5708739256238fb912c62f03988815db89ec9a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -135,6 +176,29 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"fenix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nps",
|
||||
"naersk",
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-analyzer-src": "rust-analyzer-src"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1752475459,
|
||||
"narHash": "sha256-z6QEu4ZFuHiqdOPbYss4/Q8B0BFhacR8ts6jO/F/aOU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"rev": "bf0d6f70f4c9a9cf8845f992105652173f4b617f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"firefox-addons": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@ -161,15 +225,15 @@
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1747046372,
|
||||
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
|
||||
"owner": "edolstra",
|
||||
"lastModified": 1767039857,
|
||||
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
|
||||
"owner": "NixOS",
|
||||
"repo": "flake-compat",
|
||||
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
|
||||
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"owner": "NixOS",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
@ -192,11 +256,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": {
|
||||
@ -207,12 +271,12 @@
|
||||
},
|
||||
"flake-compat_4": {
|
||||
"locked": {
|
||||
"lastModified": 1696426674,
|
||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||
"revCount": 57,
|
||||
"lastModified": 1733328505,
|
||||
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
|
||||
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
|
||||
"revCount": 69,
|
||||
"type": "tarball",
|
||||
"url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz"
|
||||
"url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
@ -248,11 +312,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763759067,
|
||||
"narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
|
||||
"lastModified": 1769996383,
|
||||
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
|
||||
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -284,7 +348,7 @@
|
||||
},
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": "systems_3"
|
||||
"systems": "systems_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
@ -300,21 +364,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"locked": {
|
||||
"lastModified": 1667395993,
|
||||
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"gitignore": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@ -361,11 +410,11 @@
|
||||
},
|
||||
"hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1762847253,
|
||||
"narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=",
|
||||
"lastModified": 1771257191,
|
||||
"narHash": "sha256-H1l+zHq+ZinWH7F1IidpJ2farmbfHXjaxAm1RKWE1KI=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9",
|
||||
"rev": "66e1a090ded57a0f88e2b381a7d4daf4a5722c3f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -381,11 +430,32 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763992752,
|
||||
"narHash": "sha256-iinKiBTAx7F9EkMqKFSqaWTCaay463toAPtQiA8RRyc=",
|
||||
"lastModified": 1771269455,
|
||||
"narHash": "sha256-BZ31eN5F99YH6vkc4AhzKGE+tJgJ52kl8f01K7wCs8w=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "55af952c5612190c3e7862f4e2504048c50841aa",
|
||||
"rev": "5f1d42a97b19803041434f66681d5c44c9ae62e3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"impermanence",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1768598210,
|
||||
"narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "c47b2cc64a629f8e075de52e4742de688f930dc6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -404,11 +474,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763589171,
|
||||
"narHash": "sha256-3+k074XQ4quCWQ/WLEeYTTD+AlDlxtzKvH9gkWqn+8Y=",
|
||||
"lastModified": 1769328881,
|
||||
"narHash": "sha256-y61NGkedVL4krfEkPCpngsYxGujCYcx+ryBGVrgeszE=",
|
||||
"owner": "VirtCode",
|
||||
"repo": "hypr-dynamic-cursors",
|
||||
"rev": "85e6a93f311132d775538c4a016b637b366d2a44",
|
||||
"rev": "bf761c322dbd675399e6e33628d9fb4545c59ad3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -462,11 +532,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762462052,
|
||||
"narHash": "sha256-6roLYzcDf4V38RUMSqycsOwAnqfodL6BmhRkUtwIgdA=",
|
||||
"lastModified": 1770511807,
|
||||
"narHash": "sha256-suKmSbSk34uPOJDTg/GbPrKEJutzK08vj0VoTvAFBCA=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprgraphics",
|
||||
"rev": "ffc999d980c7b3bca85d3ebd0a9fbadf984a8162",
|
||||
"rev": "7c75487edd43a71b61adb01cae8326d277aab683",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -485,6 +555,7 @@
|
||||
"hyprlang": "hyprlang",
|
||||
"hyprutils": "hyprutils",
|
||||
"hyprwayland-scanner": "hyprwayland-scanner",
|
||||
"hyprwire": "hyprwire",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
@ -493,11 +564,11 @@
|
||||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763912895,
|
||||
"narHash": "sha256-tTdCVeROhYTwV510tygS5AMutJGz5imM++P4+cXAy2w=",
|
||||
"lastModified": 1771249510,
|
||||
"narHash": "sha256-Iql2BwsfrHiyDmZfc/9Cp6oa2569/WrJqhqWWg3EY50=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "Hyprland",
|
||||
"rev": "2b0fd417d32278159d0ca1d23fb997588c37995b",
|
||||
"rev": "661314e13487784c94b3c9fd69b469764eb6ef7b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -539,11 +610,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762755186,
|
||||
"narHash": "sha256-ZjjETUHtoEhVN7JI1Cbt3p/KcXpK8ZQaPHx7UkG1OgA=",
|
||||
"lastModified": 1767023960,
|
||||
"narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprland-guiutils",
|
||||
"rev": "66356e20a8ed348aa49c1b9ceace786e224225b3",
|
||||
"rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -567,11 +638,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763856454,
|
||||
"narHash": "sha256-jlP442tr1Q7BynLKEb+L5lyGViJF5qUioymBCccV7/Y=",
|
||||
"lastModified": 1770899531,
|
||||
"narHash": "sha256-UBrWjh0DR8db60aLNkTnZTJ9F4kWK0Y7rUDNJC88W7A=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprland-plugins",
|
||||
"rev": "7ffc0b314e638ca4f8ce9cb1305951a47d107ade",
|
||||
"rev": "e03c34ccd51280a44ea6d1f5c040cd81ecca25ed",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -592,11 +663,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": {
|
||||
@ -621,11 +692,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763254292,
|
||||
"narHash": "sha256-JNgz3Fz2KMzkT7aR72wsgu/xNeJB//LSmdilh8Z/Zao=",
|
||||
"lastModified": 1767983607,
|
||||
"narHash": "sha256-8C2co8NYfR4oMOUEsPROOJ9JHrv9/ktbJJ6X1WsTbXc=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprlang",
|
||||
"rev": "deea98d5b61d066bdc7a68163edd2c4bd28d3a6b",
|
||||
"rev": "d4037379e6057246b408bbcf796cf3e9838af5b2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -642,11 +713,11 @@
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1759033501,
|
||||
"narHash": "sha256-QhcOFLJYC9CiSVPkci62ghMEAJChzl+L98To1pKvnRQ=",
|
||||
"lastModified": 1767871242,
|
||||
"narHash": "sha256-Gge7LY1lrPc2knDnyw8GBQ2sxRPzM7W2T6jNG1HY5bA=",
|
||||
"owner": "KZDKM",
|
||||
"repo": "Hyprspace",
|
||||
"rev": "e54884da1d6a1af76af9d053887bf3750dd554fd",
|
||||
"rev": "bcd969224ffeb6266c6618c192949461135eef38",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -694,11 +765,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762463729,
|
||||
"narHash": "sha256-2fYkU/mdz8WKY3dkDPlE/j6hTxIwqultsx4gMMsMns0=",
|
||||
"lastModified": 1764592794,
|
||||
"narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprtoolkit",
|
||||
"rev": "88483bdee5329ec985f0c8f834c519cd18cfe532",
|
||||
"rev": "5cfe0743f0e608e1462972303778d8a0859ee63e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -719,11 +790,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763323331,
|
||||
"narHash": "sha256-+Z0OfCo1MS8/aIutSAW5aJR9zTae1wz9kcJYMgpwN6M=",
|
||||
"lastModified": 1770139857,
|
||||
"narHash": "sha256-bCqxcXjavgz5KBJ/1CBLqnagMMf9JvU1m9HmYVASKoc=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprutils",
|
||||
"rev": "0c6411851cc779d551edc89b83966696201611aa",
|
||||
"rev": "9038eec033843c289b06b83557a381a2648d8fa5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -744,11 +815,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1755184602,
|
||||
"narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=",
|
||||
"lastModified": 1770501770,
|
||||
"narHash": "sha256-NWRM6+YxTRv+bT9yvlhhJ2iLae1B1pNH3mAL5wi2rlQ=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprwayland-scanner",
|
||||
"rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d",
|
||||
"rev": "0bd8b6cde9ec27d48aad9e5b4deefb3746909d40",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -757,46 +828,51 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hyprwire": {
|
||||
"inputs": {
|
||||
"hyprutils": [
|
||||
"hyprland",
|
||||
"hyprutils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"hyprland",
|
||||
"nixpkgs"
|
||||
],
|
||||
"systems": [
|
||||
"hyprland",
|
||||
"systems"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1770203293,
|
||||
"narHash": "sha256-PR/KER+yiHabFC/h1Wjb+9fR2Uy0lWM3Qld7jPVaWkk=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprwire",
|
||||
"rev": "37bc90eed02b0c8b5a77a0b00867baf3005cfb98",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprwire",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"impermanence": {
|
||||
"locked": {
|
||||
"lastModified": 1737831083,
|
||||
"narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "impermanence",
|
||||
"rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "impermanence",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"ixx": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"nixvim",
|
||||
"nuschtosSearch",
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixvim",
|
||||
"nuschtosSearch",
|
||||
"nixpkgs"
|
||||
]
|
||||
"home-manager": "home-manager_2",
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1754860581,
|
||||
"narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=",
|
||||
"owner": "NuschtOS",
|
||||
"repo": "ixx",
|
||||
"rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281",
|
||||
"lastModified": 1769548169,
|
||||
"narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=",
|
||||
"owner": "nix-community",
|
||||
"repo": "impermanence",
|
||||
"rev": "7b1d382faf603b6d264f58627330f9faa5cba149",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NuschtOS",
|
||||
"ref": "v0.1.1",
|
||||
"repo": "ixx",
|
||||
"owner": "nix-community",
|
||||
"repo": "impermanence",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
@ -828,14 +904,15 @@
|
||||
},
|
||||
"naersk": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_4"
|
||||
"fenix": "fenix",
|
||||
"nixpkgs": "nixpkgs_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733346208,
|
||||
"narHash": "sha256-a4WZp1xQkrnA4BbnKrzJNr+dYoQr5Xneh2syJoddFyE=",
|
||||
"lastModified": 1763384566,
|
||||
"narHash": "sha256-r+wgI+WvNaSdxQmqaM58lVNvJYJ16zoq+tKN20cLst4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "naersk",
|
||||
"rev": "378614f37a6bee5a3f2ef4f825a73d948d3ae921",
|
||||
"rev": "d4155d6ebb70fbe2314959842f744aa7cabbbf6a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -856,11 +933,11 @@
|
||||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763992300,
|
||||
"narHash": "sha256-1FJbVjlM8M9pahzcgrdVvQjNuVo3AMF+/XVUcFlnu8Q=",
|
||||
"lastModified": 1771308899,
|
||||
"narHash": "sha256-kb/4oSHB261GOLhVGgrzTOqo/ImeCi/WS25q2ujtHGc=",
|
||||
"owner": "sodiboo",
|
||||
"repo": "niri-flake",
|
||||
"rev": "69a8827e8c3eaf6dd59630b99ce0afdfb2d52521",
|
||||
"rev": "f3e98ba073bd7e2717a07d622f9b737c461a97b9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -889,11 +966,11 @@
|
||||
"niri-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1763986753,
|
||||
"narHash": "sha256-eHxFROH247tQhvvxazYB4zIaeJgXaJhEoSohiRRRCJI=",
|
||||
"lastModified": 1771305475,
|
||||
"narHash": "sha256-lqweVTwHhYc+9T33cysp38gVwxaibGJHriOPZXWyhCY=",
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"rev": "9eeedff6295d17dd44594e2e8bcc1911f1535989",
|
||||
"rev": "a2a52911757cb3b497db9407592f9b4c439571ea",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -906,14 +983,14 @@
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_3",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763199681,
|
||||
"narHash": "sha256-3c5oZigLzzQp13TnjwkOAT0QDaJjShQciIHMa1PFR+c=",
|
||||
"lastModified": 1771150922,
|
||||
"narHash": "sha256-+oQJun4CFDlOQRocbZpqQDj7agoy56/4ZjT1oUR7NOs=",
|
||||
"owner": "thiagokokada",
|
||||
"repo": "nix-alien",
|
||||
"rev": "f1e67b6763e47794f1819eb9d55d95b839484bad",
|
||||
"rev": "96045e886ba0dd45b27590e7c0c6e77bbb54033d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -924,11 +1001,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": {
|
||||
@ -946,11 +1023,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762660502,
|
||||
"narHash": "sha256-C9F1C31ys0V7mnp4EcDy7L1cLZw/sCTEXqqTtGnvu08=",
|
||||
"lastModified": 1771130777,
|
||||
"narHash": "sha256-UIKOwG0D9XVIJfNWg6+gENAvQP+7LO46eO0Jpe+ItJ0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "15c5451c63f4c612874a43846bfe3fa828b03eee",
|
||||
"rev": "efec7aaad8d43f8e5194df46a007456093c40f88",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -977,27 +1054,27 @@
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1763622513,
|
||||
"narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=",
|
||||
"lastModified": 1771208521,
|
||||
"narHash": "sha256-X01Q3DgSpjeBpapoGA4rzKOn25qdKxbPnxHeMLNoHTU=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b",
|
||||
"rev": "fa56d7d6de78f5a7f997b0ea2bc6efd5868ad9e8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-25.05",
|
||||
"ref": "nixos-25.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1763622513,
|
||||
"narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=",
|
||||
"lastModified": 1767313136,
|
||||
"narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b",
|
||||
"rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1009,15 +1086,15 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1762977756,
|
||||
"narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
|
||||
"owner": "NixOS",
|
||||
"lastModified": 1768564909,
|
||||
"narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
|
||||
"rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
@ -1025,11 +1102,27 @@
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1763835633,
|
||||
"narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=",
|
||||
"lastModified": 1771008912,
|
||||
"narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a82ccc39b39b621151d6732718e3e250109076fa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1771008912,
|
||||
"narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "050e09e091117c3d7328c7b2b7b577492c43c134",
|
||||
"rev": "a82ccc39b39b621151d6732718e3e250109076fa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1039,20 +1132,23 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1734323986,
|
||||
"narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=",
|
||||
"path": "/nix/store/wj2qla569hnxwqfc26imv5hqbxc1rc27-source",
|
||||
"rev": "394571358ce82dff7411395829aa6a3aad45b907",
|
||||
"type": "path"
|
||||
"lastModified": 1752077645,
|
||||
"narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "be9e214982e20b8310878ac2baa063a961c1bdf6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"type": "indirect"
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1750776420,
|
||||
"narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=",
|
||||
@ -1074,15 +1170,14 @@
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nuschtosSearch": "nuschtosSearch",
|
||||
"systems": "systems_4"
|
||||
"systems": "systems_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763984728,
|
||||
"narHash": "sha256-i07UsSg+kedev5Bh/p/ERG1xrbRivOztih8laHZR6W8=",
|
||||
"lastModified": 1771135771,
|
||||
"narHash": "sha256-wyvBIhDuyCRyjB3yPg77qoyxrlgQtBR1rVW3c9knV3E=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "3dc952d69cd38cdc3ad3ec7570fc4a1caed2bfea",
|
||||
"rev": "ed0424f0b08d303a7348f52f7850ad1b2704f9ba",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1098,11 +1193,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763989982,
|
||||
"narHash": "sha256-fUC13I7HJ6E0+KzkLMD34EpvKopqdwAk2jd31L65AyM=",
|
||||
"lastModified": 1771320561,
|
||||
"narHash": "sha256-sM+gR+fo9HVtV27gYa4aBtT06wfg1tcyYJ8pjmQ0rRQ=",
|
||||
"owner": "noctalia-dev",
|
||||
"repo": "noctalia-shell",
|
||||
"rev": "c7116827a4f58dc9f59f5e80f72466774a7c0ca3",
|
||||
"rev": "7c210ef00e289558f6b5d01926760c3b46cd979e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1114,18 +1209,18 @@
|
||||
"nps": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_4",
|
||||
"flake-utils": "flake-utils_2",
|
||||
"flake-utils": "flake-utils",
|
||||
"naersk": "naersk",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1738483270,
|
||||
"narHash": "sha256-q/PkigsNAI7MCmeDFBMGuZJFXVL95pQCNOVhNvBH9dc=",
|
||||
"lastModified": 1765122297,
|
||||
"narHash": "sha256-kOVpn13lJYeO/99e39c0wbe7qcKHyMj5v4prBtZ3N7s=",
|
||||
"owner": "OleMussmann",
|
||||
"repo": "nps",
|
||||
"rev": "2d005f22a52a0bda19d1afd8736ad5bfcb1d38cf",
|
||||
"rev": "e71c134e676588e5d8a7a849dc6664c64e7913ab",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1142,11 +1237,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763994422,
|
||||
"narHash": "sha256-Enjm3sjc2HSfPNjQ4RQ0QiymvMbsMHiFP4RyHgrwnmc=",
|
||||
"lastModified": 1771321196,
|
||||
"narHash": "sha256-I/1/nZOIFByTYZONatUpYdh/Abh2FjlQwtZ7u4r70Nw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "6197606a8ff0d9cb2e35b09a260c163786cdb837",
|
||||
"rev": "250a13346efcfff65f490136e9705233b69d3401",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1155,29 +1250,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nuschtosSearch": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"ixx": "ixx",
|
||||
"nixpkgs": [
|
||||
"nixvim",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1761730856,
|
||||
"narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=",
|
||||
"owner": "NuschtOS",
|
||||
"repo": "search",
|
||||
"rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NuschtOS",
|
||||
"repo": "search",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"pre-commit-hooks": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
@ -1188,11 +1260,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763319842,
|
||||
"narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=",
|
||||
"lastModified": 1770726378,
|
||||
"narHash": "sha256-kck+vIbGOaM/dHea7aTBxdFYpeUl/jHOy5W3eyRvVx8=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761",
|
||||
"rev": "5eaaedde414f6eb1aea8b8525c466dc37bba95ae",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1230,15 +1302,37 @@
|
||||
"quickshell": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"dank-material-shell",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763629934,
|
||||
"narHash": "sha256-jWz10RbNAyylJbH4cUTLS/CsDjkd8gxfT8OsIgQIgEg=",
|
||||
"lastModified": 1766725085,
|
||||
"narHash": "sha256-O2aMFdDUYJazFrlwL7aSIHbUSEm3ADVZjmf41uBJfHs=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "41828c4180fb921df7992a5405f5ff05d2ac2fff",
|
||||
"revCount": 715,
|
||||
"type": "git",
|
||||
"url": "https://git.outfoxxed.me/quickshell/quickshell"
|
||||
},
|
||||
"original": {
|
||||
"rev": "41828c4180fb921df7992a5405f5ff05d2ac2fff",
|
||||
"type": "git",
|
||||
"url": "https://git.outfoxxed.me/quickshell/quickshell"
|
||||
}
|
||||
},
|
||||
"quickshell_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1770693276,
|
||||
"narHash": "sha256-ngXnN5YXu+f45+QGYNN/VEBMQmcBCYGRCqwaK8cxY1s=",
|
||||
"owner": "quickshell-mirror",
|
||||
"repo": "quickshell",
|
||||
"rev": "ed036d514b0fdbce03158a0b331305be166f4555",
|
||||
"rev": "dacfa9de829ac7cb173825f593236bf2c21f637e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1250,6 +1344,8 @@
|
||||
"root": {
|
||||
"inputs": {
|
||||
"caelestia": "caelestia",
|
||||
"dank-material-shell": "dank-material-shell",
|
||||
"danksearch": "danksearch",
|
||||
"devshell": "devshell",
|
||||
"disko": "disko",
|
||||
"hardware": "hardware",
|
||||
@ -1263,18 +1359,35 @@
|
||||
"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",
|
||||
"nps": "nps",
|
||||
"nur": "nur",
|
||||
"quickshell": "quickshell",
|
||||
"quickshell": "quickshell_2",
|
||||
"sops-nix": "sops-nix",
|
||||
"textfox": "textfox",
|
||||
"waifu-cursors": "waifu-cursors"
|
||||
}
|
||||
},
|
||||
"rust-analyzer-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1752428706,
|
||||
"narHash": "sha256-EJcdxw3aXfP8Ex1Nm3s0awyH9egQvB2Gu+QEnJn2Sfg=",
|
||||
"owner": "rust-lang",
|
||||
"repo": "rust-analyzer",
|
||||
"rev": "591e3b7624be97e4443ea7b5542c191311aa141d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "rust-lang",
|
||||
"ref": "nightly",
|
||||
"repo": "rust-analyzer",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"rust-overlay": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@ -1303,11 +1416,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763870012,
|
||||
"narHash": "sha256-AHxFfIu73SpNLAOZbu/AvpLhZ/Szhx6gRPj9ufZtaZA=",
|
||||
"lastModified": 1771166946,
|
||||
"narHash": "sha256-UFc4lfGBr+wJmwgDGJDn1cVD6DTr0/8TdronNUiyXlU=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "4e7d74d92398b933cc0e0e25af5b0836efcfdde3",
|
||||
"rev": "2d0cf89b4404529778bc82de7e42b5754e0fe4fa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1384,11 +1497,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763730250,
|
||||
"narHash": "sha256-OPlKRltdA2iIm70Nw/kWt5FnwxR1xmxC44tqGUX7Hro=",
|
||||
"lastModified": 1771103358,
|
||||
"narHash": "sha256-EFU39ivrUUGBzuiwmc94Hxp5uD9hC8Qf80Esh+w8xpE=",
|
||||
"owner": "adriankarlen",
|
||||
"repo": "textfox",
|
||||
"rev": "2f385d16abab56984b874627ca0dd4f3ca7ae4ac",
|
||||
"rev": "e86c0a3a77cbdd8dbbca51b0c190733c8e6788e1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1399,7 +1512,7 @@
|
||||
},
|
||||
"waifu-cursors": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_5"
|
||||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1755614728,
|
||||
@ -1476,11 +1589,11 @@
|
||||
"xwayland-satellite-unstable": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1763704521,
|
||||
"narHash": "sha256-ceYEV6PnvUN8Zixao4gpPuN+VT3B0SlAXKuPNHZhqUY=",
|
||||
"lastModified": 1771195969,
|
||||
"narHash": "sha256-BUE41HjLIGPjq3U8VXPjf8asH8GaMI7FYdgrIHKFMXA=",
|
||||
"owner": "Supreeeme",
|
||||
"repo": "xwayland-satellite",
|
||||
"rev": "f379ff5722a821212eb59ada9cf8e51cb3654aad",
|
||||
"rev": "536bd32efc935bf876d6de385ec18a1b715c9358",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@ -77,9 +77,11 @@
|
||||
# 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";
|
||||
danksearch.url = "github:AvengeMedia/danksearch";
|
||||
danksearch.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
# 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;
|
||||
@ -98,8 +88,8 @@ in
|
||||
};
|
||||
|
||||
hyprland = {
|
||||
enable = !headless;
|
||||
dunst.enable = !config.modules.hyprpanel.enable; # Disable for hyprpanel
|
||||
enable = nixosConfig.programs.hyprland.enable;
|
||||
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"];
|
||||
@ -225,8 +215,8 @@ in
|
||||
|
||||
windowrules = [
|
||||
# Fix jetbrains tooltip flicker
|
||||
"float,class:^(jetbrains-.*)$,title:^(win[0-9]+)$"
|
||||
"nofocus,class:^(jetbrains-.*)$,title:^(win[0-9]+)$"
|
||||
"match:class ^(jetbrains-.*)$, match:title ^(win[0-9]+)$, float 1"
|
||||
"match:class ^(jetbrains-.*)$, match:title ^(win[0-9]+)$, no_initial_focus 1"
|
||||
];
|
||||
|
||||
workspacerules = {
|
||||
@ -291,7 +281,7 @@ in
|
||||
neovide = !headless;
|
||||
};
|
||||
|
||||
niri.enable = !headless;
|
||||
niri.enable = nixosConfig.programs.niri.enable;
|
||||
nnn.enable = false; # Use yazi
|
||||
qutebrowser.enable = !headless;
|
||||
rmpc.enable = !headless;
|
||||
@ -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,8 @@ in
|
||||
lazyjournal # Journalctl viewer
|
||||
systemctl-tui
|
||||
restic # Backups
|
||||
gnumake
|
||||
just
|
||||
|
||||
# Hardware/Software info
|
||||
pciutils # lspci
|
||||
@ -508,7 +500,7 @@ in
|
||||
imagemagick # Convert image (magic)
|
||||
mp3val # Validate mp3 files
|
||||
flac # Validate flac files
|
||||
spotdl
|
||||
# spotdl
|
||||
|
||||
# Document utils
|
||||
poppler-utils # pdfunite
|
||||
@ -526,7 +518,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 +561,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 +643,7 @@ in
|
||||
|
||||
eza = {
|
||||
enable = true;
|
||||
enableFishIntegration = config.modules.fish.enable;
|
||||
enableFishIntegration = config.homemodules.fish.enable;
|
||||
};
|
||||
|
||||
# TODO: Module
|
||||
@ -811,7 +800,7 @@ in
|
||||
|
||||
fzf = {
|
||||
enable = true;
|
||||
enableFishIntegration = config.modules.fish.enable;
|
||||
enableFishIntegration = config.homemodules.fish.enable;
|
||||
};
|
||||
|
||||
imv = {
|
||||
@ -829,7 +818,7 @@ in
|
||||
|
||||
keychain = {
|
||||
enable = true;
|
||||
enableFishIntegration = config.modules.fish.enable;
|
||||
enableFishIntegration = config.homemodules.fish.enable;
|
||||
enableXsessionIntegration = !headless;
|
||||
keys = ["id_ed25519"];
|
||||
};
|
||||
@ -843,12 +832,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 +929,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
|
||||
@ -136,12 +133,20 @@
|
||||
godot_4
|
||||
(obs-studio.override {cudaSupport = true;})
|
||||
kdePackages.kdenlive
|
||||
# davinci-resolve
|
||||
krita
|
||||
makemkv
|
||||
lrcget
|
||||
msty
|
||||
# msty
|
||||
# jellyfin-media-player # CVE, can't install
|
||||
jellyfin-desktop
|
||||
jellyfin-mpv-shim
|
||||
# tidal-hifi
|
||||
# tidal-dl-ng # TODO: Borked
|
||||
tiddl
|
||||
picard
|
||||
handbrake
|
||||
teamspeak6-client
|
||||
|
||||
steam-devices-udev-rules
|
||||
];
|
||||
@ -177,7 +182,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,9 @@
|
||||
# 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
|
||||
inputs.danksearch.homeModules.default
|
||||
|
||||
# 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 = {
|
||||
@ -69,6 +69,7 @@ in [
|
||||
(mkBm "Rust" "https://doc.rust-lang.org/stable/book/ch03-00-common-programming-concepts.html")
|
||||
(mkBm "RustOS" "https://os.phil-opp.com/")
|
||||
(mkBm "Interpreters" "https://craftinginterpreters.com/contents.html")
|
||||
(mkBm "Godbolt" "https://godbolt.org")
|
||||
];
|
||||
}
|
||||
{
|
||||
@ -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";
|
||||
# useLegacyExtensions = false;
|
||||
profiles = ["default"];
|
||||
|
||||
config = {
|
||||
background = {
|
||||
@ -54,7 +54,9 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [vdhcoapp];
|
||||
home.packages = with pkgs; [
|
||||
# vdhcoapp # No longer required since VDH >= 10
|
||||
];
|
||||
|
||||
home.sessionVariables = lib.mkMerge [
|
||||
{
|
||||
@ -243,7 +245,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;
|
||||
@ -111,19 +111,19 @@
|
||||
|
||||
windowrule = let
|
||||
mkWorkspaceRule = workspace: class:
|
||||
"workspace ${workspace}, "
|
||||
+ "class:^(${class})$";
|
||||
"match:class ^(${class})$, "
|
||||
+ "workspace ${workspace}";
|
||||
mkWorkspaceRules = workspace: class-list:
|
||||
builtins.map (mkWorkspaceRule workspace) class-list;
|
||||
|
||||
mkFloatingRule = attrs:
|
||||
"float"
|
||||
+ (lib.optionalString (builtins.hasAttr "class" attrs) ", class:^(${attrs.class})$")
|
||||
+ (lib.optionalString (builtins.hasAttr "title" attrs) ", title:^(${attrs.title})$");
|
||||
(lib.optionalString (builtins.hasAttr "class" attrs) "match:class ^(${attrs.class})$, ")
|
||||
+ (lib.optionalString (builtins.hasAttr "title" attrs) "match:title ^(${attrs.title})$, ")
|
||||
+ "float 1";
|
||||
|
||||
mkTranslucentRule = class:
|
||||
"opacity ${hyprland.transparent-opacity} ${hyprland.transparent-opacity}, "
|
||||
+ "class:^(${class})$";
|
||||
"match:class ^(${class})$, "
|
||||
+ "opacity ${hyprland.transparent-opacity} ${hyprland.transparent-opacity}";
|
||||
in
|
||||
lib.mkMerge [
|
||||
(hyprland.workspacerules
|
||||
@ -165,15 +165,15 @@
|
||||
# Because those are not windows, but layers,
|
||||
# we have to blur them explicitly
|
||||
layerrule = [
|
||||
"blur,rofi"
|
||||
"ignorealpha 0.001,rofi" # Fix pixelated corners
|
||||
"xray 0,rofi" # Render on top of other windows
|
||||
"dimaround,rofi"
|
||||
"match:class rofi, blur 1"
|
||||
# "match:class rofi, ignore_alpha 0.001" # Fix pixelated corners
|
||||
# "match:class rofi, xray 0" # Render on top of other windows
|
||||
# "match:class rofi, dim_around 1"
|
||||
|
||||
"blur,waybar"
|
||||
"blur,gtk4-layer-shell"
|
||||
"blur,bar-0"
|
||||
"blur,bar-1"
|
||||
"match:class waybar, blur 1"
|
||||
"match:class gtk4-layer-shell, blur 1"
|
||||
"match:class bar-0, blur 1"
|
||||
"match:class bar-1, blur 1"
|
||||
];
|
||||
|
||||
decoration = {
|
||||
@ -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,8 @@ in {
|
||||
tinymist
|
||||
typescript
|
||||
vscode-langservers-extracted # includes nodejs
|
||||
autotools-language-server
|
||||
just-lsp
|
||||
|
||||
# Linters
|
||||
checkstyle # java
|
||||
@ -64,7 +65,6 @@ in {
|
||||
# statix # nix (doesn't recognize pipe operator)
|
||||
|
||||
# Formatters
|
||||
alejandra # nix
|
||||
cljfmt
|
||||
python313Packages.black
|
||||
google-java-format
|
||||
@ -75,6 +75,8 @@ in {
|
||||
rustfmt
|
||||
stylua
|
||||
typstyle
|
||||
mbake
|
||||
just-formatter
|
||||
])
|
||||
|
||||
[
|
||||
@ -83,6 +85,9 @@ in {
|
||||
# Dependencies
|
||||
lua54Packages.jsregexp # For tree-sitter
|
||||
# nodejs_latest
|
||||
|
||||
nixd
|
||||
alejandra # nix
|
||||
]
|
||||
];
|
||||
};
|
||||
@ -349,7 +354,7 @@ in {
|
||||
clangd-extensions = rec {
|
||||
name = "clangd_extensions";
|
||||
pkg = pkgs.vimPlugins.clangd_extensions-nvim;
|
||||
lazy = true;
|
||||
lazy = false;
|
||||
config = mkDefaultConfig name;
|
||||
opts = {
|
||||
inlay_hints = {
|
||||
@ -511,8 +516,10 @@ in {
|
||||
html = ["prettierd" "prettier"];
|
||||
java = ["google-java-format"];
|
||||
javascript = ["prettierd" "prettier"];
|
||||
just = ["just"];
|
||||
latex = ["tex-fmt"];
|
||||
lua = ["stylua"];
|
||||
make = ["bake"];
|
||||
markdown = ["prettierd" "prettier"];
|
||||
nix = ["alejandra"];
|
||||
python = ["black"];
|
||||
@ -842,21 +849,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"
|
||||
@ -883,6 +883,7 @@ in {
|
||||
{name = "cmake";}
|
||||
{name = "cssls";}
|
||||
{name = "html";} # vscode-langservers-extracted
|
||||
{name = "just-lsp";} # TODO: Doesn't autostart?
|
||||
{name = "lua_ls";}
|
||||
{
|
||||
name = "ltex";
|
||||
@ -893,12 +894,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 +1844,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 +1854,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 +1875,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;
|
||||
@ -1989,6 +1993,39 @@ in {
|
||||
'';
|
||||
};
|
||||
|
||||
visual-whitespace = rec {
|
||||
name = "visual-whitespace";
|
||||
pkg = pkgs.vimPlugins.visual-whitespace-nvim;
|
||||
event = ["ModeChanged *:[vV\22]"];
|
||||
config = mkDefaultConfig name;
|
||||
opts = {
|
||||
enabled = true;
|
||||
highlight = {
|
||||
link = "Visual";
|
||||
default = true;
|
||||
};
|
||||
match_types = {
|
||||
space = true;
|
||||
tab = true;
|
||||
nbsp = true;
|
||||
lead = false;
|
||||
trail = false;
|
||||
};
|
||||
list_chars = {
|
||||
space = "·";
|
||||
tab = "↦";
|
||||
nbsp = "␣";
|
||||
lead = "‹";
|
||||
trail = "›";
|
||||
};
|
||||
fileformat_chars = {
|
||||
unix = "↲";
|
||||
mac = "←";
|
||||
dos = "↙";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# wakatime = {
|
||||
# name = "wakatime";
|
||||
# pkg = pkgs.vimPlugins.vim-wakatime;
|
||||
@ -2170,6 +2207,7 @@ in {
|
||||
typst-preview # Typst support
|
||||
ufo # Code folding
|
||||
vimtex # LaTeX support
|
||||
visual-whitespace
|
||||
# wakatime # Time tracking
|
||||
web-devicons # Icons for many plugins
|
||||
which-key # Live keybinding help
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user