harald/nixcfg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor: simplify Nix configuration and update dependencies

Browse source 
Replaced custom Nerd Fonts overrides with predefined ones. Removed unused Neovim settings and plugins, and disabled Neovim for a specific user. Updated various flake dependencies to their latest versions.
This commit is contained in:
Harald Hoyer 2025-05-27 12:59:30 +02:00
parent 85a81dd054
commit bbc247aa23
17 changed files with 135 additions and 2015 deletions
Download patch file Download diff file Expand all files Collapse all files

2000
flake.lock generated
View file

File diff suppressed because it is too large Load diff

21
flake.nix
View file

@ -2,23 +2,31 @@
description = "Harald Hoyer's Nix Configurations"; description = "Harald Hoyer's Nix Configurations";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
# NixPkgs Unstable (nixos-unstable) # NixPkgs Unstable (nixos-unstable)
unstable.url = "github:nixos/nixpkgs/nixos-unstable"; unstable.url = "github:nixos/nixpkgs/nixos-unstable";
lanzaboote = { crane.url = "github:ipetkov/crane/v0.20.3";
url = "github:nix-community/lanzaboote/v0.3.0"; rust-overlay = {
url = "github:oxalica/rust-overlay";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
lanzaboote = {
url = "github:nix-community/lanzaboote/v0.4.2";
inputs.nixpkgs.follows = "nixpkgs";
inputs.crane.follows = "crane";
inputs.rust-overlay.follows = "rust-overlay";
};
snowfall-lib = { snowfall-lib = {
url = "github:snowfallorg/lib"; url = "github:snowfallorg/lib";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# macOS Support (master) # macOS Support (master)
darwin.url = "github:lnl7/nix-darwin/nix-darwin-24.11"; darwin.url = "github:lnl7/nix-darwin/nix-darwin-25.05";
darwin.inputs.nixpkgs.follows = "nixpkgs"; darwin.inputs.nixpkgs.follows = "nixpkgs";
nix-homebrew.url = "github:zhaofengli-wip/nix-homebrew"; nix-homebrew.url = "github:zhaofengli-wip/nix-homebrew";
@ -35,12 +43,11 @@
flake = false; flake = false;
}; };
home-manager.url = "github:nix-community/home-manager/release-24.11"; home-manager.url = "github:nix-community/home-manager/release-25.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
neovim-flake.url = "github:NotAShelf/nvf/v0.6"; neovim-flake.url = "github:NotAShelf/nvf/";
neovim-flake.inputs.nixpkgs.follows = "nixpkgs"; neovim-flake.inputs.nixpkgs.follows = "nixpkgs";
neovim-flake.inputs.mnw.url = "github:Gerg-L/mnw?rev=5fe5c41975ed0af55f55dc37cd28ba906a5d015e";
disko.url = "github:nix-community/disko"; disko.url = "github:nix-community/disko";
disko.inputs.nixpkgs.follows = "nixpkgs"; disko.inputs.nixpkgs.follows = "nixpkgs";

2
homes/aarch64-linux/harald@m4nix/default.nix
View file

@ -10,7 +10,7 @@
cli-apps = { cli-apps = {
bash.enable = true; bash.enable = true;
fish.enable = true; fish.enable = true;
neovim.enable = true; neovim.enable = false;
bat.enable = true; bat.enable = true;
starship.enable = true; starship.enable = true;
home-manager.enable = true; home-manager.enable = true;

2
homes/x86_64-darwin/harald@mpro/default.nix
View file

@ -17,7 +17,7 @@
cli-apps = { cli-apps = {
bash.enable = true; bash.enable = true;
fish.enable = true; fish.enable = true;
neovim.enable = true; neovim.enable = false;
bat.enable = true; bat.enable = true;
starship.enable = true; starship.enable = true;
#home-manager.enable = true; #home-manager.enable = true;

2
homes/x86_64-linux/harald@mx/default.nix
View file

@ -19,7 +19,7 @@
cli-apps = { cli-apps = {
bash.enable = true; bash.enable = true;
fish.enable = true; fish.enable = true;
neovim.enable = true; neovim.enable = false;
bat.enable = true; bat.enable = true;
starship.enable = true; starship.enable = true;
home-manager.enable = true; home-manager.enable = true;

2
homes/x86_64-linux/harald@sgx-azure/default.nix
View file

@ -27,7 +27,7 @@
cli-apps = { cli-apps = {
bash.enable = true; bash.enable = true;
fish.enable = true; fish.enable = true;
neovim.enable = true; neovim.enable = false;
tmux.enable = true; tmux.enable = true;
bat.enable = true; bat.enable = true;
starship.enable = true; starship.enable = true;

2
homes/x86_64-linux/harald@sgx-nixos/default.nix
View file

@ -10,7 +10,7 @@
cli-apps = { cli-apps = {
bash.enable = true; bash.enable = true;
fish.enable = true; fish.enable = true;
neovim.enable = true; neovim.enable = false;
bat.enable = true; bat.enable = true;
starship.enable = true; starship.enable = true;
home-manager.enable = true; home-manager.enable = true;

2
homes/x86_64-linux/harald@sgx/default.nix
View file

@ -10,7 +10,7 @@
cli-apps = { cli-apps = {
bash.enable = true; bash.enable = true;
fish.enable = true; fish.enable = true;
neovim.enable = true; neovim.enable = false;
bat.enable = true; bat.enable = true;
starship.enable = true; starship.enable = true;
home-manager.enable = true; home-manager.enable = true;

2
homes/x86_64-linux/harald@t15/default.nix
View file

@ -10,7 +10,7 @@
cli-apps = { cli-apps = {
bash.enable = true; bash.enable = true;
fish.enable = true; fish.enable = true;
neovim.enable = true; neovim.enable = false;
bat.enable = true; bat.enable = true;
starship.enable = true; starship.enable = true;
home-manager.enable = true; home-manager.enable = true;

2
homes/x86_64-linux/harald@x1/default.nix
View file

@ -10,7 +10,7 @@
cli-apps = { cli-apps = {
bash.enable = true; bash.enable = true;
fish.enable = true; fish.enable = true;
neovim.enable = true; neovim.enable = false;
bat.enable = true; bat.enable = true;
starship.enable = true; starship.enable = true;
home-manager.enable = true; home-manager.enable = true;

24
modules/darwin/system/fonts/default.nix
View file

@ -1,9 +1,8 @@
{ { options
options, , config
config, , pkgs
pkgs, , lib
lib, , ...
...
}: }:
with lib; with lib;
@ -25,16 +24,11 @@ in
fonts = { fonts = {
packages = packages =
with pkgs;
[ [
(nerdfonts.override { pkgs.nerd-fonts.hack
fonts = [ pkgs.nerd-fonts.fira-code
"Hack" pkgs.nerd-fonts.droid-sans-mono
"FiraCode" pkgs.nerd-fonts.jetbrains-mono
"DroidSansMono"
"JetBrainsMono"
];
})
] ]
++ cfg.fonts; ++ cfg.fonts;
}; };

15
modules/home/cli-apps/neovim/default.nix
View file

@ -20,15 +20,12 @@ in
# your settings need to go into the settings attrset # your settings need to go into the settings attrset
settings = { settings = {
vim = { vim = {
viAlias = false;
vimAlias = false;
debugMode = { debugMode = {
enable = false; enable = false;
level = 20; level = 20;
logFile = "/tmp/nvim.log"; logFile = "/tmp/nvim.log";
}; };
}; };
vim.lsp = { vim.lsp = {
formatOnSave = true; formatOnSave = true;
lspkind.enable = false; lspkind.enable = false;
@ -36,7 +33,6 @@ in
lspsaga.enable = false; lspsaga.enable = false;
trouble.enable = true; trouble.enable = true;
lspSignature.enable = true; lspSignature.enable = true;
lsplines.enable = true;
}; };
vim.debugger = { vim.debugger = {
@ -54,7 +50,7 @@ in
nix = { nix = {
enable = true; enable = true;
format.type = "nixpkgs-fmt"; format.type = "nixfmt";
}; };
html.enable = true; html.enable = true;
clang = { clang = {
@ -77,10 +73,8 @@ in
}; };
vim.visuals = { vim.visuals = {
enable = true;
nvimWebDevicons.enable = true; nvimWebDevicons.enable = true;
scrollBar.enable = true; scrollBar.enable = true;
smoothScroll.enable = true;
cellularAutomaton.enable = true; cellularAutomaton.enable = true;
fidget-nvim.enable = true; fidget-nvim.enable = true;
indentBlankline = { indentBlankline = {
@ -106,13 +100,6 @@ in
transparent = false; transparent = false;
}; };
vim.autopairs.enable = true;
vim.autocomplete = {
enable = true;
type = "nvim-cmp";
};
vim.filetree = { vim.filetree = {
nvimTree = { nvimTree = {
enable = true; enable = true;

19
modules/home/cli-apps/starship/default.nix
View file

@ -1,8 +1,7 @@
{ { lib
lib, , config
config, , pkgs
pkgs, , ...
...
}: }:
let let
inherit (lib) mkEnableOption mkIf; inherit (lib) mkEnableOption mkIf;
@ -16,13 +15,9 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
(pkgs.nerdfonts.override { pkgs.nerd-fonts.fira-code
fonts = [ pkgs.nerd-fonts.droid-sans-mono
"FiraCode" pkgs.nerd-fonts.jetbrains-mono
"DroidSansMono"
"JetBrainsMono"
];
})
]; ];
programs.starship = { programs.starship = {
enable = true; enable = true;

21
modules/home/tools/jetbrains/default.nix
View file

@ -1,9 +1,8 @@
{ { options
options, , config
config, , lib
lib, , pkgs
pkgs, , ...
...
}: }:
with lib; with lib;
@ -20,13 +19,9 @@ in
home.sessionPath = [ "$HOME/.local/share/JetBrains/Toolbox/scripts" ]; home.sessionPath = [ "$HOME/.local/share/JetBrains/Toolbox/scripts" ];
home.packages = with pkgs; [ home.packages = with pkgs; [
jetbrains-toolbox jetbrains-toolbox
(pkgs.nerdfonts.override { nerd-fonts.fira-code
fonts = [ nerd-fonts.droid-sans-mono
"FiraCode" nerd-fonts.jetbrains-mono
"DroidSansMono"
"JetBrainsMono"
];
})
]; ];
}; };
} }

22
modules/nixos/services/gui/default.nix
View file

@ -1,9 +1,8 @@
{ { options
options, , config
config, , lib
lib, , pkgs
pkgs, , ...
...
}: }:
with lib; with lib;
@ -164,7 +163,6 @@ in
tmux tmux
vim vim
wl-clipboard wl-clipboard
yubikey-manager-qt
yubikey-personalization yubikey-personalization
zellij zellij
] ]
@ -184,13 +182,9 @@ in
noto-fonts-emoji noto-fonts-emoji
liberation_ttf liberation_ttf
freefont_ttf freefont_ttf
(nerdfonts.override { nerd-fonts.fira-code
fonts = [ nerd-fonts.droid-sans-mono
"FiraCode" nerd-fonts.jetbrains-mono
"DroidSansMono"
"JetBrainsMono"
];
})
]; ];
fontconfig = { fontconfig = {

10
overlays/unstable/default.nix
View file

@ -1,13 +1,9 @@
{ channels, ... }: { channels, ... }:
final: prev: { final: prev: {
inherit (channels.unstable) inherit (channels.unstable)
jetbrains-toolbox # open-webui
ollama # vscode
open-webui # nodejs_20
aider-chat
vscode
goose-cli
nodejs_20
; ;
# goose-cli = channels.unstable.callPackage ./goose.nix { }; # goose-cli = channels.unstable.callPackage ./goose.nix { };

2
systems/aarch64-linux/m4nix/default.nix
View file

@ -35,7 +35,7 @@ with lib.metacfg;
}; };
services.xrdp.enable = true; services.xrdp.enable = true;
services.xrdp.defaultWindowManager = "${pkgs.gnome.gnome-session}/bin/gnome-session"; services.xrdp.defaultWindowManager = "${pkgs.gnome-session}/bin/gnome-session";
services.xrdp.openFirewall = true; services.xrdp.openFirewall = true;
# Disable the GNOME3/GDM auto-suspend feature that cannot be disabled in GUI! # Disable the GNOME3/GDM auto-suspend feature that cannot be disabled in GUI!