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

View file

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

View file

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

View file

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

View file

@ -20,9 +20,12 @@
}; };
}; };
outputs = outputs = inputs @ {
inputs@{ flake-parts, self, ... }: flake-parts,
flake-parts.lib.mkFlake { inherit inputs; } { self,
...
}:
flake-parts.lib.mkFlake {inherit inputs;} {
imports = [ imports = [
inputs.devshell.flakeModule inputs.devshell.flakeModule
./nixos/machines/wsl/configuration.nix ./nixos/machines/wsl/configuration.nix
@ -41,16 +44,14 @@
"aarch64-darwin" "aarch64-darwin"
"x86_64-darwin" "x86_64-darwin"
]; ];
perSystem = perSystem = {
{
config, config,
self', self',
inputs', inputs',
pkgs, pkgs,
system, system,
... ...
}: }: {
{
# Per-system attributes can be defined here. The self' and inputs' # Per-system attributes can be defined here. The self' and inputs'
# module parameters provide easy access to attributes of the same # module parameters provide easy access to attributes of the same
# system. # system.
@ -63,9 +64,8 @@
flake = flake-parts.lib.mkSubmoduleOptions { flake = flake-parts.lib.mkSubmoduleOptions {
homeConfigurations = mkOption { homeConfigurations = mkOption {
type = types.lazyAttrsOf types.raw; type = types.lazyAttrsOf types.raw;
default = { }; default = {};
}; };
}; };
}; };
}; };

View file

