Compare commits
1 Commits
master
...
3ef975b960
| Author | SHA1 | Date | |
|---|---|---|---|
3ef975b960
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -11,4 +11,3 @@ config/neovim/store
|
|||||||
home/modules/ags/config/types
|
home/modules/ags/config/types
|
||||||
home/modules/ags/config/tsconfig.json
|
home/modules/ags/config/tsconfig.json
|
||||||
system/modules/agenix/secrets.nix
|
system/modules/agenix/secrets.nix
|
||||||
config/neovim/nvim_bundle
|
|
||||||
|
|||||||
16
README.md
16
README.md
@ -1,6 +1,6 @@
|
|||||||
# NixOS Configuration
|
# NixOS Configuration
|
||||||
|
|
||||||
Modular NixOS configuration, using Hyprland (yikes) or Niri for a tiling/scrolling desktop.
|
Modular NixOS configuration, using Hyprland for a lightweight desktop.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -10,10 +10,7 @@ Modular NixOS configuration, using Hyprland (yikes) or Niri for a tiling/scrolli
|
|||||||
<img src="/Btop.png" width="33%" />
|
<img src="/Btop.png" width="33%" />
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
To install, run `nixos-rebuild` with the `--flake` parameter from the `NixFlake` directory: `nixos-rebuild switch --flake .#nixinator`.
|
To install, run `nixos-rebuild` with the `--flake` parameter from the `NixFlake` directory: `nixos-rebuild switch --flake .#nixinator`.
|
||||||
Alternatively, use `nh os switch` or `nh os boot`.
|
|
||||||
|
|
||||||
## NixFlake/system
|
## NixFlake/system
|
||||||
|
|
||||||
@ -21,8 +18,7 @@ Contains all the system configurations.
|
|||||||
|
|
||||||
- There is a common configuration used for all systems: `NixFlake/system/default.nix`
|
- 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`
|
- Every system has its own special configuration: `NixFlake/system/<hostname>/default.nix`
|
||||||
- System modules are located in `NixFlake/system/systemmodules`
|
- System modules are located in `NixFlake/system/modules`
|
||||||
- Hosted services are located in `NixFlake/system/services`
|
|
||||||
|
|
||||||
When creating a NixOS configuration inside the `NixFlake/flake.nix` the common configuration is imported.
|
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.
|
Because the hostname is propagated to the common configuration, it can import the host-specific config by itself.
|
||||||
@ -33,7 +29,7 @@ Contains all the home-manager configurations.
|
|||||||
|
|
||||||
- There is a common configuration for each user: `NixFlake/home/<username>/default.nix`
|
- 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`
|
- 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/homemodules`
|
- Home-Manager modules are located in `NixFlake/home/modules`
|
||||||
|
|
||||||
When creating a NixOS configuration inside the `NixFlake/flake.nix` the common configuration is imported.
|
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.
|
Because the hostname is propagated to the common configuration, it can import the host-specific config by itself.
|
||||||
@ -45,6 +41,6 @@ Each derivation is loaded into `NixFlake/derivations/default.nix`.
|
|||||||
|
|
||||||
## NixFlake/overlays
|
## NixFlake/overlays
|
||||||
|
|
||||||
Contains all overlays, e.g. package version overrides.
|
Contains (not at the moment) all overlays.
|
||||||
The `NixFlake/overlays/default.nix` imports all overlays and all derivations.
|
The `NixFlake/overlays/default.nix` imports all of the overlays and all of the derivations.
|
||||||
It is then imported by the top-level `NixFlake/flake.nix`, to make everything available to the system/home configurations.
|
It is then imported by the toplevel `NixFlake/flake.nix`, to make everything available to the system/home configurations.
|
||||||
|
|||||||
@ -1,555 +0,0 @@
|
|||||||
{
|
|
||||||
"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"
|
|
||||||
}
|
|
||||||
@ -68,7 +68,7 @@ rec {
|
|||||||
# bintools = pkgs.bintools.bintools; # Unwrapped bintools
|
# bintools = pkgs.bintools.bintools; # Unwrapped bintools
|
||||||
# libc = pkgs.glibc;
|
# libc = pkgs.glibc;
|
||||||
# };
|
# };
|
||||||
# gcc = lib.hiPrio (pkgs.wrapCCWith {
|
# gcc = pkgs.hiPrio (pkgs.wrapCCWith {
|
||||||
# cc = pkgs.gcc.cc; # Unwrapped gcc
|
# cc = pkgs.gcc.cc; # Unwrapped gcc
|
||||||
# libc = pkgs.glibc;
|
# libc = pkgs.glibc;
|
||||||
# bintools = bintools;
|
# bintools = bintools;
|
||||||
@ -84,7 +84,7 @@ rec {
|
|||||||
# bintools = pkgs.bintools.bintools; # Unwrapped bintools
|
# bintools = pkgs.bintools.bintools; # Unwrapped bintools
|
||||||
# libc = pkgs.glibc_multi;
|
# libc = pkgs.glibc_multi;
|
||||||
# };
|
# };
|
||||||
# gcc_multilib = lib.hiPrio (pkgs.wrapCCWith {
|
# gcc_multilib = pkgs.hiPrio (pkgs.wrapCCWith {
|
||||||
# cc = pkgs.gcc.cc; # Unwrapped gcc
|
# cc = pkgs.gcc.cc; # Unwrapped gcc
|
||||||
# libc = pkgs.glibc_multi;
|
# libc = pkgs.glibc_multi;
|
||||||
# bintools = bintools_multilib;
|
# bintools = bintools_multilib;
|
||||||
@ -190,10 +190,8 @@ rec {
|
|||||||
# drv = defaultPackage;
|
# drv = defaultPackage;
|
||||||
# };
|
# };
|
||||||
|
|
||||||
devShells = {
|
# Provide environment for "nix develop"
|
||||||
# Provide default environment for "nix develop".
|
devShell = pkgs.mkShell {
|
||||||
# Other environments can be added below.
|
|
||||||
default = pkgs.mkShell {
|
|
||||||
inherit nativeBuildInputs buildInputs;
|
inherit nativeBuildInputs buildInputs;
|
||||||
name = description;
|
name = description;
|
||||||
|
|
||||||
@ -315,6 +313,5 @@ rec {
|
|||||||
# ''
|
# ''
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@ -210,10 +210,6 @@ Convert line endings to dos format
|
|||||||
unix2dos <file>
|
unix2dos <file>
|
||||||
$ file: eza -1
|
$ file: eza -1
|
||||||
|
|
||||||
% tiddl
|
|
||||||
Download stuff from tidal
|
|
||||||
tiddl download --track-quality max --path ~/Downloads/Beet/Albums --videos none url "<url>"
|
|
||||||
|
|
||||||
; ===========================
|
; ===========================
|
||||||
; SECRETS
|
; SECRETS
|
||||||
; ===========================
|
; ===========================
|
||||||
|
|||||||
@ -1,204 +0,0 @@
|
|||||||
#!/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()
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
# 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
|
}: let
|
||||||
# create a module that only contains the options, type can be home or system
|
# create a module that only contains the options, type can be home or system
|
||||||
toModule = type: name: {options.systemmodules.${name} = import ../../${type}/modules/${name}/options.nix {inherit lib mylib;};};
|
toModule = type: name: {options.modules.${name} = import ../../${type}/modules/${name}/options.nix {inherit lib mylib;};};
|
||||||
|
|
||||||
# evaluate a single module
|
# evaluate a single module
|
||||||
evalModule = type: name: (lib.evalModules {modules = [(toModule type name)];});
|
evalModule = type: name: (lib.evalModules {modules = [(toModule type name)];});
|
||||||
|
|||||||
@ -9,5 +9,4 @@
|
|||||||
msty = pkgs.callPackage ./msty {};
|
msty = pkgs.callPackage ./msty {};
|
||||||
unityhub = pkgs.callPackage ./unityhub {};
|
unityhub = pkgs.callPackage ./unityhub {};
|
||||||
tidal-dl-ng = pkgs.callPackage ./tidal-dl-ng {};
|
tidal-dl-ng = pkgs.callPackage ./tidal-dl-ng {};
|
||||||
tiddl = pkgs.callPackage ./tiddl {};
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -10,12 +10,11 @@
|
|||||||
#
|
#
|
||||||
pythonPkgs = pkgs.python313Packages.overrideScope (self: super: {
|
pythonPkgs = pkgs.python313Packages.overrideScope (self: super: {
|
||||||
typer = super.typer.overridePythonAttrs (old: {
|
typer = super.typer.overridePythonAttrs (old: {
|
||||||
version = "0.20.1";
|
version = "0.20.0";
|
||||||
src = super.fetchPypi {
|
src = super.fetchPypi {
|
||||||
inherit (old) pname;
|
inherit (old) pname;
|
||||||
version = "0.20.1";
|
version = "0.20.0";
|
||||||
# sha256 = "sha256-Gq9klAMXk+SHb7C6z6apErVRz0PB5jyADfixqGZyDDc="; # v0.20.0
|
sha256 = "sha256-Gq9klAMXk+SHb7C6z6apErVRz0PB5jyADfixqGZyDDc=";
|
||||||
sha256 = "sha256-aFhesbASA2icQZm8RA1r5hbwhR6fDrQeSneIRcWg/Vs="; # v0.20.1
|
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -49,33 +48,30 @@
|
|||||||
# doCheck = false;
|
# 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 {
|
tidalDlNg = pythonPkgs.buildPythonApplication rec {
|
||||||
pname = "tidal_dl_ng_for_dj";
|
pname = "tidal-dl-ng";
|
||||||
version = "0.33.2";
|
version = "0.31.3";
|
||||||
format = "pyproject";
|
format = "pyproject";
|
||||||
|
|
||||||
# The official repo was deleted
|
src = pkgs.fetchFromGitHub {
|
||||||
# src = pkgs.fetchFromGitHub {
|
owner = "exislow";
|
||||||
# owner = "exislow";
|
repo = "tidal-dl-ng";
|
||||||
# repo = "tidal-dl-ng";
|
rev = "v${version}";
|
||||||
# rev = "v${version}";
|
sha256 = "sha256-PUT0anx1yivgXwW21jah7Rv1/BabOT+KPoW446NFNyg=";
|
||||||
# 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=";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
dontCheckRuntimeDeps = true;
|
doCheck = false;
|
||||||
|
catchConflicts = false;
|
||||||
|
|
||||||
nativeBuildInputs = with pythonPkgs; [poetry-core setuptools];
|
nativeBuildInputs = with pythonPkgs; [poetry-core setuptools];
|
||||||
|
|
||||||
@ -100,6 +96,13 @@
|
|||||||
typer
|
typer
|
||||||
rich
|
rich
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# pythonOutputDistPhase = ''
|
||||||
|
# echo "⚠️Skipping pythonOutputDistPhase"
|
||||||
|
# '';
|
||||||
|
# pythonCatchConflictsPhase = ''
|
||||||
|
# echo "🛑 Skipping pythonCatchConflictsPhase"
|
||||||
|
# '';
|
||||||
};
|
};
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -128,7 +131,7 @@
|
|||||||
|
|
||||||
tidal-dl-ng-gui-desktopfile = pkgs.stdenv.mkDerivation {
|
tidal-dl-ng-gui-desktopfile = pkgs.stdenv.mkDerivation {
|
||||||
pname = "tdng";
|
pname = "tdng";
|
||||||
version = "0.33.2";
|
version = "0.31.3";
|
||||||
dontUnpack = true;
|
dontUnpack = true;
|
||||||
|
|
||||||
nativeBuildInputs = [pkgs.makeWrapper];
|
nativeBuildInputs = [pkgs.makeWrapper];
|
||||||
|
|||||||
@ -1,60 +0,0 @@
|
|||||||
{
|
|
||||||
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
|
|
||||||
];
|
|
||||||
}
|
|
||||||
730
flake.lock
generated
730
flake.lock
generated
File diff suppressed because it is too large
Load Diff
10
flake.nix
10
flake.nix
@ -60,7 +60,7 @@
|
|||||||
# Noctalia shell
|
# Noctalia shell
|
||||||
noctalia.url = "github:noctalia-dev/noctalia-shell";
|
noctalia.url = "github:noctalia-dev/noctalia-shell";
|
||||||
noctalia.inputs.nixpkgs.follows = "nixpkgs";
|
noctalia.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
# noctalia.inputs.quickshell.follows = "quickshell";
|
noctalia.inputs.quickshell.follows = "quickshell";
|
||||||
|
|
||||||
# Lol
|
# Lol
|
||||||
waifu-cursors.url = "github:kagurazakei/waifu-cursors";
|
waifu-cursors.url = "github:kagurazakei/waifu-cursors";
|
||||||
@ -77,11 +77,9 @@
|
|||||||
# dgop.inputs.nixpkgs.follows = "nixpkgs";
|
# dgop.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
# dms-cli.url = "github:AvengeMedia/danklinux";
|
# dms-cli.url = "github:AvengeMedia/danklinux";
|
||||||
# dms-cli.inputs.nixpkgs.follows = "nixpkgs";
|
# dms-cli.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
dank-material-shell.url = "github:AvengeMedia/DankMaterialShell";
|
# dankMaterialShell.url = "github:AvengeMedia/DankMaterialShell";
|
||||||
dank-material-shell.inputs.nixpkgs.follows = "nixpkgs";
|
# dankMaterialShell.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
# dank-material-shell.inputs.dgop.follows = "dgop";
|
# dankMaterialShell.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 (use flake so plugins are not built from source)
|
||||||
hyprland.url = "github:hyprwm/Hyprland";
|
hyprland.url = "github:hyprwm/Hyprland";
|
||||||
|
|||||||
@ -15,7 +15,7 @@
|
|||||||
headless,
|
headless,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (config.homemodules) color;
|
inherit (config.modules) color;
|
||||||
in
|
in
|
||||||
# This is a HM module.
|
# This is a HM module.
|
||||||
# Because no imports/options/config is defined explicitly, everything is treated as config:
|
# Because no imports/options/config is defined explicitly, everything is treated as config:
|
||||||
@ -25,6 +25,16 @@ in
|
|||||||
# Every module (/function) is called with the same arguments as this module.
|
# Every module (/function) is called with the same arguments as this module.
|
||||||
# Arguments with matching names are "plugged in" into the right slots,
|
# 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.
|
# 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.
|
# Enable and configure my custom HM modules.
|
||||||
paths = rec {
|
paths = rec {
|
||||||
@ -32,7 +42,7 @@ in
|
|||||||
dotfiles = "${nixflake}/config";
|
dotfiles = "${nixflake}/config";
|
||||||
};
|
};
|
||||||
|
|
||||||
homemodules = {
|
modules = {
|
||||||
beets.enable = !headless;
|
beets.enable = !headless;
|
||||||
|
|
||||||
btop.enable = true;
|
btop.enable = true;
|
||||||
@ -47,7 +57,7 @@ in
|
|||||||
extraPackages = with pkgs; [
|
extraPackages = with pkgs; [
|
||||||
papirus-icon-theme
|
papirus-icon-theme
|
||||||
bibata-cursors
|
bibata-cursors
|
||||||
inputs.waifu-cursors.packages.${pkgs.stdenv.hostPlatform.system}.all
|
inputs.waifu-cursors.packages.${pkgs.system}.all
|
||||||
];
|
];
|
||||||
|
|
||||||
cursor = "Bibata-Modern-Classic";
|
cursor = "Bibata-Modern-Classic";
|
||||||
@ -88,8 +98,8 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
hyprland = {
|
hyprland = {
|
||||||
enable = nixosConfig.programs.hyprland.enable;
|
enable = !headless;
|
||||||
dunst.enable = !config.homemodules.hyprpanel.enable; # Disable for hyprpanel
|
dunst.enable = !config.modules.hyprpanel.enable; # Disable for hyprpanel
|
||||||
bars.enable = false;
|
bars.enable = false;
|
||||||
dynamicCursor.enable = false;
|
dynamicCursor.enable = false;
|
||||||
trails.enable = true;
|
trails.enable = true;
|
||||||
@ -102,14 +112,14 @@ in
|
|||||||
|
|
||||||
bindings = lib.mergeAttrsList [
|
bindings = lib.mergeAttrsList [
|
||||||
# Use Rofi if we don't have caelestia
|
# Use Rofi if we don't have caelestia
|
||||||
(lib.optionalAttrs (!config.homemodules.hyprland.caelestia.enable) {
|
(lib.optionalAttrs (!config.modules.hyprland.caelestia.enable) {
|
||||||
"$mainMod, a" = ["exec, rofi -drun-show-actions -show drun"];
|
"$mainMod, a" = ["exec, rofi -drun-show-actions -show drun"];
|
||||||
"$mainMod, c" = ["exec, clipman pick --tool=rofi"];
|
"$mainMod, c" = ["exec, clipman pick --tool=rofi"];
|
||||||
"$mainMod SHIFT, l" = ["exec, loginctl lock-session"];
|
"$mainMod SHIFT, l" = ["exec, loginctl lock-session"];
|
||||||
})
|
})
|
||||||
|
|
||||||
# Caelestia
|
# Caelestia
|
||||||
(lib.optionalAttrs (config.homemodules.hyprland.caelestia.enable) {
|
(lib.optionalAttrs (config.modules.hyprland.caelestia.enable) {
|
||||||
"$mainMod, a" = ["exec, caelestia shell drawers toggle launcher"];
|
"$mainMod, a" = ["exec, caelestia shell drawers toggle launcher"];
|
||||||
# "$mainMod, c" = ["exec, caelestia clipboard"];
|
# "$mainMod, c" = ["exec, caelestia clipboard"];
|
||||||
"$mainMod SHIFT, l" = ["exec, caelestia shell lock lock"];
|
"$mainMod SHIFT, l" = ["exec, caelestia shell lock lock"];
|
||||||
@ -215,8 +225,8 @@ in
|
|||||||
|
|
||||||
windowrules = [
|
windowrules = [
|
||||||
# Fix jetbrains tooltip flicker
|
# Fix jetbrains tooltip flicker
|
||||||
"match:class ^(jetbrains-.*)$, match:title ^(win[0-9]+)$, float 1"
|
"float,class:^(jetbrains-.*)$,title:^(win[0-9]+)$"
|
||||||
"match:class ^(jetbrains-.*)$, match:title ^(win[0-9]+)$, no_initial_focus 1"
|
"nofocus,class:^(jetbrains-.*)$,title:^(win[0-9]+)$"
|
||||||
];
|
];
|
||||||
|
|
||||||
workspacerules = {
|
workspacerules = {
|
||||||
@ -281,7 +291,7 @@ in
|
|||||||
neovide = !headless;
|
neovide = !headless;
|
||||||
};
|
};
|
||||||
|
|
||||||
niri.enable = nixosConfig.programs.niri.enable;
|
niri.enable = !headless;
|
||||||
nnn.enable = false; # Use yazi
|
nnn.enable = false; # Use yazi
|
||||||
qutebrowser.enable = !headless;
|
qutebrowser.enable = !headless;
|
||||||
rmpc.enable = !headless;
|
rmpc.enable = !headless;
|
||||||
@ -308,10 +318,10 @@ in
|
|||||||
# as nixosConfig won't be available otherwise.
|
# as nixosConfig won't be available otherwise.
|
||||||
xdg = {
|
xdg = {
|
||||||
enable = true; # This only does xdg path management
|
enable = true; # This only does xdg path management
|
||||||
mime.enable = nixosConfig.systemmodules.mime.enable;
|
mime.enable = nixosConfig.modules.mime.enable;
|
||||||
|
|
||||||
mimeApps = {
|
mimeApps = {
|
||||||
enable = nixosConfig.systemmodules.mime.enable;
|
enable = nixosConfig.modules.mime.enable;
|
||||||
|
|
||||||
associations.added = nixosConfig.xdg.mime.addedAssociations;
|
associations.added = nixosConfig.xdg.mime.addedAssociations;
|
||||||
associations.removed = nixosConfig.xdg.mime.removedAssociations;
|
associations.removed = nixosConfig.xdg.mime.removedAssociations;
|
||||||
@ -382,7 +392,7 @@ in
|
|||||||
config.lib.file.mkOutOfStoreSymlink
|
config.lib.file.mkOutOfStoreSymlink
|
||||||
nixosConfig.sops.templates."nix.conf".path;
|
nixosConfig.sops.templates."nix.conf".path;
|
||||||
}
|
}
|
||||||
(lib.mkIf nixosConfig.systemmodules.desktopportal.termfilechooser.enable {
|
(lib.mkIf nixosConfig.modules.desktopportal.termfilechooser.enable {
|
||||||
".config/xdg-desktop-portal-termfilechooser/config".text = ''
|
".config/xdg-desktop-portal-termfilechooser/config".text = ''
|
||||||
[filechooser]
|
[filechooser]
|
||||||
cmd=${pkgs.xdg-desktop-portal-termfilechooser}/share/xdg-desktop-portal-termfilechooser/yazi-wrapper.sh
|
cmd=${pkgs.xdg-desktop-portal-termfilechooser}/share/xdg-desktop-portal-termfilechooser/yazi-wrapper.sh
|
||||||
@ -392,7 +402,7 @@ in
|
|||||||
save_mode = last
|
save_mode = last
|
||||||
'';
|
'';
|
||||||
})
|
})
|
||||||
(lib.mkIf config.homemodules.git.enable {
|
(lib.mkIf config.modules.git.enable {
|
||||||
".ssh/allowed_signers".text = "* ${publicKeys.${username}.ssh}";
|
".ssh/allowed_signers".text = "* ${publicKeys.${username}.ssh}";
|
||||||
})
|
})
|
||||||
(lib.mkIf config.programs.navi.enable {
|
(lib.mkIf config.programs.navi.enable {
|
||||||
@ -477,8 +487,6 @@ in
|
|||||||
lazyjournal # Journalctl viewer
|
lazyjournal # Journalctl viewer
|
||||||
systemctl-tui
|
systemctl-tui
|
||||||
restic # Backups
|
restic # Backups
|
||||||
gnumake
|
|
||||||
just
|
|
||||||
|
|
||||||
# Hardware/Software info
|
# Hardware/Software info
|
||||||
pciutils # lspci
|
pciutils # lspci
|
||||||
@ -500,7 +508,7 @@ in
|
|||||||
imagemagick # Convert image (magic)
|
imagemagick # Convert image (magic)
|
||||||
mp3val # Validate mp3 files
|
mp3val # Validate mp3 files
|
||||||
flac # Validate flac files
|
flac # Validate flac files
|
||||||
# spotdl
|
spotdl
|
||||||
|
|
||||||
# Document utils
|
# Document utils
|
||||||
poppler-utils # pdfunite
|
poppler-utils # pdfunite
|
||||||
@ -518,7 +526,7 @@ in
|
|||||||
gping # ping with graph
|
gping # ping with graph
|
||||||
curlie # curl a'la httpie
|
curlie # curl a'la httpie
|
||||||
wget # download that shit
|
wget # download that shit
|
||||||
doggo # dns client
|
dogdns # dns client
|
||||||
rsync # cp on steroids
|
rsync # cp on steroids
|
||||||
rclone # Rsync for cloud
|
rclone # Rsync for cloud
|
||||||
httpie # Cool http client
|
httpie # Cool http client
|
||||||
@ -529,10 +537,10 @@ in
|
|||||||
# Run unpatched binaries on NixOS
|
# Run unpatched binaries on NixOS
|
||||||
# Sets NIX_LD_LIBRARY_PATH and NIX_LD variables for nix-ld.
|
# Sets NIX_LD_LIBRARY_PATH and NIX_LD variables for nix-ld.
|
||||||
# Usage: "nix-alien-ld -- <Executable>".
|
# Usage: "nix-alien-ld -- <Executable>".
|
||||||
inputs.nix-alien.packages.${pkgs.stdenv.hostPlatform.system}.nix-alien
|
inputs.nix-alien.packages.${system}.nix-alien
|
||||||
|
|
||||||
# Search nixpkgs
|
# Search nixpkgs
|
||||||
inputs.nps.packages.${pkgs.stdenv.hostPlatform.system}.default
|
inputs.nps.packages.${system}.default
|
||||||
|
|
||||||
# Use NixCommunity binary cache
|
# Use NixCommunity binary cache
|
||||||
cachix
|
cachix
|
||||||
@ -561,8 +569,11 @@ in
|
|||||||
audacity
|
audacity
|
||||||
ferdium
|
ferdium
|
||||||
gparted
|
gparted
|
||||||
# feishin # electron :(
|
tidal-hifi
|
||||||
jellyfin-tui
|
tidal-dl-ng
|
||||||
|
picard
|
||||||
|
handbrake
|
||||||
|
teamspeak6-client
|
||||||
|
|
||||||
# Office
|
# Office
|
||||||
kdePackages.wacomtablet # For xournalpp/krita
|
kdePackages.wacomtablet # For xournalpp/krita
|
||||||
@ -643,7 +654,7 @@ in
|
|||||||
|
|
||||||
eza = {
|
eza = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableFishIntegration = config.homemodules.fish.enable;
|
enableFishIntegration = config.modules.fish.enable;
|
||||||
};
|
};
|
||||||
|
|
||||||
# TODO: Module
|
# TODO: Module
|
||||||
@ -800,7 +811,7 @@ in
|
|||||||
|
|
||||||
fzf = {
|
fzf = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableFishIntegration = config.homemodules.fish.enable;
|
enableFishIntegration = config.modules.fish.enable;
|
||||||
};
|
};
|
||||||
|
|
||||||
imv = {
|
imv = {
|
||||||
@ -818,7 +829,7 @@ in
|
|||||||
|
|
||||||
keychain = {
|
keychain = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableFishIntegration = config.homemodules.fish.enable;
|
enableFishIntegration = config.modules.fish.enable;
|
||||||
enableXsessionIntegration = !headless;
|
enableXsessionIntegration = !headless;
|
||||||
keys = ["id_ed25519"];
|
keys = ["id_ed25519"];
|
||||||
};
|
};
|
||||||
@ -832,18 +843,18 @@ in
|
|||||||
|
|
||||||
navi = {
|
navi = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableFishIntegration = config.homemodules.fish.enable;
|
enableFishIntegration = config.modules.fish.enable;
|
||||||
};
|
};
|
||||||
|
|
||||||
nix-index = {
|
nix-index = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableFishIntegration = config.homemodules.fish.enable;
|
enableFishIntegration = config.modules.fish.enable;
|
||||||
};
|
};
|
||||||
|
|
||||||
nushell.enable = false;
|
nushell.enable = false;
|
||||||
|
|
||||||
# spicetify = let
|
# spicetify = let
|
||||||
# spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system};
|
# spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
|
||||||
# in {
|
# in {
|
||||||
# enable = true;
|
# enable = true;
|
||||||
#
|
#
|
||||||
@ -929,7 +940,7 @@ in
|
|||||||
|
|
||||||
zoxide = {
|
zoxide = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableFishIntegration = config.homemodules.fish.enable;
|
enableFishIntegration = config.modules.fish.enable;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -8,8 +8,12 @@
|
|||||||
username,
|
username,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
|
imports = [
|
||||||
|
../../modules
|
||||||
|
];
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
homemodules = {
|
modules = {
|
||||||
btop.cuda = true;
|
btop.cuda = true;
|
||||||
|
|
||||||
# This has been relocated here from the default config,
|
# This has been relocated here from the default config,
|
||||||
@ -119,10 +123,9 @@
|
|||||||
# jetbrains.idea-ultimate
|
# jetbrains.idea-ultimate
|
||||||
# jetbrains.webstorm
|
# jetbrains.webstorm
|
||||||
# jetbrains.rider
|
# jetbrains.rider
|
||||||
zed-editor
|
|
||||||
vscode
|
|
||||||
|
|
||||||
# Unity Stuff
|
# Unity Stuff
|
||||||
|
# TODO: Unity module
|
||||||
# unityhub
|
# unityhub
|
||||||
# rider-unity
|
# rider-unity
|
||||||
# dotnetCore
|
# dotnetCore
|
||||||
@ -133,20 +136,10 @@
|
|||||||
godot_4
|
godot_4
|
||||||
(obs-studio.override {cudaSupport = true;})
|
(obs-studio.override {cudaSupport = true;})
|
||||||
kdePackages.kdenlive
|
kdePackages.kdenlive
|
||||||
# davinci-resolve
|
|
||||||
krita
|
krita
|
||||||
makemkv
|
makemkv
|
||||||
lrcget
|
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
|
steam-devices-udev-rules
|
||||||
];
|
];
|
||||||
@ -182,7 +175,7 @@
|
|||||||
|
|
||||||
services = {
|
services = {
|
||||||
ollama = {
|
ollama = {
|
||||||
enable = false;
|
enable = true;
|
||||||
acceleration = "cuda";
|
acceleration = "cuda";
|
||||||
# home = "/var/lib/ollama";
|
# home = "/var/lib/ollama";
|
||||||
|
|
||||||
|
|||||||
@ -1,7 +1,11 @@
|
|||||||
# Here goes the stuff that will only be enabled on the laptop
|
# Here goes the stuff that will only be enabled on the laptop
|
||||||
{...}: {
|
{...}: {
|
||||||
|
imports = [
|
||||||
|
../../modules
|
||||||
|
];
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
homemodules = {
|
modules = {
|
||||||
hyprland = {
|
hyprland = {
|
||||||
keyboard = {
|
keyboard = {
|
||||||
layout = "us";
|
layout = "us";
|
||||||
|
|||||||
@ -6,8 +6,12 @@
|
|||||||
username,
|
username,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
|
imports = [
|
||||||
|
../../modules
|
||||||
|
];
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
homemodules = {
|
modules = {
|
||||||
btop.cuda = true;
|
btop.cuda = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -6,6 +6,10 @@
|
|||||||
username,
|
username,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
|
imports = [
|
||||||
|
../../modules
|
||||||
|
];
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
docker-compose
|
docker-compose
|
||||||
|
|||||||
@ -1,14 +0,0 @@
|
|||||||
{
|
|
||||||
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 {};
|
|
||||||
}
|
|
||||||
@ -1,664 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
color,
|
|
||||||
}: {
|
|
||||||
enable = true;
|
|
||||||
|
|
||||||
systemd = {
|
|
||||||
enable = false;
|
|
||||||
restartIfChanged = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Deprecated
|
|
||||||
# enableClipboard = true;
|
|
||||||
# enableBrightnessControl = false;
|
|
||||||
# enableColorPicker = true;
|
|
||||||
# enableSystemSound = false;
|
|
||||||
|
|
||||||
enableSystemMonitoring = true;
|
|
||||||
enableVPN = true;
|
|
||||||
enableDynamicTheming = false;
|
|
||||||
enableAudioWavelength = true;
|
|
||||||
enableCalendarEvents = false;
|
|
||||||
|
|
||||||
niri = {
|
|
||||||
enableKeybinds = false;
|
|
||||||
enableSpawn = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
# This is generated from the DMS settings dialog.
|
|
||||||
# Run: nix eval --impure --expr 'builtins.fromJSON (builtins.readFile ~/.config/DankMaterialShell/settings.json)'
|
|
||||||
settings = {
|
|
||||||
acLockTimeout = 0;
|
|
||||||
acMonitorTimeout = 0;
|
|
||||||
acProfileName = "";
|
|
||||||
acSuspendBehavior = 0;
|
|
||||||
acSuspendTimeout = 0;
|
|
||||||
activeDisplayProfile = {};
|
|
||||||
animationSpeed = 1;
|
|
||||||
appDrawerSectionViewModes = {};
|
|
||||||
appIdSubstitutions = [
|
|
||||||
{
|
|
||||||
pattern = "Spotify";
|
|
||||||
replacement = "spotify";
|
|
||||||
type = "exact";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
pattern = "beepertexts";
|
|
||||||
replacement = "beeper";
|
|
||||||
type = "exact";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
pattern = "home assistant desktop";
|
|
||||||
replacement = "homeassistant-desktop";
|
|
||||||
type = "exact";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
pattern = "com.transmissionbt.transmission";
|
|
||||||
replacement = "transmission-gtk";
|
|
||||||
type = "contains";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
pattern = "^steam_app_(\\d+)$";
|
|
||||||
replacement = "steam_icon_$1";
|
|
||||||
type = "regex";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
appLauncherGridColumns = 4;
|
|
||||||
appLauncherViewMode = "list";
|
|
||||||
appPickerViewMode = "grid";
|
|
||||||
appsDockActiveColorMode = "primary";
|
|
||||||
appsDockColorizeActive = false;
|
|
||||||
appsDockEnlargeOnHover = false;
|
|
||||||
appsDockEnlargePercentage = 125;
|
|
||||||
appsDockHideIndicators = false;
|
|
||||||
appsDockIconSizePercentage = 100;
|
|
||||||
audioInputDevicePins = {};
|
|
||||||
audioOutputDevicePins = {};
|
|
||||||
audioScrollMode = "volume";
|
|
||||||
audioVisualizerEnabled = true;
|
|
||||||
audioWheelScrollAmount = 5;
|
|
||||||
barConfigs = [
|
|
||||||
{
|
|
||||||
autoHide = false;
|
|
||||||
autoHideDelay = 250;
|
|
||||||
borderColor = "surfaceText";
|
|
||||||
borderEnabled = false;
|
|
||||||
borderOpacity = 1;
|
|
||||||
borderThickness = 2;
|
|
||||||
bottomGap = 0;
|
|
||||||
centerWidgets = [
|
|
||||||
{
|
|
||||||
enabled = true;
|
|
||||||
id = "music";
|
|
||||||
mediaSize = 1;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
enabled = true;
|
|
||||||
fontScale = 1.1;
|
|
||||||
gothCornerRadiusOverride = false;
|
|
||||||
gothCornerRadiusValue = 12;
|
|
||||||
gothCornersEnabled = false;
|
|
||||||
id = "default";
|
|
||||||
innerPadding = 4;
|
|
||||||
leftWidgets = [
|
|
||||||
{
|
|
||||||
enabled = true;
|
|
||||||
id = "launcherButton";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
enabled = true;
|
|
||||||
id = "workspaceSwitcher";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
enabled = true;
|
|
||||||
focusedWindowCompactMode = true;
|
|
||||||
id = "focusedWindow";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
maximizeDetection = true;
|
|
||||||
name = "Main Bar";
|
|
||||||
noBackground = false;
|
|
||||||
openOnOverview = true;
|
|
||||||
popupGapsAuto = true;
|
|
||||||
popupGapsManual = 4;
|
|
||||||
position = 0;
|
|
||||||
rightWidgets = [
|
|
||||||
{
|
|
||||||
enabled = true;
|
|
||||||
id = "privacyIndicator";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
enabled = true;
|
|
||||||
id = "cpuUsage";
|
|
||||||
minimumWidth = true;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
enabled = true;
|
|
||||||
id = "memUsage";
|
|
||||||
minimumWidth = true;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
enabled = true;
|
|
||||||
id = "diskUsage";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
enabled = true;
|
|
||||||
id = "colorPicker";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
enabled = true;
|
|
||||||
id = "clipboard";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
enabled = true;
|
|
||||||
id = "vpn";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
enabled = true;
|
|
||||||
id = "controlCenterButton";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
enabled = true;
|
|
||||||
id = "systemTray";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
clockCompactMode = true;
|
|
||||||
enabled = true;
|
|
||||||
id = "clock";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
enabled = true;
|
|
||||||
id = "notificationButton";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
screenPreferences = ["all"];
|
|
||||||
showOnLastDisplay = true;
|
|
||||||
spacing = 0;
|
|
||||||
squareCorners = true;
|
|
||||||
transparency = 1;
|
|
||||||
visible = true;
|
|
||||||
widgetOutlineColor = "primary";
|
|
||||||
widgetOutlineEnabled = false;
|
|
||||||
widgetOutlineOpacity = 1;
|
|
||||||
widgetOutlineThickness = 2;
|
|
||||||
widgetTransparency = 1;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
barMaxVisibleApps = 0;
|
|
||||||
barMaxVisibleRunningApps = 0;
|
|
||||||
barShowOverflowBadge = true;
|
|
||||||
batteryChargeLimit = 100;
|
|
||||||
batteryLockTimeout = 0;
|
|
||||||
batteryMonitorTimeout = 0;
|
|
||||||
batteryProfileName = "";
|
|
||||||
batterySuspendBehavior = 0;
|
|
||||||
batterySuspendTimeout = 0;
|
|
||||||
bluetoothDevicePins = {};
|
|
||||||
blurWallpaperOnOverview = true;
|
|
||||||
blurredWallpaperLayer = true;
|
|
||||||
brightnessDevicePins = {};
|
|
||||||
browserPickerViewMode = "grid";
|
|
||||||
browserUsageHistory = {};
|
|
||||||
builtInPluginSettings = {dms_settings_search = {trigger = "?";};};
|
|
||||||
buttonColorMode = "primary";
|
|
||||||
centeringMode = "index";
|
|
||||||
clipboardEnterToPaste = false;
|
|
||||||
clockCompactMode = false;
|
|
||||||
clockDateFormat = "yyyy-MM-dd";
|
|
||||||
configVersion = 5;
|
|
||||||
controlCenterShowAudioIcon = true;
|
|
||||||
controlCenterShowAudioPercent = false;
|
|
||||||
controlCenterShowBatteryIcon = false;
|
|
||||||
controlCenterShowBluetoothIcon = true;
|
|
||||||
controlCenterShowBrightnessIcon = false;
|
|
||||||
controlCenterShowBrightnessPercent = false;
|
|
||||||
controlCenterShowMicIcon = true;
|
|
||||||
controlCenterShowMicPercent = false;
|
|
||||||
controlCenterShowNetworkIcon = true;
|
|
||||||
controlCenterShowPrinterIcon = false;
|
|
||||||
controlCenterShowScreenSharingIcon = true;
|
|
||||||
controlCenterShowVpnIcon = true;
|
|
||||||
controlCenterTileColorMode = "primary";
|
|
||||||
controlCenterWidgets = [
|
|
||||||
{
|
|
||||||
enabled = true;
|
|
||||||
id = "volumeSlider";
|
|
||||||
width = 50;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
enabled = true;
|
|
||||||
id = "brightnessSlider";
|
|
||||||
width = 50;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
enabled = true;
|
|
||||||
id = "wifi";
|
|
||||||
width = 50;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
enabled = true;
|
|
||||||
id = "bluetooth";
|
|
||||||
width = 50;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
enabled = true;
|
|
||||||
id = "audioOutput";
|
|
||||||
width = 50;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
enabled = true;
|
|
||||||
id = "audioInput";
|
|
||||||
width = 50;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
enabled = true;
|
|
||||||
id = "nightMode";
|
|
||||||
width = 50;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
enabled = true;
|
|
||||||
id = "darkMode";
|
|
||||||
width = 50;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
cornerRadius = 10;
|
|
||||||
currentThemeCategory = "registry";
|
|
||||||
currentThemeName = "custom";
|
|
||||||
cursorSettings = {
|
|
||||||
dwl = {cursorHideTimeout = 0;};
|
|
||||||
hyprland = {
|
|
||||||
hideOnKeyPress = false;
|
|
||||||
hideOnTouch = false;
|
|
||||||
inactiveTimeout = 0;
|
|
||||||
};
|
|
||||||
niri = {
|
|
||||||
hideAfterInactiveMs = 0;
|
|
||||||
hideWhenTyping = false;
|
|
||||||
};
|
|
||||||
size = 24;
|
|
||||||
theme = "System Default";
|
|
||||||
};
|
|
||||||
customAnimationDuration = 500;
|
|
||||||
customPowerActionHibernate = "";
|
|
||||||
customPowerActionLock = "";
|
|
||||||
customPowerActionLogout = "";
|
|
||||||
customPowerActionPowerOff = "";
|
|
||||||
customPowerActionReboot = "";
|
|
||||||
customPowerActionSuspend = "";
|
|
||||||
customThemeFile = "/home/christoph/NixFlake/config/dankmaterialshell/catppuccin-mauve.json";
|
|
||||||
dankLauncherV2BorderColor = "primary";
|
|
||||||
dankLauncherV2BorderEnabled = false;
|
|
||||||
dankLauncherV2BorderThickness = 2;
|
|
||||||
dankLauncherV2ShowFooter = true;
|
|
||||||
dankLauncherV2Size = "compact";
|
|
||||||
dankLauncherV2UnloadOnClose = false;
|
|
||||||
desktopClockColorMode = "primary";
|
|
||||||
desktopClockCustomColor = {
|
|
||||||
a = 1;
|
|
||||||
b = 1;
|
|
||||||
g = 1;
|
|
||||||
hslHue = -1;
|
|
||||||
hslLightness = 1;
|
|
||||||
hslSaturation = 0;
|
|
||||||
hsvHue = -1;
|
|
||||||
hsvSaturation = 0;
|
|
||||||
hsvValue = 1;
|
|
||||||
r = 1;
|
|
||||||
valid = true;
|
|
||||||
};
|
|
||||||
desktopClockDisplayPreferences = ["all"];
|
|
||||||
desktopClockEnabled = false;
|
|
||||||
desktopClockHeight = 180;
|
|
||||||
desktopClockShowAnalogNumbers = false;
|
|
||||||
desktopClockShowAnalogSeconds = true;
|
|
||||||
desktopClockShowDate = true;
|
|
||||||
desktopClockStyle = "analog";
|
|
||||||
desktopClockTransparency = 0.8;
|
|
||||||
desktopClockWidth = 280;
|
|
||||||
desktopClockX = -1;
|
|
||||||
desktopClockY = -1;
|
|
||||||
desktopWidgetGridSettings = {};
|
|
||||||
desktopWidgetGroups = [];
|
|
||||||
desktopWidgetInstances = [];
|
|
||||||
desktopWidgetPositions = {};
|
|
||||||
displayNameMode = "system";
|
|
||||||
displayProfileAutoSelect = false;
|
|
||||||
displayProfiles = {};
|
|
||||||
displayShowDisconnected = false;
|
|
||||||
displaySnapToEdge = true;
|
|
||||||
dockAutoHide = false;
|
|
||||||
dockBorderColor = "surfaceText";
|
|
||||||
dockBorderEnabled = false;
|
|
||||||
dockBorderOpacity = 1;
|
|
||||||
dockBorderThickness = 1;
|
|
||||||
dockBottomGap = 0;
|
|
||||||
dockGroupByApp = false;
|
|
||||||
dockIconSize = 40;
|
|
||||||
dockIndicatorStyle = "circle";
|
|
||||||
dockIsolateDisplays = false;
|
|
||||||
dockLauncherEnabled = false;
|
|
||||||
dockLauncherLogoBrightness = 0.5;
|
|
||||||
dockLauncherLogoColorOverride = "";
|
|
||||||
dockLauncherLogoContrast = 1;
|
|
||||||
dockLauncherLogoCustomPath = "";
|
|
||||||
dockLauncherLogoMode = "apps";
|
|
||||||
dockLauncherLogoSizeOffset = 0;
|
|
||||||
dockMargin = 0;
|
|
||||||
dockMaxVisibleApps = 0;
|
|
||||||
dockMaxVisibleRunningApps = 0;
|
|
||||||
dockOpenOnOverview = false;
|
|
||||||
dockPosition = 1;
|
|
||||||
dockShowOverflowBadge = true;
|
|
||||||
dockSmartAutoHide = false;
|
|
||||||
dockSpacing = 4;
|
|
||||||
dockTransparency = 1;
|
|
||||||
dwlShowAllTags = false;
|
|
||||||
enableFprint = false;
|
|
||||||
enableRippleEffects = true;
|
|
||||||
enabledGpuPciIds = [];
|
|
||||||
fadeToDpmsEnabled = true;
|
|
||||||
fadeToDpmsGracePeriod = 5;
|
|
||||||
fadeToLockEnabled = true;
|
|
||||||
fadeToLockGracePeriod = 5;
|
|
||||||
filePickerUsageHistory = {};
|
|
||||||
focusedWindowCompactMode = false;
|
|
||||||
fontFamily = "MonoLisa Normal";
|
|
||||||
fontScale = 1;
|
|
||||||
fontWeight = 500;
|
|
||||||
groupWorkspaceApps = true;
|
|
||||||
gtkThemingEnabled = false;
|
|
||||||
hideBrightnessSlider = false;
|
|
||||||
hyprlandLayoutBorderSize = -1;
|
|
||||||
hyprlandLayoutGapsOverride = -1;
|
|
||||||
hyprlandLayoutRadiusOverride = -1;
|
|
||||||
hyprlandOutputSettings = {};
|
|
||||||
iconTheme = "System Default";
|
|
||||||
keyboardLayoutNameCompactMode = false;
|
|
||||||
launchPrefix = "";
|
|
||||||
launcherLogoBrightness = 0.5;
|
|
||||||
launcherLogoColorInvertOnMode = false;
|
|
||||||
launcherLogoColorOverride = "";
|
|
||||||
launcherLogoContrast = 1;
|
|
||||||
launcherLogoCustomPath = "";
|
|
||||||
launcherLogoMode = "os";
|
|
||||||
launcherLogoSizeOffset = 0;
|
|
||||||
launcherPluginOrder = [];
|
|
||||||
launcherPluginVisibility = {};
|
|
||||||
lockAtStartup = false;
|
|
||||||
lockBeforeSuspend = false;
|
|
||||||
lockDateFormat = "yyyy-MM-dd";
|
|
||||||
lockScreenActiveMonitor = "all";
|
|
||||||
lockScreenInactiveColor = "#000000";
|
|
||||||
lockScreenNotificationMode = 0;
|
|
||||||
lockScreenPowerOffMonitorsOnLock = false;
|
|
||||||
lockScreenShowDate = true;
|
|
||||||
lockScreenShowMediaPlayer = true;
|
|
||||||
lockScreenShowPasswordField = true;
|
|
||||||
lockScreenShowPowerActions = true;
|
|
||||||
lockScreenShowProfileImage = true;
|
|
||||||
lockScreenShowSystemIcons = true;
|
|
||||||
lockScreenShowTime = true;
|
|
||||||
loginctlLockIntegration = true;
|
|
||||||
mangoLayoutBorderSize = -1;
|
|
||||||
mangoLayoutGapsOverride = -1;
|
|
||||||
mangoLayoutRadiusOverride = -1;
|
|
||||||
matugenScheme = "scheme-tonal-spot";
|
|
||||||
matugenTargetMonitor = "";
|
|
||||||
matugenTemplateAlacritty = true;
|
|
||||||
matugenTemplateDgop = true;
|
|
||||||
matugenTemplateEmacs = true;
|
|
||||||
matugenTemplateEquibop = true;
|
|
||||||
matugenTemplateFirefox = true;
|
|
||||||
matugenTemplateFoot = true;
|
|
||||||
matugenTemplateGhostty = true;
|
|
||||||
matugenTemplateGtk = true;
|
|
||||||
matugenTemplateHyprland = true;
|
|
||||||
matugenTemplateKcolorscheme = true;
|
|
||||||
matugenTemplateKitty = true;
|
|
||||||
matugenTemplateMangowc = true;
|
|
||||||
matugenTemplateNeovim = true;
|
|
||||||
matugenTemplateNiri = true;
|
|
||||||
matugenTemplatePywalfox = true;
|
|
||||||
matugenTemplateQt5ct = true;
|
|
||||||
matugenTemplateQt6ct = true;
|
|
||||||
matugenTemplateVesktop = true;
|
|
||||||
matugenTemplateVscode = true;
|
|
||||||
matugenTemplateWezterm = true;
|
|
||||||
matugenTemplateZenBrowser = true;
|
|
||||||
maxFprintTries = 15;
|
|
||||||
maxWorkspaceIcons = 3;
|
|
||||||
mediaSize = 1;
|
|
||||||
modalAnimationSpeed = 1;
|
|
||||||
modalCustomAnimationDuration = 150;
|
|
||||||
modalDarkenBackground = true;
|
|
||||||
monoFontFamily = "MonoLisa Normal";
|
|
||||||
networkPreference = "auto";
|
|
||||||
nightModeEnabled = false;
|
|
||||||
niriLayoutBorderSize = -1;
|
|
||||||
niriLayoutGapsOverride = -1;
|
|
||||||
niriLayoutRadiusOverride = -1;
|
|
||||||
niriOutputSettings = {};
|
|
||||||
niriOverviewOverlayEnabled = true;
|
|
||||||
notepadFontFamily = "";
|
|
||||||
notepadFontSize = 14;
|
|
||||||
notepadLastCustomTransparency = 0.7;
|
|
||||||
notepadShowLineNumbers = false;
|
|
||||||
notepadTransparencyOverride = -1;
|
|
||||||
notepadUseMonospace = true;
|
|
||||||
notificationAnimationSpeed = 1;
|
|
||||||
notificationCompactMode = false;
|
|
||||||
notificationCustomAnimationDuration = 400;
|
|
||||||
notificationHistoryEnabled = true;
|
|
||||||
notificationHistoryMaxAgeDays = 7;
|
|
||||||
notificationHistoryMaxCount = 50;
|
|
||||||
notificationHistorySaveCritical = true;
|
|
||||||
notificationHistorySaveLow = true;
|
|
||||||
notificationHistorySaveNormal = true;
|
|
||||||
notificationOverlayEnabled = false;
|
|
||||||
notificationPopupPosition = 0;
|
|
||||||
notificationPopupPrivacyMode = false;
|
|
||||||
notificationPopupShadowEnabled = true;
|
|
||||||
notificationRules = [];
|
|
||||||
notificationTimeoutCritical = 0;
|
|
||||||
notificationTimeoutLow = 5000;
|
|
||||||
notificationTimeoutNormal = 5000;
|
|
||||||
osdAlwaysShowValue = true;
|
|
||||||
osdAudioOutputEnabled = true;
|
|
||||||
osdBrightnessEnabled = true;
|
|
||||||
osdCapsLockEnabled = true;
|
|
||||||
osdIdleInhibitorEnabled = true;
|
|
||||||
osdMediaPlaybackEnabled = true;
|
|
||||||
osdMediaVolumeEnabled = true;
|
|
||||||
osdMicMuteEnabled = true;
|
|
||||||
osdPosition = 7;
|
|
||||||
osdPowerProfileEnabled = false;
|
|
||||||
osdVolumeEnabled = true;
|
|
||||||
padHours12Hour = false;
|
|
||||||
popoutAnimationSpeed = 1;
|
|
||||||
popoutCustomAnimationDuration = 150;
|
|
||||||
popupTransparency = 1;
|
|
||||||
powerActionConfirm = true;
|
|
||||||
powerActionHoldDuration = 0.5;
|
|
||||||
powerMenuActions = ["reboot" "logout" "poweroff" "lock" "restart"];
|
|
||||||
powerMenuDefaultAction = "poweroff";
|
|
||||||
powerMenuGridLayout = false;
|
|
||||||
privacyShowCameraIcon = false;
|
|
||||||
privacyShowMicIcon = false;
|
|
||||||
privacyShowScreenShareIcon = false;
|
|
||||||
qtThemingEnabled = false;
|
|
||||||
registryThemeVariants = {};
|
|
||||||
reverseScrolling = false;
|
|
||||||
runDmsMatugenTemplates = false;
|
|
||||||
runUserMatugenTemplates = false;
|
|
||||||
runningAppsCompactMode = true;
|
|
||||||
runningAppsCurrentMonitor = false;
|
|
||||||
runningAppsCurrentWorkspace = false;
|
|
||||||
runningAppsGroupByApp = false;
|
|
||||||
screenPreferences = {};
|
|
||||||
scrollTitleEnabled = true;
|
|
||||||
selectedGpuIndex = 0;
|
|
||||||
showBattery = false;
|
|
||||||
showCapsLockIndicator = false;
|
|
||||||
showClipboard = true;
|
|
||||||
showClock = true;
|
|
||||||
showControlCenterButton = true;
|
|
||||||
showCpuTemp = true;
|
|
||||||
showCpuUsage = true;
|
|
||||||
showDock = false;
|
|
||||||
showFocusedWindow = true;
|
|
||||||
showGpuTemp = false;
|
|
||||||
showLauncherButton = true;
|
|
||||||
showMemUsage = true;
|
|
||||||
showMusic = true;
|
|
||||||
showNotificationButton = true;
|
|
||||||
showOccupiedWorkspacesOnly = false;
|
|
||||||
showOnLastDisplay = {};
|
|
||||||
showPrivacyButton = false;
|
|
||||||
showSeconds = true;
|
|
||||||
showSystemTray = true;
|
|
||||||
showWeather = true;
|
|
||||||
showWorkspaceApps = false;
|
|
||||||
showWorkspaceIndex = false;
|
|
||||||
showWorkspaceName = false;
|
|
||||||
showWorkspacePadding = false;
|
|
||||||
showWorkspaceSwitcher = true;
|
|
||||||
sortAppsAlphabetically = false;
|
|
||||||
soundNewNotification = true;
|
|
||||||
soundPluggedIn = true;
|
|
||||||
soundVolumeChanged = true;
|
|
||||||
soundsEnabled = false;
|
|
||||||
spotlightCloseNiriOverview = true;
|
|
||||||
spotlightModalViewMode = "list";
|
|
||||||
spotlightSectionViewModes = {};
|
|
||||||
syncComponentAnimationSpeeds = true;
|
|
||||||
syncModeWithPortal = true;
|
|
||||||
systemMonitorColorMode = "primary";
|
|
||||||
systemMonitorCustomColor = {
|
|
||||||
a = 1;
|
|
||||||
b = 1;
|
|
||||||
g = 1;
|
|
||||||
hslHue = -1;
|
|
||||||
hslLightness = 1;
|
|
||||||
hslSaturation = 0;
|
|
||||||
hsvHue = -1;
|
|
||||||
hsvSaturation = 0;
|
|
||||||
hsvValue = 1;
|
|
||||||
r = 1;
|
|
||||||
valid = true;
|
|
||||||
};
|
|
||||||
systemMonitorDisplayPreferences = ["all"];
|
|
||||||
systemMonitorEnabled = false;
|
|
||||||
systemMonitorGpuPciId = "";
|
|
||||||
systemMonitorGraphInterval = 60;
|
|
||||||
systemMonitorHeight = 480;
|
|
||||||
systemMonitorLayoutMode = "auto";
|
|
||||||
systemMonitorShowCpu = true;
|
|
||||||
systemMonitorShowCpuGraph = true;
|
|
||||||
systemMonitorShowCpuTemp = true;
|
|
||||||
systemMonitorShowDisk = true;
|
|
||||||
systemMonitorShowGpuTemp = false;
|
|
||||||
systemMonitorShowHeader = true;
|
|
||||||
systemMonitorShowMemory = true;
|
|
||||||
systemMonitorShowMemoryGraph = true;
|
|
||||||
systemMonitorShowNetwork = true;
|
|
||||||
systemMonitorShowNetworkGraph = true;
|
|
||||||
systemMonitorShowTopProcesses = false;
|
|
||||||
systemMonitorTopProcessCount = 3;
|
|
||||||
systemMonitorTopProcessSortBy = "cpu";
|
|
||||||
systemMonitorTransparency = 0.8;
|
|
||||||
systemMonitorVariants = [];
|
|
||||||
systemMonitorWidth = 320;
|
|
||||||
systemMonitorX = -1;
|
|
||||||
systemMonitorY = -1;
|
|
||||||
terminalsAlwaysDark = false;
|
|
||||||
updaterCustomCommand = "";
|
|
||||||
updaterHideWidget = false;
|
|
||||||
updaterTerminalAdditionalParams = "";
|
|
||||||
updaterUseCustomCommand = false;
|
|
||||||
use24HourClock = true;
|
|
||||||
useAutoLocation = false;
|
|
||||||
useFahrenheit = false;
|
|
||||||
useSystemSoundTheme = false;
|
|
||||||
wallpaperFillMode = "Fill";
|
|
||||||
waveProgressEnabled = true;
|
|
||||||
weatherEnabled = true;
|
|
||||||
widgetBackgroundColor = "sc";
|
|
||||||
widgetColorMode = "default";
|
|
||||||
wifiNetworkPins = {};
|
|
||||||
windSpeedUnit = "kmh";
|
|
||||||
workspaceAppIconSizeOffset = 0;
|
|
||||||
workspaceColorMode = "default";
|
|
||||||
workspaceDragReorder = true;
|
|
||||||
workspaceFocusedBorderColor = "primary";
|
|
||||||
workspaceFocusedBorderEnabled = false;
|
|
||||||
workspaceFocusedBorderThickness = 2;
|
|
||||||
workspaceFollowFocus = false;
|
|
||||||
workspaceNameIcons = {};
|
|
||||||
workspaceOccupiedColorMode = "none";
|
|
||||||
workspaceScrolling = false;
|
|
||||||
workspaceUnfocusedColorMode = "default";
|
|
||||||
workspaceUrgentColorMode = "default";
|
|
||||||
};
|
|
||||||
|
|
||||||
session = {
|
|
||||||
# Settings
|
|
||||||
doNotDisturb = false;
|
|
||||||
isLightMode = false;
|
|
||||||
weatherHourlyDetailed = true;
|
|
||||||
|
|
||||||
# Night
|
|
||||||
nightModeAutoEnabled = true;
|
|
||||||
nightModeAutoMode = "time";
|
|
||||||
nightModeEnabled = true;
|
|
||||||
nightModeEndHour = 6;
|
|
||||||
nightModeEndMinute = 0;
|
|
||||||
nightModeHighTemperature = 6500;
|
|
||||||
nightModeLocationProvider = "";
|
|
||||||
nightModeStartHour = 22;
|
|
||||||
nightModeStartMinute = 0;
|
|
||||||
nightModeTemperature = 5500;
|
|
||||||
nightModeUseIPLocation = false;
|
|
||||||
|
|
||||||
# Hardware
|
|
||||||
nonNvidiaGpuTempEnabled = false;
|
|
||||||
nvidiaGpuTempEnabled = false;
|
|
||||||
selectedGpuIndex = 0;
|
|
||||||
wifiDeviceOverride = "";
|
|
||||||
enabledGpuPciIds = [];
|
|
||||||
lastBrightnessDevice = "";
|
|
||||||
|
|
||||||
# Wallpapers
|
|
||||||
perModeWallpaper = false;
|
|
||||||
perMonitorWallpaper = false;
|
|
||||||
wallpaperCyclingEnabled = false;
|
|
||||||
wallpaperCyclingInterval = 300;
|
|
||||||
wallpaperCyclingMode = "interval";
|
|
||||||
wallpaperCyclingTime = "06:00";
|
|
||||||
wallpaperPath = "/home/christoph/NixFlake/wallpapers/Windows.jpg";
|
|
||||||
wallpaperPathDark = "";
|
|
||||||
wallpaperPathLight = "";
|
|
||||||
wallpaperTransition = "iris bloom";
|
|
||||||
|
|
||||||
# Random shit
|
|
||||||
includedTransitions = ["fade" "wipe" "disc" "stripes" "iris bloom" "pixelate" "portal"];
|
|
||||||
launchPrefix = "";
|
|
||||||
latitude = 0;
|
|
||||||
longitude = 0;
|
|
||||||
pinnedApps = [];
|
|
||||||
hiddenTrayIds = [];
|
|
||||||
recentColors = [];
|
|
||||||
showThirdPartyPlugins = true;
|
|
||||||
|
|
||||||
# Ultra random shit
|
|
||||||
monitorCyclingSettings = {};
|
|
||||||
monitorWallpapers = {};
|
|
||||||
monitorWallpapersDark = {};
|
|
||||||
monitorWallpapersLight = {};
|
|
||||||
brightnessExponentValues = {};
|
|
||||||
brightnessExponentialDevices = {};
|
|
||||||
brightnessUserSetValues = {};
|
|
||||||
|
|
||||||
configVersion = 1;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
14
home/modules/0_template/default.nix
Normal file
14
home/modules/0_template/default.nix
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
nixosConfig,
|
||||||
|
lib,
|
||||||
|
mylib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
|
inherit (config.modules) TEMPLATE color;
|
||||||
|
in {
|
||||||
|
options.modules.TEMPLATE = import ./options.nix {inherit lib mylib;};
|
||||||
|
|
||||||
|
config = lib.mkIf TEMPLATE.enable {};
|
||||||
|
}
|
||||||
@ -6,9 +6,9 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (config.homemodules) ags;
|
inherit (config.modules) ags;
|
||||||
in {
|
in {
|
||||||
options.homemodules.ags = import ./options.nix {inherit lib mylib;};
|
options.modules.ags = import ./options.nix {inherit lib mylib;};
|
||||||
|
|
||||||
config = lib.mkIf ags.enable {
|
config = lib.mkIf ags.enable {
|
||||||
programs.ags = {
|
programs.ags = {
|
||||||
@ -17,20 +17,20 @@ in {
|
|||||||
|
|
||||||
# AGS libs go here
|
# AGS libs go here
|
||||||
extraPackages = [
|
extraPackages = [
|
||||||
inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.apps
|
inputs.ags.packages.${pkgs.system}.apps
|
||||||
inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.auth
|
inputs.ags.packages.${pkgs.system}.auth
|
||||||
inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.battery
|
inputs.ags.packages.${pkgs.system}.battery
|
||||||
inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.bluetooth
|
inputs.ags.packages.${pkgs.system}.bluetooth
|
||||||
inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.cava
|
inputs.ags.packages.${pkgs.system}.cava
|
||||||
# inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.greet
|
# inputs.ags.packages.${pkgs.system}.greet
|
||||||
inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.hyprland
|
inputs.ags.packages.${pkgs.system}.hyprland
|
||||||
inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.mpris
|
inputs.ags.packages.${pkgs.system}.mpris
|
||||||
inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.network
|
inputs.ags.packages.${pkgs.system}.network
|
||||||
inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.notifd
|
inputs.ags.packages.${pkgs.system}.notifd
|
||||||
# inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.powerprofiles
|
# inputs.ags.packages.${pkgs.system}.powerprofiles
|
||||||
# inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.river
|
# inputs.ags.packages.${pkgs.system}.river
|
||||||
inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.tray
|
inputs.ags.packages.${pkgs.system}.tray
|
||||||
inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.wireplumber
|
inputs.ags.packages.${pkgs.system}.wireplumber
|
||||||
];
|
];
|
||||||
|
|
||||||
# This should symlink but doesn't, it copies the files :/
|
# This should symlink but doesn't, it copies the files :/
|
||||||
@ -40,7 +40,7 @@ in {
|
|||||||
# The ags module doesn't expose the "astal" cli tool or extraPackages
|
# The ags module doesn't expose the "astal" cli tool or extraPackages
|
||||||
home.packages =
|
home.packages =
|
||||||
[
|
[
|
||||||
inputs.ags.packages.${pkgs.stdenv.hostPlatform.system}.io
|
inputs.ags.packages.${pkgs.system}.io
|
||||||
]
|
]
|
||||||
++ config.programs.ags.extraPackages;
|
++ config.programs.ags.extraPackages;
|
||||||
|
|
||||||
@ -68,7 +68,7 @@ in {
|
|||||||
# ".config/ags".source = config.lib.file.mkOutOfStoreSymlink "${config.paths.nixflake}/home/modules/ags/config";
|
# ".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
|
# NOTE: Don't symlink to ~/.config/ags/colors.scss, since that is already used by configDir
|
||||||
".config/_colors.scss".text = with config.homemodules.color.hex; ''
|
".config/_colors.scss".text = with config.modules.color.hex; ''
|
||||||
$dark-rosewater: #${dark.rosewater};
|
$dark-rosewater: #${dark.rosewater};
|
||||||
$dark-flamingo: #${dark.flamingo};
|
$dark-flamingo: #${dark.flamingo};
|
||||||
$dark-pink: #${dark.pink};
|
$dark-pink: #${dark.pink};
|
||||||
@ -5,9 +5,9 @@
|
|||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
with mylib.modules; let
|
with mylib.modules; let
|
||||||
cfg = config.homemodules.alacritty;
|
cfg = config.modules.alacritty;
|
||||||
in {
|
in {
|
||||||
options.homemodules.alacritty = import ./options.nix {inherit lib mylib;};
|
options.modules.alacritty = import ./options.nix {inherit lib mylib;};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
programs.alacritty = {
|
programs.alacritty = {
|
||||||
@ -8,14 +8,14 @@
|
|||||||
}:
|
}:
|
||||||
with lib;
|
with lib;
|
||||||
with mylib.modules; let
|
with mylib.modules; let
|
||||||
cfg = config.homemodules.audio;
|
cfg = config.modules.audio;
|
||||||
cfgfp = config.homemodules.flatpak;
|
cfgfp = config.modules.flatpak;
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
../flatpak
|
../flatpak
|
||||||
];
|
];
|
||||||
|
|
||||||
options.homemodules.audio = import ./options.nix {inherit lib mylib;};
|
options.modules.audio = import ./options.nix {inherit lib mylib;};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
assertions = [
|
assertions = [
|
||||||
@ -12,13 +12,13 @@ with lib;
|
|||||||
with mylib.modules; let
|
with mylib.modules; let
|
||||||
# This is the current state of the option that this module defines
|
# This is the current state of the option that this module defines
|
||||||
# We use it to determine if the config should be changed below
|
# We use it to determine if the config should be changed below
|
||||||
cfg = config.homemodules.emacs;
|
cfg = config.modules.emacs;
|
||||||
in {
|
in {
|
||||||
imports = [];
|
imports = [];
|
||||||
|
|
||||||
# Options is a vector of options this module defines
|
# Options is a vector of options this module defines
|
||||||
# This module defines only the "emacs" option and suboptions "enable" and "doom"
|
# This module defines only the "emacs" option and suboptions "enable" and "doom"
|
||||||
options.homemodules.emacs = import ./options.nix {inherit lib mylib;};
|
options.modules.emacs = import ./options.nix {inherit lib mylib;};
|
||||||
|
|
||||||
# Config is the merged set of all module configurations
|
# 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)
|
# 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 lib;
|
||||||
with mylib.modules; let
|
with mylib.modules; let
|
||||||
cfg = config.homemodules.email;
|
cfg = config.modules.email;
|
||||||
in {
|
in {
|
||||||
options.homemodules.email = import ./options.nix {inherit lib mylib;};
|
options.modules.email = import ./options.nix {inherit lib mylib;};
|
||||||
|
|
||||||
# TODO: Add Maildir to nextcloud sync
|
# TODO: Add Maildir to nextcloud sync
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
@ -12,9 +12,9 @@ with mylib.modules;
|
|||||||
# It is important that every flatpak interaction is handled through this module
|
# 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
|
# to prevent that anything is removed by a module although it is required by another one
|
||||||
let
|
let
|
||||||
cfg = config.homemodules.flatpak;
|
cfg = config.modules.flatpak;
|
||||||
in {
|
in {
|
||||||
options.homemodules.flatpak = import ./options.nix {inherit lib mylib;};
|
options.modules.flatpak = import ./options.nix {inherit lib mylib;};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
assertions = [
|
assertions = [
|
||||||
@ -7,11 +7,11 @@
|
|||||||
}:
|
}:
|
||||||
with lib;
|
with lib;
|
||||||
with mylib.modules; let
|
with mylib.modules; let
|
||||||
cfg = config.homemodules.gaming;
|
cfg = config.modules.gaming;
|
||||||
cfgfp = config.homemodules.flatpak;
|
cfgfp = config.modules.flatpak;
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
# NOTE: I don't know if this is the right approach or if I should use config.homemodules.flatpak
|
# NOTE: I don't know if this is the right approach or if I should use config.modules.flatpak
|
||||||
../flatpak
|
../flatpak
|
||||||
];
|
];
|
||||||
|
|
||||||
@ -19,7 +19,7 @@ in {
|
|||||||
# TODO: SteamTinkerLaunch option
|
# TODO: SteamTinkerLaunch option
|
||||||
# TODO: Dolphin + SteamRomManager option
|
# TODO: Dolphin + SteamRomManager option
|
||||||
|
|
||||||
options.homemodules.gaming = import ./options.nix {inherit lib mylib;};
|
options.modules.gaming = import ./options.nix {inherit lib mylib;};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
assertions = [
|
assertions = [
|
||||||
@ -10,9 +10,9 @@
|
|||||||
}:
|
}:
|
||||||
with lib;
|
with lib;
|
||||||
with mylib.modules; let
|
with mylib.modules; let
|
||||||
cfg = config.homemodules.helix;
|
cfg = config.modules.helix;
|
||||||
in {
|
in {
|
||||||
options.homemodules.helix = import ./options.nix {inherit lib mylib;};
|
options.modules.helix = import ./options.nix {inherit lib mylib;};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
home.sessionVariables = {
|
home.sessionVariables = {
|
||||||
@ -9,9 +9,9 @@
|
|||||||
# TODO: Remove this module, put protonmail into the email module
|
# TODO: Remove this module, put protonmail into the email module
|
||||||
with lib;
|
with lib;
|
||||||
with mylib.modules; let
|
with mylib.modules; let
|
||||||
cfg = config.homemodules.misc;
|
cfg = config.modules.misc;
|
||||||
in {
|
in {
|
||||||
options.homemodules.misc = import ./options.nix {inherit lib mylib;};
|
options.modules.misc = import ./options.nix {inherit lib mylib;};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
home.packages = with pkgs;
|
home.packages = with pkgs;
|
||||||
@ -12,9 +12,9 @@
|
|||||||
}:
|
}:
|
||||||
with lib;
|
with lib;
|
||||||
with mylib.modules; let
|
with mylib.modules; let
|
||||||
cfg = config.homemodules.nextcloud;
|
cfg = config.modules.nextcloud;
|
||||||
in {
|
in {
|
||||||
options.homemodules.nextcloud = import ./options.nix {inherit lib mylib;};
|
options.modules.nextcloud = import ./options.nix {inherit lib mylib;};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
assertions = [
|
assertions = [
|
||||||
@ -8,9 +8,9 @@
|
|||||||
}:
|
}:
|
||||||
with lib;
|
with lib;
|
||||||
with mylib.modules; let
|
with mylib.modules; let
|
||||||
cfg = config.homemodules.ranger;
|
cfg = config.modules.ranger;
|
||||||
in {
|
in {
|
||||||
options.homemodules.ranger = import ./options.nix {inherit lib mylib;};
|
options.modules.ranger = import ./options.nix {inherit lib mylib;};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
home.packages = with pkgs;
|
home.packages = with pkgs;
|
||||||
@ -9,9 +9,9 @@
|
|||||||
}:
|
}:
|
||||||
with lib;
|
with lib;
|
||||||
with mylib.modules; let
|
with mylib.modules; let
|
||||||
cfg = config.homemodules.vscode;
|
cfg = config.modules.vscode;
|
||||||
in {
|
in {
|
||||||
options.homemodules.vscode = import ./options.nix {inherit lib mylib;};
|
options.modules.vscode = import ./options.nix {inherit lib mylib;};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
programs.vscode = {
|
programs.vscode = {
|
||||||
@ -6,9 +6,9 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (config.homemodules) beets;
|
inherit (config.modules) beets;
|
||||||
in {
|
in {
|
||||||
options.homemodules.beets = import ./options.nix {inherit lib mylib;};
|
options.modules.beets = import ./options.nix {inherit lib mylib;};
|
||||||
|
|
||||||
config = lib.mkIf beets.enable {
|
config = lib.mkIf beets.enable {
|
||||||
programs.beets = {
|
programs.beets = {
|
||||||
@ -6,9 +6,9 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (config.homemodules) btop color;
|
inherit (config.modules) btop color;
|
||||||
in {
|
in {
|
||||||
options.homemodules.btop = import ./options.nix {inherit lib mylib;};
|
options.modules.btop = import ./options.nix {inherit lib mylib;};
|
||||||
|
|
||||||
config = lib.mkIf btop.enable {
|
config = lib.mkIf btop.enable {
|
||||||
programs.btop = {
|
programs.btop = {
|
||||||
@ -5,9 +5,9 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (config.homemodules) chromium;
|
inherit (config.modules) chromium;
|
||||||
in {
|
in {
|
||||||
options.homemodules.chromium = import ./options.nix {inherit lib mylib;};
|
options.modules.chromium = import ./options.nix {inherit lib mylib;};
|
||||||
|
|
||||||
config = lib.mkIf chromium.enable {
|
config = lib.mkIf chromium.enable {
|
||||||
home.packages = with pkgs;
|
home.packages = with pkgs;
|
||||||
@ -5,9 +5,9 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (config.homemodules) color;
|
inherit (config.modules) color;
|
||||||
in {
|
in {
|
||||||
options.homemodules.color = import ./options.nix {inherit lib mylib pkgs;};
|
options.modules.color = import ./options.nix {inherit lib mylib pkgs;};
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
home.packages = let
|
home.packages = let
|
||||||
@ -59,7 +59,7 @@ in {
|
|||||||
++ (lib.optionals color.installPackages color.extraPackages);
|
++ (lib.optionals color.installPackages color.extraPackages);
|
||||||
|
|
||||||
# This module sets its own options to the values specified in a colorscheme file.
|
# This module sets its own options to the values specified in a colorscheme file.
|
||||||
homemodules.color = let
|
modules.color = let
|
||||||
scheme = import ./schemes/${color.scheme}.nix;
|
scheme = import ./schemes/${color.scheme}.nix;
|
||||||
|
|
||||||
# Add the aliases
|
# Add the aliases
|
||||||
@ -35,9 +35,8 @@
|
|||||||
# inputs.niri.homeModules.niri # Imported by system module
|
# inputs.niri.homeModules.niri # Imported by system module
|
||||||
inputs.noctalia.homeModules.default
|
inputs.noctalia.homeModules.default
|
||||||
inputs.caelestia.homeManagerModules.default
|
inputs.caelestia.homeManagerModules.default
|
||||||
inputs.dank-material-shell.homeModules.dank-material-shell
|
# inputs.dankMaterialShell.homeModules.dankMaterialShell.default
|
||||||
inputs.dank-material-shell.homeModules.niri
|
# inputs.dankMaterialShell.homeModules.dankMaterialShell.niri
|
||||||
inputs.danksearch.homeModules.default
|
|
||||||
|
|
||||||
# NOTE: Do NOT use this, use the system module (the HM module has to rely on fuse)
|
# NOTE: Do NOT use this, use the system module (the HM module has to rely on fuse)
|
||||||
# inputs.impermanence.homeManagerModules.impermanence
|
# inputs.impermanence.homeManagerModules.impermanence
|
||||||
@ -5,18 +5,15 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (config.homemodules) docs;
|
inherit (config.modules) docs;
|
||||||
in {
|
in {
|
||||||
options.homemodules.docs = import ./options.nix {inherit lib mylib;};
|
options.modules.docs = import ./options.nix {inherit lib mylib;};
|
||||||
|
|
||||||
config = lib.mkIf docs.enable {
|
config = lib.mkIf docs.enable {
|
||||||
home = {
|
home = {
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
|
texliveFull
|
||||||
inkscape
|
inkscape
|
||||||
|
|
||||||
texliveFull # TODO: LaTeX packages
|
|
||||||
|
|
||||||
typst # TODO: Typst packages
|
|
||||||
];
|
];
|
||||||
|
|
||||||
file = {
|
file = {
|
||||||
@ -5,9 +5,9 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (config.homemodules) fcitx;
|
inherit (config.modules) fcitx;
|
||||||
in {
|
in {
|
||||||
options.homemodules.fcitx = import ./options.nix {inherit lib mylib;};
|
options.modules.fcitx = import ./options.nix {inherit lib mylib;};
|
||||||
|
|
||||||
config = lib.mkIf fcitx.enable {
|
config = lib.mkIf fcitx.enable {
|
||||||
i18n.inputMethod = {
|
i18n.inputMethod = {
|
||||||
@ -69,7 +69,6 @@ in [
|
|||||||
(mkBm "Rust" "https://doc.rust-lang.org/stable/book/ch03-00-common-programming-concepts.html")
|
(mkBm "Rust" "https://doc.rust-lang.org/stable/book/ch03-00-common-programming-concepts.html")
|
||||||
(mkBm "RustOS" "https://os.phil-opp.com/")
|
(mkBm "RustOS" "https://os.phil-opp.com/")
|
||||||
(mkBm "Interpreters" "https://craftinginterpreters.com/contents.html")
|
(mkBm "Interpreters" "https://craftinginterpreters.com/contents.html")
|
||||||
(mkBm "Godbolt" "https://godbolt.org")
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
@ -6,15 +6,15 @@
|
|||||||
hostname,
|
hostname,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (config.homemodules) firefox color;
|
inherit (config.modules) firefox color;
|
||||||
in {
|
in {
|
||||||
options.homemodules.firefox = import ./options.nix {inherit lib mylib;};
|
options.modules.firefox = import ./options.nix {inherit lib mylib;};
|
||||||
|
|
||||||
config = lib.mkIf firefox.enable {
|
config = lib.mkIf firefox.enable {
|
||||||
textfox = {
|
textfox = {
|
||||||
enable = firefox.textfox;
|
enable = firefox.textfox;
|
||||||
# useLegacyExtensions = false;
|
useLegacyExtensions = false;
|
||||||
profiles = ["default"];
|
profile = "default";
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
background = {
|
background = {
|
||||||
@ -54,9 +54,7 @@ in {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [vdhcoapp];
|
||||||
# vdhcoapp # No longer required since VDH >= 10
|
|
||||||
];
|
|
||||||
|
|
||||||
home.sessionVariables = lib.mkMerge [
|
home.sessionVariables = lib.mkMerge [
|
||||||
{
|
{
|
||||||
@ -245,7 +243,7 @@ in {
|
|||||||
# catppuccin-web-file-icons
|
# catppuccin-web-file-icons
|
||||||
clearurls
|
clearurls
|
||||||
# cookie-autodelete
|
# cookie-autodelete
|
||||||
# dark-background-light-text
|
dark-background-light-text
|
||||||
display-_anchors # Easier linking to specific website parts
|
display-_anchors # Easier linking to specific website parts
|
||||||
don-t-fuck-with-paste
|
don-t-fuck-with-paste
|
||||||
# enhancer-for-youtube # Discontinued, use tweaks-for-youtube
|
# enhancer-for-youtube # Discontinued, use tweaks-for-youtube
|
||||||
@ -7,9 +7,9 @@
|
|||||||
nixosConfig,
|
nixosConfig,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (config.homemodules) fish color;
|
inherit (config.modules) fish color;
|
||||||
in {
|
in {
|
||||||
options.homemodules.fish = import ./options.nix {inherit lib mylib;};
|
options.modules.fish = import ./options.nix {inherit lib mylib;};
|
||||||
|
|
||||||
config = lib.mkIf fish.enable {
|
config = lib.mkIf fish.enable {
|
||||||
# https://github.com/catppuccin/fish/blob/main/themes/Catppuccin%20Mocha.theme
|
# https://github.com/catppuccin/fish/blob/main/themes/Catppuccin%20Mocha.theme
|
||||||
@ -47,7 +47,7 @@ in {
|
|||||||
generateCompletions = nixosConfig.programs.fish.generateCompletions;
|
generateCompletions = nixosConfig.programs.fish.generateCompletions;
|
||||||
|
|
||||||
functions = lib.mergeAttrsList [
|
functions = lib.mergeAttrsList [
|
||||||
(lib.optionalAttrs config.homemodules.nnn.enable {
|
(lib.optionalAttrs config.modules.nnn.enable {
|
||||||
nnncd = {
|
nnncd = {
|
||||||
wraps = "nnn";
|
wraps = "nnn";
|
||||||
description = "support nnn quit and change directory";
|
description = "support nnn quit and change directory";
|
||||||
@ -101,7 +101,7 @@ in {
|
|||||||
# Same as above but with args for bat
|
# Same as above but with args for bat
|
||||||
batifyWithArgs = command: args: command + (lib.optionalString config.programs.bat.enable (" | bat " + args));
|
batifyWithArgs = command: args: command + (lib.optionalString config.programs.bat.enable (" | bat " + args));
|
||||||
|
|
||||||
# These can be used for my config.homemodules and for HM config.programs,
|
# These can be used for my config.modules and for HM config.programs,
|
||||||
# as both of these add the package to home.packages
|
# as both of these add the package to home.packages
|
||||||
hasHomePackage = package: (mylib.modules.contains config.home.packages package);
|
hasHomePackage = package: (mylib.modules.contains config.home.packages package);
|
||||||
|
|
||||||
@ -167,15 +167,15 @@ in {
|
|||||||
gcl = "git clone";
|
gcl = "git clone";
|
||||||
})
|
})
|
||||||
|
|
||||||
(lib.optionalAttrs config.homemodules.kitty.enable {ssh = "kitty +kitten ssh";})
|
(lib.optionalAttrs config.modules.kitty.enable {ssh = "kitty +kitten ssh";})
|
||||||
|
|
||||||
(abbrify pkgs.lazygit {lg = "lazygit";})
|
(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";})
|
(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...
|
# Doesn't work with abbrify because I have nnn.override...
|
||||||
(lib.optionalAttrs config.homemodules.nnn.enable {n = "nnncd -a";})
|
(lib.optionalAttrs config.modules.nnn.enable {n = "nnncd -a";})
|
||||||
(lib.optionalAttrs config.homemodules.nnn.enable {np = "nnncd -a -P p";})
|
(lib.optionalAttrs config.modules.nnn.enable {np = "nnncd -a -P p";})
|
||||||
|
|
||||||
(abbrify pkgs.ranger {r = "ranger --choosedir=$HOME/.rangerdir; set LASTDIR (cat $HOME/.rangerdir); cd $LASTDIR";})
|
(abbrify pkgs.ranger {r = "ranger --choosedir=$HOME/.rangerdir; set LASTDIR (cat $HOME/.rangerdir); cd $LASTDIR";})
|
||||||
|
|
||||||
@ -184,7 +184,7 @@ in {
|
|||||||
# grep = rg;
|
# grep = rg;
|
||||||
})
|
})
|
||||||
|
|
||||||
(lib.optionalAttrs config.homemodules.rmpc.enable {r = "rcmp";})
|
(lib.optionalAttrs config.modules.rmpc.enable {r = "rcmp";})
|
||||||
|
|
||||||
(abbrify pkgs.rsync rec {
|
(abbrify pkgs.rsync rec {
|
||||||
rsync = "rsync -ahv --inplace --partial --info=progress2";
|
rsync = "rsync -ahv --inplace --partial --info=progress2";
|
||||||
@ -197,7 +197,7 @@ in {
|
|||||||
|
|
||||||
programs.starship = {
|
programs.starship = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableFishIntegration = config.homemodules.fish.enable;
|
enableFishIntegration = config.modules.fish.enable;
|
||||||
settings = {
|
settings = {
|
||||||
# Other config here
|
# Other config here
|
||||||
format = "$all"; # Remove this line to disable the default prompt format
|
format = "$all"; # Remove this line to disable the default prompt format
|
||||||
@ -6,9 +6,9 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (config.homemodules) git;
|
inherit (config.modules) git;
|
||||||
in {
|
in {
|
||||||
options.homemodules.git = import ./options.nix {inherit lib mylib;};
|
options.modules.git = import ./options.nix {inherit lib mylib;};
|
||||||
|
|
||||||
config = lib.mkIf git.enable {
|
config = lib.mkIf git.enable {
|
||||||
programs.diff-so-fancy = {
|
programs.diff-so-fancy = {
|
||||||
@ -8,7 +8,7 @@
|
|||||||
username,
|
username,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (config.homemodules) hyprland color;
|
inherit (config.modules) hyprland color;
|
||||||
|
|
||||||
# Autostart programs
|
# Autostart programs
|
||||||
always-exec = import ./autostart.nix {inherit lib pkgs config hyprland;};
|
always-exec = import ./autostart.nix {inherit lib pkgs config hyprland;};
|
||||||
@ -22,7 +22,7 @@
|
|||||||
"$mainMod, mouse:273" = ["resizewindow"];
|
"$mainMod, mouse:273" = ["resizewindow"];
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
options.homemodules.hyprland = import ./options.nix {inherit lib mylib;};
|
options.modules.hyprland = import ./options.nix {inherit lib mylib;};
|
||||||
|
|
||||||
config = lib.mkIf hyprland.enable {
|
config = lib.mkIf hyprland.enable {
|
||||||
assertions = [
|
assertions = [
|
||||||
@ -46,7 +46,7 @@ in {
|
|||||||
iconTheme.name = color.iconTheme;
|
iconTheme.name = color.iconTheme;
|
||||||
};
|
};
|
||||||
|
|
||||||
homemodules = {
|
modules = {
|
||||||
hyprpanel.enable = hyprland.hyprpanel.enable;
|
hyprpanel.enable = hyprland.hyprpanel.enable;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -142,8 +142,8 @@ in {
|
|||||||
|
|
||||||
wayland.windowManager.hyprland = {
|
wayland.windowManager.hyprland = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
|
package = inputs.hyprland.packages.${pkgs.system}.hyprland;
|
||||||
portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
|
portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
|
||||||
|
|
||||||
systemd.enable = true; # Enable hyprland-session.target
|
systemd.enable = true; # Enable hyprland-session.target
|
||||||
systemd.variables = ["--all"]; # Import PATH into systemd
|
systemd.variables = ["--all"]; # Import PATH into systemd
|
||||||
@ -152,16 +152,16 @@ in {
|
|||||||
plugins = builtins.concatLists [
|
plugins = builtins.concatLists [
|
||||||
(lib.optionals
|
(lib.optionals
|
||||||
hyprland.bars.enable
|
hyprland.bars.enable
|
||||||
[inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprbars])
|
[inputs.hyprland-plugins.packages.${pkgs.system}.hyprbars])
|
||||||
(lib.optionals
|
(lib.optionals
|
||||||
hyprland.dynamicCursor.enable
|
hyprland.dynamicCursor.enable
|
||||||
[inputs.hypr-dynamic-cursors.packages.${pkgs.stdenv.hostPlatform.system}.hypr-dynamic-cursors])
|
[inputs.hypr-dynamic-cursors.packages.${pkgs.system}.hypr-dynamic-cursors])
|
||||||
(lib.optionals
|
(lib.optionals
|
||||||
hyprland.trails.enable
|
hyprland.trails.enable
|
||||||
[inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprtrails])
|
[inputs.hyprland-plugins.packages.${pkgs.system}.hyprtrails])
|
||||||
(lib.optionals
|
(lib.optionals
|
||||||
hyprland.hyprspace.enable
|
hyprland.hyprspace.enable
|
||||||
[inputs.hyprspace.packages.${pkgs.stdenv.hostPlatform.system}.Hyprspace])
|
[inputs.hyprspace.packages.${pkgs.system}.Hyprspace])
|
||||||
];
|
];
|
||||||
|
|
||||||
settings = import ./settings.nix {
|
settings = import ./settings.nix {
|
||||||
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
global = {
|
global = {
|
||||||
monitor = config.homemodules.waybar.monitor;
|
monitor = config.modules.waybar.monitor;
|
||||||
font = "${color.font} 11";
|
font = "${color.font} 11";
|
||||||
offset = "10x10";
|
offset = "10x10";
|
||||||
background = color.hexS.base;
|
background = color.hexS.base;
|
||||||
@ -111,19 +111,19 @@
|
|||||||
|
|
||||||
windowrule = let
|
windowrule = let
|
||||||
mkWorkspaceRule = workspace: class:
|
mkWorkspaceRule = workspace: class:
|
||||||
"match:class ^(${class})$, "
|
"workspace ${workspace}, "
|
||||||
+ "workspace ${workspace}";
|
+ "class:^(${class})$";
|
||||||
mkWorkspaceRules = workspace: class-list:
|
mkWorkspaceRules = workspace: class-list:
|
||||||
builtins.map (mkWorkspaceRule workspace) class-list;
|
builtins.map (mkWorkspaceRule workspace) class-list;
|
||||||
|
|
||||||
mkFloatingRule = attrs:
|
mkFloatingRule = attrs:
|
||||||
(lib.optionalString (builtins.hasAttr "class" attrs) "match:class ^(${attrs.class})$, ")
|
"float"
|
||||||
+ (lib.optionalString (builtins.hasAttr "title" attrs) "match:title ^(${attrs.title})$, ")
|
+ (lib.optionalString (builtins.hasAttr "class" attrs) ", class:^(${attrs.class})$")
|
||||||
+ "float 1";
|
+ (lib.optionalString (builtins.hasAttr "title" attrs) ", title:^(${attrs.title})$");
|
||||||
|
|
||||||
mkTranslucentRule = class:
|
mkTranslucentRule = class:
|
||||||
"match:class ^(${class})$, "
|
"opacity ${hyprland.transparent-opacity} ${hyprland.transparent-opacity}, "
|
||||||
+ "opacity ${hyprland.transparent-opacity} ${hyprland.transparent-opacity}";
|
+ "class:^(${class})$";
|
||||||
in
|
in
|
||||||
lib.mkMerge [
|
lib.mkMerge [
|
||||||
(hyprland.workspacerules
|
(hyprland.workspacerules
|
||||||
@ -165,15 +165,15 @@
|
|||||||
# Because those are not windows, but layers,
|
# Because those are not windows, but layers,
|
||||||
# we have to blur them explicitly
|
# we have to blur them explicitly
|
||||||
layerrule = [
|
layerrule = [
|
||||||
"match:class rofi, blur 1"
|
"blur,rofi"
|
||||||
# "match:class rofi, ignore_alpha 0.001" # Fix pixelated corners
|
"ignorealpha 0.001,rofi" # Fix pixelated corners
|
||||||
# "match:class rofi, xray 0" # Render on top of other windows
|
"xray 0,rofi" # Render on top of other windows
|
||||||
# "match:class rofi, dim_around 1"
|
"dimaround,rofi"
|
||||||
|
|
||||||
"match:class waybar, blur 1"
|
"blur,waybar"
|
||||||
"match:class gtk4-layer-shell, blur 1"
|
"blur,gtk4-layer-shell"
|
||||||
"match:class bar-0, blur 1"
|
"blur,bar-0"
|
||||||
"match:class bar-1, blur 1"
|
"blur,bar-1"
|
||||||
];
|
];
|
||||||
|
|
||||||
decoration = {
|
decoration = {
|
||||||
@ -6,9 +6,9 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (config.homemodules) hyprpanel color;
|
inherit (config.modules) hyprpanel color;
|
||||||
in {
|
in {
|
||||||
options.homemodules.hyprpanel = import ./options.nix {inherit lib mylib;};
|
options.modules.hyprpanel = import ./options.nix {inherit lib mylib;};
|
||||||
|
|
||||||
config = lib.mkIf hyprpanel.enable {
|
config = lib.mkIf hyprpanel.enable {
|
||||||
programs.hyprpanel = {
|
programs.hyprpanel = {
|
||||||
@ -5,9 +5,9 @@
|
|||||||
mylib,
|
mylib,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (config.homemodules) kitty color;
|
inherit (config.modules) kitty color;
|
||||||
in {
|
in {
|
||||||
options.homemodules.kitty = import ./options.nix {inherit lib mylib;};
|
options.modules.kitty = import ./options.nix {inherit lib mylib;};
|
||||||
|
|
||||||
config = lib.mkIf kitty.enable {
|
config = lib.mkIf kitty.enable {
|
||||||
programs.kitty = {
|
programs.kitty = {
|
||||||
@ -15,7 +15,7 @@ in {
|
|||||||
shellIntegration.enableFishIntegration = true;
|
shellIntegration.enableFishIntegration = true;
|
||||||
|
|
||||||
font = {
|
font = {
|
||||||
name = "${config.homemodules.color.font}";
|
name = "${config.modules.color.font}";
|
||||||
size = 12;
|
size = 12;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -6,9 +6,9 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (config.homemodules) lazygit color;
|
inherit (config.modules) lazygit color;
|
||||||
in {
|
in {
|
||||||
options.homemodules.lazygit = import ./options.nix {inherit lib mylib;};
|
options.modules.lazygit = import ./options.nix {inherit lib mylib;};
|
||||||
|
|
||||||
config = lib.mkIf lazygit.enable {
|
config = lib.mkIf lazygit.enable {
|
||||||
programs.lazygit = {
|
programs.lazygit = {
|
||||||
@ -6,9 +6,9 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (config.homemodules) mpd;
|
inherit (config.modules) mpd;
|
||||||
in {
|
in {
|
||||||
options.homemodules.mpd = import ./options.nix {inherit lib mylib;};
|
options.modules.mpd = import ./options.nix {inherit lib mylib;};
|
||||||
|
|
||||||
config = lib.mkIf mpd.enable {
|
config = lib.mkIf mpd.enable {
|
||||||
services = {
|
services = {
|
||||||
@ -1,7 +1,6 @@
|
|||||||
{
|
{
|
||||||
inputs,
|
inputs,
|
||||||
system,
|
system,
|
||||||
headless,
|
|
||||||
username,
|
username,
|
||||||
hostname,
|
hostname,
|
||||||
config,
|
config,
|
||||||
@ -10,9 +9,9 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (config.homemodules) neovim color;
|
inherit (config.modules) neovim color;
|
||||||
in {
|
in {
|
||||||
options.homemodules.neovim = import ./options.nix {inherit lib mylib;};
|
options.modules.neovim = import ./options.nix {inherit lib mylib;};
|
||||||
|
|
||||||
config = lib.mkIf neovim.enable {
|
config = lib.mkIf neovim.enable {
|
||||||
home = {
|
home = {
|
||||||
@ -28,7 +27,13 @@ in {
|
|||||||
builtins.concatLists [
|
builtins.concatLists [
|
||||||
(lib.optionals neovim.neovide [neovide])
|
(lib.optionals neovim.neovide [neovide])
|
||||||
|
|
||||||
(lib.optionals (!headless) [
|
[
|
||||||
|
(pkgs.ripgrep.override {withPCRE2 = true;})
|
||||||
|
|
||||||
|
# Dependencies
|
||||||
|
lua54Packages.jsregexp # For tree-sitter
|
||||||
|
# nodejs_latest
|
||||||
|
|
||||||
# Language servers
|
# Language servers
|
||||||
clang-tools
|
clang-tools
|
||||||
clojure-lsp
|
clojure-lsp
|
||||||
@ -38,6 +43,7 @@ in {
|
|||||||
ltex-ls # TODO: Only enable on-demand
|
ltex-ls # TODO: Only enable on-demand
|
||||||
lua-language-server
|
lua-language-server
|
||||||
# nil
|
# nil
|
||||||
|
nixd
|
||||||
basedpyright
|
basedpyright
|
||||||
pyrefly
|
pyrefly
|
||||||
ty
|
ty
|
||||||
@ -46,11 +52,8 @@ in {
|
|||||||
tailwindcss-language-server
|
tailwindcss-language-server
|
||||||
tex-fmt
|
tex-fmt
|
||||||
texlab
|
texlab
|
||||||
tinymist
|
|
||||||
typescript
|
typescript
|
||||||
vscode-langservers-extracted # includes nodejs
|
vscode-langservers-extracted # includes nodejs
|
||||||
autotools-language-server
|
|
||||||
just-lsp
|
|
||||||
|
|
||||||
# Linters
|
# Linters
|
||||||
checkstyle # java
|
checkstyle # java
|
||||||
@ -65,6 +68,7 @@ in {
|
|||||||
# statix # nix (doesn't recognize pipe operator)
|
# statix # nix (doesn't recognize pipe operator)
|
||||||
|
|
||||||
# Formatters
|
# Formatters
|
||||||
|
alejandra # nix
|
||||||
cljfmt
|
cljfmt
|
||||||
python313Packages.black
|
python313Packages.black
|
||||||
google-java-format
|
google-java-format
|
||||||
@ -74,20 +78,6 @@ in {
|
|||||||
# nodePackages_latest.prettier # Use local install as plugins change per project
|
# nodePackages_latest.prettier # Use local install as plugins change per project
|
||||||
rustfmt
|
rustfmt
|
||||||
stylua
|
stylua
|
||||||
typstyle
|
|
||||||
mbake
|
|
||||||
just-formatter
|
|
||||||
])
|
|
||||||
|
|
||||||
[
|
|
||||||
(pkgs.ripgrep.override {withPCRE2 = true;})
|
|
||||||
|
|
||||||
# Dependencies
|
|
||||||
lua54Packages.jsregexp # For tree-sitter
|
|
||||||
# nodejs_latest
|
|
||||||
|
|
||||||
nixd
|
|
||||||
alejandra # nix
|
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
@ -354,7 +344,7 @@ in {
|
|||||||
clangd-extensions = rec {
|
clangd-extensions = rec {
|
||||||
name = "clangd_extensions";
|
name = "clangd_extensions";
|
||||||
pkg = pkgs.vimPlugins.clangd_extensions-nvim;
|
pkg = pkgs.vimPlugins.clangd_extensions-nvim;
|
||||||
lazy = false;
|
lazy = true;
|
||||||
config = mkDefaultConfig name;
|
config = mkDefaultConfig name;
|
||||||
opts = {
|
opts = {
|
||||||
inlay_hints = {
|
inlay_hints = {
|
||||||
@ -516,18 +506,15 @@ in {
|
|||||||
html = ["prettierd" "prettier"];
|
html = ["prettierd" "prettier"];
|
||||||
java = ["google-java-format"];
|
java = ["google-java-format"];
|
||||||
javascript = ["prettierd" "prettier"];
|
javascript = ["prettierd" "prettier"];
|
||||||
just = ["just"];
|
|
||||||
latex = ["tex-fmt"];
|
latex = ["tex-fmt"];
|
||||||
lua = ["stylua"];
|
lua = ["stylua"];
|
||||||
make = ["bake"];
|
|
||||||
markdown = ["prettierd" "prettier"];
|
markdown = ["prettierd" "prettier"];
|
||||||
nix = ["alejandra"];
|
nix = ["alejandra"];
|
||||||
python = ["black"];
|
python = ["black"];
|
||||||
qml = ["qmlformat"];
|
qml = ["qmlformat"];
|
||||||
rust = ["rustfmt"];
|
|
||||||
svelte = ["prettierd" "prettier"];
|
svelte = ["prettierd" "prettier"];
|
||||||
typescript = ["prettierd" "prettier"];
|
typescript = ["prettierd" "prettier"];
|
||||||
typst = ["typstyle"];
|
rust = ["rustfmt"];
|
||||||
};
|
};
|
||||||
|
|
||||||
default_format_opts = {
|
default_format_opts = {
|
||||||
@ -834,10 +821,11 @@ in {
|
|||||||
|
|
||||||
# NOTE: This entire thing is rough, I should rewrite...
|
# NOTE: This entire thing is rough, I should rewrite...
|
||||||
# TODO: Need to rewrite this once lspconfig 3.0 comes around
|
# TODO: Need to rewrite this once lspconfig 3.0 comes around
|
||||||
|
# TODO: LSP servers don't autostart anymore...
|
||||||
lspconfig = {
|
lspconfig = {
|
||||||
name = "lspconfig";
|
name = "lspconfig";
|
||||||
pkg = pkgs.vimPlugins.nvim-lspconfig;
|
pkg = pkgs.vimPlugins.nvim-lspconfig;
|
||||||
lazy = false;
|
lazy = true;
|
||||||
cmd = ["LspInfo"];
|
cmd = ["LspInfo"];
|
||||||
event = ["BufReadPost" "BufNewFile"];
|
event = ["BufReadPost" "BufNewFile"];
|
||||||
dependencies = [_lazydev];
|
dependencies = [_lazydev];
|
||||||
@ -849,14 +837,21 @@ in {
|
|||||||
{
|
{
|
||||||
name = "clangd";
|
name = "clangd";
|
||||||
extraOptions = {
|
extraOptions = {
|
||||||
# root_markers = [
|
root_dir.__raw = ''
|
||||||
# "Makefile"
|
function(fname)
|
||||||
# "CMakeLists.txt"
|
-- return require("lspconfig.util").root_pattern(
|
||||||
# ".clang-format"
|
return vim.lsp.config.util.root_pattern(
|
||||||
# ".clang-tidy"
|
"Makefile",
|
||||||
# "compile_commands.json"
|
"CMakeLists.txt",
|
||||||
# ];
|
".clang-format",
|
||||||
# workspace_required = true;
|
".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
|
||||||
|
'';
|
||||||
|
|
||||||
cmd = [
|
cmd = [
|
||||||
"clangd"
|
"clangd"
|
||||||
@ -883,7 +878,6 @@ in {
|
|||||||
{name = "cmake";}
|
{name = "cmake";}
|
||||||
{name = "cssls";}
|
{name = "cssls";}
|
||||||
{name = "html";} # vscode-langservers-extracted
|
{name = "html";} # vscode-langservers-extracted
|
||||||
{name = "just-lsp";} # TODO: Doesn't autostart?
|
|
||||||
{name = "lua_ls";}
|
{name = "lua_ls";}
|
||||||
{
|
{
|
||||||
name = "ltex";
|
name = "ltex";
|
||||||
@ -894,13 +888,12 @@ in {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
{name = "autotools-language-server";}
|
|
||||||
# {name = "nil_ls";}
|
# {name = "nil_ls";}
|
||||||
{
|
{
|
||||||
name = "nixd";
|
name = "nixd";
|
||||||
extraOptions.cmd = [
|
extraOptions.cmd = [
|
||||||
"nixd"
|
"nixd"
|
||||||
"--inlay-hints=true"
|
"--inlay-hints=false"
|
||||||
"--semantic-tokens=true"
|
"--semantic-tokens=true"
|
||||||
];
|
];
|
||||||
extraOptions.settings = {
|
extraOptions.settings = {
|
||||||
@ -946,14 +939,6 @@ in {
|
|||||||
{name = "svelte";}
|
{name = "svelte";}
|
||||||
{name = "tailwindcss";}
|
{name = "tailwindcss";}
|
||||||
{name = "texlab";}
|
{name = "texlab";}
|
||||||
{
|
|
||||||
name = "tinymist";
|
|
||||||
extraOptions.settings = {
|
|
||||||
formatterMode = "typstyle";
|
|
||||||
exportPdf = "onType";
|
|
||||||
semanticTokens = "disable";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
# {name = "jdtls";} # Don't set up when using nvim-jdtls
|
# {name = "jdtls";} # Don't set up when using nvim-jdtls
|
||||||
# {name = "rust_analyzer";} # Don't set up when using rustaceanvim
|
# {name = "rust_analyzer";} # Don't set up when using rustaceanvim
|
||||||
@ -1002,12 +987,10 @@ in {
|
|||||||
capabilities = __lspCapabilities(),
|
capabilities = __lspCapabilities(),
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Enable configured servers
|
|
||||||
for i, server in ipairs(${servers}) do
|
for i, server in ipairs(${servers}) do
|
||||||
if type(server) == "string" then
|
if type(server) == "string" then
|
||||||
-- require("lspconfig")[server].setup(__setup)
|
-- require("lspconfig")[server].setup(__setup)
|
||||||
vim.lsp.config(server, __setup)
|
vim.lsp.config(server, __setup)
|
||||||
vim.lsp.enable(server)
|
|
||||||
else
|
else
|
||||||
local options = server.extraOptions
|
local options = server.extraOptions
|
||||||
|
|
||||||
@ -1019,7 +1002,6 @@ in {
|
|||||||
|
|
||||||
-- require("lspconfig")[server.name].setup(options)
|
-- require("lspconfig")[server.name].setup(options)
|
||||||
vim.lsp.config(server.name, options)
|
vim.lsp.config(server.name, options)
|
||||||
vim.lsp.enable(server.name)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -1517,8 +1499,6 @@ in {
|
|||||||
line_length = 1000;
|
line_length = 1000;
|
||||||
};
|
};
|
||||||
|
|
||||||
bufdelete.enabled = false;
|
|
||||||
|
|
||||||
dashboard = {
|
dashboard = {
|
||||||
enabled = true;
|
enabled = true;
|
||||||
|
|
||||||
@ -1580,24 +1560,11 @@ in {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
debug.enabled = false;
|
|
||||||
dim.enabled = false;
|
|
||||||
|
|
||||||
explorer = {
|
explorer = {
|
||||||
enabled = false;
|
enabled = false;
|
||||||
replace_netrw = false; # Use yazi for that
|
replace_netrw = false; # Use yazi for that
|
||||||
};
|
};
|
||||||
|
|
||||||
gh.enabled = false;
|
|
||||||
git.enabled = false;
|
|
||||||
gitbrowse.enabled = false;
|
|
||||||
image.enabled = false;
|
|
||||||
indent.enabled = false;
|
|
||||||
input.enabled = false;
|
|
||||||
keymap.enabled = false;
|
|
||||||
layout.enabled = false;
|
|
||||||
lazygit.enabled = true;
|
|
||||||
|
|
||||||
notifier = {
|
notifier = {
|
||||||
enabled = true;
|
enabled = true;
|
||||||
};
|
};
|
||||||
@ -1630,20 +1597,6 @@ in {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
profiler.enabled = false;
|
|
||||||
quickfile.enabled = false;
|
|
||||||
rename.enabled = false;
|
|
||||||
scope.enabled = false;
|
|
||||||
scratch.enabled = false;
|
|
||||||
scroll.enabled = false;
|
|
||||||
statuscolumn.enabled = false;
|
|
||||||
terminal.enabled = false;
|
|
||||||
toggle.enabled = false;
|
|
||||||
util.enabled = false;
|
|
||||||
win.enabled = false;
|
|
||||||
words.enabled = false;
|
|
||||||
zen.enabled = false;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -1844,7 +1797,9 @@ in {
|
|||||||
# _treesitter-context # Ugly
|
# _treesitter-context # Ugly
|
||||||
# _treesitter-refactor # Ugly
|
# _treesitter-refactor # Ugly
|
||||||
];
|
];
|
||||||
lazy = false;
|
lazy = true;
|
||||||
|
cmd = ["TSModuleInfo"];
|
||||||
|
event = ["BufReadPost" "BufNewFile"];
|
||||||
init = ''
|
init = ''
|
||||||
function()
|
function()
|
||||||
-- Fix treesitter grammars/parsers on nix
|
-- Fix treesitter grammars/parsers on nix
|
||||||
@ -1854,10 +1809,7 @@ in {
|
|||||||
'';
|
'';
|
||||||
config = ''
|
config = ''
|
||||||
function(_, opts)
|
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
|
-- GLSL filetypes
|
||||||
vim.filetype.add {
|
vim.filetype.add {
|
||||||
@ -1875,8 +1827,7 @@ in {
|
|||||||
opts = {
|
opts = {
|
||||||
auto_install = false;
|
auto_install = false;
|
||||||
ensure_installed = [];
|
ensure_installed = [];
|
||||||
# parser_install_dir = "${treesitter-parsers}";
|
parser_install_dir = "${treesitter-parsers}";
|
||||||
install_dir = "${treesitter-parsers}";
|
|
||||||
|
|
||||||
indent = {
|
indent = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@ -1937,24 +1888,6 @@ in {
|
|||||||
config = mkDefaultConfig name;
|
config = mkDefaultConfig name;
|
||||||
};
|
};
|
||||||
|
|
||||||
typst-preview = rec {
|
|
||||||
name = "typst-preview";
|
|
||||||
pkg = pkgs.vimPlugins.typst-preview-nvim;
|
|
||||||
lazy = true;
|
|
||||||
ft = ["typst"];
|
|
||||||
config = mkDefaultConfig name;
|
|
||||||
opts = {
|
|
||||||
dependencies_bin.__raw = ''
|
|
||||||
{
|
|
||||||
['tinymist'] = "${pkgs.tinymist}/bin/tinymist",
|
|
||||||
['websocat'] = "${pkgs.websocat}/bin/websocat"
|
|
||||||
}
|
|
||||||
'';
|
|
||||||
# open_cmd = "qutebrowser %s";
|
|
||||||
# open_cmd = "firefox %s -P typst-preview --class typst-preview";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
_promise = {
|
_promise = {
|
||||||
name = "promise";
|
name = "promise";
|
||||||
pkg = pkgs.vimPlugins.promise-async;
|
pkg = pkgs.vimPlugins.promise-async;
|
||||||
@ -1993,39 +1926,6 @@ 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 = {
|
# wakatime = {
|
||||||
# name = "wakatime";
|
# name = "wakatime";
|
||||||
# pkg = pkgs.vimPlugins.vim-wakatime;
|
# pkg = pkgs.vimPlugins.vim-wakatime;
|
||||||
@ -2204,10 +2104,8 @@ in {
|
|||||||
trouble # Diagnostics window
|
trouble # Diagnostics window
|
||||||
ts-autotag # Automatic html tag insertion/updating
|
ts-autotag # Automatic html tag insertion/updating
|
||||||
typescript-tools # Typescript tsserver LSP
|
typescript-tools # Typescript tsserver LSP
|
||||||
typst-preview # Typst support
|
|
||||||
ufo # Code folding
|
ufo # Code folding
|
||||||
vimtex # LaTeX support
|
vimtex # LaTeX support
|
||||||
visual-whitespace
|
|
||||||
# wakatime # Time tracking
|
# wakatime # Time tracking
|
||||||
web-devicons # Icons for many plugins
|
web-devicons # Icons for many plugins
|
||||||
which-key # Live keybinding help
|
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