Nix/System
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Reformat

Browse source
This commit is contained in:
Nathan McCarty 2025-01-13 14:53:42 -05:00
parent ac3825e6f9
commit 29fd118635
22 changed files with 424 additions and 424 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
devshells/idris2.nix
View file

@ -1,24 +1,23 @@
{ withSystem, inputs, ... }:
{
perSystem =
{
withSystem,
inputs,
...
}: {
perSystem = {
config,
pkgs,
lib,
inputs',
...
}:
{
devShells.idris2 =
let
}: {
devShells.idris2 = let
libPackages = with pkgs; [
readline70
openssl
];
in
pkgs.mkShell {
buildInputs =
with pkgs;
buildInputs = with pkgs;
[
# Idris toolchain
inputs'.nixpkgs-unstable.legacyPackages.idris2Packages.pack

17
devshells/raku.nix
View file

@ -1,16 +1,16 @@
{ withSystem, inputs, ... }:
{
perSystem =
{
withSystem,
inputs,
...
}: {
perSystem = {
config,
pkgs,
lib,
inputs',
...
}:
{
devShells.raku =
let
}: {
devShells.raku = let
rakudo_env = pkgs.buildEnv {
name = "rakudo-env";
paths = with pkgs; [
@ -26,8 +26,7 @@
libPackages = with pkgs; [readline70];
in
pkgs.mkShell {
buildInputs =
with pkgs;
buildInputs = with pkgs;
[
# Raku toolchain
rakudo_env

13
devshells/rust.nix
View file

@ -1,8 +1,13 @@
{ withSystem, inputs, ... }:
{
perSystem =
{ config, pkgs, ... }:
{
withSystem,
inputs,
...
}: {
perSystem = {
config,
pkgs,
...
}: {
devShells.rust = pkgs.mkShell {
buildInputs = with pkgs; [
# Rust toolchain

14
flake.nix
View file

@ -20,8 +20,11 @@
};
};
outputs =
inputs@{ flake-parts, self, ... }:
outputs = inputs @ {
flake-parts,
self,
...
}:
flake-parts.lib.mkFlake {inherit inputs;} {
imports = [
inputs.devshell.flakeModule
@ -41,16 +44,14 @@
"aarch64-darwin"
"x86_64-darwin"
];
perSystem =
{
perSystem = {
config,
self',
inputs',
pkgs,
system,
...
}:
{
}: {
# Per-system attributes can be defined here. The self' and inputs'
# module parameters provide easy access to attributes of the same
# system.
@ -65,7 +66,6 @@
type = types.lazyAttrsOf types.raw;
default = {};
};
};
};
};

14
home-manager/machines/crash/home.nix
View file

@ -1,9 +1,16 @@
{ withSystem, inputs, ... }:
{
withSystem,
inputs,
...
}: {
# perSystem = { ... }: { config.packages.hello = ...; };
flake.homeConfigurations.crash = withSystem "x86_64-linux" (
ctx@{ config, inputs', ... }:
ctx @ {
config,
inputs',
...
}:
inputs.home-manager.lib.homeManagerConfiguration {
pkgs = inputs.nixpkgs.legacyPackages.${"x86_64-linux"};
extraSpecialArgs = {
@ -17,8 +24,7 @@
lib,
pkgs,
...
}:
{
}: {
imports = [
../../modules/programs/shell.nix
../../modules/programs/neovim.nix

14
home-manager/machines/wsl/home.nix
View file

@ -1,9 +1,16 @@
{ withSystem, inputs, ... }:
{
withSystem,
inputs,
...
}: {
# perSystem = { ... }: { config.packages.hello = ...; };
flake.homeConfigurations.wsl = withSystem "x86_64-linux" (
ctx@{ config, inputs', ... }:
ctx @ {
config,
inputs',
...
}:
inputs.home-manager.lib.homeManagerConfiguration {
pkgs = inputs.nixpkgs.legacyPackages.${"x86_64-linux"};
extraSpecialArgs = {
@ -17,8 +24,7 @@
lib,
pkgs,
...
}:
{
}: {
imports = [
../../modules/programs/shell.nix
../../modules/programs/neovim.nix

10
home-manager/modules/programs/core.nix
View file

@ -3,9 +3,7 @@
lib,
pkgs,
...
}:
{
}: {
home.packages = with pkgs; [
# Rust rewrites of cli stuff
fd
@ -41,7 +39,10 @@
aggressiveResize = true;
keyMode = "vi";
shortcut = "x";
terminal = if pkgs.stdenv.isLinux then "tmux-256color" else "screen-256color";
terminal =
if pkgs.stdenv.isLinux
then "tmux-256color"
else "screen-256color";
escapeTime = 100;
plugins = with pkgs; [
tmuxPlugins.cpu
@ -56,5 +57,4 @@
};
programs.btop.enable = true;
programs.jq.enable = true;
}

5
home-manager/modules/programs/desktop.nix
View file

@ -4,9 +4,7 @@
pkgs,
inputs',
...
}:
{
}: {
home.packages = with pkgs; [
# Communications
webcord-vencord
@ -27,5 +25,4 @@
enable = true;
};
};
}

4
home-manager/modules/programs/devel.nix
View file

@ -4,9 +4,7 @@
pkgs,
inputs',
...
}:
{
}: {
home.packages = with pkgs; [
# Git addons
git-secret

23
home-manager/modules/programs/emacs.nix
View file

@ -1,21 +1,19 @@
{
emacsPackage ? null,
}:
{
{emacsPackage ? null}: {
config,
lib,
pkgs,
...
}:
let
}: let
myAspell = pkgs.aspellWithDicts (d: [
d.en
d.en-science
d.en-computers
]);
emacsPackage' = if emacsPackage == null then pkgs.emacs29-pgtk else emacsPackage;
in
{
emacsPackage' =
if emacsPackage == null
then pkgs.emacs29-pgtk
else emacsPackage;
in {
home.packages = with pkgs; [
# For markdown rendering
python312Packages.grip
@ -56,15 +54,16 @@ in
programs.emacs = {
enable = true;
package = emacsPackage';
extraPackages =
epkgs: with pkgs; [
extraPackages = epkgs:
with pkgs; [
epkgs.mu4e
epkgs.vterm
epkgs.pdf-tools
epkgs.emacsql
epkgs.emacsql-sqlite
(tree-sitter.withPlugins (
grammars: with grammars; [
grammars:
with grammars; [
tree-sitter-nix
tree-sitter-rust
tree-sitter-toml

4
home-manager/modules/programs/fonts.nix
View file

@ -3,9 +3,7 @@
lib,
pkgs,
...
}:
{
}: {
fonts.fontconfig = {
enable = true;
defaultFonts = {

7
home-manager/modules/programs/git.nix
View file

@ -1,15 +1,12 @@
{
gitUserName ? "Nathan McCarty",
gitUserEmail ? "thatonelutenist@stranger.systems",
}:
{
}: {
config,
lib,
pkgs,
...
}:
{
}: {
programs.git = {
enable = true;
package = pkgs.gitAndTools.gitFull;

4
home-manager/modules/programs/neovim.nix
View file

@ -3,9 +3,7 @@
lib,
pkgs,
...
}:
{
}: {
programs.neovim = {
enable = true;
viAlias = true;

5
home-manager/modules/programs/shell.nix
View file

@ -3,9 +3,7 @@
lib,
pkgs,
...
}:
{
}: {
programs.nushell = {
enable = true;
configFile.source = ./nushell/config.nu;
@ -64,5 +62,4 @@
};
programs.fzf.enable = true;
}

4
home-manager/modules/programs/ssh.nix
View file

@ -3,9 +3,7 @@
lib,
pkgs,
...
}:
{
}: {
programs.ssh = {
# SSH configuration
enable = true;

8
nixos/machines/crash/configuration.nix
View file

@ -1,10 +1,11 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’).
{ config, pkgs, ... }:
{
config,
pkgs,
...
}: {
imports = [
];
@ -185,5 +186,4 @@
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "24.11"; # Did you read the comment?
}

4
nixos/machines/crash/hardware.nix
View file

@ -7,9 +7,7 @@
pkgs,
modulesPath,
...
}:
{
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];

16
nixos/machines/crash/machine.nix
View file

@ -1,9 +1,16 @@
{ withSystem, inputs, ... }:
{
withSystem,
inputs,
...
}: {
# perSystem = { ... }: { config.packages.hello = ...; };
flake.nixosConfigurations.crash = withSystem "x86_64-linux" (
ctx@{ config, inputs', ... }:
ctx @ {
config,
inputs',
...
}:
inputs.nixpkgs.lib.nixosSystem {
# Expose `packages`, `inputs` and `inputs'` as module arguments.
# Use specialArgs permits use in `imports`.
@ -20,9 +27,7 @@
lib,
pkgs,
...
}:
{
}: {
imports = [
# Hardware support
inputs.nixos-hardware.nixosModules.microsoft-surface-common
@ -40,7 +45,6 @@
"nix-command"
"flakes"
];
}
)
];

16
nixos/machines/installer/configuration.nix
View file

@ -1,9 +1,16 @@
{ withSystem, inputs, ... }:
{
withSystem,
inputs,
...
}: {
# perSystem = { ... }: { config.packages.hello = ...; };
flake.nixosConfigurations.inst = withSystem "x86_64-linux" (
ctx@{ config, inputs', ... }:
ctx @ {
config,
inputs',
...
}:
inputs.nixpkgs.lib.nixosSystem {
# Expose `packages`, `inputs` and `inputs'` as module arguments.
# Use specialArgs permits use in `imports`.
@ -20,15 +27,12 @@
(
# NixOS-WSL specific options are documented on the NixOS-WSL repository:
# https://github.com/nix-community/NixOS-WSL
{
config,
lib,
pkgs,
...
}:
{
}: {
imports = [
];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";

16
nixos/machines/wsl/configuration.nix
View file

@ -1,9 +1,16 @@
{ withSystem, inputs, ... }:
{
withSystem,
inputs,
...
}: {
# perSystem = { ... }: { config.packages.hello = ...; };
flake.nixosConfigurations.wsl = withSystem "x86_64-linux" (
ctx@{ config, inputs', ... }:
ctx @ {
config,
inputs',
...
}:
inputs.nixpkgs.lib.nixosSystem {
# Expose `packages`, `inputs` and `inputs'` as module arguments.
# Use specialArgs permits use in `imports`.
@ -17,15 +24,12 @@
(
# NixOS-WSL specific options are documented on the NixOS-WSL repository:
# https://github.com/nix-community/NixOS-WSL
{
config,
lib,
pkgs,
...
}:
{
}: {
imports = [
# WSL support
inputs.nixos-wsl.nixosModules.default

7
nixos/modules/base.nix
View file

@ -1,12 +1,9 @@
{ inputs }:
{
{inputs}: {
config,
lib,
pkgs,
...
}:
{
}: {
imports = [
inputs.lix-module.nixosModules.default
];

8
nixos/modules/user.nix
View file

@ -3,15 +3,12 @@
mutableUsers ? false,
username ? "nathan",
homedir ? "/home/nathan",
}:
{
}: {
config,
lib,
pkgs,
...
}:
{
}: {
security.polkit = {
enable = true;
};
@ -30,6 +27,5 @@
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEtE+KjKuHUj5bKKQBDKqhO5dpEQf8E8u1G6kRj7y6dI nathan@nixos"
];
};
};
}