From ddf11f3ec0642448b68a29f9c1b008af9bb67a10 Mon Sep 17 00:00:00 2001 From: uttarayan21 Date: Fri, 3 Jan 2025 00:59:40 +0530 Subject: [PATCH] feat: Rename device.nix to default.nix for nixos and darwin --- darwin/{device.nix => default.nix} | 0 flake.nix | 8 ++------ linux/default.nix | 13 ------------- nixos/{device.nix => default.nix} | 0 4 files changed, 2 insertions(+), 19 deletions(-) rename darwin/{device.nix => default.nix} (100%) rename nixos/{device.nix => default.nix} (100%) diff --git a/darwin/device.nix b/darwin/default.nix similarity index 100% rename from darwin/device.nix rename to darwin/default.nix diff --git a/flake.nix b/flake.nix index 5495809f..aecfb06d 100644 --- a/flake.nix +++ b/flake.nix @@ -216,10 +216,6 @@ if (builtins.hasAttr "monitors" device) then device.monitors else null; - live = - if (builtins.hasAttr "live" device) - then device.live - else false; system = device.system; name = device.name; user = device.user; @@ -240,14 +236,14 @@ nixosConfigurations = let devices = nixos_devices; in - import ./nixos/device.nix { + import ./nixos { inherit devices inputs nixpkgs home-manager overlays nur; }; darwinConfigurations = let devices = darwin_devices; in - import ./darwin/device.nix { + import ./darwin { inherit devices inputs nixpkgs home-manager overlays nix-darwin; }; diff --git a/linux/default.nix b/linux/default.nix index febc11ac..8f11e7d1 100644 --- a/linux/default.nix +++ b/linux/default.nix @@ -24,17 +24,4 @@ enable = device.hasGui; startInBackground = true; }; - # systemd.user.services.spotify-player = { - # Install = {WantedBy = ["graphical-session.target"];}; - # Unit = { - # Description = "Spotify Player Daemon"; - # After = ["graphical-session.target"]; - # }; - # Service = { - # ExecStart = "${pkgs.spotify-player}/bin/spotify_player -d"; - # Restart = "on-failure"; - # RestartSec = "5"; - # User = "${device.user}"; - # }; - # }; } diff --git a/nixos/device.nix b/nixos/default.nix similarity index 100% rename from nixos/device.nix rename to nixos/default.nix