mirror of
https://github.com/harryssecret/homelab-nix.git
synced 2025-08-07 22:20:33 +02:00
it makes more sense upgrading to unstable
This commit is contained in:
parent
1251054fd6
commit
851eaf80ee
4 changed files with 32 additions and 37 deletions
7
flake.lock
generated
7
flake.lock
generated
|
@ -252,16 +252,15 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1739757849,
|
||||
"narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
|
||||
"lastModified": 1740845322,
|
||||
"narHash": "sha256-AXEgFj3C0YJhu9k1OhbRhiA6FnDr81dQZ65U3DhaWpw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
|
||||
"rev": "fcac3d6d88302a5e64f6cb8014ac785e08874c8d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-24.11",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
37
flake.nix
37
flake.nix
|
@ -7,7 +7,7 @@
|
|||
nixpkgsUnstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
sops-nix.url = "github:Mic92/sops-nix";
|
||||
|
||||
home-manager.url = "github:nix-community/home-manager/release-24.11";
|
||||
home-manager.url = "github:nix-community/home-manager/";
|
||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
alejandra.url = "github:kamadorueda/alejandra/3.0.0";
|
||||
|
@ -30,7 +30,7 @@
|
|||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1";
|
||||
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1";
|
||||
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
|
||||
};
|
||||
|
||||
|
@ -39,6 +39,7 @@
|
|||
self,
|
||||
nixpkgs,
|
||||
nixpkgsSmall,
|
||||
nixpkgsUnstable,
|
||||
sops-nix,
|
||||
nixos-generators,
|
||||
nix-darwin,
|
||||
|
@ -58,7 +59,7 @@
|
|||
};
|
||||
|
||||
system = "x86_64-linux";
|
||||
pkgs = import nixpkgs {inherit system;};
|
||||
pkgs = import nixpkgs { inherit system; };
|
||||
in
|
||||
{
|
||||
nixosConfigurations = {
|
||||
|
@ -80,21 +81,22 @@
|
|||
];
|
||||
};
|
||||
|
||||
goober = nixpkgs.lib.nixosSystem {
|
||||
goober = nixpkgsUnstable.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = specialArgs;
|
||||
modules = [
|
||||
./hosts/goober/configuration.nix
|
||||
nix-flatpak.nixosModules.nix-flatpak
|
||||
|
||||
{environment.systemPackages = [ anyrun.packages."x86_64-linux".anyrun ];}
|
||||
{ environment.systemPackages = [ anyrun.packages."x86_64-linux".anyrun ]; }
|
||||
|
||||
home-manager.nixosModules.home-manager {
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.users.${username} = import ./home-manager/home.nix;
|
||||
|
||||
home-manager.extraSpecialArgs = {inherit inputs;};
|
||||
|
||||
home-manager.extraSpecialArgs = { inherit inputs; };
|
||||
}
|
||||
];
|
||||
};
|
||||
|
@ -152,17 +154,18 @@
|
|||
};
|
||||
};
|
||||
|
||||
darwinConfigurations."iMac-de-Eddie" = nix-darwin.lib.darwinSystem {
|
||||
modules = [ ./hosts/dadarwin/configuration.nix
|
||||
|
||||
{system.configurationRevision = self.rev or self.dirtyRev or null;}
|
||||
];
|
||||
};
|
||||
darwinConfigurations."iMac-de-Eddie" = nix-darwin.lib.darwinSystem {
|
||||
modules = [
|
||||
./hosts/dadarwin/configuration.nix
|
||||
|
||||
# Expose the package set, including overlays, for convenience.
|
||||
darwinPackages = self.darwinConfigurations."iMac-de-Eddie".pkgs;
|
||||
{ system.configurationRevision = self.rev or self.dirtyRev or null; }
|
||||
];
|
||||
};
|
||||
|
||||
packages.miku-cursor-linux = pkgs.callPackage ./packages/miku-cursor.nix {};
|
||||
# Expose the package set, including overlays, for convenience.
|
||||
darwinPackages = self.darwinConfigurations."iMac-de-Eddie".pkgs;
|
||||
|
||||
packages.miku-cursor-linux = pkgs.callPackage ./packages/miku-cursor.nix { };
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -17,7 +17,6 @@
|
|||
../../features/client/tailscale.nix
|
||||
../../features/client/sway.nix
|
||||
./features/default.nix
|
||||
./overlays/foot-overlay.nix
|
||||
];
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
|
|
@ -1,19 +1,13 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
let foot-next = pkgs.foot.overrideAttrs (oldAttrs: rec {
|
||||
final: prev: {
|
||||
foot-next = pkgs.foot.overrideAttrs (oldAttrs: rec {
|
||||
inherit (oldAttrs) name;
|
||||
version = "1.20.2";
|
||||
src = pkgs.fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "dnkl";
|
||||
repo = "foot";
|
||||
rev = version;
|
||||
hash = "sha256-tnBoRRKHcuvBSnqvJ/772UWuepvpUiSg6t+gx4MZ0VQ=";
|
||||
domain = "codeberg.org";
|
||||
owner = "dnkl";
|
||||
repo = "foot";
|
||||
rev = version;
|
||||
hash = "sha256-tnBoRRKHcuvBSnqvJ/772UWuepvpUiSg6t+gx4MZ0VQ=";
|
||||
};
|
||||
}) in
|
||||
nixpkgs.overlays = [(
|
||||
final: previous: {
|
||||
foot = foot-next;
|
||||
}
|
||||
)];
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue