Compare commits

..

9 Commits

7 changed files with 93 additions and 50 deletions

View File

@ -24,6 +24,7 @@ in {
extraLuaConfig = ''
-- 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.
vim.g.gcc_bin_path = '${lib.getExe pkgs.gcc}'
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
-- stylua: ignore
@ -52,6 +53,20 @@ in {
nodejs
nixd
alejandra
python3Full
neocmakelsp
ripgrep
gdu
bottom
luajitPackages.luarocks-nix
lua
go
statix
deadnix
tree-sitter
texliveMinimal
biber
gcc
];
};

View File

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

View File

@ -8,7 +8,7 @@
}: let
cfg = config.myConfig;
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];
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];
options.myConfig = {
enable = lib.mkEnableOption "my custom config";
@ -33,6 +33,7 @@ in {
qemu.enable = true;
qemu.kvm = lib.mkIf (system == "x86_64-linux") true;
network.enable = true;
nix-ld.enable = true;
greetd.enable = lib.mkIf cfg.desktop true;
sway.enable = lib.mkIf cfg.desktop true;

19
modules/nixos/nix-ld.nix Normal file
View File

@ -0,0 +1,19 @@
{
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"];
auto-optimise-store = true;
max-jobs = "auto";
cores = 1;
cores = 12;
};
};
}

View File

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