me/nix-system-configurations
1
0
Fork 0
Code Activity

Compare commits

base: me:dc57b47ab997a2eda335985615c513f1279ad118
Branches Tags
me:main
..
compare: me:10d3dc205cbef4e2062119f23e787f64ec03432a
Branches Tags
me:main

No commits in common. "dc57b47ab997a2eda335985615c513f1279ad118" and "10d3dc205cbef4e2062119f23e787f64ec03432a" have entirely different histories.
dc57b47ab9 ... 10d3dc205c

13 changed files with 311 additions and 285 deletions
Show stats Expand all files Collapse all files

1
.envrc
View file

@ -1,4 +1,3 @@
watch_dir ./base watch_dir ./base
watch_dir ./sops
watch_file ./home-manager/default.nix watch_file ./home-manager/default.nix
use flake use flake

87
base/base/default.nix
View file

@ -1,54 +1,57 @@
{ inputs, ... }: { flake-parts-lib, inputs, ... }:
{ {
imports = [ imports = [
inputs.treefmt-nix.flakeModule inputs.treefmt-nix.flakeModule
inputs.git-hooks-nix.flakeModule inputs.git-hooks-nix.flakeModule
inputs.devshell.flakeModule inputs.devshell.flakeModule
]; ];
perSystem = options.perSystem = flake-parts-lib.mkPerSystemOption (
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
devshells.default = { config = {
commands = [ devshells.default = {
{ commands = [
help = "󰚰 update dependencies"; {
name = "update"; help = "󰚰 update dependencies";
command = "${pkgs.lix}/bin/nix flake update"; name = "update";
category = "󱄅 Flake"; command = "${pkgs.lix}/bin/nix flake update";
} category = "󱄅 Flake";
{ }
help = "󰑓 reload direnv environment"; {
name = "reload"; help = "󰑓 reload direnv environment";
command = "${pkgs.direnv}/bin/direnv reload"; name = "reload";
category = "󱄅 Flake"; command = "${pkgs.direnv}/bin/direnv reload";
} category = "󱄅 Flake";
]; }
packages = [ ];
pkgs.git packages = [
pkgs.jujutsu pkgs.git
pkgs.lix pkgs.jujutsu
pkgs.man pkgs.lix
pkgs.uutils-coreutils-noprefix pkgs.man
]; pkgs.uutils-coreutils-noprefix
devshell.startup = { ];
pre-commit.text = '' devshell.startup = {
${config.pre-commit.installationScript} pre-commit.text = ''
''; ${config.pre-commit.installationScript}
}; '';
};
# https://flake.parts/options/git-hooks-nix.html
pre-commit.settings = {
hooks = {
treefmt = {
enable = true;
package = config.treefmt.build.wrapper;
}; };
check-merge-conflicts.enable = true;
check-symlinks.enable = true;
flake-checker.enable = true;
}; };
# https://flake.parts/options/git-hooks-nix.html
pre-commit.settings = {
hooks = {
treefmt = {
enable = true;
package = config.treefmt.build.wrapper;
};
check-merge-conflicts.enable = true;
check-symlinks.enable = true;
flake-checker.enable = true;
};
};
# https://flake.parts/options/treefmt-nix.html
treefmt.projectRootFile = "flake.nix";
}; };
# https://flake.parts/options/treefmt-nix.html }
treefmt.projectRootFile = "flake.nix"; );
};
} }

115
base/languages/en-us/default.nix
View file

