summaryrefslogtreecommitdiff
path: root/modules/nixos
diff options
context:
space:
mode:
authorseth <[email protected]>2025-01-05 23:24:04 -0500
committerGitHub <[email protected]>2025-01-06 04:24:04 +0000
commita0726ea66d1857eb2e1c9d7dfd2f10d30ac64706 (patch)
tree585d4c7706ef52fc037419958b0af86e216a5d43 /modules/nixos
parent85e702efc03b04cbb0ac5b1b2ef79c21602c8ed8 (diff)
treewide: back to flake parts (#539)
* treewide: back to flake parts * treewide: drop extra docs these are kind pointless
Diffstat (limited to 'modules/nixos')
-rw-r--r--modules/nixos/default.nix22
-rw-r--r--modules/nixos/desktop/plasma/default.nix5
-rw-r--r--modules/nixos/profiles/server.nix5
3 files changed, 17 insertions, 15 deletions
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 82e4b93..47a814d 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -1,11 +1,15 @@
{
- imports = [
- ../shared
- ./defaults
- ./desktop
- ./mixins
- ./profiles
- ./services
- ./traits
- ];
+ flake.nixosModules = {
+ default = {
+ imports = [
+ ../shared
+ ./defaults
+ ./desktop
+ ./mixins
+ ./profiles
+ ./services
+ ./traits
+ ];
+ };
+ };
}
diff --git a/modules/nixos/desktop/plasma/default.nix b/modules/nixos/desktop/plasma/default.nix
index dceded3..c021d46 100644
--- a/modules/nixos/desktop/plasma/default.nix
+++ b/modules/nixos/desktop/plasma/default.nix
@@ -2,11 +2,10 @@
config,
lib,
pkgs,
- inputs,
+ inputs',
...
}:
let
- inherit (pkgs.stdenv.hostPlatform) system;
cfg = config.desktop.plasma;
in
{
@@ -26,7 +25,7 @@ in
systemPackages = [
pkgs.haruna # mpv frontend
- inputs.krunner-nix.packages.${system}.default # thank you leah
+ inputs'.krunner-nix.packages.default # thank you leah
];
};
diff --git a/modules/nixos/profiles/server.nix b/modules/nixos/profiles/server.nix
index e3e785b..a4eae44 100644
--- a/modules/nixos/profiles/server.nix
+++ b/modules/nixos/profiles/server.nix
@@ -1,8 +1,7 @@
{
config,
lib,
- pkgs,
- inputs,
+ inputs',
...
}:
let
@@ -21,7 +20,7 @@ in
lib.mkMerge [
{
# All servers are most likely on stable, so we want to pull in some newer packages from time to time
- _module.args.unstable = inputs.nixpkgs.legacyPackages.${pkgs.stdenv.hostPlatform.system};
+ _module.args.unstable = inputs'.nixpkgs.legacyPackages;
boot.tmp.cleanOnBoot = lib.mkDefault true;