alex/nixos-configs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

config-manager: Remove system option in favor of pkgs.system

Browse Source
This commit is contained in:
Alexander Heldt
2023-11-01 16:05:00 +01:00
parent 89cd417d12
commit 39fb7e868f
7 changed files with 6 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hosts/pinwheel/configuration.nix
View File

@@ -71,7 +71,6 @@
config-manager = {
flakePath = "/home/alex/config";
system=pkgs.system;
};
mod = {

7
hosts/pinwheel/modules/age/default.nix
View File

@@ -1,7 +1,4 @@
{ inputs, config, ... }:
let
system = config.config-manager.system;
in
{ inputs, pkgs, ... }:
{
age = {
identityPaths = [
@@ -11,6 +8,6 @@ in
};
environment.systemPackages = [
inputs.agenix.packages."${system}".default
inputs.agenix.packages."${pkgs.system}".default
];
}

4
hosts/pinwheel/modules/screenshot/default.nix
View File

@@ -1,10 +1,8 @@
{ inputs, pkgs, lib, config, ...}:
let
system = config.config-manager.system;
hyprlandEnabled = config.mod.hyprland.enable;
grimblast = inputs.hyprland-contrib.packages.${system}.grimblast;
grimblast = inputs.hyprland-contrib.packages.${pkgs.system}.grimblast;
area = "${pkgs.libnotify}/bin/notify-send 'ps: selected area' && ${grimblast}/bin/grimblast copy area";
screen = "${pkgs.libnotify}/bin/notify-send 'ps: selected screen' &&${grimblast}/bin/grimblast copy output";
in

1
hosts/sombrero/configuration.nix
View File

@@ -76,7 +76,6 @@
config-manager = {
flakePath = "/home/alex/config";
system = pkgs.system;
};
mod = {

7
hosts/sombrero/modules/age/default.nix
View File

@@ -1,13 +1,10 @@
{ inputs, config, ... }:
let
system = config.config-manager.system;
in
{ inputs, pkgs, ... }:
{
age = {
identityPaths = [ "/etc/ssh/sombrero" ];
};
environment.systemPackages = [
inputs.agenix.packages."${system}".default
inputs.agenix.packages."${pkgs.system}".default
];
}