@ -1,4 +1,4 @@
{ ... }: { flake-parts-lib, ... }:
let let
dictionary = [ dictionary = [
"Asahi" "Asahi"
@ -11,7 +11,7 @@ let
]; ];
in in
{ {
perSystem = options.perSystem = flake-parts-lib.mkPerSystemOption (
{ pkgs, ... }: { pkgs, ... }:
let let
tomlFormatter = pkgs.formats.toml { }; tomlFormatter = pkgs.formats.toml { };
@ -85,64 +85,67 @@ in
}; };
in in
{ {
helix.languages.language-server = { config = {
# https://ltex-plus.github.io/ltex-plus/supported-languages.html helix.languages.language-server = {
ltex-ls-plus = { # https://ltex-plus.github.io/ltex-plus/supported-languages.html
command = "${pkgs.ltex-ls-plus}/bin/ltex-ls-plus"; ltex-ls-plus = {
config.ltex = { command = "${pkgs.ltex-ls-plus}/bin/ltex-ls-plus";
dictionary.en-US = dictionary; config.ltex = {
additionalRules.enablePickyRules = true; dictionary.en-US = dictionary;
}; additionalRules.enablePickyRules = true;
};
# https://vale.sh/docs/formats/code
vale-ls = {
command = "${pkgs.vale-ls}/bin/vale-ls";
config.configPath = "${vale.directory.path}/${vale.config.name}";
};
# https://writewithharper.com/docs/integrations/language-server#Supported-Languages
harper-ls.command = "${pkgs.harper}/bin/harper-ls";
typos = {
command = "${pkgs.typos-lsp}/bin/typos-lsp";
config.config = typos.file.outPath;
};
};
pre-commit.settings = {
hooks = {
typos = {
enable = true;
settings = {
configPath = typos.file.outPath;
locale = "en-us";
}; };
}; };
vale = { # https://vale.sh/docs/formats/code
enable = true; vale-ls = {
settings.configPath = "${vale.directory.path}/${vale.config.name}"; command = "${pkgs.vale-ls}/bin/vale-ls";
config.configPath = "${vale.directory.path}/${vale.config.name}";
};
# https://writewithharper.com/docs/integrations/language-server#Supported-Languages
harper-ls.command = "${pkgs.harper}/bin/harper-ls";
typos = {
command = "${pkgs.typos-lsp}/bin/typos-lsp";
config.config = typos.file.outPath;
}; };
}; };
excludes = [ "base/languages/en-us/.vale" ]; pre-commit.settings = {
}; hooks = {
treefmt = { typos = {
programs.typos = { enable = true;
enable = true; settings = {
configFile = typos.file.outPath; configPath = typos.file.outPath;
locale = "en-us"; locale = "en-us";
};
};
vale = {
enable = true;
settings.configPath = "${vale.directory.path}/${vale.config.name}";
};
};
excludes = [ "base/languages/en-us/.vale" ];
};
treefmt = {
programs.typos = {
enable = true;
configFile = typos.file.outPath;
locale = "en-us";
};
settings.global.excludes = [ "base/languages/en-us/.vale/*" ];
};
devshells.default = {
# commands = [
# {
# help = " sync vale configuration";
# name = "vale-sync";
# command = "${pkgs.vale}/bin/vale sync --config ${vale.valeDirectory}/${vale.config.filename}";
# category = " Languages (en_US)";
# }
# ];
# packages = [ pkgs.vale ];
# devshell.startup.vale_config.text = ''
# ${pkgs.uutils-coreutils-noprefix}/bin/ln -fs ${vale.config.file} ${vale.valeDirectory}/${vale.config.filename}
# '';
}; };
settings.global.excludes = [ "base/languages/en-us/.vale/*" ];
}; };
devshells.default = { }
# commands = [ );
# {
# help = " sync vale configuration";
# name = "vale-sync";
# command = "${pkgs.vale}/bin/vale sync --config ${vale.valeDirectory}/${vale.config.filename}";
# category = " Languages (en_US)";
# }
# ];
# packages = [ pkgs.vale ];
# devshell.startup.vale_config.text = ''
# ${pkgs.uutils-coreutils-noprefix}/bin/ln -fs ${vale.config.file} ${vale.valeDirectory}/${vale.config.filename}
# '';
};
};
} }

73
base/languages/markdown/default.nix
View file

