From 7827b018996c6bb247b9a5fc2dc9f2b8fa584c15 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Wed, 19 Oct 2022 15:03:58 -0400 Subject: [PATCH] nit: make nix flake check happy --- flake.nix | 4 ++-- hosts/Infini-RPI/default.nix | 13 ------------- hosts/Infini-STICK/default.nix | 1 - hosts/Infini-SWIFT/default.nix | 5 ----- pkgs/olympus.nix | 3 +++ 5 files changed, 5 insertions(+), 21 deletions(-) delete mode 100644 hosts/Infini-RPI/default.nix diff --git a/flake.nix b/flake.nix index 609016b..5559fd9 100644 --- a/flake.nix +++ b/flake.nix @@ -191,13 +191,13 @@ }; }; - devshell = ./shell; + devshells.x86_64-linux.default = ./shell; homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations; deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations { }; - defaultTemplate = self.templates.bud; + templates.default = self.templates.bud; templates.bud.path = ./.; templates.bud.description = "bud template"; diff --git a/hosts/Infini-RPI/default.nix b/hosts/Infini-RPI/default.nix deleted file mode 100644 index 484c024..0000000 --- a/hosts/Infini-RPI/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ suites, profiles, pkgs, lib, ... }: { - imports = lib.lists.flatten [ - (with suites; [ - base - ]) - - (with profiles; [ - networking.wireless - ]) - ]; - - modules.hardware.form.raspi = true; -} diff --git a/hosts/Infini-STICK/default.nix b/hosts/Infini-STICK/default.nix index 4e1d4e4..e3ea8af 100644 --- a/hosts/Infini-STICK/default.nix +++ b/hosts/Infini-STICK/default.nix @@ -15,7 +15,6 @@ audio.enable = true; form.portable = true; }; - services.proxy.enable = false; }; environment.persistence."/persist" = { diff --git a/hosts/Infini-SWIFT/default.nix b/hosts/Infini-SWIFT/default.nix index cc94204..e6fd0c0 100644 --- a/hosts/Infini-SWIFT/default.nix +++ b/hosts/Infini-SWIFT/default.nix @@ -5,8 +5,6 @@ profiles = with profiles; [ networking.wireless - - btrfs ]; }; @@ -23,9 +21,6 @@ gpu.amdgpu = true; wireless.enable = true; }; - services = { - proxy.enable = true; - }; desktop.wm.enable = true; }; } diff --git a/pkgs/olympus.nix b/pkgs/olympus.nix index d1685cb..3172378 100644 --- a/pkgs/olympus.nix +++ b/pkgs/olympus.nix @@ -1,5 +1,6 @@ # Taken from https://github.com/VergeDX/config-nixpkgs/blob/899f13750c9c1795d455eeee9cb28d3aa74a0866/packages/gui/olympus.nix { stdenv +, lib , fetchzip , unzip , makeDesktopItem @@ -41,6 +42,8 @@ buildFHSUserEnv { pkgs.glib ]; + meta.platforms = lib.platforms.linux; + # https://github.com/EverestAPI/Olympus/blob/main/lib-linux/olympus.desktop # https://stackoverflow.com/questions/8822097/how-to-replace-a-whole-line-with-sed extraInstallCommands = ''cp -r "${olympus}/share/" $out'';