Toast/nix-stuff
1
0
Fork 0
Code Issues Pull requests Projects 1 Wiki Activity

Compare commits

base: Toast:d92b95c90f7342157cf7b72c3dfc893136ff7c48
Branches Tags
Toast:main
Toast:plasma-refactor
Toast:headscale
Toast:plasma6
Toast:catppuccin
Toast:kde-stuff
Toast:firefox
Toast:upgrade-to-23.05
...
compare: Toast:da0bd779303547fb7031c27eed1cb011599d4fc7
Branches Tags
Toast:main
Toast:plasma-refactor
Toast:headscale
Toast:plasma6
Toast:catppuccin
Toast:kde-stuff
Toast:firefox
Toast:upgrade-to-23.05

2 commits
d92b95c90f ... da0bd77930

Author SHA1 Message Date
Toast
da0bd77930 Common: set system.configurationRevision 2023-09-14 23:19:26 +02:00
Toast
884590e972 Flake: remove leftover nixPath setting 2023-09-14 18:22:41 +02:00
2 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
flake.nix
View file

@ -47,7 +47,7 @@ inputs = {
}; };
}; };
outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstable, nixos-hardware, nix-impermanence, nix-index-db, nix-index-db-unstable, jovian, ... } @inputs: { outputs = { self, nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstable, nixos-hardware, nix-impermanence, nix-index-db, nix-index-db-unstable, jovian, ... } @inputs: {
devShells.x86_64-linux.default = nixpkgs.legacyPackages.x86_64-linux.mkShell { devShells.x86_64-linux.default = nixpkgs.legacyPackages.x86_64-linux.mkShell {
name = "Environment for toast's nixos configurations"; name = "Environment for toast's nixos configurations";
@ -67,7 +67,7 @@ outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstabl
nixosConfigurations = { nixosConfigurations = {
Archie = nixpkgs-unstable.lib.nixosSystem { Archie = nixpkgs-unstable.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { systemPkgs = inputs.nixpkgs-unstable; }; specialArgs = { systemPkgs = inputs.nixpkgs-unstable; flakeSelf = self; };
/* /*
I used to set up nixpkgs in the flake, but doing that made I used to set up nixpkgs in the flake, but doing that made
defining overlays in modules impossible (or at least I could defining overlays in modules impossible (or at least I could
@ -75,8 +75,6 @@ outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstabl
Also has nice side effect of making it easier to add new systems :3 Also has nice side effect of making it easier to add new systems :3
*/ */
modules = [ modules = [
# Needed for nix-index
{ nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; }
agenix.nixosModules.default agenix.nixosModules.default
home-manager-unstable.nixosModule home-manager-unstable.nixosModule
nix-index-db-unstable.nixosModules.nix-index nix-index-db-unstable.nixosModules.nix-index
@ -90,10 +88,8 @@ outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstabl
SurfaceGo = nixpkgs.lib.nixosSystem { SurfaceGo = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { systemPkgs = inputs.nixpkgs; }; specialArgs = { systemPkgs = inputs.nixpkgs; flakeSelf = self; };
modules = [ modules = [
# Needed for nix-index
{ nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; }
agenix.nixosModules.default agenix.nixosModules.default
home-manager.nixosModule home-manager.nixosModule
nixos-hardware.nixosModules.microsoft-surface-go nixos-hardware.nixosModules.microsoft-surface-go
@ -107,10 +103,8 @@ outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstabl
SteamDeck = nixpkgs-unstable.lib.nixosSystem { SteamDeck = nixpkgs-unstable.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { systemPkgs = inputs.nixpkgs-unstable; }; specialArgs = { systemPkgs = inputs.nixpkgs-unstable; flakeSelf = self; };
modules = [ modules = [
# Needed for nix-index
{ nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; }
agenix.nixosModules.default agenix.nixosModules.default
jovian.nixosModules.default jovian.nixosModules.default
home-manager-unstable.nixosModule home-manager-unstable.nixosModule
@ -125,10 +119,8 @@ outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstabl
Everest = nixpkgs.lib.nixosSystem { Everest = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { systemPkgs = inputs.nixpkgs; }; specialArgs = { systemPkgs = inputs.nixpkgs; flakeSelf = self; };
modules = [ modules = [
# Needed for nix-index
{ nix.nixPath = [ "nixpkgs=${nixpkgs}" ]; }
agenix.nixosModules.default agenix.nixosModules.default
home-manager.nixosModule home-manager.nixosModule
nix-index-db.nixosModules.nix-index nix-index-db.nixosModules.nix-index

7
roles/common/configuration.nix
View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, flakeSelf, ... }:
{ {
environment = { environment = {
@ -85,5 +85,8 @@
manually on everything else manually on everything else
*/ */
system.stateVersion = "23.05"; system = {
stateVersion = "23.05";
configurationRevision = flakeSelf.sourceInfo.rev or flakeSelf.sourceInfo.dirtyRev;
};
} }