Update inputs and add captpucino

This commit is contained in:
Fabian Hauser 2024-04-08 13:03:20 +07:00
parent c81ffb64a9
commit 3f4a4c838d
2 changed files with 36 additions and 14 deletions

40
flake.lock generated
View file

@ -1,5 +1,20 @@
{ {
"nodes": { "nodes": {
"catppuccin": {
"locked": {
"lastModified": 1712482981,
"narHash": "sha256-LJOOpTey9Y29C/TK4h9KP7v4HvqDL3mLyT9hSWCfFlI=",
"owner": "catppuccin",
"repo": "nix",
"rev": "4043beb6c792a40e9c513aa261f4ba10601a4457",
"type": "github"
},
"original": {
"owner": "catppuccin",
"repo": "nix",
"type": "github"
}
},
"fcc-unlock": { "fcc-unlock": {
"inputs": { "inputs": {
"nixos-stable": [ "nixos-stable": [
@ -27,11 +42,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710281778, "lastModified": 1712462372,
"narHash": "sha256-bvWr9vvBrAxb44kHM3H3cY/uQg+4pYP1BM/Nu3e/7V8=", "narHash": "sha256-WA3bbBWhd3o1wAgyHZNypjb/LG4oq+IWxFq8ey8yNPU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "49a266d2ca59df8a03249550e73a54626181b65d", "rev": "a561ad6ab38578c812cc9af3b04f2cc60ebf48c9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -43,11 +58,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1710123225, "lastModified": 1712324865,
"narHash": "sha256-j3oWlxRZxB7cFsgEntpH3rosjFHRkAo/dhX9H3OfxtY=", "narHash": "sha256-+BatEWd4HlMeK7Ora+gYIkarjxFVCg9oKrIeybHIIX4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "ad2fd7b978d5e462048729a6c635c45d3d33c9ba", "rev": "f3b959627bca46a9f7052b8fbc464b8323e68c2c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -58,11 +73,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1710272261, "lastModified": 1712439257,
"narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -74,11 +89,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1710272261, "lastModified": 1712439257,
"narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -90,6 +105,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"catppuccin": "catppuccin",
"fcc-unlock": "fcc-unlock", "fcc-unlock": "fcc-unlock",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",

View file

@ -9,6 +9,8 @@
home-manager.url = "github:nix-community/home-manager/master"; home-manager.url = "github:nix-community/home-manager/master";
home-manager.inputs.nixpkgs.follows = "nixpkgs-stable"; home-manager.inputs.nixpkgs.follows = "nixpkgs-stable";
catppuccin.url = "github:catppuccin/nix";
fcc-unlock = { fcc-unlock = {
url = "git+file:///etc/nixos/fcc-unlock"; url = "git+file:///etc/nixos/fcc-unlock";
inputs.nixos-stable.follows = "nixpkgs-stable"; inputs.nixos-stable.follows = "nixpkgs-stable";
@ -17,7 +19,7 @@
}; };
outputs = { self, nixpkgs-unstable, nixpkgs-stable, home-manager outputs = { self, nixpkgs-unstable, nixpkgs-stable, home-manager
, nixos-hardware, fcc-unlock, ... }@inputs: , nixos-hardware, fcc-unlock, catppuccin, ... }@inputs:
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgsUnstable = import nixpkgs-unstable { pkgsUnstable = import nixpkgs-unstable {
@ -47,7 +49,10 @@
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
extraSpecialArgs = sharedSpecialArgs; extraSpecialArgs = sharedSpecialArgs;
users.fhauser = import ./home/fhauser/default.nix; users.fhauser.imports = [
./home/fhauser/default.nix
catppuccin.homeManagerModules.catppuccin
];
}; };
}; };
mapHostnameToAttr = host: mapHostnameToAttr = host:
@ -58,6 +63,7 @@
}; };
modules = [ modules = [
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
catppuccin.nixosModules.catppuccin
./host/${host}/default.nix ./host/${host}/default.nix
] ++ (if host == "bachtel" then [ ] else [ home-manager-config ]); ] ++ (if host == "bachtel" then [ ] else [ home-manager-config ]);
}; };