@ -1,43 +1,46 @@
{ ... }: { flake-parts-lib, ... }:
{ {
imports = [ ../en-us ]; imports = [ ../en-us ];
perSystem = options.perSystem = flake-parts-lib.mkPerSystemOption (
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
helix.languages = { config = {
language = [ helix.languages = {
{ language = [
name = "markdown"; {
language-servers = [ name = "markdown";
"marksman" language-servers = [
"ltex-ls-plus" "marksman"
"vale-ls" "ltex-ls-plus"
"typos" "vale-ls"
]; "typos"
formatter = {
command = "${config.treefmt.build.wrapper}/bin/treefmt";
args = [
"--stdin"
".md"
"--quiet"
]; ];
}; formatter = {
auto-format = true; command = "${config.treefmt.build.wrapper}/bin/treefmt";
} args = [
]; "--stdin"
language-server.marksman.command = "${pkgs.marksman}/bin/marksman"; ".md"
}; "--quiet"
treefmt.programs.dprint = { ];
enable = true; };
settings = { auto-format = true;
plugins = (pkgs.dprint-plugins.getPluginList (plugins: with plugins; [ dprint-plugin-markdown ])); }
markdown = { ];
lineWidth = 80; language-server.marksman.command = "${pkgs.marksman}/bin/marksman";
textWrap = "always";
};
}; };
includes = [ "*.md" ]; treefmt.programs.dprint = {
enable = true;
settings = {
plugins = (pkgs.dprint-plugins.getPluginList (plugins: with plugins; [ dprint-plugin-markdown ]));
markdown = {
lineWidth = 80;
textWrap = "always";
};
};
includes = [ "*.md" ];
};
pre-commit.settings.hooks.markdownlint.enable = true;
}; };
pre-commit.settings.hooks.markdownlint.enable = true; }
}; );
} }

7
base/languages/nix/default.nix
View file

@ -1,7 +1,7 @@
{ ... }: { flake-parts-lib, ... }:
{ {
imports = [ ../en-us ]; imports = [ ../en-us ];
perSystem = options.perSystem = flake-parts-lib.mkPerSystemOption (
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
helix.languages = { helix.languages = {
@ -30,5 +30,6 @@
enable = true; enable = true;
strict = true; strict = true;
}; };
}; }
);
} }

53
base/languages/toml/default.nix
View file

@ -1,32 +1,35 @@
{ ... }: { flake-parts-lib, ... }:
{ {
imports = [ ../en-us ]; imports = [ ../en-us ];
perSystem = options.perSystem = flake-parts-lib.mkPerSystemOption (
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
helix.languages = { config = {
language = [ helix.languages = {
{ language = [
name = "toml"; {
language-servers = [ name = "toml";
"taplo" language-servers = [
"harper-ls" "taplo"
"typos" "harper-ls"
]; "typos"
formatter = {
command = "${config.treefmt.build.wrapper}/bin/treefmt";
args = [
"--stdin"
".toml"
"--quiet"
]; ];
}; formatter = {
auto-format = true; command = "${config.treefmt.build.wrapper}/bin/treefmt";
} args = [
]; "--stdin"
language-server.taplo.command = "${pkgs.taplo}/bin/taplo"; ".toml"
"--quiet"
];
};
auto-format = true;
}
];
language-server.taplo.command = "${pkgs.taplo}/bin/taplo";
};
treefmt.programs.taplo.enable = true;
pre-commit.settings.hooks.check-toml.enable = true;
}; };
treefmt.programs.taplo.enable = true; }
pre-commit.settings.hooks.check-toml.enable = true; );
};
} }

77
base/languages/yaml/default.nix
View file

