Compare commits

..

No commits in common. "9a53098835c3fbeb0b48cc266dc9022bb54a67f5" and "752fc1d40a6ece6db2c07afa5860666597b2f06e" have entirely different histories.

2 changed files with 4 additions and 45 deletions

40
flake.lock generated
View File

@ -56,25 +56,6 @@
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": {
"lastModified": 1706981411,
"narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "652fda4ca6dafeb090943422c34ae9145787af37",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-23.11",
"repo": "home-manager",
"type": "github"
}
},
"home-manager-unstable": {
"inputs": {
"nixpkgs": "nixpkgs_3"
},
"locked": { "locked": {
"lastModified": 1709204054, "lastModified": 1709204054,
"narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=", "narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=",
@ -122,22 +103,6 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1709309926,
"narHash": "sha256-VZFBtXGVD9LWTecGi6eXrE0hJ/mVB3zGUlHImUs2Qak=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "79baff8812a0d68e24a836df0a364c678089e2c7",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1708118438, "lastModified": 1708118438,
"narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=",
@ -153,7 +118,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1701282334, "lastModified": 1701282334,
"narHash": "sha256-MxCVrXY6v4QmfTwIysjjaX0XUhqBbxTWWB4HXtDYsdk=", "narHash": "sha256-MxCVrXY6v4QmfTwIysjjaX0XUhqBbxTWWB4HXtDYsdk=",
@ -174,8 +139,7 @@
"apple-silicon": "apple-silicon", "apple-silicon": "apple-silicon",
"emacs-config": "emacs-config", "emacs-config": "emacs-config",
"home-manager": "home-manager", "home-manager": "home-manager",
"home-manager-unstable": "home-manager-unstable", "nixpkgs": "nixpkgs_3",
"nixpkgs": "nixpkgs_4",
"nixpkgs-unstable": "nixpkgs-unstable" "nixpkgs-unstable": "nixpkgs-unstable"
} }
}, },

View File

@ -7,12 +7,8 @@
url = "github:tpwrules/nixos-apple-silicon"; url = "github:tpwrules/nixos-apple-silicon";
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-23.11";
# inputs.nixpkgs.follows = "nixpkgs";
};
home-manager-unstable = {
url = "github:nix-community/home-manager"; #/release-23.11"; url = "github:nix-community/home-manager"; #/release-23.11";
inputs.nixpkgs-unstable.follows = "nixpkgs"; # inputs.nixpkgs.follows = "nixpkgs";
}; };
emacs-config = { emacs-config = {
url = "git+https://git.marq42.xyz/mir/emacs?ref=main"; url = "git+https://git.marq42.xyz/mir/emacs?ref=main";
@ -23,8 +19,7 @@
self, self,
nixpkgs, nixpkgs,
nixpkgs-unstable, nixpkgs-unstable,
home-manager, home-manager, ... }: {
... }: {
nixosConfigurations = { nixosConfigurations = {
galvatron = nixpkgs.lib.nixosSystem { galvatron = nixpkgs.lib.nixosSystem {
system = "aarch64-linux"; system = "aarch64-linux";