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

Compare commits

base: nix:a58f16e18b7e9161012dcfd90075e7b72e4f50cf
Branches Tags
nix:main
nix:switch-fix
nix:julia
nix:chloe
nix:nats
..
compare: nix:5dc2d9d1daf45712c60239be1e4387d2b47e9b82
Branches Tags
nix:main
nix:switch-fix
nix:julia
nix:chloe
nix:nats

No commits in common. "a58f16e18b7e9161012dcfd90075e7b72e4f50cf" and "5dc2d9d1daf45712c60239be1e4387d2b47e9b82" have entirely different histories.
a58f16e18b ... 5dc2d9d1da

8 changed files with 159 additions and 59 deletions
Show stats Expand all files Collapse all files

134
flake.lock
View file

@ -15,11 +15,11 @@
"sf-pro": "sf-pro" "sf-pro": "sf-pro"
}, },
"locked": { "locked": {
"lastModified": 1752383772, "lastModified": 1748299691,
"narHash": "sha256-I5Y0gUJS85lGEuuKr+tKSRUpJWeKavE+WmiAHRcyBaU=", "narHash": "sha256-HMlx5HzeOOhpewq3y9UaSMP9AkhEo+AFJHZIWLQvJGw=",
"owner": "Lyndeno", "owner": "Lyndeno",
"repo": "apple-fonts.nix", "repo": "apple-fonts.nix",
"rev": "875c694d7f0ec2020d7511264907a1f0e3262931", "rev": "ec51ae2e8ba89adbb5188c40aa262a7418c48b00",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -83,17 +83,14 @@
}, },
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": "nixpkgs-lib"
"nvf",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1753121425, "lastModified": 1749398372,
"narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -140,10 +137,7 @@
}, },
"flake-utils_3": { "flake-utils_3": {
"inputs": { "inputs": {
"systems": [ "systems": "systems_3"
"nvf",
"systems"
]
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@ -161,7 +155,7 @@
}, },
"flake-utils_4": { "flake-utils_4": {
"inputs": { "inputs": {
"systems": "systems_4" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1705309234, "lastModified": 1705309234,
@ -179,7 +173,7 @@
}, },
"flake-utils_5": { "flake-utils_5": {
"inputs": { "inputs": {
"systems": "systems_5" "systems": "systems_6"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,
@ -197,7 +191,7 @@
}, },
"flake-utils_6": { "flake-utils_6": {
"inputs": { "inputs": {
"systems": "systems_6" "systems": "systems_7"
}, },
"locked": { "locked": {
"lastModified": 1705309234, "lastModified": 1705309234,
@ -257,11 +251,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1753943136, "lastModified": 1752093218,
"narHash": "sha256-eiEE5SabVcIlGSTRcRyBjmJMaYAV95SJnjy8YSsVeW4=", "narHash": "sha256-+3rXu8ewcNDi65/2mKkdSGrivQs5zEZVp5aYszXC0d0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "bd82507edd860c453471c46957cbbe3c9fd01b5c", "rev": "206ed3c71418b52e176f16f58805c96e84555320",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -306,11 +300,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1753293216, "lastModified": 1752099881,
"narHash": "sha256-4hAm9PYNHAsR3MxH8MhSZt7mTiR8MlhyQilLJEPdaZs=", "narHash": "sha256-mn6f4ci5C2jkyxgmBHQ4dI9V0/20DlyS6EbQz4w7znc=",
"owner": "moonlight-mod", "owner": "moonlight-mod",
"repo": "moonlight", "repo": "moonlight",
"rev": "297a1b57c14ff18890382b2fe89f493ba349a730", "rev": "dbef0c38e1c0066de5ec35a4d4219026b1bd7010",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -319,6 +313,26 @@
"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": [
@ -326,11 +340,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1753589988, "lastModified": 1751774635,
"narHash": "sha256-y1JlcMB2dKFkrr6g+Ucmj8L//IY09BtSKTH/A7OU7mU=", "narHash": "sha256-DuOznGdgMxeSlPpUu6Wkq0ZD5e2Cfv9XRZeZlHWMd1s=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "f0736b09c43028fd726fb70c3eb3d1f0795454cf", "rev": "85686025ba6d18df31cc651a91d5adef63378978",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -375,13 +389,28 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-lib": {
"locked": {
"lastModified": 1748740939,
"narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "656a64127e9d791a334452c6b6606d17539476e2",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1753694789, "lastModified": 1751984180,
"narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -430,19 +459,18 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_3" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1754043154, "lastModified": 1752075018,
"narHash": "sha256-Q47BVxwocPZ1GEDs6gKGH00eso74i0gTEPNuF8Kj0T8=", "narHash": "sha256-RJnQJooI1Jc7U4gvEKErbiIcgqGtEeUWddvxIjQfP58=",
"owner": "notashelf", "owner": "notashelf",
"repo": "nvf", "repo": "nvf",
"rev": "69659e078b6531698255deda280c9407b34e29ea", "rev": "9aa90885640d19b1375e6dec75c6cb125ac0f0c2",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "notashelf", "owner": "notashelf",
"ref": "v0.8",
"repo": "nvf", "repo": "nvf",
"type": "github" "type": "github"
} }
@ -465,6 +493,7 @@
"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",
@ -482,11 +511,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1753930086, "lastModified": 1752028888,
"narHash": "sha256-Os6Ta5zamfAllmQNlvkbGZLHn06zJy3hVXRk+Dy2yMo=", "narHash": "sha256-LRj3/PUpII6taWOrX1w/OeI6f1ncND02PP/kEHvPCqU=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "17b672c10c1798696a516cb879edbc2ebd0f58a4", "rev": "a0f1c656e053463b47639234b151a05e4441bb19",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -522,7 +551,7 @@
"sf-compact": { "sf-compact": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-VMCf2Mhmx/qhLRQxlTAsQWxtonS27kPW+oTYBBRWHMg=", "narHash": "sha256-J72Lyt2wy83E46wN8w6/Rih9kilM9wEjtY6KnbF0DsA=",
"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"
}, },
@ -570,7 +599,7 @@
"sf-pro": { "sf-pro": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-RX6X2ltVE88Hp1g9tpSywMT3UfdLpRxgw92KRpiAues=", "narHash": "sha256-Q/pOQ4MGhW/ZtLka+UUQcwSoZFDWW34XvutxL4GvzUY=",
"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"
}, },
@ -669,6 +698,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_7": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"zen-browser": { "zen-browser": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -676,11 +720,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1753676490, "lastModified": 1751688498,
"narHash": "sha256-XeifEftxYGP/gzp6O1yO1S1W+MEx4Xvrgeu84ryRPNQ=", "narHash": "sha256-6kYe6ozYDvsHAxV1zbSxg0oRWF4TzTfOUUJsR6MJlYY=",
"owner": "youwen5", "owner": "youwen5",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "77024f4557204bb4d526893d42db2e6f50727fab", "rev": "b5d422dc2b28eb77a21fbdf60aca9a6e63d5a1ab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -696,11 +740,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1753963984, "lastModified": 1752063248,
"narHash": "sha256-JPiCLZHuNk11XYYCqoLoKYIgdUu2WpNccTzl4ljycTQ=", "narHash": "sha256-albe9Q066T4IesTRfaNpEcNQ09ABwU6esFUDyfb472U=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "45772b76cdb103bd300abac4a85a34518dee65a0", "rev": "6f9a3c160daca2a701a638a7ea7b0e675c1a1848",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
flake.nix
View file

@ -12,7 +12,7 @@
apple-fonts.url = "github:Lyndeno/apple-fonts.nix"; apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
apple-fonts.inputs.nixpkgs.follows = "nixpkgs"; apple-fonts.inputs.nixpkgs.follows = "nixpkgs";
nvf.url = "github:notashelf/nvf/v0.8"; nvf.url = "github:notashelf/nvf";
nvf.inputs.nixpkgs.follows = "nixpkgs"; nvf.inputs.nixpkgs.follows = "nixpkgs";
darwin.url = "github:lnl7/nix-darwin/master"; darwin.url = "github:lnl7/nix-darwin/master";
@ -28,6 +28,8 @@
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";
@ -47,6 +49,8 @@
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: {

2
modules/neovim/default.nix
View file

@ -69,7 +69,6 @@
signatureHelp = null; signatureHelp = null;
toggleFormatOnSave = null; toggleFormatOnSave = null;
}; };
servers.nixd.init_options.autoArchive = true;
}; };
treesitter = { treesitter = {
enable = true; enable = true;
@ -106,6 +105,7 @@
nix = { nix = {
enable = true; enable = true;
format.type = "nixfmt"; # looks so much nicer format.type = "nixfmt"; # looks so much nicer
lsp.options.autoArchive = true;
}; };
}; };
formatter.conform-nvim = { formatter.conform-nvim = {

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

@ -28,7 +28,6 @@
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,6 +26,7 @@ with pkgs;
qemu qemu
podman podman
docker docker
devenv
#productivity #productivity
glance glance
@ -58,7 +59,10 @@ with pkgs;
imagemagick imagemagick
#chatting apps #chatting apps
(discord.override { withMoonlight = true; }) discord
# (discord.override {
# withMoonlight = true;
# })
vesktop vesktop
#media #media
@ -86,8 +90,9 @@ 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 Normal file
View file

@ -0,0 +1,16 @@
{ 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,6 +5,7 @@
./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,23 +9,54 @@
vim = { vim = {
extraPackages = with pkgs; [ extraPackages = with pkgs; [
python312Packages.pylatexenc python312Packages.pylatexenc
nixd
]; ];
languages = { lsp = {
python = { servers = {
format.type = "ruff"; 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 = {
python.format.type = "ruff";
markdown = { markdown = {
enable = true; enable = true;
extensions.render-markdown-nvim = { extensions.render-markdown-nvim = {
enable = true; enable = true;
}; };
}; };
nix = { nix.format.enable = true;
lsp.servers = [
"nil"
"nixd"
];
};
}; };
formatter.conform-nvim = { formatter.conform-nvim = {