@ -1,44 +1,47 @@
{ ... }: { flake-parts-lib, ... }:
{ {
imports = [ ../en-us ]; imports = [ ../en-us ];
perSystem = options.perSystem = flake-parts-lib.mkPerSystemOption (
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
helix.languages = { config = {
language = [ helix.languages = {
{ language = [
name = "yaml"; {
language-servers = [ name = "yaml";
"yaml-language-server" language-servers = [
"harper-ls" "yaml-language-server"
"typos" "harper-ls"
]; "typos"
formatter = {
command = "${config.treefmt.build.wrapper}/bin/treefmt";
args = [
"--stdin"
".yaml"
"--quiet"
]; ];
}; formatter = {
auto-format = true; command = "${config.treefmt.build.wrapper}/bin/treefmt";
} args = [
]; "--stdin"
language-server.yaml-language-server.command = "${pkgs.yaml-language-server}/bin/yaml-language-server"; ".yaml"
"--quiet"
];
};
auto-format = true;
}
];
language-server.yaml-language-server.command = "${pkgs.yaml-language-server}/bin/yaml-language-server";
};
treefmt.programs.dprint = {
enable = true;
settings.plugins = (
pkgs.dprint-plugins.getPluginList (plugins: with plugins; [ g-plane-pretty_yaml ])
);
includes = [
"*.yaml"
"*.yml"
];
};
pre-commit.settings.hooks = {
check-yaml.enable = true;
sort-simple-yaml.enable = true;
};
}; };
treefmt.programs.dprint = { }
enable = true; );
settings.plugins = (
pkgs.dprint-plugins.getPluginList (plugins: with plugins; [ g-plane-pretty_yaml ])
);
includes = [
"*.yaml"
"*.yml"
];
};
pre-commit.settings.hooks = {
check-yaml.enable = true;
sort-simple-yaml.enable = true;
};
};
} }

31
flake.nix
View file

