fix: use full flake path for all mkOutOfStoreSymlinks
This commit is contained in:
parent
2629d175bc
commit
89813f9e81
4 changed files with 28 additions and 86 deletions
|
@ -1,4 +1,4 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, machine, pkgs, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (pkgs.stdenv.hostPlatform) isLinux;
|
inherit (pkgs.stdenv.hostPlatform) isLinux;
|
||||||
|
@ -168,7 +168,7 @@ in
|
||||||
xdg = lib.mkIf isLinux {
|
xdg = lib.mkIf isLinux {
|
||||||
configFile = {
|
configFile = {
|
||||||
"i3" = {
|
"i3" = {
|
||||||
source = config.lib.file.mkOutOfStoreSymlink ./i3;
|
source = config.lib.file.mkOutOfStoreSymlink "${machine.flakePath}/modules/i3";
|
||||||
recursive = true;
|
recursive = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, machine, pkgs, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (pkgs.stdenv.hostPlatform) isLinux;
|
inherit (pkgs.stdenv.hostPlatform) isLinux;
|
||||||
|
@ -20,11 +20,11 @@ in
|
||||||
home.file = {
|
home.file = {
|
||||||
"${config.xdg.configHome}/Code/User/settings.json" = {
|
"${config.xdg.configHome}/Code/User/settings.json" = {
|
||||||
enable = isLinux;
|
enable = isLinux;
|
||||||
source = config.lib.file.mkOutOfStoreSymlink ./vscode/settings.json;
|
source = config.lib.file.mkOutOfStoreSymlink "${machine.flakePath}/modules/vscode/settings.json";
|
||||||
};
|
};
|
||||||
"Library/Application Support/Code/User/settings.json" = {
|
"Library/Application Support/Code/User/settings.json" = {
|
||||||
enable = isDarwin;
|
enable = isDarwin;
|
||||||
source = config.lib.file.mkOutOfStoreSymlink ./vscode/settings.json;
|
source = config.lib.file.mkOutOfStoreSymlink "${machine.flakePath}/modules/vscode/settings.json";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,88 +24,40 @@
|
||||||
"vim.insertModeKeyBindings": [],
|
"vim.insertModeKeyBindings": [],
|
||||||
"vim.normalModeKeyBindingsNonRecursive": [
|
"vim.normalModeKeyBindingsNonRecursive": [
|
||||||
{
|
{
|
||||||
"before": [
|
"before": ["K"],
|
||||||
"K"
|
"commands": ["editor.action.showHover"]
|
||||||
],
|
|
||||||
"commands": [
|
|
||||||
"editor.action.showHover"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"before": [
|
"before": ["<leader>", "f", "d"],
|
||||||
"<leader>",
|
"commands": ["workbench.action.quickOpen"]
|
||||||
"f",
|
|
||||||
"d"
|
|
||||||
],
|
|
||||||
"commands": [
|
|
||||||
"workbench.action.quickOpen"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"before": [
|
"before": ["<leader>", "f", "t"],
|
||||||
"<leader>",
|
"commands": ["workbench.action.selectTheme"]
|
||||||
"f",
|
|
||||||
"t"
|
|
||||||
],
|
|
||||||
"commands": [
|
|
||||||
"workbench.action.selectTheme"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"before": [
|
"before": ["<leader>", "n", "f"],
|
||||||
"<leader>",
|
"commands": ["editor.action.formatDocument"]
|
||||||
"n",
|
|
||||||
"f"
|
|
||||||
],
|
|
||||||
"commands": [
|
|
||||||
"editor.action.formatDocument"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"before": [
|
"before": ["<C-l>"],
|
||||||
"<C-l>"
|
"after": ["<C-W>", "l"]
|
||||||
],
|
|
||||||
"after": [
|
|
||||||
"<C-W>",
|
|
||||||
"l"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"before": [
|
"before": ["<C-h>"],
|
||||||
"<C-h>"
|
"after": ["<C-W>", "h"]
|
||||||
],
|
|
||||||
"after": [
|
|
||||||
"<C-W>",
|
|
||||||
"h"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"before": [
|
"before": ["K"],
|
||||||
"K"
|
"commands": ["editor.action.showHover"]
|
||||||
],
|
|
||||||
"commands": [
|
|
||||||
"editor.action.showHover"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"before": [
|
"before": ["<C-W>", "\\"],
|
||||||
"<C-W>",
|
"after": ["<C-W>", "v"]
|
||||||
"\\"
|
|
||||||
],
|
|
||||||
"after": [
|
|
||||||
"<C-W>",
|
|
||||||
"v"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"before": [
|
"before": ["<C-W>", "-"],
|
||||||
"<C-W>",
|
"after": ["<C-W>", "s"]
|
||||||
"-"
|
|
||||||
],
|
|
||||||
"after": [
|
|
||||||
"<C-W>",
|
|
||||||
"s"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"vim.leader": "<space>",
|
"vim.leader": "<space>",
|
||||||
|
@ -128,17 +80,7 @@
|
||||||
"catppuccin.customUIColors": {
|
"catppuccin.customUIColors": {
|
||||||
"all": {
|
"all": {
|
||||||
"statusBar.foreground": "accent",
|
"statusBar.foreground": "accent",
|
||||||
"statusBar.noFolderForeground": "accent",
|
"statusBar.noFolderForeground": "accent"
|
||||||
}
|
|
||||||
},
|
|
||||||
"workbench.colorCustomizations": {
|
|
||||||
"[Catppuccin Mocha]": {
|
|
||||||
"editorInlayHint.foreground": "#74416b",
|
|
||||||
"editorInlayHint.background": "#41363f2f",
|
|
||||||
"editorInlayHint.typeForeground": "#74416b",
|
|
||||||
"editorInlayHint.typeBackground": "#41363f2f",
|
|
||||||
"editorInlayHint.parameterForeground": "#74416b",
|
|
||||||
"editorInlayHint.parameterBackground": "#41363f2f",
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"redhat.telemetry.enabled": false,
|
"redhat.telemetry.enabled": false,
|
||||||
|
@ -149,5 +91,5 @@
|
||||||
"editor.inlayHints.fontSize": 12,
|
"editor.inlayHints.fontSize": 12,
|
||||||
"vs-kubernetes": {
|
"vs-kubernetes": {
|
||||||
"vs-kubernetes.crd-code-completion": "enabled"
|
"vs-kubernetes.crd-code-completion": "enabled"
|
||||||
},
|
}
|
||||||
}
|
}
|
|
@ -87,11 +87,11 @@
|
||||||
|
|
||||||
xdg.configFile = {
|
xdg.configFile = {
|
||||||
"lsd" = {
|
"lsd" = {
|
||||||
source = config.lib.file.mkOutOfStoreSymlink ./lsd/themes;
|
source = config.lib.file.mkOutOfStoreSymlink "${machine.flakePath}/modules/lsd/themes";
|
||||||
recursive = true;
|
recursive = true;
|
||||||
};
|
};
|
||||||
"zsh/functions" = {
|
"zsh/functions" = {
|
||||||
source = config.lib.file.mkOutOfStoreSymlink ./zsh/functions;
|
source = config.lib.file.mkOutOfStoreSymlink "${machine.flakePath}/modules/zsh/functions";
|
||||||
recursive = true;
|
recursive = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue