Compare commits

..

No commits in common. "32e6adb6e379ed0cd4b74eeffcec2b96b79843b2" and "7a2647d5aee40b9467d4bc000e902accba9da020" have entirely different histories.

5 changed files with 11 additions and 127 deletions

1
.gitignore vendored
View File

@ -1,3 +1,2 @@
\#*\#
.vscode
.theia

View File

@ -73,13 +73,10 @@ if vim.fn.executable("git") == 1 then
lazy = false,
},
{
"Mofiqul/dracula.nvim",
"mofiqul/dracula.nvim",
lazy = false,
priority = 1000,
opts = {},
config = function()
vim.cmd.colorscheme("dracula")
end
opts = {}
},
{
"romgrk/barbar.nvim",
@ -148,4 +145,5 @@ if vim.fn.executable("git") == 1 then
}
require('nvim-treesitter').install { 'lua' }
end
vim.cmd [[colorscheme dracula]]
end

View File

@ -61,7 +61,6 @@
sys-nixpkgs = if stable then nixpkgs else nixpkgs-unstable;
materusArgs = {
inherit files;
inherit arch;
inputs = inp;
flake-path = path;
host-path = path + "/nix-config/host/${host}";
@ -97,7 +96,6 @@
};
materusArgs = {
inherit files;
inherit arch;
inputs = inp;
flake-path = path;
home-path = path + "/nix-config/home/${user}";

View File

@ -102,6 +102,12 @@ in
kdePackages.kcalc
vim
nano
(vscodium.fhsWithPackages (
ps: with ps; [
nixfmt-rfc-style
nixd
]
))
obsidian
git-crypt

View File

@ -1,13 +1,4 @@
{
pkgs,
materusArgs,
config,
lib,
...
}:
let
jsonFormat = pkgs.formats.json { };
in
{ pkgs, materusArgs, config, ... }:
{
mkk.neovim.enable = true;
@ -40,115 +31,7 @@ in
libreoffice-qt6-fresh
direnv
jsonnet
jsonnet-language-server
];
programs.vscode = {
enable = true;
mutableExtensionsDir = true;
profiles.default.enableExtensionUpdateCheck = true;
profiles.default.extensions =
let
market = (
materusArgs.inputs.nix-vscode-extensions.extensions."${materusArgs.arch}".forVSCodeVersion
config.programs.vscode.package.version
);
marketNv = (materusArgs.inputs.nix-vscode-extensions.extensions."${materusArgs.arch}");
in
with market.vscode-marketplace;
with marketNv.vscode-marketplace;
[
# Python
#ms-python.vscode-pylance
ms-python.python
ms-python.debugpy
ms-python.vscode-python-envs
# Git
eamodio.gitlens
donjayamanne.githistory
waderyan.gitblame
codezombiech.gitignore
# Lua
sumneko.lua
# VSCode
kerrickstaley.layered-settings
mkhl.direnv
betterthantomorrow.joyride
dracula-theme.theme-dracula
# Jsonnet
grafana.vscode-jsonnet
# Nix
jnoortheen.nix-ide
];
package = (
pkgs.vscodium.fhsWithPackages (
ps: with ps; [
nixfmt-rfc-style
nixd
direnv
jsonnet
jsonnet-language-server
]
)
);
};
xdg.configFile."VSCodium/User/settings.nix.jsonnet".enable = false;
home.activation.mutableFileGeneration =
let
source = jsonFormat.generate "settings.nix" {
"window.dialogStyle" = "custom";
"window.titleBarStyle" = "custom";
"workbench.colorTheme" = "Dracula Theme";
"editor.fontFamily" = "'Hack Nerd Font', 'monospace', monospace";
"direnv.path.executable" = "${pkgs.direnv}/bin/direnv";
"typescript.tsserver.maxTsServerMemory" = 1024 * 8;
"typescript.tsserver.nodePath" = "${pkgs.nodejs}/bin/node";
"nix.enableLanguageServer" = true;
"nix.formatterPath" = "${pkgs.nixfmt-rfc-style}/bin/nixfmt";
"nix.serverPath" = "${pkgs.nixd}/bin/nixd";
"nix.serverSettings" = {
"nixd" = {
"nixpkgs" = {
"expr" = "import (builtins.getFlake \"/mkk/config\").inputs.nixpkgs { }";
};
"formatting" = {
"command" = [
"nixfmt"
];
};
"options" = {
"nixos" = {
"expr" = "(builtins.getFlake (builtins.toString \"/mkk/config\" )).nixosConfigurations.materusPC.options";
};
"home-manager" = {
"expr" = "(builtins.getFlake (builtins.toString \"/mkk/config\")).homeConfigurations.materus.options";
};
};
};
};
};
target = config.xdg.configFile."VSCodium/User/settings.nix.jsonnet".target;
command = ''
echo "Copying mutable home files for $HOME"
$VERBOSE_ECHO "${source} -> ${target}"
$DRY_RUN_CMD cp --remove-destination --no-preserve=mode ${source} ${target}
'';
in
(lib.hm.dag.entryAfter [ "linkGeneration" ] command);
xdg.dataFile."java-runtimes/graalvm-oracle-17".source = pkgs.graalvmPackages.graalvm-oracle_17;
xdg.dataFile."java-runtimes/graalvm-oracle-latest".source = pkgs.graalvmPackages.graalvm-oracle;
xdg.dataFile."java-runtimes/openjdk21".source = pkgs.jdk21;