This commit is contained in:
larstvei 2024-07-03 16:03:08 +02:00
parent 828a753517
commit 4a5dd7a777
5 changed files with 39 additions and 48 deletions

View File

@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1713946171,
"narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=",
"lastModified": 1716993688,
"narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7",
"rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4",
"type": "github"
},
"original": {
@ -27,11 +27,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1715096528,
"narHash": "sha256-u5XIabJ+/Q42Db61ShlCFbrN3ZvhztBcYQxCxZab7t8=",
"lastModified": 1717799041,
"narHash": "sha256-nPicJz3CJi/yCNect0EW4TaXhHmcE+wQboLDhRo0VDo=",
"owner": "larstvei",
"repo": "dot-emacs",
"rev": "3d17c07585c016d991cedd3b63c75155aa01e06e",
"rev": "817a32bfc8314ea9c1fa5e017b5e8c32584fc329",
"type": "github"
},
"original": {
@ -47,11 +47,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1715046400,
"narHash": "sha256-gryLgWTbv1C4/j/6YleqQ5UmJQwa+UdkXEaemwhkGlM=",
"lastModified": 1717780033,
"narHash": "sha256-zK2vQ40nuAbv91ngVn4viZ57ZzTUfZOYmJWUGVjfNG4=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "f2804916dbc4655722f743b5299b6f706335b25b",
"rev": "ac3c29547bf7a87fe5911694f45a5192aaaf92ee",
"type": "github"
},
"original": {
@ -103,11 +103,11 @@
]
},
"locked": {
"lastModified": 1715077503,
"narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=",
"lastModified": 1717525419,
"narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "6e277d9566de9976f47228dd8c580b97488734d4",
"rev": "a7117efb3725e6197dd95424136f79147aa35e5b",
"type": "github"
},
"original": {
@ -118,11 +118,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1714906307,
"narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=",
"lastModified": 1717602782,
"narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588",
"rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6",
"type": "github"
},
"original": {
@ -134,11 +134,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1714971268,
"narHash": "sha256-IKwMSwHj9+ec660l+I4tki/1NRoeGpyA2GdtdYpAgEw=",
"lastModified": 1717530100,
"narHash": "sha256-b4Dn+PnrZoVZ/BoR9JN2fTxXxplJrAsdSUIePf4Cacs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "27c13997bf450a01219899f5a83bd6ffbfc70d3c",
"rev": "a2e1d0414259a144ebdc048408a807e69e0565af",
"type": "github"
},
"original": {
@ -150,11 +150,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1715037484,
"narHash": "sha256-OUt8xQFmBU96Hmm4T9tOWTu4oCswCzoVl+pxSq/kiFc=",
"lastModified": 1717681334,
"narHash": "sha256-HlvsMH8BNgdmQCwbBDmWp5/DfkEQYhXZHagJQCgbJU0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ad7efee13e0d216bf29992311536fce1d3eefbef",
"rev": "31f40991012489e858517ec20102f033e4653afb",
"type": "github"
},
"original": {
@ -166,11 +166,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1715037484,
"narHash": "sha256-OUt8xQFmBU96Hmm4T9tOWTu4oCswCzoVl+pxSq/kiFc=",
"lastModified": 1717681334,
"narHash": "sha256-HlvsMH8BNgdmQCwbBDmWp5/DfkEQYhXZHagJQCgbJU0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ad7efee13e0d216bf29992311536fce1d3eefbef",
"rev": "31f40991012489e858517ec20102f033e4653afb",
"type": "github"
},
"original": {

View File

@ -37,15 +37,6 @@
}
({ config, pkgs, lib, ... }: {
services.nix-daemon.enable = true;
nixpkgs = {
config.allowUnfree = true;
overlays = with inputs; [
(final: prev: {
maude-mac = final.callPackage ./pkgs/maude-mac { };
})
];
};
})
];
};

View File

@ -1,4 +1,4 @@
{ pkgs, lib, config, home-manager, nix-darwin, inputs, emacs-larstvei, ... }: {
{ pkgs, emacs-larstvei, ... }: {
home.packages = with pkgs; [
@ -21,6 +21,7 @@
python-lsp-server
scipy
scikit-learn
xlsxwriter
z3
]))
(haskell.packages.ghc96.ghcWithPackages
@ -28,6 +29,7 @@
QuickCheck
]))
bat
# cargo
cbqn
cloc
clojure
@ -41,9 +43,9 @@
htop
inkscape
jdk
jet
jq
leiningen
# maude-mac
minizinc
nil
nixfmt
@ -54,7 +56,6 @@
ripgrep
# rust-analyzer
rustup
shortcat
stack
texlive.combined.scheme-full
tree
@ -144,7 +145,6 @@
custom = {
direnv = {
format = "[\\[direnv\\]]($style) ";
style = "fg:yellow dimmed";
when = "env | grep -E '^DIRENV_FILE='";
};
};

View File

@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }: {
{ pkgs, lib, ... }: {
nix = {
package = pkgs.nix;
@ -16,6 +16,7 @@
fonts = with pkgs; [
fira
fira-code
iosevka
roboto
roboto-mono
source-sans
@ -70,33 +71,30 @@
homebrew = {
enable = true;
onActivation = {
# autoUpdate = true;
upgrade = true;
cleanup = "uninstall";
};
taps = [ "homebrew/cask" "sourcegraph/src-cli" "homebrew/cask-versions" ];
taps = [ "homebrew/cask" "homebrew/cask-versions" ];
casks = [
"amethyst"
"arc"
"chatgpt"
"docker"
"dropbox"
# "expressvpn"
"firefox-developer-edition"
# "firefox-developer-edition"
"google-chrome"
"iina"
"karabiner-elements"
"mactex"
# "mactex"
"obs"
"orion"
"ollama"
"raycast"
"remarkable"
"signal"
"supercollider"
"zoom"
];
brews = [
{
name = "src-cli";
link = true;
}
];
};
}

View File

@ -1 +1,3 @@
experimental-features = nix-command flakes
substituters = https://cache.nixos.org https://cache.nixos.org/ https://nix-community.cachix.org
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=