misschloe/nix-config
1
0
Fork 0
mirror of https://github.com/harryssecret/homelab-nix.git synced 2025-08-08 06:30:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

it makes more sense upgrading to unstable

Browse source
This commit is contained in:
chloe 2025-03-03 08:58:57 +01:00
parent 1251054fd6
commit 851eaf80ee
4 changed files with 32 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

7
flake.lock generated
View file

@ -252,16 +252,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739757849, "lastModified": 1740845322,
"narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", "narHash": "sha256-AXEgFj3C0YJhu9k1OhbRhiA6FnDr81dQZ65U3DhaWpw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", "rev": "fcac3d6d88302a5e64f6cb8014ac785e08874c8d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }

37
flake.nix
View file

@ -7,7 +7,7 @@
nixpkgsUnstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgsUnstable.url = "github:NixOS/nixpkgs/nixos-unstable";
sops-nix.url = "github:Mic92/sops-nix"; 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"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
alejandra.url = "github:kamadorueda/alejandra/3.0.0"; alejandra.url = "github:kamadorueda/alejandra/3.0.0";
@ -30,7 +30,7 @@
inputs.nixpkgs.follows = "nixpkgs"; 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"; neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
}; };
@ -39,6 +39,7 @@
self, self,
nixpkgs, nixpkgs,
nixpkgsSmall, nixpkgsSmall,
nixpkgsUnstable,
sops-nix, sops-nix,
nixos-generators, nixos-generators,
nix-darwin, nix-darwin,
@ -58,7 +59,7 @@
}; };
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs {inherit system;}; pkgs = import nixpkgs { inherit system; };
in in
{ {
nixosConfigurations = { nixosConfigurations = {
@ -80,21 +81,22 @@
]; ];
}; };
goober = nixpkgs.lib.nixosSystem { goober = nixpkgsUnstable.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = specialArgs; specialArgs = specialArgs;
modules = [ modules = [
./hosts/goober/configuration.nix ./hosts/goober/configuration.nix
nix-flatpak.nixosModules.nix-flatpak 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.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.${username} = import ./home-manager/home.nix; 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 { darwinConfigurations."iMac-de-Eddie" = nix-darwin.lib.darwinSystem {
modules = [ ./hosts/dadarwin/configuration.nix modules = [
./hosts/dadarwin/configuration.nix
{system.configurationRevision = self.rev or self.dirtyRev or null;}
];
};
# Expose the package set, including overlays, for convenience. { system.configurationRevision = self.rev or self.dirtyRev or null; }
darwinPackages = self.darwinConfigurations."iMac-de-Eddie".pkgs; ];
};
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 { };
}; };
} }

1
hosts/goober/configuration.nix
View file

@ -17,7 +17,6 @@
../../features/client/tailscale.nix ../../features/client/tailscale.nix
../../features/client/sway.nix ../../features/client/sway.nix
./features/default.nix ./features/default.nix
./overlays/foot-overlay.nix
]; ];
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;

24
overlays/foot-overlay.nix
View file

@ -1,19 +1,13 @@
{ config, lib, pkgs, ... }: final: prev: {
{ foot-next = pkgs.foot.overrideAttrs (oldAttrs: rec {
let foot-next = pkgs.foot.overrideAttrs (oldAttrs: rec {
inherit (oldAttrs) name; inherit (oldAttrs) name;
version = "1.20.2"; version = "1.20.2";
src = pkgs.fetchFromGitea { src = pkgs.fetchFromGitea {
domain = "codeberg.org"; domain = "codeberg.org";
owner = "dnkl"; owner = "dnkl";
repo = "foot"; repo = "foot";
rev = version; rev = version;
hash = "sha256-tnBoRRKHcuvBSnqvJ/772UWuepvpUiSg6t+gx4MZ0VQ="; hash = "sha256-tnBoRRKHcuvBSnqvJ/772UWuepvpUiSg6t+gx4MZ0VQ=";
}; };
}) in });
nixpkgs.overlays = [( }
final: previous: {
foot = foot-next;
}
)];
}