Daholli/nixos-config
1
0
Fork 0
Code Issues 2 Pull requests Releases Packages Activity Actions

chore: reorganize

Browse source
This commit is contained in:
Christoph Hollizeck 2025-12-02 15:18:15 +01:00
parent 4897d002a8
commit 318294f683
Signed by: Daholli
GPG key ID: 249300664F2AF2C7
7 changed files with 0 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

71
modules/base/system/default.nix
View file

@ -1,71 +0,0 @@
{
flake.modules =
let
stateVersion = "25.05";
in
{
homeManager.base =
{
config,
inputs,
...
}:
{
imports = [
inputs.sops-nix.homeManagerModules.sops
];
home = {
inherit stateVersion;
};
};
nixos.base =
{
config,
inputs,
pkgs,
...
}:
{
imports = [
inputs.sops-nix.nixosModules.sops
inputs.niri-flake.nixosModules.niri
];
environment.systemPackages = with pkgs; [
sops
age
ssh-to-age
];
services.gnome.gnome-keyring.enable = true;
services.dbus.packages = [
pkgs.gnome-keyring
pkgs.gcr
];
sops = {
defaultSopsFile = ../../../secrets/secrets.yaml;
defaultSopsFormat = "yaml";
age = {
keyFile = "/home/cholli/.config/sops/age/keys.txt";
sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
};
};
system = {
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave
# this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://search.nixos.org/options?&show=system.stateVersion&from=0&size=50&sort=relevance&type=packages&query=stateVersion).
inherit stateVersion;
};
};
};
}

200
modules/base/system/helix.nix
View file

@ -1,200 +0,0 @@
{
flake.modules = {
nixos.base =
{
inputs,
pkgs,
...
}:
let
helix-pkg = inputs.helix.packages.${pkgs.stdenv.hostPlatform.system}.default;
in
{
environment = {
systemPackages = [
helix-pkg
];
};
};
homeManager.cholli =
{
inputs,
lib,
pkgs,
...
}:
let
helix-pkg = inputs.helix.packages.${pkgs.stdenv.hostPlatform.system}.default;
in
{
home.file.".config/helix/ignore".text = ''
.idea/
!**/appsettings.json
.direnv/
.devenv/
'';
catppuccin.helix.enable = true;
programs.helix = {
enable = true;
package = helix-pkg;
defaultEditor = true;
settings = {
editor = {
auto-format = true;
line-number = "relative";
file-picker = {
hidden = false;
};
lsp = {
display-inlay-hints = true;
display-messages = true;
};
cursor-shape = {
normal = "block";
insert = "bar";
select = "underline";
};
indent-guides = {
render = true;
character = "|";
};
statusline = {
left = [
"mode"
"spinner"
];
center = [ "file-name" ];
right = [
"workspace-diagnostics"
"diagnostics"
"selections"
"position"
"total-line-numbers"
"spacer"
"file-encoding"
"file-line-ending"
"file-type"
];
separator = "│";
};
};
keys = {
normal = {
esc = [
"collapse_selection"
"keep_primary_selection"
];
space = {
space = "file_picker";
};
C-j = (builtins.genList (_: "move_line_down") 5) ++ [ "align_view_center" ];
C-k = (builtins.genList (_: "move_line_up") 5) ++ [ "align_view_center" ];
};
};
};
languages = {
language = [
{
name = "nix";
auto-format = true;
formatter.command = "${pkgs.nixfmt-rfc-style}/bin/nixfmt";
language-servers = [
"nixd"
"nil"
"harper-ls"
];
}
{
# Provided by the dev environment in the rust shell
name = "rust";
auto-format = true;
formatter.command = "cargo fmt";
language-servers = [
"rust-analyzer"
"harper-ls"
];
}
{
name = "zig";
language-servers = [
"zls"
"harper-ls"
];
}
];
language-server = {
nixd = {
command = "${pkgs.nixd}/bin/nixd";
args = [ "--semantic-tokens=true" ];
config.nixd =
let
myFlake = "(builtins.getFlake (toString /home/cholli/projects/config))";
nixosOpts = "${myFlake}.nixosConfigurations.manin.options";
in
{
nixpkgs.expr = "import ${myFlake}.inputs.nixpkgs { }";
formatting.command = [ "nixfmt" ];
options = {
nixos.expr = nixosOpts;
home-manager.expr = "${nixosOpts}.home-manager.users.type.getSubOptions []";
};
};
};
marksman = {
command = "${pkgs.marksman}/bin/marksman";
};
vscode-json-language-server = {
command = "${pkgs.vscode-langservers-extracted}/bin/vscode-json-language-server";
args = [ "--stdio" ];
config.provideFormatter = true;
config.json.validate.enable = true;
};
vscode-html-language-server = {
command = "${pkgs.vscode-langservers-extracted}/bin/vscode-html-language-server";
args = [ "--stdio" ];
config.provideFormatter = true;
};
vscode-css-language-server = {
command = "${pkgs.vscode-langservers-extracted}/bin/vscode-css-language-server";
args = [ "--stdio" ];
config.provideFormatter = true;
};
vscode-eslint-language-server = {
command = "${pkgs.vscode-langservers-extracted}/bin/vscode-eslint-language-server";
args = [ "--stdio" ];
config.provideFormatter = true;
};
harper-ls = {
command = "${lib.getExe pkgs.harper}";
args = [ "--stdio" ];
config = {
linters = {
long_sentences = false;
};
};
};
};
};
};
};
};
}