Compare commits

..

No commits in common. "9de0d57860444572b76151cd34655c0ffaff5565" and "d6369e5980edf133e8dba60fe79ce2df7202fc17" have entirely different histories.

4 changed files with 22 additions and 94 deletions

View File

@ -23,11 +23,11 @@
"emacs-config": { "emacs-config": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1745013913, "lastModified": 1740924875,
"narHash": "sha256-vOppZSLE0LuVO3GaF0sARwEfdTMtUswbn96B7CNjfQ8=", "narHash": "sha256-u0n98s3Lhm7SGY1k65TWQ7a9vWT9nWd2jRXsPquqM0M=",
"owner": "larstvei", "owner": "larstvei",
"repo": "dot-emacs", "repo": "dot-emacs",
"rev": "72fbff0076f8ef417993510f0047dcc5a3fe1c18", "rev": "56f6827eb3077a60c839b3033b4db626341bb58a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -45,11 +45,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1745014073, "lastModified": 1744513704,
"narHash": "sha256-bUErPobuvffGHUqlQzCofTSqa5IVbrc5cj6MH5WrCPo=", "narHash": "sha256-LEPQ9AXJYDHWCFmkkhkbkTwNHaeEEm6+6EE89IePLsE=",
"owner": "larstvei", "owner": "larstvei",
"repo": "emacs-flake", "repo": "emacs-flake",
"rev": "c02fca42d35fb4755a33af6879a8cee8b1668172", "rev": "3fc9e43ad2bccb8b27c682629162f564c6e4a773",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -64,11 +64,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1744993365, "lastModified": 1744512440,
"narHash": "sha256-YAcjnoRJo7m9Sq9uNorkNM33f1oZIigVuNPvUy6y3po=", "narHash": "sha256-6cItqiP/EDLgQdKXyqAGwsYnNITNH3EBV2PA0nVkVBw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "90642af1fb7ab5e4c6deb221305acf6fc4472582", "rev": "5494c453843359d4b03ace92e06cbf8143ef62b0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -118,11 +118,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745001336, "lastModified": 1744498625,
"narHash": "sha256-R4HuzrgYtOYBNmB3lfRxcieHEBO4uSfgHNz4MzWkZ5M=", "narHash": "sha256-pL52uCt9CUoTTmysGG91c2FeU7XUvpB7Cep6yon2vDk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "fc09cb7aaadb70d6c4898654ffc872f0d2415df9", "rev": "db56335ca8942d86f2200664acdbd5b9212b26ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -131,71 +131,13 @@
"type": "github" "type": "github"
} }
}, },
"nix-rosetta-builder": {
"inputs": {
"nixos-generators": "nixos-generators",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1745249216,
"narHash": "sha256-bNuaIdGrs8LfintWymo9KQTILwVxsw5T6zdfxZY6K0g=",
"owner": "cpick",
"repo": "nix-rosetta-builder",
"rev": "5cf6aa1f3f2fbb70443d33b5ef7779b7c7063392",
"type": "github"
},
"original": {
"owner": "cpick",
"repo": "nix-rosetta-builder",
"type": "github"
}
},
"nixlib": {
"locked": {
"lastModified": 1736643958,
"narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixos-generators": {
"inputs": {
"nixlib": "nixlib",
"nixpkgs": [
"nix-rosetta-builder",
"nixpkgs"
]
},
"locked": {
"lastModified": 1737057290,
"narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=",
"owner": "nix-community",
"repo": "nixos-generators",
"rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixos-generators",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1744932701, "lastModified": 1744463964,
"narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -207,11 +149,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1744440957, "lastModified": 1744309437,
"narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -223,11 +165,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1744536153, "lastModified": 1744502386,
"narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", "narHash": "sha256-QAd1L37eU7ktL2WeLLLTmI6P9moz9+a/ONO8qNBYJgM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", "rev": "f6db44a8daa59c40ae41ba6e5823ec77fe0d2124",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -258,7 +200,6 @@
"darwin": "darwin", "darwin": "darwin",
"emacs-larstvei": "emacs-larstvei", "emacs-larstvei": "emacs-larstvei",
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-rosetta-builder": "nix-rosetta-builder",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
} }
}, },

View File

@ -13,15 +13,11 @@
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-rosetta-builder = {
url = "github:cpick/nix-rosetta-builder";
inputs.nixpkgs.follows = "nixpkgs";
};
emacs-larstvei.url = "github:larstvei/emacs-flake"; emacs-larstvei.url = "github:larstvei/emacs-flake";
}; };
outputs = outputs =
{ darwin, home-manager, nix-rosetta-builder, ... }@inputs: { darwin, home-manager, ... }@inputs:
{ {
darwinConfigurations."larstvei-macbookpro" = darwin.lib.darwinSystem { darwinConfigurations."larstvei-macbookpro" = darwin.lib.darwinSystem {
system = "aarch64-darwin"; system = "aarch64-darwin";
@ -30,11 +26,6 @@
./modules/core.nix ./modules/core.nix
./modules/macos.nix ./modules/macos.nix
nix-rosetta-builder.darwinModules.default
{
nix-rosetta-builder.onDemand = true;
}
home-manager.darwinModules.default home-manager.darwinModules.default
{ {
home-manager = { home-manager = {

View File

@ -3,9 +3,6 @@
nix = { nix = {
package = pkgs.nix; package = pkgs.nix;
linux-builder.enable = true;
settings = { settings = {
experimental-features = [ experimental-features = [
"nix-command" "nix-command"

View File

@ -24,7 +24,6 @@ with pkgs;
QuickCheck QuickCheck
] ]
)) ))
cabal-install
stack stack
]; ];