diff --git a/dotfiles/sway/config b/dotfiles/sway/config index 513f932..95de070 100644 --- a/dotfiles/sway/config +++ b/dotfiles/sway/config @@ -171,7 +171,12 @@ exec_always { } # autostarts -exec swaync +exec mako --font "$font" \ + --background-color "$white" \ + --border-colo "$red" \ + --text-color "$black" \ + --default-timeout 1000 \ + --padding 10 exec emacs --daemon exec swayidle before-sleep "$lock" exec /run/current-system/sw/libexec/polkit-gnome-authentication-agent-1 diff --git a/dotfiles/sway/status.toml b/dotfiles/sway/status.toml index 6add7e0..4696623 100644 --- a/dotfiles/sway/status.toml +++ b/dotfiles/sway/status.toml @@ -91,20 +91,8 @@ block = "battery" device = "BAT1" interval = 10 format = " $icon $percentage ($time) " -full_format = " $icon $percentage " [[block]] block = "time" interval = 60 format = " $timestamp.datetime(f:'%Y-%m-%d %H:%M') " - -[[block]] -block = "notify" -driver = "swaync" -format = " $icon {($notification_count.eng(w:1)) |}" -[[block.click]] -button = "left" -action = "show" -[[block.click]] -button = "right" -action = "toggle_paused" diff --git a/roles/admin.nix b/roles/admin.nix index 541f26b..0e76052 100644 --- a/roles/admin.nix +++ b/roles/admin.nix @@ -1,7 +1,6 @@ { pkgs, options, ... }: -let -unstable = import { config.allowUnfree = true; }; +let unstable = import { }; in { environment.systemPackages = with pkgs; [ cryptsetup @@ -43,11 +42,5 @@ in { enable = true; storageDriver = "zfs"; }; - virtualisation.libvirtd = { - enable = true; - qemu = { - swtpm.enable = true; - ovmf.enable = true; - }; - }; + virtualisation.libvirtd.enable = true; } diff --git a/roles/base.nix b/roles/base.nix index 032f4d7..1186c9b 100644 --- a/roles/base.nix +++ b/roles/base.nix @@ -90,8 +90,6 @@ in { alias ls="ls --color=auto" alias vim="nvim" alias k="kubectl" - alias n="nix-shell -p" - alias nu="nix-shell -I nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos-unstable -p" sink() { VAULT_TOKEN=$(vault token lookup -format=json | jq -r .data.id) \ @@ -141,12 +139,7 @@ in { services.fwupd.enable = true; services.resolved.enable = true; - services.lorri.enable = true; - systemd.user.services.lorri.serviceConfig = { - ProtectSystem = pkgs.lib.mkForce "full"; - ProtectHome = pkgs.lib.mkForce false; - }; security.wrappers.gvfsd-nfs = { source = "${pkgs.gnome.gvfs}/libexec/gvfsd-nfs"; diff --git a/roles/desktop.nix b/roles/desktop.nix index bade0d7..aef3f36 100644 --- a/roles/desktop.nix +++ b/roles/desktop.nix @@ -26,7 +26,6 @@ in slurp swayidle swaylock - swaynotificationcenter swayr wf-recorder wofi @@ -171,9 +170,10 @@ in pavucontrol pcmanfm qrencode - remmina - unstable.wezterm uxplay + unstable.wezterm + unstable.prusa-slicer + unstable.super-slicer-latest solaar gdk-pixbuf diff --git a/roles/work.nix b/roles/work.nix index 46c3d9d..ac89906 100644 --- a/roles/work.nix +++ b/roles/work.nix @@ -41,7 +41,6 @@ in { 172.20.0.2 alert.kind #192.168.2.111 hass.home.f2o.io - #192.168.2.111 sync.home.f2o.io #127.0.0.1 auth-dev.thobits.com 127.0.0.1 database @@ -60,7 +59,6 @@ in { anydesk chromium nodejs - vscodium drone-cli govc