nix/config
2
0
Fork 0
Code Issues 5 Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of paperclover.dev:nix/config

Browse source
This commit is contained in:
Natalie Marks 2025-08-02 14:38:29 -07:00
commit b0b81115da
No known key found for this signature in database
GPG key ID: 61F4EAEB0C9C3D5F
12 changed files with 154 additions and 188 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
flake.lock
View file

@ -15,11 +15,11 @@
"sf-pro": "sf-pro" "sf-pro": "sf-pro"
}, },
"locked": { "locked": {
"lastModified": 1748299691, "lastModified": 1752383772,
"narHash": "sha256-HMlx5HzeOOhpewq3y9UaSMP9AkhEo+AFJHZIWLQvJGw=", "narHash": "sha256-I5Y0gUJS85lGEuuKr+tKSRUpJWeKavE+WmiAHRcyBaU=",
"owner": "Lyndeno", "owner": "Lyndeno",
"repo": "apple-fonts.nix", "repo": "apple-fonts.nix",
"rev": "ec51ae2e8ba89adbb5188c40aa262a7418c48b00", "rev": "875c694d7f0ec2020d7511264907a1f0e3262931",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -89,11 +89,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749398372, "lastModified": 1753121425,
"narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -257,11 +257,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752093218, "lastModified": 1753943136,
"narHash": "sha256-+3rXu8ewcNDi65/2mKkdSGrivQs5zEZVp5aYszXC0d0=", "narHash": "sha256-eiEE5SabVcIlGSTRcRyBjmJMaYAV95SJnjy8YSsVeW4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "206ed3c71418b52e176f16f58805c96e84555320", "rev": "bd82507edd860c453471c46957cbbe3c9fd01b5c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -306,11 +306,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752099881, "lastModified": 1753293216,
"narHash": "sha256-mn6f4ci5C2jkyxgmBHQ4dI9V0/20DlyS6EbQz4w7znc=", "narHash": "sha256-4hAm9PYNHAsR3MxH8MhSZt7mTiR8MlhyQilLJEPdaZs=",
"owner": "moonlight-mod", "owner": "moonlight-mod",
"repo": "moonlight", "repo": "moonlight",
"rev": "dbef0c38e1c0066de5ec35a4d4219026b1bd7010", "rev": "297a1b57c14ff18890382b2fe89f493ba349a730",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -319,26 +319,6 @@
"type": "github" "type": "github"
} }
}, },
"nh": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1751375534,
"narHash": "sha256-9z1W64dDVtVxqgPzUbjIQqRfygg1hdivUOZ6d/H+yFg=",
"owner": "viperML",
"repo": "nh",
"rev": "d0abb8eebe32f79ce4659e68dd777cf497a5d3d2",
"type": "github"
},
"original": {
"owner": "viperML",
"repo": "nh",
"type": "github"
}
},
"nix-index-database": { "nix-index-database": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -346,11 +326,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1751774635, "lastModified": 1753589988,
"narHash": "sha256-DuOznGdgMxeSlPpUu6Wkq0ZD5e2Cfv9XRZeZlHWMd1s=", "narHash": "sha256-y1JlcMB2dKFkrr6g+Ucmj8L//IY09BtSKTH/A7OU7mU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "85686025ba6d18df31cc651a91d5adef63378978", "rev": "f0736b09c43028fd726fb70c3eb3d1f0795454cf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -397,11 +377,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1751984180, "lastModified": 1753694789,
"narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -453,11 +433,11 @@
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1753085278, "lastModified": 1754043154,
"narHash": "sha256-jOGYaMh4KBhzTqer3G66ki17CL7e822PExkcgWiQoWE=", "narHash": "sha256-Q47BVxwocPZ1GEDs6gKGH00eso74i0gTEPNuF8Kj0T8=",
"owner": "notashelf", "owner": "notashelf",
"repo": "nvf", "repo": "nvf",
"rev": "08991be77a9f641facbddeca619388727661427d", "rev": "69659e078b6531698255deda280c9407b34e29ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -485,7 +465,6 @@
"darwin": "darwin", "darwin": "darwin",
"home-manager": "home-manager", "home-manager": "home-manager",
"moonlight": "moonlight", "moonlight": "moonlight",
"nh": "nh",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nix-options-search": "nix-options-search", "nix-options-search": "nix-options-search",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
@ -503,11 +482,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752028888, "lastModified": 1753930086,
"narHash": "sha256-LRj3/PUpII6taWOrX1w/OeI6f1ncND02PP/kEHvPCqU=", "narHash": "sha256-Os6Ta5zamfAllmQNlvkbGZLHn06zJy3hVXRk+Dy2yMo=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "a0f1c656e053463b47639234b151a05e4441bb19", "rev": "17b672c10c1798696a516cb879edbc2ebd0f58a4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -543,7 +522,7 @@
"sf-compact": { "sf-compact": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-J72Lyt2wy83E46wN8w6/Rih9kilM9wEjtY6KnbF0DsA=", "narHash": "sha256-VMCf2Mhmx/qhLRQxlTAsQWxtonS27kPW+oTYBBRWHMg=",
"type": "file", "type": "file",
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg" "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg"
}, },
@ -591,7 +570,7 @@
"sf-pro": { "sf-pro": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-Q/pOQ4MGhW/ZtLka+UUQcwSoZFDWW34XvutxL4GvzUY=", "narHash": "sha256-RX6X2ltVE88Hp1g9tpSywMT3UfdLpRxgw92KRpiAues=",
"type": "file", "type": "file",
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg" "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"
}, },
@ -697,11 +676,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1751688498, "lastModified": 1753676490,
"narHash": "sha256-6kYe6ozYDvsHAxV1zbSxg0oRWF4TzTfOUUJsR6MJlYY=", "narHash": "sha256-XeifEftxYGP/gzp6O1yO1S1W+MEx4Xvrgeu84ryRPNQ=",
"owner": "youwen5", "owner": "youwen5",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "b5d422dc2b28eb77a21fbdf60aca9a6e63d5a1ab", "rev": "77024f4557204bb4d526893d42db2e6f50727fab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -717,11 +696,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1752063248, "lastModified": 1753963984,
"narHash": "sha256-albe9Q066T4IesTRfaNpEcNQ09ABwU6esFUDyfb472U=", "narHash": "sha256-JPiCLZHuNk11XYYCqoLoKYIgdUu2WpNccTzl4ljycTQ=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "6f9a3c160daca2a701a638a7ea7b0e675c1a1848", "rev": "45772b76cdb103bd300abac4a85a34518dee65a0",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
flake.nix
View file