@ -41,15 +41,42 @@
systems = [ "aarch64-linux" ]; systems = [ "aarch64-linux" ];
imports = [ imports = [
./base ./base
./sops
./home-manager ./home-manager
]; ];
perSystem = perSystem =
{ pkgs, system, ... }: { pkgs, system, ... }:
# let
# pkgs = import inputs.nixpkgs {
# inherit system;
# overlays = [
# inputs.nur.overlays.default
# inputs.nixgl.overlays.default
# ];
# };
# in
{ {
# _module.args.pkgs = pkgs;
# https://flake.parts/options/devshell.html # https://flake.parts/options/devshell.html
devshells.default = { devshells.default = {
packages = [ pkgs.forgejo-cli ]; commands = [
{
help = " generate age key";
name = "age-generate-key";
command = "${pkgs.uutils-coreutils-noprefix}/bin/mkdir -p ~/.config/sops/age && ${pkgs.age}/bin/age-keygen -o ~/.config/sops/age/keys.txt && ${pkgs.uutils-coreutils-noprefix}/bin/cat ~/.config/sops/age/keys.txt";
category = " SOPS";
}
{
help = " edit secrets.yaml";
name = "sops-edit";
command = "${pkgs.sops}/bin/sops edit ./home-manager/secrets/secrets.yaml";
category = " SOPS";
}
];
packages = [
pkgs.age
pkgs.forgejo-cli
pkgs.sops
];
devshell = { devshell = {
motd = '' motd = ''
{202} Nix Laptop Configuration{reset} {202} Nix Laptop Configuration{reset}

121
home-manager/default.nix
View file

@ -1,61 +1,74 @@
{ inputs, withSystem, ... }: {
flake-parts-lib,
inputs,
withSystem,
...
}:
{ {
imports = [ inputs.home-manager.flakeModules.home-manager ]; imports = [ inputs.home-manager.flakeModules.home-manager ];
# https://nix-community.github.io/home-manager/options.xhtml options = {
flake.homeConfigurations = { perSystem = flake-parts-lib.mkPerSystemOption (
asahi = withSystem "aarch64-linux" ( { config, system, ... }:
{ pkgs, ... }: {
inputs.home-manager.lib.homeManagerConfiguration { config =
inherit pkgs; let
extraSpecialArgs = { inherit inputs pkgs; }; pkgs = import inputs.nixpkgs {
modules = [ inherit system;
{ nixpkgs.overlays = [ inputs.nur.overlays.default ]; } overlays = [
inputs.lix-module.nixosModules.default inputs.nur.overlays.default
inputs.sops-nix.homeManagerModules.sops inputs.nixgl.overlays.default
inputs.stylix.homeModules.stylix ];
inputs.catppuccin.homeModules.catppuccin };
./home.nix in
]; {
_module.args.pkgs = pkgs;
devshells.default = {
commands = [
{
help = " `home-manager switch` for asahi";
name = "hm-asahi";
command = "${pkgs.home-manager}/bin/home-manager switch --flake .#asahi";
category = " home-manager (Asahi)";
}
{
help = "󰸨 `home-manager switch` for asahi with backup";
name = "hm-asahi-backup";
command = "${pkgs.home-manager}/bin/home-manager switch --flake .#asahi -b backup";
category = " home-manager (Asahi)";
}
{
help = "󰘥 show home-manager documentation";
name = "man-home";
command = "${pkgs.man}/bin/man home-configuration.nix";
category = " home-manager";
}
];
packages = [ pkgs.home-manager ];
};
pre-commit.settings.excludes = [ "home-manager/vencord.nix" ];
treefmt.settings.global.excludes = [ "home-manager/vencord.nix" ];
};
} }
); );
}; };
perSystem = config = {
{ config, system, ... }: # https://nix-community.github.io/home-manager/options.xhtml
let flake.homeConfigurations = {
pkgs = import inputs.nixpkgs { asahi = withSystem "aarch64-linux" (
inherit system; { pkgs, ... }:
overlays = [ inputs.home-manager.lib.homeManagerConfiguration {
inputs.nur.overlays.default inherit pkgs;
inputs.nixgl.overlays.default extraSpecialArgs = { inherit inputs pkgs; };
]; modules = [
}; { nixpkgs.overlays = [ inputs.nur.overlays.default ]; }
in inputs.lix-module.nixosModules.default
{ inputs.sops-nix.homeManagerModules.sops
_module.args.pkgs = pkgs; inputs.stylix.homeModules.stylix
devshells.default = { inputs.catppuccin.homeModules.catppuccin
commands = [ ./home.nix
{ ];
help = " `home-manager switch` for asahi"; }
name = "hm-asahi"; );
command = "${pkgs.home-manager}/bin/home-manager switch --flake .#asahi";
category = " home-manager (Asahi)";
}
{
help = "󰸨 `home-manager switch` for asahi with backup";
name = "hm-asahi-backup";
command = "${pkgs.home-manager}/bin/home-manager switch --flake .#asahi -b backup";
category = " home-manager (Asahi)";
}
{
help = "󰘥 show home-manager documentation";
name = "man-home";
command = "${pkgs.man}/bin/man home-configuration.nix";
category = " home-manager";
}
];
packages = [ pkgs.home-manager ];
};
pre-commit.settings.excludes = [ "home-manager/vencord.nix" ];
treefmt.settings.global.excludes = [ "home-manager/vencord.nix" ];
}; };
};
} }

2
home-manager/home.nix
View file

@ -18,7 +18,7 @@ in
secrets = { secrets = {
openrouter_api_key = { }; openrouter_api_key = { };
}; };
defaultSopsFile = ../sops/secrets.yaml; defaultSopsFile = ./secrets/secrets.yaml;
age.keyFile = /home/${username}/.config/sops/age/keys.txt; age.keyFile = /home/${username}/.config/sops/age/keys.txt;
}; };
# https://nix.catppuccin.com/search/rolling/ # https://nix.catppuccin.com/search/rolling/

0
sops/secrets.yaml → home-manager/secrets/secrets.yaml
View file

0
sops/secrets.yaml.example → home-manager/secrets/secrets.yaml.example
View file

29
sops/default.nix
View file

@ -1,29 +0,0 @@
{ ... }:
{
perSystem =
{ pkgs, ... }:
{
config = {
devshells.default = {
commands = [
{
help = " generate age key";
name = "age-generate-key";
command = "${pkgs.uutils-coreutils-noprefix}/bin/mkdir -p ~/.config/sops/age && ${pkgs.age}/bin/age-keygen -o ~/.config/sops/age/keys.txt && ${pkgs.uutils-coreutils-noprefix}/bin/cat ~/.config/sops/age/keys.txt";
category = " SOPS";
}
{
help = " edit secrets.yaml";
name = "sops-edit";
command = "${pkgs.sops}/bin/sops edit ./sops/secrets.yaml";
category = " SOPS";
}
];
packages = [
pkgs.age
pkgs.sops
];
};
};
};
}