run format

This commit is contained in:
Natalie Marks 2025-05-28 12:06:37 -07:00
parent 800f63b000
commit 40840a8084
No known key found for this signature in database
GPG key ID: 61F4EAEB0C9C3D5F
15 changed files with 661 additions and 614 deletions

View file

@ -595,6 +595,7 @@
"nixpkgs": "nixpkgs_2",
"nvf": "nvf",
"rust-overlay": "rust-overlay_2",
"zen-browser": "zen-browser",
"zig": "zig",
"zls": "zls"
}
@ -845,6 +846,26 @@
"type": "github"
}
},
"zen-browser": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1748059546,
"narHash": "sha256-e0jy8RU8ofOdeS5gF9Hir+M5Wn0q7D8MkpeQXsOJdu4=",
"owner": "youwen5",
"repo": "zen-browser-flake",
"rev": "716a5af28d686d67146d01b14112c919b6133a84",
"type": "github"
},
"original": {
"owner": "youwen5",
"repo": "zen-browser-flake",
"type": "github"
}
},
"zig": {
"inputs": {
"flake-compat": "flake-compat",

View file

@ -29,6 +29,10 @@
moonlight.url = "github:moonlight-mod/moonlight"; # Add `/develop` to the flake URL to use nightly.
moonlight.inputs.nixpkgs.follows = "nixpkgs";
zen-browser = {
url = "github:youwen5/zen-browser-flake";
inputs.nixpkgs.follows = "nixpkgs";
};
nh.url = "github:viperML/nh";
nh.inputs.nixpkgs.follows = "nixpkgs";
@ -37,13 +41,15 @@
nix-index-database.url = "github:nix-community/nix-index-database";
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
};
outputs = {
outputs =
{
self,
nixpkgs,
lix-module,
darwin,
...
} @ inputs: let
}@inputs:
let
lib = nixpkgs.lib;
# TODO: apply these overlays sooner and remove uses of legacyPackages elsewhere.
overlays = [
@ -69,7 +75,8 @@
"x86_64-linux"
"aarch64-darwin"
];
forAllSystems = f:
forAllSystems =
f:
builtins.listToAttrs (
builtins.map (system: {
name = system;
@ -80,8 +87,7 @@
pkgs = nixpkgs.legacyPackages.${system};
}
);
})
systems
}) systems
);
mkSystem = import ./lib/mkSystem.nix {
@ -101,12 +107,13 @@
inputs
;
};
in rec {
in
rec {
inherit self;
# "nix fmt"
formatter = forAllSystems (inputs: inputs.pkgs.nixfmt-tree);
packages = forAllSystems (
{system, ...}:
{ system, ... }:
{
nvim-chloe = mkNeovim "chloe" system;
nvim-natalie = mkNeovim "natalie" system;
@ -148,9 +155,11 @@
# generate checks for "nix flake check --all-systems --no-build"
checks.aarch64-darwin = builtins.listToAttrs (
builtins.map (
name: let
name:
let
d = darwinConfigurations.${name}.system;
in {
in
{
name = "darwinConfiguration-" + d.name;
value = d;
}

View file

@ -4,7 +4,9 @@
# TODO: apply overlays here
overlays,
inputs,
}: user: system: let
}:
user: system:
let
darwin = nixpkgs.lib.strings.hasSuffix "-darwin" system;
host = {
@ -15,7 +17,7 @@
userDir = ../users + "/${user}";
userConfig = import (userDir + "/user.nix");
in
(inputs.nvf.lib.neovimConfiguration {
(inputs.nvf.lib.neovimConfiguration {
pkgs = nixpkgs.legacyPackages.${system};
modules = builtins.filter (f: f != null) [
(../users + ("/" + user + "/vim.nix"))
@ -26,4 +28,4 @@ in
flake = self;
user = userConfig;
};
}).neovim
}).neovim

View file

@ -8,12 +8,12 @@
host,
mainHomeImports,
...
}: let
}:
let
cfg = config.programs;
in {
imports =
mainHomeImports
++ [
in
{
imports = mainHomeImports ++ [
./macos/sketchybar.nix
];
programs = {
@ -80,7 +80,7 @@ in {
}
];
shellAliases =
{}
{ }
// lib.optionalAttrs (!host.darwin) {
reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now";
};

View file

@ -4,13 +4,16 @@
config,
host,
...
}: {
}:
{
home.file =
{}
{ }
// lib.optionalAttrs host.darwin (
lib.attrsets.mapAttrs (file: value: (
lib.attrsets.overrideExisting value {enable = config.shared.darwin.tiling.enable;}
)) {
lib.attrsets.mapAttrs
(
file: value: (lib.attrsets.overrideExisting value { enable = config.shared.darwin.tiling.enable; })
)
{
sketchybarrc = {
executable = true;
target = ".config/sketchybar/sketchybarrc";

View file

@ -4,9 +4,11 @@
pkgs,
lib,
...
}: let
}:
let
tiling = config.shared.darwin.tiling.enable;
in {
in
{
# Use touchid or watch to activate sudo
security.pam.services.sudo_local = {
enable = true;

View file

@ -1,4 +1,5 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
services = {
avahi = {
enable = true;
@ -40,7 +41,7 @@
# Enable CUPS to print documents.
printing = {
enable = true;
drivers = [pkgs.brlaser]; # Brother printer driver
drivers = [ pkgs.brlaser ]; # Brother printer driver
};
pipewire = {
@ -55,7 +56,7 @@
openssh = {
enable = true;
ports = [22];
ports = [ 22 ];
settings = {
PasswordAuthentication = true;
UseDns = true;

View file

@ -1,4 +1,5 @@
{inputs, ...}: {
{ inputs, ... }:
{
nixpkgs.config = {
allowUnfree = true;
};

View file

@ -3,7 +3,8 @@
user,
host,
...
}: {
}:
{
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix
@ -17,7 +18,7 @@
enable = true;
# Certain features, including CLI integration and system authentication support,
# require enabling PolKit integration on some desktop environments (e.g. Plasma).
polkitPolicyOwners = [user.username];
polkitPolicyOwners = [ user.username ];
};
noisetorch.enable = true;
@ -34,7 +35,7 @@
steam = {
enable = true;
package = with pkgs; steam.override {extraPkgs = pkgs: [attr];};
package = with pkgs; steam.override { extraPkgs = pkgs: [ attr ]; };
};
git = {
@ -58,7 +59,7 @@
xdg.portal = {
enable = true;
extraPortals = with pkgs; [xdg-desktop-portal-gtk];
extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
};
virtualisation = {
containers.enable = true;
@ -83,14 +84,14 @@
hybrid-sleep.enable = false;
};
services.monitord.wantedBy = ["multi-user.target"];
services.monitord.wantedBy = [ "multi-user.target" ];
};
i18n = {
# Select internationalisation properties.
defaultLocale = "en_US.UTF-8";
supportedLocales = ["all"];
supportedLocales = [ "all" ];
extraLocaleSettings = {
LC_ADDRESS = "en_US.UTF-8";
@ -170,7 +171,7 @@
};
interfaces.enp11s0.wakeOnLan = {
enable = true;
policy = ["magic"];
policy = [ "magic" ];
};
};

View file

@ -8,6 +8,7 @@
...
}:
{
programs.mangohud.enable = true;
home = {
stateVersion = "23.05"; # Please read the comment before changing.
@ -29,6 +30,7 @@
wineWowPackages.stable
winetricks
(prismlauncher.override { gamemodeSupport = true; })
umu-launcher
#window manager stuff
wofi
@ -50,8 +52,8 @@
signal-desktop
inputs.zls.packages.x86_64-linux.zls
rust-bin.stable.latest.default
inputs.zen-browser.packages.x86_64-linux.default
];
# programs.mangohud.enable = true;
};
# xdg.mimeApps.defaultApplications."inode/directory" = "dolphin.desktop";

View file

@ -2,7 +2,8 @@
pkgs,
lib,
...
} @ args: {
}@args:
{
programs = {
# sort-lines:start
atuin.enable = true;

View file

@ -1,4 +1,5 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [
pinentry_mac
];
@ -6,7 +7,7 @@
# Custom configuration modules in "modules" are shared between users,
# and can be configured in this "shared" namespace
shared.darwin = {
macAppStoreApps = ["wireguard"];
macAppStoreApps = [ "wireguard" ];
};
# Create /etc/zshrc that loads the nix-darwin environment.

View file

@ -1,4 +1,5 @@
{...}: {
{ ... }:
{
imports = [
./keybinds.nix
./languages.nix

View file

@ -1,4 +1,5 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
vim = {
lazy.plugins."lean.nvim" = {
enabled = true;

View file

@ -1,4 +1,5 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
vim = {
visuals = {
indent-blankline = {