@ -1,9 +1,16 @@
{ withSystem, inputs, ... }:
{ {
withSystem,
inputs,
...
}: {
# perSystem = { ... }: { config.packages.hello = ...; }; # perSystem = { ... }: { config.packages.hello = ...; };
flake.homeConfigurations.crash = withSystem "x86_64-linux" ( flake.homeConfigurations.crash = withSystem "x86_64-linux" (
ctx@{ config, inputs', ... }: ctx @ {
config,
inputs',
...
}:
inputs.home-manager.lib.homeManagerConfiguration { inputs.home-manager.lib.homeManagerConfiguration {
pkgs = inputs.nixpkgs.legacyPackages.${"x86_64-linux"}; pkgs = inputs.nixpkgs.legacyPackages.${"x86_64-linux"};
extraSpecialArgs = { extraSpecialArgs = {
@ -17,16 +24,15 @@
lib, lib,
pkgs, pkgs,
... ...
}: }: {
{
imports = [ imports = [
../../modules/programs/shell.nix ../../modules/programs/shell.nix
../../modules/programs/neovim.nix ../../modules/programs/neovim.nix
(import ../../modules/programs/git.nix { }) (import ../../modules/programs/git.nix {})
../../modules/programs/core.nix ../../modules/programs/core.nix
../../modules/programs/devel.nix ../../modules/programs/devel.nix
../../modules/programs/ssh.nix ../../modules/programs/ssh.nix
(import ../../modules/programs/emacs.nix { }) (import ../../modules/programs/emacs.nix {})
../../modules/programs/fonts.nix ../../modules/programs/fonts.nix
../../modules/programs/desktop.nix ../../modules/programs/desktop.nix
]; ];
@ -46,7 +52,7 @@
targets.tray = { targets.tray = {
Unit = { Unit = {
Description = "Home Manager System Tray"; Description = "Home Manager System Tray";
Requires = [ "graphical-session.target" ]; Requires = ["graphical-session.target"];
}; };
}; };
services.syncthingtray = { services.syncthingtray = {

View file

@ -1,9 +1,16 @@
{ withSystem, inputs, ... }:
{ {
withSystem,
inputs,
...
}: {
# perSystem = { ... }: { config.packages.hello = ...; }; # perSystem = { ... }: { config.packages.hello = ...; };
flake.homeConfigurations.wsl = withSystem "x86_64-linux" ( flake.homeConfigurations.wsl = withSystem "x86_64-linux" (
ctx@{ config, inputs', ... }: ctx @ {
config,
inputs',
...
}:
inputs.home-manager.lib.homeManagerConfiguration { inputs.home-manager.lib.homeManagerConfiguration {
pkgs = inputs.nixpkgs.legacyPackages.${"x86_64-linux"}; pkgs = inputs.nixpkgs.legacyPackages.${"x86_64-linux"};
extraSpecialArgs = { extraSpecialArgs = {
@ -17,16 +24,15 @@
lib, lib,
pkgs, pkgs,
... ...
}: }: {
{
imports = [ imports = [
../../modules/programs/shell.nix ../../modules/programs/shell.nix
../../modules/programs/neovim.nix ../../modules/programs/neovim.nix
(import ../../modules/programs/git.nix { }) (import ../../modules/programs/git.nix {})
../../modules/programs/core.nix ../../modules/programs/core.nix
../../modules/programs/devel.nix ../../modules/programs/devel.nix
../../modules/programs/ssh.nix ../../modules/programs/ssh.nix
(import ../../modules/programs/emacs.nix { }) (import ../../modules/programs/emacs.nix {})
../../modules/programs/fonts.nix ../../modules/programs/fonts.nix
]; ];
home.username = "nathan"; home.username = "nathan";

View file

@ -3,9 +3,7 @@
lib, lib,
pkgs, pkgs,
... ...
}: }: {
{
home.packages = with pkgs; [ home.packages = with pkgs; [
# Rust rewrites of cli stuff # Rust rewrites of cli stuff
fd fd
@ -41,7 +39,10 @@
aggressiveResize = true; aggressiveResize = true;
keyMode = "vi"; keyMode = "vi";
shortcut = "x"; 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; escapeTime = 100;
plugins = with pkgs; [ plugins = with pkgs; [
tmuxPlugins.cpu tmuxPlugins.cpu
@ -56,5 +57,4 @@
}; };
programs.btop.enable = true; programs.btop.enable = true;
programs.jq.enable = true; programs.jq.enable = true;
} }

View file

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

View file

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

View file

@ -1,21 +1,19 @@
{ {emacsPackage ? null}: {
emacsPackage ? null,
}:
{
config, config,
lib, lib,
pkgs, pkgs,
... ...
}: }: let
let
myAspell = pkgs.aspellWithDicts (d: [ myAspell = pkgs.aspellWithDicts (d: [
d.en d.en
d.en-science d.en-science
d.en-computers d.en-computers
]); ]);
emacsPackage' = if emacsPackage == null then pkgs.emacs29-pgtk else emacsPackage; emacsPackage' =
in if emacsPackage == null
{ then pkgs.emacs29-pgtk
else emacsPackage;
in {
home.packages = with pkgs; [ home.packages = with pkgs; [
# For markdown rendering # For markdown rendering
python312Packages.grip python312Packages.grip
@ -48,7 +46,7 @@ in
comment = "Org protocol"; comment = "Org protocol";
desktopName = "org-protocol"; desktopName = "org-protocol";
type = "Application"; type = "Application";
mimeTypes = [ "x-scheme-handler/org-protocol" ]; mimeTypes = ["x-scheme-handler/org-protocol"];
}) })
# For format output # For format output
# wkhtmltopdf # wkhtmltopdf
@ -56,15 +54,16 @@ in
programs.emacs = { programs.emacs = {
enable = true; enable = true;
package = emacsPackage'; package = emacsPackage';
extraPackages = extraPackages = epkgs:
epkgs: with pkgs; [ with pkgs; [
epkgs.mu4e epkgs.mu4e
epkgs.vterm epkgs.vterm
epkgs.pdf-tools epkgs.pdf-tools
epkgs.emacsql epkgs.emacsql
epkgs.emacsql-sqlite epkgs.emacsql-sqlite
(tree-sitter.withPlugins ( (tree-sitter.withPlugins (
grammars: with grammars; [ grammars:
with grammars; [
tree-sitter-nix tree-sitter-nix
tree-sitter-rust tree-sitter-rust
tree-sitter-toml tree-sitter-toml

View file

@ -3,9 +3,7 @@
lib, lib,
pkgs, pkgs,
... ...
}: }: {
{
fonts.fontconfig = { fonts.fontconfig = {
enable = true; enable = true;
defaultFonts = { defaultFonts = {
@ -13,8 +11,8 @@
"Noto Emoji" "Noto Emoji"
"Noto Color Emoji" "Noto Color Emoji"
]; ];
monospace = [ "JetBrainsMono-NF-Regular" ]; monospace = ["JetBrainsMono-NF-Regular"];
sansSerif = [ "Roboto" ]; sansSerif = ["Roboto"];
}; };
}; };

View file

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

View file

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

View file

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

View file

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

View file

@ -1,10 +1,11 @@
# Edit this configuration file to define what should be installed on # Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help). # and in the NixOS manual (accessible by running nixos-help).
{ config, pkgs, ... }:
{ {
config,
pkgs,
...
}: {
imports = [ imports = [
]; ];
@ -18,7 +19,7 @@
''; '';
programs.ssh.knownHosts = { programs.ssh.knownHosts = {
nixbuild = { nixbuild = {
hostNames = [ "eu.nixbuild.net" ]; hostNames = ["eu.nixbuild.net"];
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPIQCZc54poJ8vqawd8TraNryQeJnvH1eLpIDgbiqymM"; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPIQCZc54poJ8vqawd8TraNryQeJnvH1eLpIDgbiqymM";
}; };
}; };
@ -144,7 +145,7 @@
# Define a user account. Don't forget to set a password with passwd. # Define a user account. Don't forget to set a password with passwd.
users.users.nathan = { users.users.nathan = {
extraGroups = [ "networkmanager" ]; extraGroups = ["networkmanager"];
}; };
# Install firefox. # Install firefox.
@ -185,5 +186,4 @@
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "24.11"; # Did you read the comment? system.stateVersion = "24.11"; # Did you read the comment?
} }

View file

@ -7,9 +7,7 @@
pkgs, pkgs,
modulesPath, modulesPath,
... ...
}: }: {
{
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
@ -20,9 +18,9 @@
"usb_storage" "usb_storage"
"sd_mod" "sd_mod"
]; ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/0a846b89-7219-47c1-9db5-362e3c018964"; device = "/dev/disk/by-uuid/0a846b89-7219-47c1-9db5-362e3c018964";
@ -39,7 +37,7 @@
}; };
swapDevices = [ swapDevices = [
{ device = "/dev/disk/by-uuid/bf35a46f-552c-4b37-a68b-c2fcf132f359"; } {device = "/dev/disk/by-uuid/bf35a46f-552c-4b37-a68b-c2fcf132f359";}
]; ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

View file

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

View file

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

View file

@ -1,9 +1,16 @@
{ withSystem, inputs, ... }:
{ {
withSystem,
inputs,
...
}: {
# perSystem = { ... }: { config.packages.hello = ...; }; # perSystem = { ... }: { config.packages.hello = ...; };
flake.nixosConfigurations.wsl = withSystem "x86_64-linux" ( flake.nixosConfigurations.wsl = withSystem "x86_64-linux" (
ctx@{ config, inputs', ... }: ctx @ {
config,
inputs',
...
}:
inputs.nixpkgs.lib.nixosSystem { inputs.nixpkgs.lib.nixosSystem {
# Expose `packages`, `inputs` and `inputs'` as module arguments. # Expose `packages`, `inputs` and `inputs'` as module arguments.
# Use specialArgs permits use in `imports`. # Use specialArgs permits use in `imports`.
@ -17,20 +24,17 @@
( (
# NixOS-WSL specific options are documented on the NixOS-WSL repository: # NixOS-WSL specific options are documented on the NixOS-WSL repository:
# https://github.com/nix-community/NixOS-WSL # https://github.com/nix-community/NixOS-WSL
{ {
config, config,
lib, lib,
pkgs, pkgs,
... ...
}: }: {
{
imports = [ imports = [
# WSL support # WSL support
inputs.nixos-wsl.nixosModules.default inputs.nixos-wsl.nixosModules.default
# Our modules # Our modules
(import ../../modules/base.nix { inherit inputs; }) (import ../../modules/base.nix {inherit inputs;})
(import ../../modules/user.nix { (import ../../modules/user.nix {
inherit inputs; inherit inputs;
mutableUsers = true; mutableUsers = true;
@ -45,7 +49,7 @@
services.tailscale.enable = true; services.tailscale.enable = true;
nix.settings.system-features = [ "x86_64-linux" ]; nix.settings.system-features = ["x86_64-linux"];
nix.settings.experimental-features = [ nix.settings.experimental-features = [
"nix-command" "nix-command"

View file

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

View file

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