qenya/nixfiles
1
0
Fork 0
Code Issues 5 Pull requests Actions Activity

tohru: get scoutshonour games from their own repo instead of NUR

Browse source
This commit is contained in:
Katherina Walshe-Grey 2024-12-27 13:09:22 +00:00
parent e31fb0fc24
commit 7b7e8683b3
3 changed files with 51 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
flake.lock
View file

@ -344,7 +344,29 @@
"nixpkgs-unstable-small": "nixpkgs-unstable-small", "nixpkgs-unstable-small": "nixpkgs-unstable-small",
"nur": "nur", "nur": "nur",
"plasma-manager": "plasma-manager", "plasma-manager": "plasma-manager",
"randomcat": "randomcat" "randomcat": "randomcat",
"scoutshonour": "scoutshonour"
}
},
"scoutshonour": {
"inputs": {
"nixpkgs": [
"nixpkgs-unstable"
]
},
"locked": {
"lastModified": 1735301893,
"narHash": "sha256-d95MCTUYMCcOQv4LpmWxPuVnx7McezXYs2Idw8u8ngI=",
"ref": "main",
"rev": "f447cd380ea1fb81a0ff8f292b6bbdf0be9c9520",
"revCount": 23,
"type": "git",
"url": "https://git.qenya.tel/qenya/nix-scoutshonour"
},
"original": {
"ref": "main",
"type": "git",
"url": "https://git.qenya.tel/qenya/nix-scoutshonour"
} }
}, },
"systems": { "systems": {

36
flake.nix
View file

@ -57,9 +57,14 @@
}; };
birdsong.url = "git+https://git.qenya.tel/qenya/birdsong?ref=main"; birdsong.url = "git+https://git.qenya.tel/qenya/birdsong?ref=main";
scoutshonour = {
url = "git+https://git.qenya.tel/qenya/nix-scoutshonour?ref=main";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
}; };
outputs = inputs@{ self, nixpkgs, nixpkgs-small, lix-module, home-manager, plasma-manager, nur, agenix, colmena, randomcat, actual, birdsong, ... }: { outputs = inputs@{ self, nixpkgs, nixpkgs-small, colmena, ... }: {
nixosConfigurations = self.outputs.colmenaHive.nodes; nixosConfigurations = self.outputs.colmenaHive.nodes;
colmenaHive = colmena.lib.makeHive self.outputs.colmena; colmenaHive = colmena.lib.makeHive self.outputs.colmena;
@ -71,7 +76,7 @@
# https://github.com/NixOS/nix/pull/10858 # https://github.com/NixOS/nix/pull/10858
homeManagerModules = { homeManagerModules = {
"qenya".imports = [ "qenya".imports = [
plasma-manager.homeManagerModules.plasma-manager inputs.plasma-manager.homeManagerModules.plasma-manager
./home/qenya ./home/qenya
]; ];
@ -88,7 +93,10 @@
orm = import nixpkgs-small { system = "x86_64-linux"; }; orm = import nixpkgs-small { system = "x86_64-linux"; };
kalessin = import nixpkgs-small { system = "aarch64-linux"; }; kalessin = import nixpkgs-small { system = "aarch64-linux"; };
}; };
specialArgs = { inherit self; }; specialArgs = {
inherit self;
inherit inputs;
};
}; };
defaults = { config, lib, pkgs, ... }: { defaults = { config, lib, pkgs, ... }: {
@ -98,16 +106,16 @@
deployment.buildOnTarget = lib.mkDefault true; deployment.buildOnTarget = lib.mkDefault true;
imports = [ imports = [
lix-module.nixosModules.default inputs.lix-module.nixosModules.default
home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
nur.nixosModules.nur inputs.nur.nixosModules.nur
{ nixpkgs.overlays = [ nur.overlay ]; } { nixpkgs.overlays = [ inputs.nur.overlay ]; }
agenix.nixosModules.default inputs.agenix.nixosModules.default
birdsong.nixosModules.default inputs.birdsong.nixosModules.default
actual.nixosModules.default inputs.actual.nixosModules.default
./common ./common
./services ./services
(builtins.toPath "${randomcat}/services/default.nix") (builtins.toPath "${inputs.randomcat}/services/default.nix")
]; ];
}; };
@ -130,9 +138,9 @@
in in
pkgs.mkShell { pkgs.mkShell {
packages = [ packages = [
colmena.packages.${system}.colmena inputs.colmena.packages.${system}.colmena
agenix.packages.${system}.default inputs.agenix.packages.${system}.default
plasma-manager.packages.${system}.rc2nix inputs.plasma-manager.packages.${system}.rc2nix
]; ];
}; };
}; };

8
hosts/tohru/default.nix
View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, inputs, ... }:
{ {
imports = [ imports = [
@ -31,6 +31,8 @@
"networkmanager" # UI wifi configuration "networkmanager" # UI wifi configuration
"dialout" # access to serial ports "dialout" # access to serial ports
]; ];
nixpkgs.overlays = [ inputs.scoutshonour.overlays.default ];
home-manager.users.qenya = { pkgs, ... }: { home-manager.users.qenya = { pkgs, ... }: {
home.packages = with pkgs; [ home.packages = with pkgs; [
keepassxc keepassxc
@ -41,8 +43,8 @@
# games # games
openttd openttd
prismlauncher prismlauncher
nur.repos.qenya.digital-a-love-story scoutshonour.digital-a-love-story
nur.repos.qenya.dont-take-it-personally-babe scoutshonour.dont-take-it-personally-babe
]; ];
}; };