From f249dd5fc77cbdc798999b03f05fe70a94d2a900 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Fri, 27 Aug 2021 19:03:50 +0000 Subject: [PATCH] Get rustybar and sway customizations working on mistmane --- externals/packages/rustybar | 2 +- system/mistmane/default.nix | 47 +++++++++++++++++++++++++++++++++---- 2 files changed, 43 insertions(+), 6 deletions(-) diff --git a/externals/packages/rustybar b/externals/packages/rustybar index 3f69c3d..56da465 160000 --- a/externals/packages/rustybar +++ b/externals/packages/rustybar @@ -1 +1 @@ -Subproject commit 3f69c3d2eb046be51dd4021bf730779500b8d330 +Subproject commit 56da46578d8b41c8a3f8bb83eb3b6b194a6538bc diff --git a/system/mistmane/default.nix b/system/mistmane/default.nix index bf0c441..d07c8c2 100644 --- a/system/mistmane/default.nix +++ b/system/mistmane/default.nix @@ -1,22 +1,59 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: { imports = [ ./boot-config.nix ./hardware-configuration.nix ../../externals/wip-pinebook-pro/pinebook_pro.nix - ../../sets/wifi.nix + ../../sets/laptop.nix ../../sets/workstation.nix ]; networking.hostName = "mistmane"; - programs.light.enable = true; - system.stateVersion = "20.09"; security.pam.enableEcryptfs = true; environment.systemPackages = with pkgs; [ ecryptfs ecryptfs-helper - foot ]; + + home-manager.users.artemis = { + programs.foot = { + enable = true; + settings.main = { + shell = "/run/current-system/sw/bin/fish"; + font = "Fira Code:size=6"; + }; + }; + wayland.windowManager.sway.config = { + terminal = lib.mkForce "foot"; + input."9610:30:HAILUCK_CO.,LTD_USB_KEYBOARD_Touchpad" = { + middle_emulation = "enabled"; + click_method = "clickfinger"; + }; + }; + xdg.configFile."rustybar/config.toml".text = '' + [[tile]] + type = "iwd" + interface = "wlan0" + [[tile]] + type = "load" + [[tile]] + type = "memory" + [[tile]] + type = "hostname" + [[tile]] + type = "battery" + battery = "cw2015-battery" + [[tile]] + type = "time" + format = "%Y-%m-%dT%H:%M:%S" + ''; + }; + services.logind = { + lidSwitch = lib.mkForce "lock"; + extraConfig = lib.mkForce "HandlePowerKey=lock"; + }; + + system.stateVersion = "21.11"; }