genebean/dots
1
0
Fork 0
mirror of https://github.com/genebean/dots.git synced 2026-03-27 01:17:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #375 from genebean/flake-fix-and-updates

Browse source 
Fixup flake.nix syntax and run updates
This commit is contained in:
Gene Liverman 2024-03-04 22:14:25 -05:00 • committed by GitHub
commit 25afbfa270
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 60 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

36
flake.lock generated
View file

@ -24,11 +24,11 @@
]
},
"locked": {
"lastModified": 1709286488,
"narHash": "sha256-RDpTZ72zLu05djvXRzK76Ysqp9zSdh84ax/edEaJucs=",
"lastModified": 1709599612,
"narHash": "sha256-3fCm3BIc2iva90E/lbkkt+fPXkZr9pnC7tJk3QPOf7Q=",
"owner": "nix-community",
"repo": "disko",
"rev": "bde7dd352c07d43bd5b8245e6c39074a391fdd46",
"rev": "c54e7e2b2b7e394440be36305a8fdeeba6339712",
"type": "github"
},
"original": {
@ -99,11 +99,11 @@
]
},
"locked": {
"lastModified": 1709292216,
"narHash": "sha256-DwC4ASXZpssI7ZOJADOtQ7PhVV1mrEEXQdML/0gLPGo=",
"lastModified": 1709554374,
"narHash": "sha256-1yYgwxBzia+QrOaQaZ6YKqGFfiQcSBwYLzd9XRsRLQY=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "70d162d4684f738761ab4251c0cee05b5f5d4d53",
"rev": "daa03606dfb5296a22e842acb02b46c1c4e9f5e7",
"type": "github"
},
"original": {
@ -181,11 +181,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1708819810,
"narHash": "sha256-1KosU+ZFXf31GPeCBNxobZWMgHsSOJcrSFA6F2jhzdE=",
"lastModified": 1709428628,
"narHash": "sha256-//ZCCnpVai/ShtO2vPjh3AWgo8riXCaret6V9s7Hew4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "89a2a12e6c8c6a56c72eb3589982c8e2f89c70ea",
"rev": "66d65cb00b82ffa04ee03347595aa20e41fe3555",
"type": "github"
},
"original": {
@ -197,11 +197,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1709294055,
"narHash": "sha256-7EECkQYoNKJZOf2+miJdrMpxpvsn/qZFwIhUI3fQpLs=",
"lastModified": 1709386671,
"narHash": "sha256-VPqfBnIJ+cfa78pd4Y5Cr6sOWVW8GYHRVucxJGmRf8Q=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "ec869190b56a1b4677d24a8bdbcfe80ccea2ece6",
"rev": "fa9a51752f1b5de583ad5213eb621be071806663",
"type": "github"
},
"original": {
@ -229,11 +229,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1709314135,
"narHash": "sha256-fTwx+IvA3/h0t+Rf51M1r5Bi2qD/gn9Ii3JQMPvkKOU=",
"lastModified": 1709591591,
"narHash": "sha256-wj8F+FHHmVuhAfD6fJ8MA8//3NiRO+8sRFe3Z9Ri4l0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "d631b4f5907462496f18ea04b0d18205f48a6cb4",
"rev": "d073ef74d56480c6dd721d11e25159b7a75b2bf6",
"type": "github"
},
"original": {
@ -264,11 +264,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1708987867,
"narHash": "sha256-k2lDaDWNTU5sBVHanYzjDKVDmk29RHIgdbbXu5sdzBA=",
"lastModified": 1709591996,
"narHash": "sha256-0sQcalXSgqlO6mnxBTXkSQChBHy2GQsokB1XY8r+LpQ=",
"owner": "mic92",
"repo": "sops-nix",
"rev": "a1c8de14f60924fafe13aea66b46157f0150f4cf",
"rev": "291aad29b59ceda517a06e59809f35cb0bb17c6b",
"type": "github"
},
"original": {

60
flake.nix
View file

@ -47,14 +47,22 @@
# creates a macOS system config
darwinHostConfig = system: hostname: username: nix-darwin.lib.darwinSystem {
pkgs = import nixpkgs {
inherit system;
config = {
allowUnfree = true;
permittedInsecurePackages = [ "python-2.7.18.7" ];
specialArgs = { inherit inputs username hostname;
pkgs = import nixpkgs {
inherit system;
config = {
allowUnfree = true;
permittedInsecurePackages = [ "python-2.7.18.7" ];
};
};
pkgs-unstable = import nixpkgs-unstable {
inherit system;
config = {
allowUnfree = true;
permittedInsecurePackages = [ "python-2.7.18.7" ];
};
};
};
specialArgs = { inherit inputs username hostname; };
modules = [
nix-homebrew.darwinModules.nix-homebrew {
nix-homebrew = {
@ -83,14 +91,22 @@
# creates a nixos system config
nixosHostConfig = system: hostname: username: nixpkgs.lib.nixosSystem {
pkgs = import nixpkgs {
inherit system;
config = {
allowUnfree = true;
permittedInsecurePackages = [ "electron-21.4.4" ];
specialArgs = { inherit inputs username hostname;
pkgs = import nixpkgs {
inherit system;
config = {
allowUnfree = true;
permittedInsecurePackages = [ "electron-21.4.4" ];
};
};
pkgs-unstable = import nixpkgs-unstable {
inherit system;
config = {
allowUnfree = true;
permittedInsecurePackages = [ "electron-21.4.4" ];
};
};
};
specialArgs = { inherit inputs username hostname; };
modules = [
disko.nixosModules.disko
@ -114,14 +130,22 @@
}; # end nixosSystem
linuxHomeConfig = system: hostname: username: home-manager.lib.homeManagerConfiguration {
pkgs = import nixpkgs {
inherit system;
config = {
allowUnfree = true;
permittedInsecurePackages = [ "electron-21.4.4" ];
extraSpecialArgs = { inherit genebean-omp-themes hostname username;
pkgs = import nixpkgs {
inherit system;
config = {
allowUnfree = true;
permittedInsecurePackages = [ "electron-21.4.4" ];
};
};
pkgs-unstable = import nixpkgs-unstable {
inherit system;
config = {
allowUnfree = true;
permittedInsecurePackages = [ "electron-21.4.4" ];
};
};
};
extraSpecialArgs = { inherit genebean-omp-themes hostname username; };
modules = [
./modules/home-manager/hosts/${hostname}/${username}.nix
{