Compare commits

..

No commits in common. "195f941fadf62c40b1104dc38615cddbb39dbd07" and "99bcf9068c6afeb03a3d65895fc67c4be633d62b" have entirely different histories.

7 changed files with 50 additions and 93 deletions

View File

@ -24,7 +24,6 @@ in {
extraLuaConfig = '' extraLuaConfig = ''
-- This file simply bootstraps the installation of Lazy.nvim and then calls other files for execution -- This file simply bootstraps the installation of Lazy.nvim and then calls other files for execution
-- This file doesn't necessarily need to be touched, BE CAUTIOUS editing this file and proceed at your own risk. -- This file doesn't necessarily need to be touched, BE CAUTIOUS editing this file and proceed at your own risk.
vim.g.gcc_bin_path = '${lib.getExe pkgs.gcc}'
local lazypath = vim.env.LAZY or vim.fn.stdpath "data" .. "/lazy/lazy.nvim" local lazypath = vim.env.LAZY or vim.fn.stdpath "data" .. "/lazy/lazy.nvim"
if not (vim.env.LAZY or (vim.uv or vim.loop).fs_stat(lazypath)) then if not (vim.env.LAZY or (vim.uv or vim.loop).fs_stat(lazypath)) then
-- stylua: ignore -- stylua: ignore
@ -53,20 +52,6 @@ in {
nodejs nodejs
nixd nixd
alejandra alejandra
python3Full
neocmakelsp
ripgrep
gdu
bottom
luajitPackages.luarocks-nix
lua
go
statix
deadnix
tree-sitter
texliveMinimal
biber
gcc
]; ];
}; };

View File

@ -1,8 +0,0 @@
return {
{
"nvim-treesitter/nvim-treesitter",
config = function ()
require("nvim-treesitter.install").compilers = {vim.g.gcc_bin_path}
end,
}
}

View File

@ -1,52 +1,52 @@
---@type LazySpec ---@type LazySpec
return { return {
-- { {
-- "catppuccin/nvim", "catppuccin/nvim",
-- name = "catppuccin", name = "catppuccin",
-- opts = { opts = {
-- -- configuration options... -- configuration options...
-- flavor = "mocha", flavor = "mocha",
-- dim_inactive = { dim_inactive = {
-- enable = true, enable = true,
-- shade = "light", shade = "light",
-- percentage = 0.15, percentage = 0.15,
-- }, },
-- color_overrides = { color_overrides = {
-- mocha = { mocha = {
-- base = "#26211e", base = "#26211e",
-- crust = "#0a0807", crust = "#0a0807",
-- mantle = "#585049", mantle = "#585049",
-- text = "#e6e2de", text = "#e6e2de",
-- subtext0 = "#c6c2be", subtext0 = "#c6c2be",
-- subtext1 = "#a6a29e", subtext1 = "#a6a29e",
-- surface0 = "#585049", surface0 = "#585049",
-- surface1 = "#c1b7b0", surface1 = "#c1b7b0",
-- surface2 = "#f2f0ef", surface2 = "#f2f0ef",
--
-- red = "#f75b72", red = "#f75b72",
-- green = "#67af34", green = "#67af34",
-- yellow = "#c98b1a", yellow = "#c98b1a",
-- blue = "#509af6", blue = "#509af6",
-- pink = "#ca64f3", pink = "#ca64f3",
-- teal = "#1faeae", teal = "#1faeae",
--
-- bright_red = "#fb8590", bright_red = "#fb8590",
-- bright_green = "#75c73b", bright_green = "#75c73b",
-- bright_yellow = "#e49f27", bright_yellow = "#e49f27",
-- bright_blue = "#77b1fb", bright_blue = "#77b1fb",
-- bright_pink = "#d68af7", bright_pink = "#d68af7",
-- bright_teal = "#24c6c6", bright_teal = "#24c6c6",
-- }, },
-- }, },
-- }, },
-- }, },
-- { {
-- "AstroNvim/astroui", "AstroNvim/astroui",
-- ---@type AstroUIOpts ---@type AstroUIOpts
-- opts = { opts = {
-- colorscheme = "catppuccin", colorscheme = "catppuccin",
-- }, },
-- }, },
{ {
"p00f/clangd_extensions.nvim", "p00f/clangd_extensions.nvim",
optional = true, optional = true,

View File

@ -8,7 +8,7 @@
}: let }: let
cfg = config.myConfig; cfg = config.myConfig;
in { in {
imports = [./bootloader.nix ./locale.nix ./greetd.nix ./rebuild.nix ./sops.nix ./sway.nix ./wifi.nix ./music.nix ./cups.nix ./gpu/amd.nix ./touch.nix ./cache.nix ./nix.nix ./update.nix ./podman.nix ./qemu.nix ./bluetooth.nix ./network.nix ./nix-ld.nix]; imports = [./bootloader.nix ./locale.nix ./greetd.nix ./rebuild.nix ./sops.nix ./sway.nix ./wifi.nix ./music.nix ./cups.nix ./gpu/amd.nix ./touch.nix ./cache.nix ./nix.nix ./update.nix ./podman.nix ./qemu.nix ./bluetooth.nix ./network.nix];
options.myConfig = { options.myConfig = {
enable = lib.mkEnableOption "my custom config"; enable = lib.mkEnableOption "my custom config";
@ -33,7 +33,6 @@ in {
qemu.enable = true; qemu.enable = true;
qemu.kvm = lib.mkIf (system == "x86_64-linux") true; qemu.kvm = lib.mkIf (system == "x86_64-linux") true;
network.enable = true; network.enable = true;
nix-ld.enable = true;
greetd.enable = lib.mkIf cfg.desktop true; greetd.enable = lib.mkIf cfg.desktop true;
sway.enable = lib.mkIf cfg.desktop true; sway.enable = lib.mkIf cfg.desktop true;

View File

@ -1,19 +0,0 @@
{
lib,
config,
pkgs,
...
}: let
cfg = config.myConfig.nix-ld;
in {
options.myConfig.nix-ld = {
enable = lib.mkEnableOption "ld replacement for external binaries";
};
config = lib.mkIf cfg.enable {
programs.nix-ld = {
enable = true;
libraries = with pkgs; [];
};
};
}

View File

@ -4,7 +4,7 @@
experimental-features = ["nix-command" "flakes"]; experimental-features = ["nix-command" "flakes"];
auto-optimise-store = true; auto-optimise-store = true;
max-jobs = "auto"; max-jobs = "auto";
cores = 12; cores = 1;
}; };
}; };
} }

View File

@ -34,7 +34,7 @@ in {
}; };
}; };
}; };
# boot.binfmt.emulatedSystems = ["aarch64-linux"]; boot.binfmt.emulatedSystems = ["aarch64-linux"];
users.users.${config.myConfig.user}.extraGroups = ["libvirtd"]; users.users.${config.myConfig.user}.extraGroups = ["libvirtd"];
}; };
} }