From 20c689c882fb13e46abaca5486f510a63eeca3c8 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Wed, 7 Jun 2023 16:59:11 +0200 Subject: [PATCH] upgrade uhk --- flake.nix | 65 +++++++++++++++++---------------- nixos/components/gui/kmonad.nix | 2 +- 2 files changed, 35 insertions(+), 32 deletions(-) diff --git a/flake.nix b/flake.nix index 56a40cf..f49a234 100644 --- a/flake.nix +++ b/flake.nix @@ -149,7 +149,10 @@ overlays = [ (_self: _super: { # we assign the overlay created before to the overlays of nixpkgs. - unstable = nixpkgs-unstable.legacyPackages.${pkgs.system}; + unstable = import nixpkgs-unstable { + inherit system; + config.allowUnfree = true; + }; legacy = nixpkgs-legacy.legacyPackages.${pkgs.system}; polygon-art = polygon-art.packages.${pkgs.system}; landingpage = landingpage.packages.${pkgs.system}.plain; @@ -214,38 +217,38 @@ }; }; - sterni = { name, nodes, pkgs, ... }: { - deployment.allowLocalDeployment = true; - deployment.targetHost = "${name}.private"; - deployment.tags = [ "desktop" "online" "private" ]; - imports = [ - grocy-scanner.nixosModule - nixos-hardware.nixosModules.lenovo-thinkpad-x220 - retiolum.nixosModules.retiolum - ]; + #sterni = { name, nodes, pkgs, ... }: { + # deployment.allowLocalDeployment = true; + # deployment.targetHost = "${name}.private"; + # deployment.tags = [ "desktop" "online" "private" ]; + # imports = [ + # grocy-scanner.nixosModule + # nixos-hardware.nixosModules.lenovo-thinkpad-x220 + # retiolum.nixosModules.retiolum + # ]; - home-manager.users.mainUser = { - imports = [ - doom-emacs-nix.hmModule - home-manager-utils.hmModule - ]; - }; - }; + # home-manager.users.mainUser = { + # imports = [ + # doom-emacs-nix.hmModule + # home-manager-utils.hmModule + # ]; + # }; + #}; - sternchen = { name, nodes, pkgs, ... }: { - deployment.targetHost = "${name}.secret"; - deployment.tags = [ "desktop" ]; - imports = [ - grocy-scanner.nixosModule - ]; - home-manager.users.mainUser = { - imports = [ - doom-emacs-nix.hmModule - home-manager-utils.hmModule - ]; - programs.doom-emacs.enable = false; - }; - }; + #sternchen = { name, nodes, pkgs, ... }: { + # deployment.targetHost = "${name}.secret"; + # deployment.tags = [ "desktop" ]; + # imports = [ + # grocy-scanner.nixosModule + # ]; + # home-manager.users.mainUser = { + # imports = [ + # doom-emacs-nix.hmModule + # home-manager-utils.hmModule + # ]; + # programs.doom-emacs.enable = false; + # }; + #}; pepe = { name, nodes, pkgs, ... }: { deployment.targetHost = "${name}.private"; diff --git a/nixos/components/gui/kmonad.nix b/nixos/components/gui/kmonad.nix index 816f063..f849dda 100644 --- a/nixos/components/gui/kmonad.nix +++ b/nixos/components/gui/kmonad.nix @@ -10,7 +10,7 @@ # only needed if you have an UHK hardware.keyboard.uhk.enable = true; - environment.systemPackages = [ pkgs.uhk-agent ]; + environment.systemPackages = [ pkgs.unstable.uhk-agent ]; users.users.mainUser.extraGroups = [ "input" ]; services.xserver = {