@ -28,8 +28,6 @@
url = "github:youwen5/zen-browser-flake"; url = "github:youwen5/zen-browser-flake";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nh.url = "github:viperML/nh";
nh.inputs.nixpkgs.follows = "nixpkgs";
nix-options-search.url = "github:madsbv/nix-options-search"; nix-options-search.url = "github:madsbv/nix-options-search";
@ -49,8 +47,6 @@
overlays = [ overlays = [
inputs.zig.overlays.default inputs.zig.overlays.default
inputs.rust-overlay.overlays.default inputs.rust-overlay.overlays.default
inputs.nh.overlays.default
inputs.moonlight.overlays.default
# https://github.com/LnL7/nix-darwin/issues/1041 # https://github.com/LnL7/nix-darwin/issues/1041
(_: prev: { (_: prev: {

135
modules/home/default.nix
View file

@ -23,82 +23,85 @@ in
description = "set the ghostty shader, relative to 'files/ghostty'"; description = "set the ghostty shader, relative to 'files/ghostty'";
}; };
}; };
config.programs = { config = {
home-manager.enable = true; home.shell = {
nix-index.enable = true; enableShellIntegration = true;
};
programs = {
home-manager.enable = true;
nix-index.enable = true;
direnv = { direnv = {
enableZshIntegration = true; nix-direnv.enable = config.programs.direnv.enable;
nix-direnv.enable = config.programs.direnv.enable; };
};
git = { git = {
enable = true; enable = true;
userName = lib.mkDefault user.name; userName = lib.mkDefault user.name;
userEmail = lib.mkDefault user.email; userEmail = lib.mkDefault user.email;
ignores = [ ignores = [
(lib.mkIf host.darwin ".DS_Store") # When using Finder (lib.mkIf host.darwin ".DS_Store") # When using Finder
(lib.mkIf host.darwin "._*") # When using non-APFS drives (lib.mkIf host.darwin "._*") # When using non-APFS drives
# ViM and Neovim # ViM and Neovim
".*.swp" ".*.swp"
".nvimlog" ".nvimlog"
]; ];
}; };
atuin = { atuin = {
enableBashIntegration = true; daemon.enable = cfg.atuin.enable;
enableFishIntegration = true; };
daemon.enable = cfg.atuin.enable;
}; bat = {
bat = { extraPackages = with pkgs.bat-extras; [
extraPackages = with pkgs.bat-extras; [ batdiff
batdiff batman
batman batgrep
batgrep batwatch
batwatch batpipe
batpipe prettybat
prettybat ];
]; };
}; hyfetch = {
hyfetch = { settings = {
settings = { backend = "fastfetch";
backend = "fastfetch"; preset = user.sexuality;
preset = user.sexuality; mode = "rgb";
mode = "rgb"; light_dark = "dark";
light_dark = "dark"; lightness = {
lightness = { };
}; color_align = {
color_align = { mode = "horizontal";
mode = "horizontal"; };
}; };
}; };
}; fastfetch.enable = cfg.hyfetch.enable;
fastfetch.enable = cfg.hyfetch.enable;
fish = { fish = {
plugins = [ plugins = [
{ {
name = "tide"; name = "tide";
inherit (pkgs.fishPlugins.tide) src; inherit (pkgs.fishPlugins.tide) src;
}
{
name = "!!";
inherit (pkgs.fishPlugins.bang-bang) src;
}
];
shellAliases = {
} }
{
name = "!!";
inherit (pkgs.fishPlugins.bang-bang) src;
}
];
shellAliases =
{ }
// lib.optionalAttrs (!host.darwin) { // lib.optionalAttrs (!host.darwin) {
reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now"; reboot-windows = "sudo efibootmgr --bootnext 0000; sudo reboot -h now";
}; };
shellInit = '' shellInit = ''
batman --export-env | source batman --export-env | source
test -r '/Users/${user.username}/.opam/opam-init/init.fish' && source '/Users/${user.username}/.opam/opam-init/init.fish' > /dev/null 2> /dev/null; or true test -r '/Users/${user.username}/.opam/opam-init/init.fish' && source '/Users/${user.username}/.opam/opam-init/init.fish' > /dev/null 2> /dev/null; or true
''; '';
}; };
ghostty.settings.custom-shader = lib.mkIf ( ghostty.settings.custom-shader = lib.mkIf (
cfg.ghostty.shader != null cfg.ghostty.shader != null
) "${../../files/ghostty}/${cfg.ghostty.shader}"; ) "${../../files/ghostty}/${cfg.ghostty.shader}";
};
}; };
} }

