nixfmt-rfc-style now

This commit is contained in:
Daylin Morgan 2024-05-06 14:32:00 -05:00
parent 9174ac3198
commit ee519f94c9
Signed by: daylin
GPG key ID: 950D13E9719334AD
49 changed files with 393 additions and 309 deletions

View file

@ -3,10 +3,9 @@
pkgs, pkgs,
enabled, enabled,
... ...
}: { }:
imports = with self.nixosModules; [ {
restic imports = with self.nixosModules; [ restic ];
];
oizys = { oizys = {
languages = [ languages = [
@ -31,14 +30,18 @@
rcloneConfigFile = "/home/daylin/.config/rclone/rclone.conf"; rcloneConfigFile = "/home/daylin/.config/rclone/rclone.conf";
repository = "rclone:g:archives/algiz"; repository = "rclone:g:archives/algiz";
passwordFile = "/home/daylin/.config/restic/algiz-pass"; passwordFile = "/home/daylin/.config/restic/algiz-pass";
paths = ["/home/daylin/services/git/" "/home/daylin/services/gotosocial/" "home/daylin/services/caddy"]; paths = [
"/home/daylin/services/git/"
"/home/daylin/services/gotosocial/"
"home/daylin/services/caddy"
];
}; };
security.sudo.wheelNeedsPassword = false; security.sudo.wheelNeedsPassword = false;
users.users = { users.users = {
daylin = { daylin = {
extraGroups = ["docker"]; extraGroups = [ "docker" ];
}; };
git = { git = {

View file

@ -1,28 +1,28 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ lib, modulesPath, ... }:
{ {
lib, imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
modulesPath,
...
}: {
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
];
boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"]; boot.initrd.availableKernelModules = [
boot.initrd.kernelModules = []; "ahci"
boot.kernelModules = []; "xhci_pci"
boot.extraModulePackages = []; "virtio_pci"
"virtio_scsi"
"sd_mod"
"sr_mod"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ];
boot.extraModulePackages = [ ];
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/70d6dad3-1778-43bf-8f87-76dd7f54c545"; device = "/dev/disk/by-uuid/70d6dad3-1778-43bf-8f87-76dd7f54c545";
fsType = "ext4"; fsType = "ext4";
}; };
swapDevices = [ swapDevices = [ { device = "/dev/disk/by-uuid/a4e4cad9-1844-45dd-9bea-eb77bd71c37b"; } ];
{device = "/dev/disk/by-uuid/a4e4cad9-1844-45dd-9bea-eb77bd71c37b";}
];
# 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
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's

View file

@ -1,8 +1,5 @@
{ lib, enabled, ... }:
{ {
lib,
enabled,
...
}: {
users.motd = lib.mkRune { users.motd = lib.mkRune {
number = "6"; number = "6";
rune = "algiz"; rune = "algiz";
@ -23,15 +20,16 @@
# networking.nameservers = [ "8.8.8.8"]; # networking.nameservers = [ "8.8.8.8"];
# allow tcp connections for revsere proxy # allow tcp connections for revsere proxy
networking.firewall = networking.firewall = enabled // {
enabled allowedTCPPorts = [
// { 80
allowedTCPPorts = [80 443]; 443
}; ];
};
services.openssh = services.openssh = enabled // {
enabled settings.PasswordAuthentication = false;
// {settings.PasswordAuthentication = false;}; };
# users.mutableUsers = false; # users.mutableUsers = false;

View file

@ -1,11 +1,6 @@
{ self, enabled, ... }:
{ {
self, imports = with self.nixosModules; [ nix-ld ];
enabled,
...
}: {
imports = with self.nixosModules; [
nix-ld
];
oizys = { oizys = {
desktop = enabled; desktop = enabled;
@ -19,5 +14,5 @@
windowManager.qtile.enable = true; windowManager.qtile.enable = true;
}; };
users.users.daylin.extraGroups = ["docker"]; users.users.daylin.extraGroups = [ "docker" ];
} }

View file

@ -6,15 +6,24 @@
lib, lib,
modulesPath, modulesPath,
... ...
}: { }:
imports = [ {
(modulesPath + "/installer/scan/not-detected.nix") imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
];
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"]; boot.initrd.availableKernelModules = [
boot.initrd.kernelModules = []; "nvme"
boot.kernelModules = ["kvm-amd" "wl"]; "xhci_pci"
boot.extraModulePackages = [config.boot.kernelPackages.broadcom_sta]; "ahci"
"usbhid"
"usb_storage"
"sd_mod"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [
"kvm-amd"
"wl"
];
boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/47108030-bad4-431a-8fe3-0063accca466"; device = "/dev/disk/by-uuid/47108030-bad4-431a-8fe3-0063accca466";
@ -26,9 +35,7 @@
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = [ swapDevices = [ { device = "/dev/disk/by-uuid/115bc13a-9b09-4790-986c-ab3b434cde69"; } ];
{device = "/dev/disk/by-uuid/115bc13a-9b09-4790-986c-ab3b434cde69";}
];
# 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
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's

View file

@ -4,7 +4,8 @@
enabled, enabled,
mkRune, mkRune,
... ...
}: { }:
{
users.motd = mkRune { users.motd = mkRune {
number = "2"; number = "2";
rune = "mannaz"; rune = "mannaz";
@ -27,31 +28,25 @@
} }
]; ];
hardware.opengl = hardware.opengl = enabled // {
enabled driSupport = true;
// { driSupport32Bit = true;
driSupport = true; extraPackages = with pkgs; [ libGL ];
driSupport32Bit = true; setLdLibraryPath = true;
extraPackages = with pkgs; [ };
libGL
];
setLdLibraryPath = true;
};
# Load nvidia driver for Xorg and Wayland # Load nvidia driver for Xorg and Wayland
services.xserver.videoDrivers = ["nvidia"]; services.xserver.videoDrivers = [ "nvidia" ];
hardware.nvidia = { hardware.nvidia = {
# Modesetting is required. # Modesetting is required.
modesetting = enabled; modesetting = enabled;
# Nvidia power management. Experimental, and can cause sleep/suspend to fail. # Nvidia power management. Experimental, and can cause sleep/suspend to fail.
powerManagement = powerManagement = enabled // {
enabled # Fine-grained power management. Turns off GPU when not in use.
// { # Experimental and only works on modern Nvidia GPUs (Turing or newer).
# Fine-grained power management. Turns off GPU when not in use. finegrained = false;
# Experimental and only works on modern Nvidia GPUs (Turing or newer). };
finegrained = false;
};
# Use the NVidia open source kernel module (not to be confused with the # Use the NVidia open source kernel module (not to be confused with the
# independent third-party "nouveau" open source driver). # independent third-party "nouveau" open source driver).

View file

@ -1,8 +1,5 @@
{ pkgs, enabled, ... }:
{ {
pkgs,
enabled,
...
}: {
oizys = { oizys = {
desktop = enabled; desktop = enabled;
hyprland = enabled; hyprland = enabled;
@ -31,7 +28,10 @@
user = "daylin"; user = "daylin";
repository = "rclone:g:archives/othalan"; repository = "rclone:g:archives/othalan";
passwordFile = "/home/daylin/.config/restic/othalan-pass"; passwordFile = "/home/daylin/.config/restic/othalan-pass";
paths = ["/home/daylin/stuff/" "/home/daylin/dev/"]; paths = [
"/home/daylin/stuff/"
"/home/daylin/dev/"
];
}; };
users.users.daylin.extraGroups = [ users.users.daylin.extraGroups = [

View file

@ -6,15 +6,20 @@
lib, lib,
modulesPath, modulesPath,
... ...
}: { }:
imports = [ {
(modulesPath + "/installer/scan/not-detected.nix") imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
];
boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod"]; boot.initrd.availableKernelModules = [
boot.initrd.kernelModules = []; "xhci_pci"
boot.kernelModules = ["kvm-intel"]; "thunderbolt"
boot.extraModulePackages = []; "nvme"
"usb_storage"
"sd_mod"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/00587bf0-9f7f-4d96-9b8b-cf5024157e2c"; device = "/dev/disk/by-uuid/00587bf0-9f7f-4d96-9b8b-cf5024157e2c";
@ -26,9 +31,7 @@
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = [ swapDevices = [ { device = "/dev/disk/by-uuid/bd64a1ba-f259-4b64-88cd-5585b9345f5a"; } ];
{device = "/dev/disk/by-uuid/bd64a1ba-f259-4b64-88cd-5585b9345f5a";}
];
# 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
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's

View file

@ -1,6 +1,8 @@
{pkgs, ...}: let { pkgs, ... }:
let
notes-git = ''${pkgs.git}/bin/git -C /home/daylin/stuff/notes''; notes-git = ''${pkgs.git}/bin/git -C /home/daylin/stuff/notes'';
in { in
{
systemd.services.notes-bot = { systemd.services.notes-bot = {
description = "auto commit changes to notes"; description = "auto commit changes to notes";
serviceConfig = { serviceConfig = {
@ -13,7 +15,7 @@ in {
}; };
systemd.timers.notes-bot-timer = { systemd.timers.notes-bot-timer = {
description = "run notes commit service"; description = "run notes commit service";
wantedBy = ["timers.target"]; wantedBy = [ "timers.target" ];
timerConfig = { timerConfig = {
OnCalendar = "daily"; OnCalendar = "daily";
Persistent = true; Persistent = true;

View file

@ -3,11 +3,14 @@
enabled, enabled,
mkRune, mkRune,
... ...
}: { }:
{
networking.networkmanager = enabled; networking.networkmanager = enabled;
services.printing = enabled; services.printing = enabled;
services.fwupd = enabled; services.fwupd = enabled;
hardware.bluetooth = enabled // {powerOnBoot = true;}; hardware.bluetooth = enabled // {
powerOnBoot = true;
};
# https://github.com/NixOS/nixos-hardware/blob/c478b3d56969006e015e55aaece4931f3600c1b2/lenovo/thinkpad/x1/9th-gen/default.nix # https://github.com/NixOS/nixos-hardware/blob/c478b3d56969006e015e55aaece4931f3600c1b2/lenovo/thinkpad/x1/9th-gen/default.nix
# https://github.com/NixOS/nixos-hardware/blob/c478b3d56969006e015e55aaece4931f3600c1b2/common/pc/ssd/default.nix # https://github.com/NixOS/nixos-hardware/blob/c478b3d56969006e015e55aaece4931f3600c1b2/common/pc/ssd/default.nix
@ -15,17 +18,15 @@
# rtkit is optional but recommended # rtkit is optional but recommended
security.rtkit = enabled; security.rtkit = enabled;
services.pipewire = services.pipewire = enabled // {
enabled audio = enabled;
// { pulse = enabled;
audio = enabled; alsa = enabled // {
pulse = enabled; support32Bit = true;
alsa = enabled // {support32Bit = true;};
}; };
};
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [ pamixer ];
pamixer
];
services.getty = { services.getty = {
greetingLine = mkRune { greetingLine = mkRune {
@ -48,11 +49,9 @@
boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_latest; boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_latest;
boot.loader = { boot.loader = {
systemd-boot = systemd-boot = enabled // {
enabled consoleMode = "max";
// { };
consoleMode = "max";
};
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;
}; };

View file

@ -1,57 +1,78 @@
inputs: let inputs:
let
inherit (inputs) nixpkgs self; inherit (inputs) nixpkgs self;
lib = nixpkgs.lib.extend (import ./extended.nix); lib = nixpkgs.lib.extend (import ./extended.nix);
inherit (builtins) mapAttrs readDir filter listToAttrs; inherit (builtins)
inherit (lib) nixosSystem genAttrs isNixFile mkDefaultOizysModule mkOizysModule enabled mkRune; mapAttrs
readDir
filter
listToAttrs
;
inherit (lib)
nixosSystem
genAttrs
isNixFile
mkDefaultOizysModule
mkOizysModule
enabled
mkRune
;
inherit (lib.filesystem) listFilesRecursive; inherit (lib.filesystem) listFilesRecursive;
inherit (import ./find-modules.nix {inherit lib;}) findModulesList; inherit (import ./find-modules.nix { inherit lib; }) findModulesList;
#supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"]; #supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"];
supportedSystems = ["x86_64-linux"]; supportedSystems = [ "x86_64-linux" ];
in rec { in
forAllSystems = f: genAttrs supportedSystems (system: f (import nixpkgs {inherit system;})); rec {
forAllSystems = f: genAttrs supportedSystems (system: f (import nixpkgs { inherit system; }));
nixosModules = listToAttrs (findModulesList ../modules); nixosModules = listToAttrs (findModulesList ../modules);
mkSystem = hostname: mkSystem =
hostname:
nixosSystem { nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = modules = [
[ ../modules/oizys.nix
../modules/oizys.nix ../overlays
../overlays ] ++ filter isNixFile (listFilesRecursive (../. + "/hosts/${hostname}"));
]
++ filter
isNixFile
(listFilesRecursive (../. + "/hosts/${hostname}"));
specialArgs = {inherit inputs lib self mkDefaultOizysModule mkOizysModule enabled mkRune;}; specialArgs = {
inherit
inputs
lib
self
mkDefaultOizysModule
mkOizysModule
enabled
mkRune
;
};
}; };
oizysHosts = mapAttrs (name: _: mkSystem name) (readDir ../hosts); oizysHosts = mapAttrs (name: _: mkSystem name) (readDir ../hosts);
oizysPkg = forAllSystems ( oizysPkg = forAllSystems (pkgs: rec {
pkgs: rec { oizys-zig = pkgs.callPackage ../pkgs/oizys/oizys-zig { zig2nix = inputs.zig2nix; };
oizys-zig = pkgs.callPackage ../pkgs/oizys/oizys-zig {zig2nix = inputs.zig2nix;}; oizys-nim = pkgs.callPackage ../pkgs/oizys/oizys-nim { };
oizys-nim = pkgs.callPackage ../pkgs/oizys/oizys-nim {}; oizys-rs = pkgs.callPackage ../pkgs/oizys/oizys-rs { };
oizys-rs = pkgs.callPackage ../pkgs/oizys/oizys-rs {}; oizys-go = pkgs.callPackage ../pkgs/oizys/oizys-go { };
oizys-go = pkgs.callPackage ../pkgs/oizys/oizys-go {}; default = oizys-go;
default = oizys-go; });
} devShells = forAllSystems (pkgs: {
); default = pkgs.mkShell {
devShells = forAllSystems ( packages = with pkgs; [
pkgs: { git
default = pkgs.mkShell { deadnix
packages = with pkgs; [git deadnix]; ];
}; };
} });
);
oizysFlake = { oizysFlake = {
nixosModules = nixosModules; nixosModules = nixosModules;
nixosConfigurations = oizysHosts; nixosConfigurations = oizysHosts;
packages = oizysPkg; packages = oizysPkg;
devShells = devShells; devShells = devShells;
formatter = forAllSystems (pkgs: pkgs.alejandra); formatter = forAllSystems (pkgs: pkgs.nixfmt-rfc-style);
}; };
} }

View file

@ -1,32 +1,49 @@
final: prev: let final: prev:
inherit (final) hasSuffix mkEnableOption mkIf mkOption types; let
inherit (final)
hasSuffix
mkEnableOption
mkIf
mkOption
types
;
runes = import ../modules/runes; runes = import ../modules/runes;
in rec { in
enabled = {enable = true;}; rec {
disabled = {enable = false;}; enabled = {
enable = true;
};
disabled = {
enable = false;
};
# ["a" "b"] -> {a.enable = true; b.enable = true;} # ["a" "b"] -> {a.enable = true; b.enable = true;}
enableAttrs = attrs: enableAttrs =
builtins.listToAttrs (map (attr: { attrs:
builtins.listToAttrs (
map (attr: {
name = attr; name = attr;
value = enabled; value = enabled;
}) }) attrs
attrs); );
# ["a" "b"] -> {a.enable = false; b.enable = false;} # ["a" "b"] -> {a.enable = false; b.enable = false;}
disableAttrs = attrs: disableAttrs =
builtins.listToAttrs (map (attr: { attrs:
builtins.listToAttrs (
map (attr: {
name = attr; name = attr;
value = disabled; value = disabled;
}) }) attrs
attrs); );
isNixFile = path: hasSuffix ".nix" path; isNixFile = path: hasSuffix ".nix" path;
mkIfIn = name: list: prev.mkIf (builtins.elem name list); mkIfIn = name: list: prev.mkIf (builtins.elem name list);
mkRune = { mkRune =
rune, {
number ? "6", rune,
runeKind ? "braille", number ? "6",
}: runeKind ? "braille",
}:
"[1;3${number}m\n" + runes.${rune}.${runeKind} + "\n"; "[1;3${number}m\n" + runes.${rune}.${runeKind} + "\n";
mkOizysModule = config: attr: content: { mkOizysModule = config: attr: content: {

View file

@ -1,25 +1,39 @@
{...}: let { ... }:
inherit (builtins) concatLists attrValues mapAttrs elemAt match readDir; let
in rec { inherit (builtins)
concatLists
attrValues
mapAttrs
elemAt
match
readDir
;
in
rec {
# https://github.com/balsoft/nixos-config/blob/73cc2c3a8bb62a9c3980a16ae70b2e97af6e1abd/flake.nix#L109-L120 # https://github.com/balsoft/nixos-config/blob/73cc2c3a8bb62a9c3980a16ae70b2e97af6e1abd/flake.nix#L109-L120
findModulesList = dir: findModulesList =
concatLists (attrValues (mapAttrs dir:
(name: type: concatLists (
if type == "regular" attrValues (
then [ mapAttrs (
{ name: type:
name = elemAt (match "(.*)\\.nix" name) 0; if type == "regular" then
value = dir + "/${name}"; [
} {
] name = elemAt (match "(.*)\\.nix" name) 0;
else if value = dir + "/${name}";
(readDir (dir + "/${name}")) }
? "default.nix" ]
then [ else if (readDir (dir + "/${name}")) ? "default.nix" then
{ [
inherit name; {
value = dir + "/${name}"; inherit name;
} value = dir + "/${name}";
] }
else findModulesList (dir + "/${name}")) (readDir dir))); ]
else
findModulesList (dir + "/${name}")
) (readDir dir)
)
);
} }

View file

@ -3,13 +3,15 @@
config, config,
lib, lib,
... ...
}: let }:
let
inherit (lib) mkIf; inherit (lib) mkIf;
in { in
{
config = mkIf config.oizys.desktop.enable { config = mkIf config.oizys.desktop.enable {
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
(nerdfonts.override {fonts = ["FiraCode"];}) (nerdfonts.override { fonts = [ "FiraCode" ]; })
recursive recursive
]; ];
}; };

View file

@ -4,9 +4,11 @@
config, config,
lib, lib,
... ...
}: let }:
let
inherit (lib) mkIf; inherit (lib) mkIf;
in { in
{
config = mkIf config.oizys.desktop.enable { config = mkIf config.oizys.desktop.enable {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
wezterm wezterm
@ -23,7 +25,7 @@ in {
hunspell # spell check for libreoffice hunspell # spell check for libreoffice
(catppuccin-gtk.override { (catppuccin-gtk.override {
accents = ["rosewater"]; accents = [ "rosewater" ];
variant = "mocha"; variant = "mocha";
}) })

View file

@ -3,15 +3,21 @@
config, config,
lib, lib,
... ...
}: let }:
let
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = config.services.xserver.windowManager.qtile; cfg = config.services.xserver.windowManager.qtile;
lock = pkgs.writeShellApplication { lock = pkgs.writeShellApplication {
name = "lock"; name = "lock";
runtimeInputs = with pkgs; [i3lock-color figlet procps]; runtimeInputs = with pkgs; [
i3lock-color
figlet
procps
];
text = builtins.readFile ./lock.sh; text = builtins.readFile ./lock.sh;
}; };
in { in
{
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
xss-lock xss-lock
@ -19,9 +25,9 @@ in {
]; ];
systemd.services.i3lock = { systemd.services.i3lock = {
wantedBy = ["sleep.target"]; wantedBy = [ "sleep.target" ];
description = "Lock the screen using a custom lock script"; description = "Lock the screen using a custom lock script";
before = ["suspend.target"]; before = [ "suspend.target" ];
serviceConfig = { serviceConfig = {
User = "daylin"; User = "daylin";
Type = "forking"; Type = "forking";

View file

@ -15,12 +15,10 @@
# ''; # '';
# }; # };
mkOizysModule config "hyprland" { mkOizysModule config "hyprland" {
programs.hyprland = programs.hyprland = enabled // {
enabled package = inputs.hyprland.packages.${pkgs.system}.default;
// { };
package = inputs.hyprland.packages.${pkgs.system}.default; security.pam.services.swaylock = { };
};
security.pam.services.swaylock = {};
# Optional, hint electron apps to use wayland: # Optional, hint electron apps to use wayland:
environment.sessionVariables.NIXOS_OZONE_WL = "1"; environment.sessionVariables.NIXOS_OZONE_WL = "1";

View file

@ -3,10 +3,12 @@
config, config,
lib, lib,
... ...
}: let }:
let
inherit (lib) mkIf; inherit (lib) mkIf;
cfg = config.services.xserver.windowManager.qtile; cfg = config.services.xserver.windowManager.qtile;
in { in
{
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
brightnessctl brightnessctl

View file

@ -1,11 +1,6 @@
{ pkgs, self, ... }:
{ {
pkgs, imports = with self.nixosModules; [ git ];
self,
...
}: {
imports = with self.nixosModules; [
git
];
programs.zsh.enable = true; programs.zsh.enable = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
tmux tmux

View file

@ -1,4 +1,5 @@
{pkgs, ...}: { { pkgs, ... }:
{
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
git git
git-lfs git-lfs

View file

@ -1,4 +1,5 @@
{pkgs, ...}: { { pkgs, ... }:
{
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
vim vim
neovim neovim

View file

@ -3,9 +3,11 @@
lib, lib,
config, config,
... ...
}: let }:
let
inherit (lib) mkIf; inherit (lib) mkIf;
in { in
{
config = mkIf config.oizys.desktop.enable { config = mkIf config.oizys.desktop.enable {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# vscode # vscode

View file

@ -1,13 +1,27 @@
{lib, ...}: let { lib, ... }:
inherit (lib) mkOption types literalExpression mdDoc; let
in { inherit (lib)
imports = [./nim.nix ./tex.nix ./misc.nix ./node.nix ./python.nix ./zig.nix]; mkOption
types
literalExpression
mdDoc
;
in
{
imports = [
./nim.nix
./tex.nix
./misc.nix
./node.nix
./python.nix
./zig.nix
];
options.oizys.languages = mkOption { options.oizys.languages = mkOption {
type = with types; (listOf str); type = with types; (listOf str);
description = mdDoc '' description = mdDoc ''
List of programming languages to enable. List of programming languages to enable.
''; '';
default = []; default = [ ];
example = literalExpression '' example = literalExpression ''
[ [
"python" "python"

View file

@ -3,10 +3,12 @@
lib, lib,
pkgs, pkgs,
... ...
}: let }:
let
inherit (lib) mkIfIn; inherit (lib) mkIfIn;
cfg = config.oizys.languages; cfg = config.oizys.languages;
in { in
{
config = mkIfIn "misc" cfg { config = mkIfIn "misc" cfg {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
go go

View file

@ -3,10 +3,12 @@
lib, lib,
pkgs, pkgs,
... ...
}: let }:
let
inherit (lib) mkIfIn; inherit (lib) mkIfIn;
cfg = config.oizys.languages; cfg = config.oizys.languages;
in { in
{
config = mkIfIn "nim" cfg { config = mkIfIn "nim" cfg {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
nim nim

View file

@ -3,10 +3,12 @@
lib, lib,
pkgs, pkgs,
... ...
}: let }:
let
inherit (lib) mkIfIn; inherit (lib) mkIfIn;
cfg = config.oizys.languages; cfg = config.oizys.languages;
in { in
{
config = mkIfIn "node" cfg { config = mkIfIn "node" cfg {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
nodejs nodejs

View file

@ -3,15 +3,19 @@
lib, lib,
pkgs, pkgs,
... ...
}: let }:
let
inherit (lib) mkIfIn; inherit (lib) mkIfIn;
cfg = config.oizys.languages; cfg = config.oizys.languages;
in { in
{
config = mkIfIn "python" cfg { config = mkIfIn "python" cfg {
environment.systemPackages = let environment.systemPackages =
python = pkgs.python3.withPackages (ps: with ps; [pip]); let
in python = pkgs.python3.withPackages (ps: with ps; [ pip ]);
with pkgs; [ in
with pkgs;
[
# https://github.com/Mic92/nix-ld?tab=readme-ov-file#my-pythonnodejsrubyinterpreter-libraries-do-not-find-the-libraries-configured-by-nix-ld # https://github.com/Mic92/nix-ld?tab=readme-ov-file#my-pythonnodejsrubyinterpreter-libraries-do-not-find-the-libraries-configured-by-nix-ld
(pkgs.writeShellScriptBin "python" '' (pkgs.writeShellScriptBin "python" ''
export LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH export LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH
@ -23,7 +27,7 @@ in {
exec ${python}/bin/python "$@" exec ${python}/bin/python "$@"
'') '')
(python3.withPackages (ps: with ps; [pip])) (python3.withPackages (ps: with ps; [ pip ]))
micromamba micromamba
pixi pixi
]; ];

View file

@ -3,13 +3,13 @@
lib, lib,
pkgs, pkgs,
... ...
}: let }:
let
inherit (lib) mkIfIn; inherit (lib) mkIfIn;
cfg = config.oizys.languages; cfg = config.oizys.languages;
in { in
{
config = mkIfIn "tex" cfg { config = mkIfIn "tex" cfg {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [ texlive.combined.scheme-full ];
texlive.combined.scheme-full
];
}; };
} }

View file

@ -4,13 +4,18 @@
lib, lib,
pkgs, pkgs,
... ...
}: let }:
let
inherit (lib) mkIfIn; inherit (lib) mkIfIn;
cfg = config.oizys.languages; cfg = config.oizys.languages;
zig = inputs.zig2nix.outputs.packages.${pkgs.system}.zig.master.bin; zig = inputs.zig2nix.outputs.packages.${pkgs.system}.zig.master.bin;
zls = inputs.zls.outputs.packages.${pkgs.system}.default; zls = inputs.zls.outputs.packages.${pkgs.system}.default;
in { in
{
config = mkIfIn "zig" cfg { config = mkIfIn "zig" cfg {
environment.systemPackages = [zig zls]; environment.systemPackages = [
zig
zls
];
}; };
} }

View file

@ -5,7 +5,10 @@
... ...
}: }:
mkOizysModule config "vpn" { mkOizysModule config "vpn" {
environment.systemPackages = with pkgs; [openconnect openvpn]; environment.systemPackages = with pkgs; [
openconnect
openvpn
];
services.openvpn.servers = { services.openvpn.servers = {
express-ny = { express-ny = {

View file

@ -3,10 +3,12 @@
lib, lib,
config, config,
... ...
}: let }:
let
inherit (lib) mkEnableOption mkIf; inherit (lib) mkEnableOption mkIf;
cfg = config.oizys.nix-ld; cfg = config.oizys.nix-ld;
in { in
{
options.oizys.nix-ld.enable = mkEnableOption "enable nix-ld support"; options.oizys.nix-ld.enable = mkEnableOption "enable nix-ld support";
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.nix-ld.enable = true; programs.nix-ld.enable = true;

View file

@ -3,10 +3,9 @@
self, self,
pkgs, pkgs,
... ...
}: { }:
imports = [ {
inputs.nix-index-database.nixosModules.nix-index imports = [ inputs.nix-index-database.nixosModules.nix-index ];
];
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nix.package = pkgs.nixVersions.latest; nix.package = pkgs.nixVersions.latest;
@ -34,7 +33,7 @@
programs.command-not-found.enable = false; programs.command-not-found.enable = false;
nix.settings = { nix.settings = {
trusted-users = ["@wheel"]; trusted-users = [ "@wheel" ];
accept-flake-config = true; accept-flake-config = true;
# substituters = [ # substituters = [

View file

@ -1,10 +1,8 @@
{ { lib, self, ... }:
lib, let
self,
...
}: let
inherit (lib) mkEnableOption; inherit (lib) mkEnableOption;
in { in
{
imports = with self.nixosModules; [ imports = with self.nixosModules; [
users users
nix nix

View file

@ -22,16 +22,8 @@ mkOizysModule config "chrome" {
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
(chromium.override { (chromium.override { commandLineArgs = [ "--force-dark-mode" ]; })
commandLineArgs = [
"--force-dark-mode"
];
})
(google-chrome.override { (google-chrome.override { commandLineArgs = [ "--force-dark-mode" ]; })
commandLineArgs = [
"--force-dark-mode"
];
})
]; ];
} }

View file

@ -1,5 +1,6 @@
{ {
braille = '' braille = ''

View file

@ -1,5 +1,6 @@
{ {
braille = '' braille = ''

View file

@ -1,4 +1,5 @@
{...}: { { ... }:
{
programs.gnupg.agent = { programs.gnupg.agent = {
enable = true; enable = true;
enableSSHSupport = true; enableSSHSupport = true;

View file

@ -5,7 +5,7 @@
... ...
}: }:
mkOizysModule config "backups" { mkOizysModule config "backups" {
environment.systemPackages = with pkgs; [rclone]; environment.systemPackages = with pkgs; [ rclone ];
services.restic.backups.gdrive = { services.restic.backups.gdrive = {
# BUG: if .conda/environments.txt doesn't exist then this won't work # BUG: if .conda/environments.txt doesn't exist then this won't work

View file

@ -3,10 +3,12 @@
lib, lib,
pkgs, pkgs,
... ...
}: let }:
let
inherit (lib) mkOption mkIf types; inherit (lib) mkOption mkIf types;
cfg = config.users.defaultUser; cfg = config.users.defaultUser;
in { in
{
options.users.defaultUser = mkOption { options.users.defaultUser = mkOption {
default = true; default = true;
type = types.bool; type = types.bool;

View file

@ -6,7 +6,5 @@
}: }:
mkOizysModule config "docker" { mkOizysModule config "docker" {
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [ lazydocker ];
lazydocker
];
} }

View file

@ -1,11 +1,7 @@
{ { config, mkOizysModule, ... }:
config,
mkOizysModule,
...
}:
mkOizysModule config "vbox" { mkOizysModule config "vbox" {
virtualisation.virtualbox = { virtualisation.virtualbox = {
host.enable = true; host.enable = true;
}; };
users.extraGroups.vboxusers.members = ["daylin"]; users.extraGroups.vboxusers.members = [ "daylin" ];
} }

View file

@ -1,25 +1,21 @@
{inputs, ...}: let { inputs, ... }:
let
defaultOverlays = defaultOverlays =
# execute and import all overlay files in the current # execute and import all overlay files in the current
# directory with the given args # directory with the given args
builtins.map builtins.map
# execute and import the overlay file # execute and import the overlay file
(f: (import (./. + "/${f}") {inherit inputs;})) (f: (import (./. + "/${f}") { inherit inputs; }))
# find all overlay files in the current directory # find all overlay files in the current directory
(builtins.filter (builtins.filter (f: f != "default.nix") (builtins.attrNames (builtins.readDir ./.)));
(f: f != "default.nix") in
(builtins.attrNames (builtins.readDir ./.))); {
in { nixpkgs.overlays = defaultOverlays ++ [
nixpkgs.overlays = (final: _prev: {
defaultOverlays stable = import inputs.stable {
++ [ system = final.system;
( config.allowUnfree = true;
final: _prev: { };
stable = import inputs.stable { })
system = final.system; ];
config.allowUnfree = true;
};
}
)
];
} }

View file

@ -1,4 +1,5 @@
{...}: (final: prev: { { ... }:
(final: prev: {
nim-atlas = prev.nim-atlas.overrideNimAttrs { nim-atlas = prev.nim-atlas.overrideNimAttrs {
version = "unstable"; version = "unstable";
src = final.fetchFromGitHub { src = final.fetchFromGitHub {

View file

@ -1,8 +1,9 @@
{...}: (final: prev: { { ... }:
(final: prev: {
nimble = prev.nimble.overrideNimAttrs { nimble = prev.nimble.overrideNimAttrs {
version = "0.14.2-5e7901760e89108476a4e21976a0ef783403e8fe"; version = "0.14.2-5e7901760e89108476a4e21976a0ef783403e8fe";
requiredNimVersion = 2; requiredNimVersion = 2;
buildInputs = [prev.pkgs.openssl]; buildInputs = [ prev.pkgs.openssl ];
src = final.fetchFromGitHub { src = final.fetchFromGitHub {
owner = "nim-lang"; owner = "nim-lang";

View file

@ -1,4 +1,5 @@
{...}: (final: prev: { { ... }:
(final: prev: {
nimlsp = prev.nimlsp.overrideNimAttrs { nimlsp = prev.nimlsp.overrideNimAttrs {
requiredNimVersion = 2; requiredNimVersion = 2;
nimFlags = [ nimFlags = [

View file

@ -12,7 +12,7 @@ buildGoModule {
src = lib.cleanSource ./.; src = lib.cleanSource ./.;
vendorHash = "sha256-Fcq8p/YItF5lx82PRg1/tksV7iCIS0xZZVWdpE3e7F0="; vendorHash = "sha256-Fcq8p/YItF5lx82PRg1/tksV7iCIS0xZZVWdpE3e7F0=";
nativeBuildInputs = [installShellFiles]; nativeBuildInputs = [ installShellFiles ];
postInstall = '' postInstall = ''
installShellCompletion --cmd oizys \ installShellCompletion --cmd oizys \

View file

@ -1,4 +1,4 @@
{buildNimPackage}: { buildNimPackage }:
buildNimPackage { buildNimPackage {
pname = "oizys"; pname = "oizys";
version = "unstable"; version = "unstable";

View file

@ -11,8 +11,8 @@ rustPlatform.buildRustPackage {
lockFile = ./Cargo.lock; lockFile = ./Cargo.lock;
}; };
nativeBuildInputs = [installShellFiles]; nativeBuildInputs = [ installShellFiles ];
buildInputs = [nix-output-monitor]; buildInputs = [ nix-output-monitor ];
postInstall = '' postInstall = ''
installShellCompletion --cmd oizys \ installShellCompletion --cmd oizys \

View file

@ -6,8 +6,8 @@
}: }:
(zig2nix.outputs.zig-env.${pkgs.system} { (zig2nix.outputs.zig-env.${pkgs.system} {
zig = zig2nix.outputs.packages.${pkgs.system}.zig.master.bin; zig = zig2nix.outputs.packages.${pkgs.system}.zig.master.bin;
}) }).package
.package { {
name = "oizys"; name = "oizys";
src = lib.cleanSource ./.; src = lib.cleanSource ./.;
} }