christoph/flake-nixinator
1
Fork 0
Code Activity

Move some home config to initial basic modules

Browse Source
This commit is contained in:
Christoph Urlacher
2023-05-24 20:49:53 +02:00
parent 4d27d8e513
commit 4dab06a5d2
14 changed files with 349 additions and 1942 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -1,5 +1,7 @@
# NixOS Configuration
This is my modular NixOS configuration, using Hyprland for a lightweight desktop.
To install remove everything from ``/etc/nixos`` and symlink the ``flake.nix`` to ``/etc/nixos/flake.nix``.
## NixFlake/system
@ -38,4 +40,3 @@ It is then imported by the toplevel ``NixFlake/flake.nix``, to make everything a
## NixFlake/docs
This folder contains automatically generated static documentation sites for my Home-Manager modules.

221
home/christoph/default.nix
View File

@ -32,6 +32,8 @@ rec {
];
modules = {
chromium.enable = true;
# Config my modules
emacs = {
enable = false;
@ -82,7 +84,8 @@ rec {
jabref.enable = false;
};
# TODO: More options, like font?
helix.enable = true;
kitty.enable = true;
misc = {
@ -90,12 +93,12 @@ rec {
keepass = {
enable = true;
autostart = false;
autostart = false; # TODO: This option should use hyprland module
};
protonmail = {
enable = true;
autostart = false;
autostart = false; # TODO: This option should use hyprland module
};
};
@ -106,18 +109,17 @@ rec {
nextcloud = {
enable = true;
autostart = false;
autostart = false; # TODO: This option should use hyprland module
};
nzbget = {
enable = true;
mainDir = "~/Videos/NzbGet";
};
nnn.enable = true;
ranger = {
enable = false;
preview = true;
};
vscode.enable = true;
};
manual.manpages.enable = true;
@ -134,7 +136,7 @@ rec {
# Make fonts installed through user packages available to applications
# NOTE: I don't think I need this anymore as all fonts are installed through the system config but let's keep this just in case
fonts.fontconfig.enable = false; # Also updates the font-cache
fonts.fontconfig.enable = true; # Also updates the font-cache
# Generate a list of installed user packages in ~/.local/share/current-user-packages
home.file.".local/share/current-user-packages".text = let
@ -149,9 +151,6 @@ rec {
source = ../../config/mpv;
};
# TODO: Hyprland Module
# TODO: Move Hyprland config to NixFlake/config/hyprland and link from here
# TODO: Latex module
home.file."texmf/tex/latex/custom/christex.sty".source = ../../config/latex/christex.sty;
home.file."Notes/Obsidian/Chriphost/christex.sty".source = ../../config/latex/christex.sty; # For obsidian notes
@ -409,30 +408,11 @@ rec {
btop.enable = true;
chromium = {
enable = true;
# TODO: Extensions for ungoogled, see https://discourse.nixos.org/t/home-manager-ungoogled-chromium-with-extensions/15214
# package = pkgs.ungoogled-chromium;
extensions = [
{id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";} # UBlock Origin
{id = "oboonakemofpalcgghocfoadofidjkkk";} # KeepassXC Browser
{id = "pkehgijcmpdhfbdbbnkijodmdjhbjlgp";} # Privacy Badger
{id = "lckanjgmijmafbedllaakclkaicjfmnk";} # ClearURLs
{id = "njdfdhgcmkocbgbhcioffdbicglldapd";} # LocalCDN
{id = "jaoafjdoijdconemdmodhbfpianehlon";} # Skip Redirect
];
};
direnv = {
enable = true;
nix-direnv.enable = true;
};
# TODO: Configure this
# editorconfig.enable = true;
exa.enable = true;
fzf = {
@ -449,7 +429,6 @@ rec {
userName = "ChUrl";
};
# Modal texteditor
helix = {
enable = true;
@ -488,13 +467,7 @@ rec {
indent-guides.render = false;
};
};
};
# kakoune = {
# enable = true;
# };
# NOTE: If error occurs after system update on fish init run "ssh-add"
}; # NOTE: If error occurs after system update on fish init run "ssh-add"
keychain = {
enable = true;
enableFishIntegration = config.modules.fish.enable;
@ -532,54 +505,6 @@ rec {
enableFishIntegration = config.modules.fish.enable;
};
nnn = {
package = pkgs.nnn.override {
# These two are mutually exclusive
withIcons = false;
withNerdIcons = true;
};
enable = true;
extraPackages = with pkgs; [
xdragon # Drag and drop (why man)
];
bookmarks = {
c = "~/.config";
d = "~/Documents";
D = "~/Downloads";
n = "~/Notes";
t = "~/Notes/TU";
h = "~/Notes/HHU";
N = "~/NixFlake";
p = "~/Pictures";
v = "~/Videos";
};
plugins = {
mappings = {
c = "fzcd";
d = "dragdrop";
f = "finder";
j = "autojump";
k = "kdeconnect";
p = "preview-tui";
# s = "suedit";
# s = "x2sel";
v = "imgview";
};
src =
(pkgs.fetchFromGitHub {
owner = "jarun";
repo = "nnn";
rev = "aaf60b93d741ffff211902a10a159434629bbdb9";
sha256 = "sha256-MwI3PqPfSyblURUAds4aVsw8WFBAgbDo5hqXMmRbAW4=";
})
+ "/plugins";
};
};
nushell = {
enable = false;
};
@ -604,128 +529,6 @@ rec {
enableFishIntegration = config.modules.fish.enable;
};
# TODO: Module
vscode = {
enable = true;
enableExtensionUpdateCheck = false;
enableUpdateCheck = false;
extensions = with pkgs.vscode-extensions; [
alefragnani.bookmarks
# alefragnani.project-manager # Not much sense with flake dev environments
# bradlc.vscode-tailwindcss
christian-kohler.path-intellisense
codezombiech.gitignore
coolbear.systemd-unit-file
eamodio.gitlens
# formulahendry.auto-rename-tag
# formulahendry.auto-close-tag
# gitlab.gitlab-workflow
# irongeek.vscode-env
jnoortheen.nix-ide
kamadorueda.alejandra
# kamikillerto.vscode-colorize
llvm-vs-code-extensions.vscode-clangd
matklad.rust-analyzer
mechatroner.rainbow-csv
# mikestead.dotenv
# mkhl.direnv
ms-azuretools.vscode-docker
ms-kubernetes-tools.vscode-kubernetes-tools
ms-python.python # TODO: Reenable, was disabled bc build failure
ms-toolsai.jupyter
ms-vscode.cmake-tools
ms-vscode.cpptools
ms-vscode.hexeditor
ms-vscode.makefile-tools
# naumovs.color-highlight
njpwerner.autodocstring
james-yu.latex-workshop
redhat.java
redhat.vscode-xml
redhat.vscode-yaml
rubymaniac.vscode-paste-and-indent
ryu1kn.partial-diff
serayuzgur.crates
shd101wyy.markdown-preview-enhanced
skyapps.fish-vscode
tamasfe.even-better-toml
timonwong.shellcheck
# tomoki1207.pdf # Incompatible with latex workshop
valentjn.vscode-ltex
vscodevim.vim
vscode-icons-team.vscode-icons
yzhang.markdown-all-in-one
];
# haskell = {};
# keybindings = {};
userSettings = {
# VSCode Internals
"editor.fontFamily" = "JetBrainsMono Nerd Font Mono";
"editor.fontSize" = 14;
"editor.renderWhitespace" = "selection";
"editor.cursorStyle" = "line"; # Use line for vim plugin
"editor.lineNumbers" = "relative";
"editor.linkedEditing" = true;
"editor.smoothScrolling" = true;
"editor.stickyScroll.enabled" = true;
"editor.tabCompletion" = "on";
"editor.cursorSmoothCaretAnimation" = "on";
"editor.cursorSurroundingLines" = 10;
"editor.minimap.renderCharacters" = false;
"editor.bracketPairColorization.enabled" = true;
"editor.guides.bracketPairs" = "active";
"editor.guides.bracketPairsHorizontal" = "active";
"editor.guides.highlightActiveIndentation" = false;
"files.autoSave" = "onFocusChange";
"files.trimFinalNewlines" = true;
"files.trimTrailingWhitespace" = true; # NOTE: If this is enabled with frequent autosave, the current lines whitespace will always be removed, which is obnoxious
"workbench.enableExperiments" = false;
"workbench.list.smoothScrolling" = true;
"workbench.colorTheme" = "Default Light Modern";
"workbench.iconTheme" = "vscode-icons";
"security.workspace.trust.enabled" = false;
# Language Tool
"ltex.checkFrequency" = "manual";
# LaTeX
"latex-workshop.latex.tools" = [
{
"name" = "latexmk";
"command" = "latexmk";
"args" = [
"-synctex=1"
"-shell-escape"
"-interaction=nonstopmode"
"-file-line-error"
"-pdf"
"-outdir=%OUTDIR%"
"%DOC%"
];
"env" = {};
}
];
"latex-workshop.latexindent.args" = [
"-c"
"%DIR%/"
"%TMPFILE%"
"-m"
"-y=defaultIndent: '%INDENT%'"
];
# Nix
"[nix]"."editor.tabSize" = 2;
"nix.enableLanguageServer" = true;
"nix.serverPath" = "nil";
"nix.formatterPath" = "alejandra";
};
# TODO: Snippets
};
# TODO: Check HM module options
yt-dlp.enable = true;

33
home/modules/chromium/default.nix Normal file
View File

@ -0,0 +1,33 @@
# TODO: Expose some settings
{
config,
nixosConfig,
lib,
mylib,
pkgs,
...
}:
with lib;
with mylib.modules; let
cfg = config.modules.chromium;
in {
options.modules.chromium = import ./options.nix {inherit lib mylib;};
config = mkIf cfg.enable {
programs.chromium = {
enable = true;
# TODO: Extensions for ungoogled, see https://discourse.nixos.org/t/home-manager-ungoogled-chromium-with-extensions/15214
# package = pkgs.ungoogled-chromium;
extensions = [
{id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";} # UBlock Origin
{id = "oboonakemofpalcgghocfoadofidjkkk";} # KeepassXC Browser
{id = "pkehgijcmpdhfbdbbnkijodmdjhbjlgp";} # Privacy Badger
{id = "lckanjgmijmafbedllaakclkaicjfmnk";} # ClearURLs
{id = "njdfdhgcmkocbgbhcioffdbicglldapd";} # LocalCDN
{id = "jaoafjdoijdconemdmodhbfpianehlon";} # Skip Redirect
];
};
};
}

9
home/modules/chromium/options.nix Normal file
View File

@ -0,0 +1,9 @@
{
lib,
mylib,
...
}:
with lib;
with mylib.modules; {
enable = mkEnableOpt "Chromium";
}

7
home/modules/default.nix
View File

@ -9,20 +9,21 @@
}: {
imports = [
./audio
./chromium
./emacs
./email
./firefox
./fish
./flatpak
./gaming
./gnome
./helix
./hyprland
./kitty
./misc
./neovim
./nextcloud
./nzbget
./plasma
./nnn
./ranger
./vscode
];
}

58
home/modules/helix/default.nix Normal file
View File

@ -0,0 +1,58 @@
# TODO: Expose some settings
# TODO: Fix language config
{
config,
nixosConfig,
lib,
mylib,
pkgs,
...
}:
with lib;
with mylib.modules; let
cfg = config.modules.helix;
in {
options.modules.helix = import ./options.nix {inherit lib mylib;};
config = mkIf cfg.enable {
programs.helix = {
enable = true;
# NOTE: Syntax changed
# languages = [
# {
# name = "verilog";
# roots = [
# ".svls.toml"
# ".svlint.toml"
# ];
# language-server = {
# command = "svls";
# args = [];
# };
# }
# ];
# https://docs.helix-editor.com/configuration.html
settings = {
# theme = "base16_terminal";
editor = {
scrolloff = 10;
mouse = false; # Default true
middle-click-paste = false; # Default true
line-number = "relative";
cursorline = true;
auto-completion = true; # Default
bufferline = "multiple";
cursor-shape = {
normal = "block";
insert = "bar";
select = "underline";
};
lsp.display-messages = true;
indent-guides.render = false;
};
};
};
};
}

9
home/modules/helix/options.nix Normal file
View File

@ -0,0 +1,9 @@
{
lib,
mylib,
...
}:
with lib;
with mylib.modules; {
enable = mkEnableOpt "Helix Editor";
}

1
home/modules/kitty/default.nix
View File

@ -1,3 +1,4 @@
# TODO: Expose some settings
{
config,
nixosConfig,

65
home/modules/nnn/default.nix Normal file
View File

@ -0,0 +1,65 @@
# TODO: Expose some settings
{
config,
nixosConfig,
lib,
mylib,
pkgs,
...
}:
with lib;
with mylib.modules; let
cfg = config.modules.nnn;
in {
options.modules.nnn = import ./options.nix {inherit lib mylib;};
config = mkIf cfg.enable {
programs.nnn = {
package = pkgs.nnn.override {
# These two are mutually exclusive
withIcons = false;
withNerdIcons = true;
};
enable = true;
extraPackages = with pkgs; [
xdragon # Drag and drop (why man)
];
bookmarks = {
c = "~/.config";
d = "~/Documents";
D = "~/Downloads";
n = "~/Notes";
t = "~/Notes/TU";
h = "~/Notes/HHU";
N = "~/NixFlake";
p = "~/Pictures";
v = "~/Videos";
};
plugins = {
mappings = {
c = "fzcd";
d = "dragdrop";
f = "finder";
j = "autojump";
k = "kdeconnect";
p = "preview-tui";
# s = "suedit";
# s = "x2sel";
v = "imgview";
};
src =
(pkgs.fetchFromGitHub {
owner = "jarun";
repo = "nnn";
rev = "aaf60b93d741ffff211902a10a159434629bbdb9";
sha256 = "sha256-MwI3PqPfSyblURUAds4aVsw8WFBAgbDo5hqXMmRbAW4=";
})
+ "/plugins";
};
};
};
}

9
home/modules/nnn/options.nix Normal file
View File

@ -0,0 +1,9 @@
{
lib,
mylib,
...
}:
with lib;
with mylib.modules; {
enable = mkEnableOpt "NNN File Manager";
}

1714
home/modules/nzbget/default.nix
View File

File diff suppressed because it is too large Load Diff

15
home/modules/nzbget/options.nix
View File

@ -1,15 +0,0 @@
{
lib,
mylib,
...
}:
with lib;
with mylib.modules; {
enable = mkEnableOpt "Enable NzbGet";
mainDir = mkOption {
type = types.str;
default = "~/Videos/NzbGet";
description = "The folder, where nzbget stores downloaded data.";
};
}

138
home/modules/vscode/default.nix Normal file
View File

@ -0,0 +1,138 @@
# TODO: Expose some settings
{
config,
nixosConfig,
lib,
mylib,
pkgs,
...
}:
with lib;
with mylib.modules; let
cfg = config.modules.vscode;
in {
options.modules.vscode = import ./options.nix {inherit lib mylib;};
config = mkIf cfg.enable {
programs.vscode = {
enable = true;
enableExtensionUpdateCheck = false;
enableUpdateCheck = false;
extensions = with pkgs.vscode-extensions; [
alefragnani.bookmarks
# alefragnani.project-manager # Not much sense with flake dev environments
# bradlc.vscode-tailwindcss
christian-kohler.path-intellisense
codezombiech.gitignore
coolbear.systemd-unit-file
eamodio.gitlens
# formulahendry.auto-rename-tag
# formulahendry.auto-close-tag
# gitlab.gitlab-workflow
# irongeek.vscode-env
jnoortheen.nix-ide
kamadorueda.alejandra
# kamikillerto.vscode-colorize
llvm-vs-code-extensions.vscode-clangd
matklad.rust-analyzer
mechatroner.rainbow-csv
# mikestead.dotenv
# mkhl.direnv
ms-azuretools.vscode-docker
ms-kubernetes-tools.vscode-kubernetes-tools
ms-python.python # TODO: Reenable, was disabled bc build failure
ms-toolsai.jupyter
ms-vscode.cmake-tools
ms-vscode.cpptools
ms-vscode.hexeditor
ms-vscode.makefile-tools
# naumovs.color-highlight
njpwerner.autodocstring
james-yu.latex-workshop
redhat.java
redhat.vscode-xml
redhat.vscode-yaml
rubymaniac.vscode-paste-and-indent
ryu1kn.partial-diff
serayuzgur.crates
shd101wyy.markdown-preview-enhanced
skyapps.fish-vscode
tamasfe.even-better-toml
timonwong.shellcheck
# tomoki1207.pdf # Incompatible with latex workshop
valentjn.vscode-ltex
vscodevim.vim
vscode-icons-team.vscode-icons
yzhang.markdown-all-in-one
];
# haskell = {};
# keybindings = {};
userSettings = {
# VSCode Internals
"editor.fontFamily" = "JetBrainsMono Nerd Font Mono";
"editor.fontSize" = 14;
"editor.renderWhitespace" = "selection";
"editor.cursorStyle" = "line"; # Use line for vim plugin
"editor.lineNumbers" = "relative";
"editor.linkedEditing" = true;
"editor.smoothScrolling" = true;
"editor.stickyScroll.enabled" = true;
"editor.tabCompletion" = "on";
"editor.cursorSmoothCaretAnimation" = "on";
"editor.cursorSurroundingLines" = 10;
"editor.minimap.renderCharacters" = false;
"editor.bracketPairColorization.enabled" = true;
"editor.guides.bracketPairs" = "active";
"editor.guides.bracketPairsHorizontal" = "active";
"editor.guides.highlightActiveIndentation" = false;
"files.autoSave" = "onFocusChange";
"files.trimFinalNewlines" = true;
"files.trimTrailingWhitespace" = true; # NOTE: If this is enabled with frequent autosave, the current lines whitespace will always be removed, which is obnoxious
"workbench.enableExperiments" = false;
"workbench.list.smoothScrolling" = true;
"workbench.colorTheme" = "Default Light Modern";
"workbench.iconTheme" = "vscode-icons";
"security.workspace.trust.enabled" = false;
# Language Tool
"ltex.checkFrequency" = "manual";
# LaTeX
"latex-workshop.latex.tools" = [
{
"name" = "latexmk";
"command" = "latexmk";
"args" = [
"-synctex=1"
"-shell-escape"
"-interaction=nonstopmode"
"-file-line-error"
"-pdf"
"-outdir=%OUTDIR%"
"%DOC%"
];
"env" = {};
}
];
"latex-workshop.latexindent.args" = [
"-c"
"%DIR%/"
"%TMPFILE%"
"-m"
"-y=defaultIndent: '%INDENT%'"
];
# Nix
"[nix]"."editor.tabSize" = 2;
"nix.enableLanguageServer" = true;
"nix.serverPath" = "nil";
"nix.formatterPath" = "alejandra";
};
# TODO: Snippets
};
};
}

9
home/modules/vscode/options.nix Normal file
View File

@ -0,0 +1,9 @@
{
lib,
mylib,
...
}:
with lib;
with mylib.modules; {
enable = mkEnableOpt "Visual Studio Code";
}