From e4bd7ee5e6643b898af632f6ae36065bd8c100bf Mon Sep 17 00:00:00 2001 From: kat Date: Sat, 17 Dec 2022 20:28:07 +0100 Subject: [PATCH] feat: fix tewi, ... --- 1 | 174 +++++++++++ flake.lock | 48 +-- hardware/networkmanager.nix | 1 + home/gtk.nix | 16 +- home/gui/nextcloud.nix | 4 +- home/gui/packages.nix | 3 + home/konawall.nix | 3 +- home/sway.nix | 3 +- home/vim/default.nix | 2 +- home/waybar/default.nix | 332 ++++++++++----------- home/waybar/waybar.sass | 15 +- nixos/base/time.nix | 3 + nixos/gui/sound.nix | 21 +- nixos/light.nix | 1 - nixos/systems/tewi/nixos.nix | 2 +- overlays/local/irlsite.nix | 4 +- overlays/local/waybar-gpg/default.nix | 2 +- overlays/local/waybar-konawall/default.nix | 5 + patchedInputs.nix | 5 +- system/time.nix | 3 - tf | 2 +- 21 files changed, 425 insertions(+), 224 deletions(-) create mode 100644 1 create mode 100644 nixos/base/time.nix delete mode 100644 system/time.nix diff --git a/1 b/1 new file mode 100644 index 00000000..6ee73975 --- /dev/null +++ b/1 @@ -0,0 +1,174 @@ +{ config, lib, pkgs, nixfiles, ... }: + +{ + xdg.configFile."waybar/style.css" = { inherit (nixfiles.sassTemplate { name = "waybar-style"; src = ./waybar.sass; }) source; }; + +#systemd.user.services.waybar.Service.Environment = lib.singleton "NOTMUCH_CONFIG=${config.home.sessionVariables.NOTMUCH_CONFIG}"; + + programs.waybar = { + enable = true; + systemd.enable = true; + settings = [{ + height = 10; + modules-left = [ + "sway/workspaces" + "sway/mode" + "sway/window" + ]; + modules-center = [ + ]; + modules-right = [ + "pulseaudio#icon" + "pulseaudio" + "custom/headset-icon" + "custom/headset" + "custom/cpu-icon" + "cpu" + "custom/memory-icon" + "memory" + "temperature#icon" + "temperature" + "battery#icon" + "battery" + "backlight#icon" + "backlight" + "network#icon" + "network" + "idle_inhibitor" + "custom/konawall" + "custom/gpg-status" + "custom/clock" + "tray" + ]; + + modules = { + "sway/workspaces" = { + format = "{icon}"; + format-icons = { + "1" = "1:"; + "2" = "2:"; + "3" = "3:"; + }; + }; + "sway/window" = { + icon = true; + icon-size = 12; + format = "{}"; + }; + tray = { + icon-size = 12; + spacing = 2; + }; + "backlight#icon" = { + format = "{icon}"; + format-icons = ["" ""]; + }; + backlight = { + format = "{percent}%"; + }; + "custom/gpg-status" = { + format = "{text} {alt}"; + interval = 300; + return-type = "json"; + exec = "${pkgs.waybar-gpg}/bin/kat-gpg-status"; + }; + "custom/headset-icon" = { + format = ""; + interval = 60; + exec-if = "${pkgs.headsetcontrol}/bin/headsetcontrol -c"; + exec = "echo 'mew'"; + }; + "custom/headset" = { + format = "{}"; + interval = 60; + exec-if = "${pkgs.headsetcontrol}/bin/headsetcontrol -c"; + exec = "${pkgs.headsetcontrol}/bin/headsetcontrol -b | ${pkgs.gnugrep}/bin/grep Battery | ${pkgs.coreutils}/bin/cut -d ' ' -f2"; + }; + "custom/konawall" = { + format = "{}"; + interval = "once"; + return-type = "json"; + exec = "${pkgs.waybar-konawall}/bin/konawall-status"; + on-click = "${pkgs.waybar-konawall}/bin/konawall-toggle"; + on-click-right = "systemctl --user restart konawall"; + signal = 8; + }; + "custom/cpu-icon".format = ""; + cpu.format = "{usage}%"; + "custom/memory-icon".format = ""; + memory.format = "{percentage}%"; + "temperature#icon" = { + format = "{icon}"; + format-icons = ["" "" ""]; + critical-threshold = 80; + }; + temperature = { + format = "{temperatureC}°C"; + critical-threshold = 80; + }; + idle_inhibitor = { + format = "{icon}"; + format-icons = { + activated = ""; + deactivated = ""; + }; + }; + "battery#icon" = { + states = { + good = 90; + warning = 30; + critical = 15; + }; + format = "{icon}"; + format-charging = ""; + format-plugged = ""; + format-icons = [ "" "" "" "" "" ]; + }; + battery = { + states = { + good = 90; + warning = 30; + critical = 15; + }; + format = "{capacity}%"; + format-charging = "{capacity}%"; + format-plugged = "{capacity}%"; + format-alt = "{time}"; + }; + "pulseaudio#icon" = { + format = "{icon}"; + format-muted = "婢"; + on-click = "foot pulsemixer"; + format-icons = { + default = [ + "" + "" + "" + ]; + }; + }; + pulseaudio = { + format = "{volume}%"; + on-click = "foot pulsemixer"; + }; + "network#icon" = { + format-wifi = "直"; + format-ethernet = ""; + format-linked = " "; + format-disconnected = ""; + }; + network = { + format-wifi = "{essid} ({signalStrength}%)"; + format-ethernet = "{ipaddr}/{cidr}"; + format-linked = "No IP"; + format-disconnected = "Disconnected"; + format-alt = "{ifname}: {ipaddr}/{cidr}"; + }; + "custom/clock" = { + exec = ''${pkgs.coreutils}/bin/date +"%a, %F %T %Z"''; + interval = 1; + }; + }; + }]; + }; +} diff --git a/flake.lock b/flake.lock index 3ce4ed5e..f51b95da 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "arcexprs": { "flake": false, "locked": { - "lastModified": 1667844584, - "narHash": "sha256-YucZC6fUjAldFvCpdjjvp0H8NBIb6xwp4ITecQGG5ZU=", + "lastModified": 1667597026, + "narHash": "sha256-XHtUQKU+w+m2/DPVlB8fmUKtSIarv/n0wOGwho/ZuCo=", "owner": "arcnmx", "repo": "nixexprs", - "rev": "ca2d7f002db8abc6133b19d9f97510364d64a377", + "rev": "a00aaa69de023da7f1429a2bd3081b1f5400118b", "type": "github" }, "original": { @@ -20,11 +20,11 @@ "ci": { "flake": false, "locked": { - "lastModified": 1667932467, - "narHash": "sha256-LjDP5b6YvHOXjqX5JrnsKBtrZ+AOrB5icMeRlONaXto=", + "lastModified": 1667599669, + "narHash": "sha256-0/PsJ5UoJ4Xa74vu25xoUO07JxHfK6pLhnjEglsWvFA=", "owner": "arcnmx", "repo": "ci", - "rev": "e744677fdde8b127cac7d6d6c7869ae1a89dd365", + "rev": "bfb73a0a2f7daeca40f8ee73506b1c5b5b5d53dc", "type": "github" }, "original": { @@ -91,11 +91,11 @@ "emacs-overlay": { "flake": false, "locked": { - "lastModified": 1668107626, - "narHash": "sha256-+SqPtgD0fQ/LvYxPH+1I5lR76rAqI67GcjQ1gvwUt6U=", + "lastModified": 1667507825, + "narHash": "sha256-Tss8NXLO5HIqcY+v+lMy/tcdBKNwKxW5Lb4PkuS5rmY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a5732835d449b66324efa829e3b8be73be3d505e", + "rev": "ccefa5f7ddbb036656d8617ed2862fe057d60fb4", "type": "github" }, "original": { @@ -272,11 +272,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1668332334, - "narHash": "sha256-YT1qcE/MCqBO1Bi/Yr6GcFpNKsvmzrBKh8juyXDbxQc=", + "lastModified": 1671209729, + "narHash": "sha256-zxn1eA/rMi2DOx43V7q87bGaDzvL7CMVY/Ti7lJ92DQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "bc90de24d898655542589237cc0a6ada7564cb6c", + "rev": "7d55a72d4c1df694e87a41a7e6c9a7b6e9a40ca3", "type": "github" }, "original": { @@ -343,11 +343,11 @@ "ws-butler": "ws-butler" }, "locked": { - "lastModified": 1668132183, - "narHash": "sha256-oHycAYbl3vU8sHQ4vwjW5SZ4T3x+B6bckSDCMjlRMdk=", + "lastModified": 1667731647, + "narHash": "sha256-E/Y5yxX8u0RlLt07PJoQ+QAYMbbL19WayLU/SJDtnMw=", "owner": "nix-community", "repo": "nix-doom-emacs", - "rev": "d73237307872f29f2c6492aa81dfc8be0dead7a8", + "rev": "c38ccd08345f58001cac2c2578e71d3f29b59bc0", "type": "github" }, "original": { @@ -374,11 +374,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1668326430, - "narHash": "sha256-fJEsHe+lzFf3qcQVTTdK9jqRtUUVXH71tdfgjcKJNpA=", + "lastModified": 1667629849, + "narHash": "sha256-P+v+nDOFWicM4wziFK9S/ajF2lc0N2Rg9p6Y35uMoZI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fc07622617a373a742ed96d4dd536849d4bc1ec6", + "rev": "3bacde6273b09a21a8ccfba15586fb165078fb62", "type": "github" }, "original": { @@ -406,11 +406,11 @@ }, "nur": { "locked": { - "lastModified": 1668439646, - "narHash": "sha256-6ImukgwTQXvJWxkk3vvlsswWI16hZbdaOxx+49rlDkg=", + "lastModified": 1667742561, + "narHash": "sha256-lhNo7sk3eqq9SOABZYBECXlP552B1wgsLEGSQkWMM1M=", "owner": "nix-community", "repo": "nur", - "rev": "437d04eb2226617399797449a5bbf847d3324240", + "rev": "8aab177dc76d9b2cffe23720567ad81aaae13052", "type": "github" }, "original": { @@ -567,11 +567,11 @@ "tf-nix": { "flake": false, "locked": { - "lastModified": 1667403920, - "narHash": "sha256-SYAud54d5eGi8VnZ4a58teqypaQY/n+WJsObDdRzlEY=", + "lastModified": 1670125422, + "narHash": "sha256-7QuCX4vGl58k3jzGkeHEI4aeSbcOKueb4U5RyZHulM8=", "owner": "arcnmx", "repo": "tf-nix", - "rev": "768cc5f75f5f15d8a44fbbbc2e771acfc0573c87", + "rev": "210f7e9c46bf8fa8f0b621f6e24adaea5a55e827", "type": "github" }, "original": { diff --git a/hardware/networkmanager.nix b/hardware/networkmanager.nix index 4a7c2a5b..fb8183b1 100644 --- a/hardware/networkmanager.nix +++ b/hardware/networkmanager.nix @@ -20,6 +20,7 @@ }; hardware.bluetooth = { enable = true; + package = pkgs.bluez5-experimental; settings = { General = { Enable = "Source,Sink,Media,Socket"; diff --git a/home/gtk.nix b/home/gtk.nix index 69462552..41f69fe1 100644 --- a/home/gtk.nix +++ b/home/gtk.nix @@ -1,13 +1,19 @@ { config, lib, pkgs, ... }: { - home.packages = with pkgs; [ lxappearance ]; - base16.gtk.enable = true; + home.packages = with pkgs; [ + gnome.adwaita-icon-theme + ]; + base16.gtk.enable = false; gtk = { - enable = false; + enable = true; + font = { + name = "Iosevka Aile"; + size = 9; + }; iconTheme = { - name = "Papirus-Dark"; - package = pkgs.papirus-icon-theme; + name = "Maia"; + package = pkgs.maia-icon-theme; }; theme = { name = "Adapta"; diff --git a/home/gui/nextcloud.nix b/home/gui/nextcloud.nix index 25779ef6..98196025 100644 --- a/home/gui/nextcloud.nix +++ b/home/gui/nextcloud.nix @@ -1,6 +1,6 @@ { config, ... }: { services = { - nextcloud-client.enable = true; - gnome-keyring.enable = true; + nextcloud-client.enable = false; + gnome-keyring.enable = false; }; } diff --git a/home/gui/packages.nix b/home/gui/packages.nix index fbc174ba..b559dafe 100644 --- a/home/gui/packages.nix +++ b/home/gui/packages.nix @@ -21,6 +21,9 @@ google-chrome element-desktop cryptsetup + signal-desktop + nix-linter + spotify esphome esptool ]; diff --git a/home/konawall.nix b/home/konawall.nix index c106cb83..c2e649d7 100644 --- a/home/konawall.nix +++ b/home/konawall.nix @@ -13,7 +13,8 @@ commonTags = [ "width:>=1600" ]; tagList = map (lib.toList) [ (["score:>=50" - "rating:s"]) #++ optional (nixos.networking.hostName == "koishi") "rating:s") + "no_humans" + "rating:s"]) ]; }; } diff --git a/home/sway.nix b/home/sway.nix index 5b41ca8b..d4f3e39b 100644 --- a/home/sway.nix +++ b/home/sway.nix @@ -3,7 +3,7 @@ let lockCommand = config.programs.swaylock.script; in { home.sessionVariables = { - XDG_CURRENT_DESKTOP = "sway"; + XDG_CURRENT_DESKTOP = "Unity"; XDG_SESSION_TYPE = "wayland"; WLR_DRM_DEVICES = "/dev/dri/card0"; }; @@ -223,6 +223,7 @@ let lockCommand = config.programs.swaylock.script; in "${cfg.modifier}+Shift+Tab" = "exec ${config.services.i3gopher.focus-last}"; # multimedia / laptop + "XF86AudioPlay" = "exec --no-startup-id ${pkgs.playerctl}/bin/playerctl play-pause"; "XF86AudioLowerVolume" = "exec --no-startup-id ${pactl} set-sink-volume @DEFAULT_SINK@ -5%"; "XF86AudioRaiseVolume" = "exec --no-startup-id ${pactl} set-sink-volume @DEFAULT_SINK@ +5%"; "XF86AudioMute" = "exec --no-startup-id ${pactl} set-sink-mute @DEFAULT_SINK@ toggle"; diff --git a/home/vim/default.nix b/home/vim/default.nix index f71db445..9146ccde 100644 --- a/home/vim/default.nix +++ b/home/vim/default.nix @@ -56,7 +56,7 @@ in { tree-sitter-c tree-sitter-lua tree-sitter-rust - tree-sitter-bash + #tree-sitter-bash tree-sitter-css tree-sitter-dockerfile tree-sitter-go diff --git a/home/waybar/default.nix b/home/waybar/default.nix index 1a9ffff2..68294255 100644 --- a/home/waybar/default.nix +++ b/home/waybar/default.nix @@ -1,174 +1,174 @@ { config, lib, pkgs, nixfiles, ... }: { - xdg.configFile."waybar/style.css" = { inherit (nixfiles.sassTemplate { name = "waybar-style"; src = ./waybar.sass; }) source; }; + xdg.configFile."waybar/style.css" = { inherit (nixfiles.sassTemplate { name = "waybar-style"; src = ./waybar.sass; }) source; }; #systemd.user.services.waybar.Service.Environment = lib.singleton "NOTMUCH_CONFIG=${config.home.sessionVariables.NOTMUCH_CONFIG}"; - programs.waybar = { - enable = true; - systemd.enable = true; - settings = [{ - height = 10; - modules-left = [ - "sway/workspaces" - "sway/mode" - "sway/window" - ]; - modules-center = [ - "clock#original" - ]; - modules-right = [ - "pulseaudio#icon" - "pulseaudio" - "custom/headset-icon" - "custom/headset" - "custom/cpu-icon" - "cpu" - "custom/memory-icon" - "memory" - "temperature#icon" - "temperature" - "battery#icon" - "battery" - "battery#icon" - "backlight" - "backlight" - "network" - "idle_inhibitor" - "custom/konawall" - "custom/gpg-status" - "tray" - ]; + programs.waybar = { + enable = true; + systemd.enable = true; + settings = [{ + height = 10; + modules-left = [ + "sway/workspaces" + "sway/mode" + "sway/window" + ]; + modules-center = [ + ]; + modules-right = [ + "pulseaudio#icon" + "pulseaudio" + "custom/headset-icon" + "custom/headset" + "custom/cpu-icon" + "cpu" + "custom/memory-icon" + "memory" + "temperature#icon" + "temperature" + "battery#icon" + "battery" + "backlight#icon" + "backlight" + "network#icon" + "network" + "idle_inhibitor" + "custom/konawall" + "custom/gpg-status" + "custom/clock" + "tray" + ]; - modules = { - "sway/workspaces" = { - format = "{icon}"; - format-icons = { - "1" = "1:"; - "2" = "2:"; - "3" = "3:"; - }; - }; - "sway/window" = { - icon = true; - icon-size = 12; - format = "{}"; - }; - tray = { - icon-size = 12; - spacing = 2; - }; - "backlight#icon" = { - format = "{icon}"; - format-icons = ["" ""]; - }; - backlight = { - format = "{percent}%"; - }; - "custom/gpg-status" = { - format = "{}"; - interval = 300; - return-type = "json"; - exec = "${pkgs.waybar-gpg}/bin/kat-gpg-status"; - }; - "custom/headset-icon" = { - format = ""; - interval = 60; - exec-if = "${pkgs.headsetcontrol}/bin/headsetcontrol -c"; - exec = "echo 'mew'"; - }; - "custom/headset" = { - format = "{}"; - interval = 60; - exec-if = "${pkgs.headsetcontrol}/bin/headsetcontrol -c"; - exec = "${pkgs.headsetcontrol}/bin/headsetcontrol -b | ${pkgs.gnugrep}/bin/grep Battery | ${pkgs.coreutils}/bin/cut -d ' ' -f2"; - }; - "custom/konawall" = { - format = "{}"; - interval = "once"; - return-type = "json"; - exec = "${pkgs.waybar-konawall}/bin/konawall-status"; - on-click = "${pkgs.waybar-konawall}/bin/konawall-toggle"; - on-click-right = "systemctl --user restart konawall"; - signal = 8; - }; - "custom/cpu-icon".format = ""; - cpu.format = "{usage}%"; - "custom/memory-icon".format = ""; - memory.format = "{percentage}%"; - "temperature#icon" = { - format = "{icon}"; - format-icons = ["" "" ""]; - critical-threshold = 80; - }; - temperature = { - format = "{temperatureC}°C"; - critical-threshold = 80; - }; - idle_inhibitor = { - format = "{icon}"; - format-icons = { - activated = ""; - deactivated = ""; - }; - }; - "battery#icon" = { - states = { - good = 90; - warning = 30; - critical = 15; - }; - format = "{icon}"; - format-charging = ""; - format-plugged = ""; - format-icons = [ "" "" "" "" "" ]; - }; - battery = { - states = { - good = 90; - warning = 30; - critical = 15; - }; - format = "{capacity}%"; - format-charging = "{capacity}%"; - format-plugged = "{capacity}%"; - format-alt = "{time}"; - }; - "pulseaudio#icon" = { - format = "{icon}"; - format-muted = "婢"; - on-click = "foot pulsemixer"; - format-icons = { - default = [ - "" - "" - "" - ]; - }; - }; - pulseaudio = { - format = "{volume}%"; - on-click = "foot pulsemixer"; - }; - network = { - format-wifi = "直"; - format-ethernet = ""; - format-linked = " {ifname} (NO IP)"; - format-disconnected = " DC"; - format-alt = "{ifname}: {ipaddr}/{cidr}"; - tooltip-format-wifi = "{essid} ({signalStrength}%)"; - }; - "clock#original" = { - format = "{:%a, %F %T}"; - tooltip = true; - tooltip-format = "{:%A, %F %T %z (%Z)}"; - timezones = [ - "America/Vancouver" - ]; - interval = 1; - }; - }; - }]; - }; + modules = { + "sway/workspaces" = { + format = "{icon}"; + format-icons = { + "1" = "1:"; + "2" = "2:"; + "3" = "3:"; + }; + }; + "sway/window" = { + icon = true; + icon-size = 12; + format = "{}"; + }; + tray = { + icon-size = 12; + spacing = 2; + }; + "backlight#icon" = { + format = "{icon}"; + format-icons = ["" ""]; + }; + backlight = { + format = "{percent}%"; + }; + "custom/gpg-status" = { + format = "{}"; + interval = 300; + return-type = "json"; + exec = "${pkgs.waybar-gpg}/bin/kat-gpg-status"; + }; + "custom/headset-icon" = { + format = ""; + interval = 60; + exec-if = "${pkgs.headsetcontrol}/bin/headsetcontrol -c"; + exec = "echo 'mew'"; + }; + "custom/headset" = { + format = "{}"; + interval = 60; + exec-if = "${pkgs.headsetcontrol}/bin/headsetcontrol -c"; + exec = "${pkgs.headsetcontrol}/bin/headsetcontrol -b | ${pkgs.gnugrep}/bin/grep Battery | ${pkgs.coreutils}/bin/cut -d ' ' -f2"; + }; + "custom/konawall" = { + format = "{}"; + interval = "once"; + return-type = "json"; + exec = "${pkgs.waybar-konawall}/bin/konawall-status"; + on-click = "${pkgs.waybar-konawall}/bin/konawall-toggle"; + on-click-right = "systemctl --user restart konawall"; + signal = 8; + }; + "custom/cpu-icon".format = ""; + cpu.format = "{usage}%"; + "custom/memory-icon".format = ""; + memory.format = "{percentage}%"; + "temperature#icon" = { + format = "{icon}"; + format-icons = ["" "" ""]; + critical-threshold = 80; + }; + temperature = { + format = "{temperatureC}°C"; + critical-threshold = 80; + }; + idle_inhibitor = { + format = "{icon}"; + format-icons = { + activated = ""; + deactivated = ""; + }; + }; + "battery#icon" = { + states = { + good = 90; + warning = 30; + critical = 15; + }; + format = "{icon}"; + format-charging = ""; + format-plugged = ""; + format-icons = [ "" "" "" "" "" ]; + }; + battery = { + states = { + good = 90; + warning = 30; + critical = 15; + }; + format = "{capacity}%"; + format-charging = "{capacity}%"; + format-plugged = "{capacity}%"; + format-alt = "{time}"; + }; + "pulseaudio#icon" = { + format = "{icon}"; + format-muted = "婢"; + on-click = "wezterm start pulsemixer"; + format-icons = { + default = [ + "" + "" + "" + ]; + }; + }; + pulseaudio = { + format = "{volume}%"; + on-click = "${pkgs.wezterm}/bin/wezterm start ${pkgs.pulsemixer}/bin/pulsemixer"; + }; + "network#icon" = { + format-wifi = "直"; + format-ethernet = ""; + format-linked = " "; + format-disconnected = ""; + }; + network = { + format-wifi = "{essid} ({signalStrength}%)"; + format-ethernet = "{ipaddr}/{cidr}"; + format-linked = "No IP"; + format-disconnected = "Disconnected"; + format-alt = "{ifname}: {ipaddr}/{cidr}"; + }; + "custom/clock" = { + exec = ''${pkgs.coreutils}/bin/date +"%a, %F %T %Z"''; + interval = 1; + }; + }; + }]; + }; } diff --git a/home/waybar/waybar.sass b/home/waybar/waybar.sass index fce39d6b..58a484b7 100644 --- a/home/waybar/waybar.sass +++ b/home/waybar/waybar.sass @@ -26,21 +26,21 @@ tooltip color: $base06 padding: 0 4px -#clock +#clock, #custom-clock @extend %extend_1 background: $base01 color: $base07 -#cpu, #memory, #temperature, #pulseaudio, #backlight, #battery, #custom-mail, #custom-headset, #clock.arc, #clock.hex, #clock.miku +#cpu, #memory, #temperature, #pulseaudio, #backlight, #battery, #custom-mail, #custom-headset, #clock.arc, #clock.hex, #clock.miku, #network background: $base01 color: $base07 padding: 0 6px margin-right: 4px -#network, #custom-gpg-status, #custom-konawall, #idle_inhibitor +#custom-gpg-status, #custom-konawall, #idle_inhibitor margin: 0 4px -#temperature.icon, #pulseaudio.icon, #battery.icon, #backlight.icon, #custom-cpu-icon, #custom-memory-icon, #custom-mail-icon, #custom-headset-icon, #custom-arc-h, #custom-hex-h, #custom-miku-h, #clock.original, #tray +#temperature.icon, #pulseaudio.icon, #battery.icon, #backlight.icon, #custom-cpu-icon, #custom-memory-icon, #custom-mail-icon, #custom-headset-icon, #custom-arc-h, #custom-hex-h, #custom-miku-h, #clock.original, #tray, #network.icon margin-left: 4px margin-right: 0px @@ -66,7 +66,7 @@ tooltip &.muted background: $base03 -#network +#network.icon @extend %extend_1 background: $base0C @@ -121,8 +121,9 @@ tooltip .modules-left margin: 0 4px image - padding-left: 4px - margin-left: 8px + padding-left: 6px + padding-right: 6px + margin-left: 4px margin-right: 0px background: $base01 #window diff --git a/nixos/base/time.nix b/nixos/base/time.nix new file mode 100644 index 00000000..ac892dbf --- /dev/null +++ b/nixos/base/time.nix @@ -0,0 +1,3 @@ +{ config, ... }: { + services.tzupdate.enable = true; +} diff --git a/nixos/gui/sound.nix b/nixos/gui/sound.nix index 7125c10c..c61e10fe 100644 --- a/nixos/gui/sound.nix +++ b/nixos/gui/sound.nix @@ -5,13 +5,24 @@ enable = true; extraConfig = '' defaults.pcm.rate_converter "speexrate_best" - ''; + ''; }; - environment.systemPackages = with pkgs; [ pulsemixer ]; + environment.systemPackages = with pkgs; [ pulsemixer bluez5-experimental ]; security.rtkit.enable = true; + environment.etc = { + "wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = '' + bluez_monitor.properties = { + ["bluez5.enable-sbc-xq"] = true, + ["bluez5.enable-msbc"] = true, + ["bluez5.enable-hw-volume"] = true, + ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]" + } + ''; + }; + services.pipewire = { enable = true; config = { @@ -26,9 +37,9 @@ name = "libpipewire-module-protocol-pulse"; args = { "pulse.min.quantum" = 32; # controls minimum playback quant - "pulse.min.req" = 32; # controls minimum recording quant - "pulse.min.frag" = 32; # controls minimum fragment size - "server.address" = + "pulse.min.req" = 32; # controls minimum recording quant + "pulse.min.frag" = 32; # controls minimum fragment size + "server.address" = [ "unix:native" ]; # the default address of the server }; }]; diff --git a/nixos/light.nix b/nixos/light.nix index 33b4f162..19b781a5 100644 --- a/nixos/light.nix +++ b/nixos/light.nix @@ -1,6 +1,5 @@ { config, lib, ... }: with lib; let lightModeExtend = { config, nixos, ... }: { - gtk.iconTheme.name = mkForce "Papirus-Light"; base16 = { defaultSchemeName = mkForce "light"; }; diff --git a/nixos/systems/tewi/nixos.nix b/nixos/systems/tewi/nixos.nix index f508200d..ff6f1044 100644 --- a/nixos/systems/tewi/nixos.nix +++ b/nixos/systems/tewi/nixos.nix @@ -24,7 +24,7 @@ interfaces = [ "eno1" ]; - ipv4 = "10.1.1.38"; + ipv4 = "100.88.107.41"; }; }; diff --git a/overlays/local/irlsite.nix b/overlays/local/irlsite.nix index 4ad55336..f4acbcc6 100644 --- a/overlays/local/irlsite.nix +++ b/overlays/local/irlsite.nix @@ -3,8 +3,8 @@ src = fetchFromGitHub { owner = "kittywitch"; repo = "inskip.me"; - rev = "3789d9ae2b0135828a6d92e2e6846aec42a29d88"; - sha256 = "sha256-nIAeZRxZ86QuZxGnHTIaawySiTEdw8ZQ4L8eR/2Mdy0="; + rev = "a430a42d70ca9ddb554e8e0c0ed78a33b3ccb9e5"; + sha256 = "sha256-SUhXD0/PdWkvMUGOVTm9PPw8fi+Q+7Psw61VhMKRf2I="; }; buildPhase = '' ''; diff --git a/overlays/local/waybar-gpg/default.nix b/overlays/local/waybar-gpg/default.nix index 072e4293..2956a58b 100644 --- a/overlays/local/waybar-gpg/default.nix +++ b/overlays/local/waybar-gpg/default.nix @@ -1,5 +1,5 @@ { wrapShellScriptBin, pkgs }: wrapShellScriptBin "kat-gpg-status" ./kat-gpg-status.sh { - depsRuntimePath = with pkgs; [ coreutils gnupg ]; + depsRuntimePath = with pkgs; [ coreutils-full gawk gnugrep gnupg ]; } diff --git a/overlays/local/waybar-konawall/default.nix b/overlays/local/waybar-konawall/default.nix index 729b3111..602f3dc3 100644 --- a/overlays/local/waybar-konawall/default.nix +++ b/overlays/local/waybar-konawall/default.nix @@ -7,6 +7,11 @@ in stdenv.mkDerivation { pname = "konawall-toggle"; version = "0.0.1"; + propagatedBuildInputs = with pkgs; [ + gawk + coreutils-full + bash + ]; unpackPhase = "true"; installPhase = '' mkdir -p $out/bin diff --git a/patchedInputs.nix b/patchedInputs.nix index a9187a6e..0970034e 100644 --- a/patchedInputs.nix +++ b/patchedInputs.nix @@ -7,13 +7,12 @@ in inputs /*// { patches = [ ]; }; - }*/ // { darwin = pkgs.applyPatches { - # TODO: close when emi's PR is merged + } // { darwin = pkgs.applyPatches { name = "darwin"; src = inputs.darwin; patches = [ (pkgs.fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/LnL7/nix-darwin/pull/310.patch"; sha256 = "sha256-drnLOhF8JGXx8YY7w1PD2arUZvbqafWPTatQNTHt+QI="; }) ]; - }; } + }; } */ diff --git a/system/time.nix b/system/time.nix deleted file mode 100644 index 0c870ba2..00000000 --- a/system/time.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ config, ... }: { - time.timeZone = "America/Vancouver"; -} diff --git a/tf b/tf index fcebdcb3..b3346400 160000 --- a/tf +++ b/tf @@ -1 +1 @@ -Subproject commit fcebdcb305933c80bd9f8ed3bc8f9713577f2bf3 +Subproject commit b3346400d4e945c4cc9b0e8d149abb37b7f15af5