Compare commits
8 commits
bac7bcb3a4
...
0b933dc9a5
Author | SHA1 | Date | |
---|---|---|---|
0b933dc9a5 | |||
8df25e2fc8 | |||
faef61c066 | |||
bcd0288107 | |||
99c4179cb5 | |||
55427d9238 | |||
cf648f81ad | |||
1e35472464 |
11 changed files with 396 additions and 42 deletions
|
@ -11,19 +11,10 @@
|
||||||
{
|
{
|
||||||
devShells.idris2 =
|
devShells.idris2 =
|
||||||
let
|
let
|
||||||
rakudo_env = pkgs.buildEnv {
|
libPackages = with pkgs; [
|
||||||
name = "rakudo-env";
|
readline70
|
||||||
paths = with pkgs; [
|
openssl
|
||||||
rakudo
|
|
||||||
zef
|
|
||||||
];
|
];
|
||||||
pathsToLink = [
|
|
||||||
"/bin"
|
|
||||||
"/lib"
|
|
||||||
"/share"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
libPackages = with pkgs; [ readline70 openssl ];
|
|
||||||
in
|
in
|
||||||
pkgs.mkShell {
|
pkgs.mkShell {
|
||||||
buildInputs =
|
buildInputs =
|
||||||
|
@ -37,7 +28,6 @@
|
||||||
gnumake
|
gnumake
|
||||||
chez
|
chez
|
||||||
rlwrap
|
rlwrap
|
||||||
rakudo_env
|
|
||||||
]
|
]
|
||||||
++ libPackages;
|
++ libPackages;
|
||||||
shellHook = ''
|
shellHook = ''
|
||||||
|
|
16
flake.nix
16
flake.nix
|
@ -21,17 +21,20 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
inputs@{ flake-parts, ... }:
|
inputs@{ flake-parts, self, ... }:
|
||||||
flake-parts.lib.mkFlake { inherit inputs; } {
|
flake-parts.lib.mkFlake { inherit inputs; } {
|
||||||
imports = [
|
imports = [
|
||||||
inputs.devshell.flakeModule
|
inputs.devshell.flakeModule
|
||||||
./nixos/machines/wsl/configuration.nix
|
./nixos/machines/wsl/configuration.nix
|
||||||
./nixos/machines/installer/configuration.nix
|
./nixos/machines/installer/configuration.nix
|
||||||
|
./nixos/machines/crash/machine.nix
|
||||||
./home-manager/machines/wsl/home.nix
|
./home-manager/machines/wsl/home.nix
|
||||||
|
./home-manager/machines/crash/home.nix
|
||||||
./devshells/rust.nix
|
./devshells/rust.nix
|
||||||
./devshells/idris2.nix
|
./devshells/idris2.nix
|
||||||
./devshells/raku.nix
|
./devshells/raku.nix
|
||||||
];
|
];
|
||||||
|
config = {
|
||||||
systems = [
|
systems = [
|
||||||
"x86_64-linux"
|
"x86_64-linux"
|
||||||
"aarch64-linux"
|
"aarch64-linux"
|
||||||
|
@ -55,6 +58,15 @@
|
||||||
# Equivalent to inputs'.nixpkgs.legacyPackages.hello;
|
# Equivalent to inputs'.nixpkgs.legacyPackages.hello;
|
||||||
packages.default = pkgs.hello;
|
packages.default = pkgs.hello;
|
||||||
};
|
};
|
||||||
flake = { };
|
};
|
||||||
|
options = with inputs.nixpkgs.lib; {
|
||||||
|
flake = flake-parts.lib.mkSubmoduleOptions {
|
||||||
|
homeConfigurations = mkOption {
|
||||||
|
type = types.lazyAttrsOf types.raw;
|
||||||
|
default = { };
|
||||||
|
};
|
||||||
|
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
56
home-manager/machines/crash/home.nix
Normal file
56
home-manager/machines/crash/home.nix
Normal file
|
@ -0,0 +1,56 @@
|
||||||
|
{ withSystem, inputs, ... }:
|
||||||
|
{
|
||||||
|
# perSystem = { ... }: { config.packages.hello = ...; };
|
||||||
|
|
||||||
|
flake.homeConfigurations.crash = withSystem "x86_64-linux" (
|
||||||
|
ctx@{ config, inputs', ... }:
|
||||||
|
inputs.home-manager.lib.homeManagerConfiguration {
|
||||||
|
pkgs = inputs.nixpkgs.legacyPackages.${"x86_64-linux"};
|
||||||
|
extraSpecialArgs = {
|
||||||
|
inherit inputs inputs';
|
||||||
|
packages = config.packages;
|
||||||
|
};
|
||||||
|
modules = [
|
||||||
|
(
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
../../modules/programs/shell.nix
|
||||||
|
../../modules/programs/neovim.nix
|
||||||
|
(import ../../modules/programs/git.nix { })
|
||||||
|
../../modules/programs/core.nix
|
||||||
|
../../modules/programs/devel.nix
|
||||||
|
../../modules/programs/ssh.nix
|
||||||
|
(import ../../modules/programs/emacs.nix { })
|
||||||
|
../../modules/programs/fonts.nix
|
||||||
|
../../modules/programs/desktop.nix
|
||||||
|
];
|
||||||
|
home.username = "nathan";
|
||||||
|
home.homeDirectory = "/home/nathan/";
|
||||||
|
programs.command-not-found.enable = true;
|
||||||
|
home.stateVersion = "24.11";
|
||||||
|
programs.home-manager.enable = true;
|
||||||
|
|
||||||
|
# Allow unfree packages
|
||||||
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
||||||
|
# Machine specific configuration
|
||||||
|
services.emacs.defaultEditor = true;
|
||||||
|
|
||||||
|
systemd.user.targets.tray = {
|
||||||
|
Unit = {
|
||||||
|
Description = "Home Manager System Tray";
|
||||||
|
Requires = [ "graphical-session-pre.target" ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
)
|
||||||
|
];
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
26
home-manager/modules/programs/desktop.nix
Normal file
26
home-manager/modules/programs/desktop.nix
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
inputs',
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
|
{
|
||||||
|
home.packages = with pkgs; [
|
||||||
|
webcord-vencord
|
||||||
|
spotify
|
||||||
|
protonmail-desktop
|
||||||
|
inputs'.nixpkgs-unstable.legacyPackages.ente-web
|
||||||
|
protonvpn-gui
|
||||||
|
calibre
|
||||||
|
];
|
||||||
|
|
||||||
|
services.syncthing = {
|
||||||
|
enable = true;
|
||||||
|
tray = {
|
||||||
|
enable = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
|
@ -72,4 +72,8 @@ in
|
||||||
))
|
))
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
services.emacs = {
|
||||||
|
enable = true;
|
||||||
|
client.enable = true;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,8 +19,7 @@
|
||||||
controlMaster = "auto";
|
controlMaster = "auto";
|
||||||
controlPersist = "10m";
|
controlPersist = "10m";
|
||||||
# Configure known hosts
|
# Configure known hosts
|
||||||
matchBlocks =
|
matchBlocks = {
|
||||||
{
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
164
nixos/machines/crash/configuration.nix
Normal file
164
nixos/machines/crash/configuration.nix
Normal file
|
@ -0,0 +1,164 @@
|
||||||
|
# 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, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
];
|
||||||
|
|
||||||
|
programs.ssh.extraConfig = ''
|
||||||
|
Host eu.nixbuild.net
|
||||||
|
PubkeyAcceptedKeyTypes ssh-ed25519
|
||||||
|
ServerAliveInterval 60
|
||||||
|
IPQoS throughput
|
||||||
|
IdentityFile /home/nathan/.ssh/id_ed25519
|
||||||
|
'';
|
||||||
|
|
||||||
|
programs.ssh.knownHosts = {
|
||||||
|
nixbuild = {
|
||||||
|
hostNames = [ "eu.nixbuild.net" ];
|
||||||
|
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPIQCZc54poJ8vqawd8TraNryQeJnvH1eLpIDgbiqymM";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
nix = {
|
||||||
|
settings = {
|
||||||
|
auto-optimise-store = true;
|
||||||
|
trusted-users = [
|
||||||
|
"root"
|
||||||
|
"nathan"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
gc = {
|
||||||
|
automatic = true;
|
||||||
|
dates = "hourly";
|
||||||
|
options = "--delete-older-than 7d";
|
||||||
|
};
|
||||||
|
distributedBuilds = true;
|
||||||
|
buildMachines = [
|
||||||
|
{
|
||||||
|
hostName = "eu.nixbuild.net";
|
||||||
|
system = "x86_64-linux";
|
||||||
|
maxJobs = 100;
|
||||||
|
supportedFeatures = [
|
||||||
|
"benchmark"
|
||||||
|
"big-parallel"
|
||||||
|
];
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
# Bootloader.
|
||||||
|
boot.loader.systemd-boot.enable = true;
|
||||||
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
|
||||||
|
networking.hostName = "crash"; # Define your hostname.
|
||||||
|
|
||||||
|
services.tailscale.enable = true;
|
||||||
|
|
||||||
|
networking.networkmanager.enable = true;
|
||||||
|
|
||||||
|
# Set your time zone.
|
||||||
|
time.timeZone = "America/New_York";
|
||||||
|
|
||||||
|
# Select internationalisation properties.
|
||||||
|
i18n.defaultLocale = "en_US.UTF-8";
|
||||||
|
|
||||||
|
i18n.extraLocaleSettings = {
|
||||||
|
LC_ADDRESS = "en_US.UTF-8";
|
||||||
|
LC_IDENTIFICATION = "en_US.UTF-8";
|
||||||
|
LC_MEASUREMENT = "en_US.UTF-8";
|
||||||
|
LC_MONETARY = "en_US.UTF-8";
|
||||||
|
LC_NAME = "en_US.UTF-8";
|
||||||
|
LC_NUMERIC = "en_US.UTF-8";
|
||||||
|
|
||||||
|
LC_PAPER = "en_US.UTF-8";
|
||||||
|
LC_TELEPHONE = "en_US.UTF-8";
|
||||||
|
LC_TIME = "en_US.UTF-8";
|
||||||
|
};
|
||||||
|
|
||||||
|
# Enable the X11 windowing system.
|
||||||
|
# You can disable this if you're only using the Wayland session.
|
||||||
|
services.xserver.enable = true;
|
||||||
|
|
||||||
|
# Enable the KDE Plasma Desktop Environment.
|
||||||
|
services.displayManager.sddm.enable = true;
|
||||||
|
services.desktopManager.plasma6.enable = true;
|
||||||
|
environment.sessionVariables.NIXOS_OZONE_WL = "1";
|
||||||
|
# Setup bluetooth
|
||||||
|
hardware.bluetooth.enable = true;
|
||||||
|
|
||||||
|
# Configure keymap in X11
|
||||||
|
services.xserver.xkb = {
|
||||||
|
layout = "us";
|
||||||
|
variant = "";
|
||||||
|
};
|
||||||
|
|
||||||
|
# Enable CUPS to print documents.
|
||||||
|
services.printing.enable = true;
|
||||||
|
|
||||||
|
# Enable sound with pipewire.
|
||||||
|
hardware.pulseaudio.enable = false;
|
||||||
|
security.rtkit.enable = true;
|
||||||
|
services.pipewire = {
|
||||||
|
enable = true;
|
||||||
|
alsa.enable = true;
|
||||||
|
alsa.support32Bit = true;
|
||||||
|
pulse.enable = true;
|
||||||
|
# If you want to use JACK applications, uncomment this
|
||||||
|
#jack.enable = true;
|
||||||
|
|
||||||
|
# use the example session manager (no others are packaged yet so this is enabled by default,
|
||||||
|
# no need to redefine it in your config for now)
|
||||||
|
#media-session.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
# Enable touchpad support (enabled default in most desktopManager).
|
||||||
|
# services.xserver.libinput.enable = true;
|
||||||
|
|
||||||
|
# Define a user account. Don't forget to set a password with ‘passwd’.
|
||||||
|
users.users.nathan = {
|
||||||
|
extraGroups = [ "networkmanager" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
# Install firefox.
|
||||||
|
programs.firefox.enable = true;
|
||||||
|
|
||||||
|
# List packages installed in system profile. To search, run:
|
||||||
|
# $ nix search wget
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
|
||||||
|
# wget
|
||||||
|
];
|
||||||
|
|
||||||
|
# Some programs need SUID wrappers, can be configured further or are
|
||||||
|
# started in user sessions.
|
||||||
|
# programs.mtr.enable = true;
|
||||||
|
# programs.gnupg.agent = {
|
||||||
|
# enable = true;
|
||||||
|
# enableSSHSupport = true;
|
||||||
|
# };
|
||||||
|
|
||||||
|
# List services that you want to enable:
|
||||||
|
|
||||||
|
# Enable the OpenSSH daemon.
|
||||||
|
# services.openssh.enable = true;
|
||||||
|
|
||||||
|
# Open ports in the firewall.
|
||||||
|
# networking.firewall.allowedTCPPorts = [ ... ];
|
||||||
|
# networking.firewall.allowedUDPPorts = [ ... ];
|
||||||
|
# Or disable the firewall altogether.
|
||||||
|
# networking.firewall.enable = false;
|
||||||
|
|
||||||
|
# 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://nixos.org/nixos/options.html).
|
||||||
|
|
||||||
|
system.stateVersion = "24.11"; # Did you read the comment?
|
||||||
|
|
||||||
|
}
|
54
nixos/machines/crash/hardware.nix
Normal file
54
nixos/machines/crash/hardware.nix
Normal file
|
@ -0,0 +1,54 @@
|
||||||
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
|
# and may be overwritten by future invocations. Please make changes
|
||||||
|
# to /etc/nixos/configuration.nix instead.
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
modulesPath,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
|
];
|
||||||
|
|
||||||
|
boot.initrd.availableKernelModules = [
|
||||||
|
"xhci_pci"
|
||||||
|
"nvme"
|
||||||
|
"usb_storage"
|
||||||
|
"sd_mod"
|
||||||
|
];
|
||||||
|
boot.initrd.kernelModules = [ ];
|
||||||
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
|
fileSystems."/" = {
|
||||||
|
device = "/dev/disk/by-uuid/0a846b89-7219-47c1-9db5-362e3c018964";
|
||||||
|
fsType = "ext4";
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/boot" = {
|
||||||
|
device = "/dev/disk/by-uuid/D1C9-AFA9";
|
||||||
|
fsType = "vfat";
|
||||||
|
options = [
|
||||||
|
"fmask=0077"
|
||||||
|
"dmask=0077"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
swapDevices = [
|
||||||
|
{ device = "/dev/disk/by-uuid/bf35a46f-552c-4b37-a68b-c2fcf132f359"; }
|
||||||
|
];
|
||||||
|
|
||||||
|
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||||
|
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||||
|
# still possible to use this option, but it's recommended to use it in conjunction
|
||||||
|
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||||
|
networking.useDHCP = lib.mkDefault true;
|
||||||
|
# networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
|
||||||
|
|
||||||
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
|
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
}
|
49
nixos/machines/crash/machine.nix
Normal file
49
nixos/machines/crash/machine.nix
Normal file
|
@ -0,0 +1,49 @@
|
||||||
|
{ withSystem, inputs, ... }:
|
||||||
|
{
|
||||||
|
# perSystem = { ... }: { config.packages.hello = ...; };
|
||||||
|
|
||||||
|
flake.nixosConfigurations.crash = withSystem "x86_64-linux" (
|
||||||
|
ctx@{ config, inputs', ... }:
|
||||||
|
inputs.nixpkgs.lib.nixosSystem {
|
||||||
|
# Expose `packages`, `inputs` and `inputs'` as module arguments.
|
||||||
|
# Use specialArgs permits use in `imports`.
|
||||||
|
# Note: if you publish modules for reuse, do not rely on specialArgs, but
|
||||||
|
# on the flake scope instead. See also https://flake.parts/define-module-in-separate-file.html
|
||||||
|
specialArgs = {
|
||||||
|
packages = config.packages;
|
||||||
|
inherit inputs inputs';
|
||||||
|
};
|
||||||
|
modules = [
|
||||||
|
(
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
# Hardware support
|
||||||
|
inputs.nixos-hardware.nixosModules.microsoft-surface-common
|
||||||
|
# Our modules
|
||||||
|
(import ../../modules/base.nix { inherit inputs; })
|
||||||
|
(import ./configuration.nix)
|
||||||
|
(import ./hardware.nix)
|
||||||
|
(import ../../modules/user.nix {
|
||||||
|
inherit inputs;
|
||||||
|
mutableUsers = false;
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
nix.settings.experimental-features = [
|
||||||
|
"nix-command"
|
||||||
|
"flakes"
|
||||||
|
];
|
||||||
|
|
||||||
|
}
|
||||||
|
)
|
||||||
|
];
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
Loading…
Add table
Reference in a new issue