1
modules/neovim/default.nix
View file

@ -69,6 +69,7 @@
signatureHelp = null; signatureHelp = null;
toggleFormatOnSave = null; toggleFormatOnSave = null;
}; };
servers.nixd.init_options.autoArchive = true;
}; };
treesitter = { treesitter = {
enable = true; enable = true;

10
modules/nixos/ld.nix
View file

@ -63,7 +63,7 @@
nss nss
openssl openssl
pango pango
# pipewire pipewire
stdenv.cc.cc stdenv.cc.cc
systemd systemd
vulkan-loader vulkan-loader
@ -82,5 +82,13 @@
xorg.libxkbfile xorg.libxkbfile
xorg.libxshmfence xorg.libxshmfence
zlib zlib
libxslt
# Stolen from https://github.com/Mic92/dotfiles/blob/57cf7fdf8705a5362fc19114b8395cdbf7668e94/nixos/modules/nix-ld.nix#L6-L58
flite
gtk2
gtk2-x11
libsecret
xorg.libXinerama
]; ];
} }

30
users/chloe/vim.nix
View file

@ -16,6 +16,36 @@ _: {
}; };
}; };
}; };
autocomplete.blink-cmp = {
enable = true;
mappings = {
close = null;
complete = null;
confirm = null;
next = null;
previous = null;
scrollDocsDown = null;
scrollDocsUp = null;
};
setupOpts = {
keymap = {
preset = "super-tab";
};
completion = {
ghost_text.enabled = false;
list.selection.preselect = true;
trigger = {
show_in_snippet = true;
};
accept.auto_brackets.enabled = true;
};
signature = {
enabled = true;
};
};
};
keymaps = keymaps =
let let
mkKeymap = mode: key: action: desc: { mkKeymap = mode: key: action: desc: {

1
users/natalie/home.nix
View file

@ -12,6 +12,7 @@
direnv.enable = true; direnv.enable = true;
fish.enable = true; fish.enable = true;
man.generateCaches = false; man.generateCaches = false;
lsd.enable = true;
# sort-lines:end # sort-lines:end
}; };

1
users/natalie/laptop/configuration.nix
View file

@ -28,6 +28,7 @@
fi fi
''; '';
}; };
programs.fish.enable = true;
# Use homebrew to install casks # Use homebrew to install casks
homebrew = { homebrew = {

9
users/natalie/packages.nix
View file

@ -26,7 +26,6 @@ with pkgs;
qemu qemu
podman podman
docker docker
devenv
#productivity #productivity
glance glance
@ -59,10 +58,7 @@ with pkgs;
imagemagick imagemagick
#chatting apps #chatting apps
discord (discord.override { withMoonlight = true; })
# (discord.override {
# withMoonlight = true;
# })
vesktop vesktop
#media #media
@ -90,9 +86,8 @@ with pkgs;
#programming languages #programming languages
deno deno
ruby ruby
nodePackages.npm # nodePackages.npm
go go
coq
elan elan
#browsers #browsers

16
users/natalie/vim/coq.nix
View file

@ -1,16 +0,0 @@
{ pkgs, ... }:
{
vim = {
# extraPackages = with pkgs; [
# coq_8_20
# coqPackages_8_20.stdlib
# ];
extraPlugins.Coqtail = {
# enabled = true;
package = pkgs.vimPlugins.Coqtail;
# lazy = true;
# ft = "coq";
};
};
}

1
users/natalie/vim/default.nix
View file

@ -5,7 +5,6 @@
./languages.nix ./languages.nix
./latex.nix ./latex.nix
./lean.nix ./lean.nix
./coq.nix
./visuals.nix ./visuals.nix
./mini.nix ./mini.nix
]; ];

49
users/natalie/vim/languages.nix
View file

@ -9,54 +9,23 @@
vim = { vim = {
extraPackages = with pkgs; [ extraPackages = with pkgs; [
python312Packages.pylatexenc python312Packages.pylatexenc
nixd
]; ];
lsp = {
servers = {
nil = {
settings.nil.nix.flake = {
autoArchive = true;
autoEvalInputs = true;
};
};
nixd = {
settings.nixd = {
nixpkgs.expr = ''import "${flake.inputs.nixpkgs}" { }'';
options =
{
home-manager = {
expr = ''(let pkgs = import "${flake.inputs.nixpkgs}" { }; lib = import "${flake.inputs.home-manager}/modules/lib/stdlib-extended.nix" pkgs.lib; in (lib.evalModules { modules = (import "${flake.inputs.home-manager}/modules/modules.nix") { inherit lib pkgs;check = false;}; })).options'';
# (builtins.getFlake "${flakePath}").${darwin}Configurations.${hostname}.options.home-manager.users.type.getSubOptions [ ]'';
};
}
// pkgs.lib.optionalAttrs host.darwin {
nix-darwin = {
expr = ''(let pkgs = import "${flake.inputs.nixpkgs}" { }; in (pkgs.lib.evalModules { modules = (import "${flake.inputs.darwin}/modules/module-list.nix"); check = false;})).options'';
# (builtins.getFlake "${flakePath}").darwinConfigurations.${hostname}.options'';
};
}
// pkgs.lib.optionalAttrs host.linux {
nixos = {
expr = ''(let pkgs = import "${flake.inputs.nixpkgs}" { }; in (pkgs.lib.evalModules { modules = (import "${flake.inputs.nixpkgs}/nixos/modules/module-list.nix"); check = false;})).options'';
# (builtins.getFlake "${flakePath}").nixosConfigurations.${hostname}.options'';
};
};
};
};
};
};
languages = { languages = {
python.format.type = "ruff"; python = {
format.type = "ruff";
};
markdown = { markdown = {
enable = true; enable = true;
extensions.render-markdown-nvim = { extensions.render-markdown-nvim = {
enable = true; enable = true;
}; };
}; };
nix.format.enable = true; nix = {
lsp.servers = [
"nil"
"nixd"
];
};
}; };
formatter.conform-nvim = { formatter.conform-nvim = {