diff --git a/overlay.nix b/overlay.nix index fd5fc9d..2d80566 100644 --- a/overlay.nix +++ b/overlay.nix @@ -137,7 +137,6 @@ in rec { rev = "39911727b7ce70a100aad84c1cdae9ab0ead1d6b"; hash = "sha256-Y+e9WjkXl38tbJq5D2BH0wJ0157yBiQ3vfRYO6rwnoU="; }; - patches = [ ]; }); audiotube = prev'.audiotube.overrideAttrs (oa: { diff --git a/profiles/applications/aerc.nix b/profiles/applications/aerc.nix index 0dc0713..598e922 100644 --- a/profiles/applications/aerc.nix +++ b/profiles/applications/aerc.nix @@ -188,6 +188,8 @@ userName = "balsoft@balsoft.ru"; passwordCommand = "pass email/balsoft@balsoft.ru"; + + folders.inbox = "virtual.all"; }; Work = { aerc.enable = true; @@ -198,6 +200,8 @@ userName = "alexander.bantyev@tweag.io"; passwordCommand = "pass aerc/alexander.bantyev@tweag.io"; + + folders.inbox = "[Gmail]/All Mail"; }; }; }; diff --git a/profiles/applications/helix.nix b/profiles/applications/helix.nix index 0dece03..e13b051 100644 --- a/profiles/applications/helix.nix +++ b/profiles/applications/helix.nix @@ -52,6 +52,7 @@ normal = "block"; select = "underline"; }; + color-modes = true; }; keys = { insert = { @@ -108,8 +109,8 @@ bg = base02; }; "ui.statusline.inactive" = { - fg = base02; - bg = base05; + fg = base03; + bg = base01; }; "ui.help" = { fg = base01; diff --git a/profiles/applications/packages.nix b/profiles/applications/packages.nix index 7951131..34bc9e7 100644 --- a/profiles/applications/packages.nix +++ b/profiles/applications/packages.nix @@ -12,7 +12,7 @@ # steam haskellPackages.hoogle nixfmt - nil + # nil nixpkgs-fmt stdman libqalculate diff --git a/profiles/workspace/gnome3/default.nix b/profiles/workspace/gnome3/default.nix index 4684b75..f5846e6 100644 --- a/profiles/workspace/gnome3/default.nix +++ b/profiles/workspace/gnome3/default.nix @@ -1,19 +1,4 @@ { config, pkgs, lib, ... }: { - services.gnome = { - core-os-services.enable = true; - core-utilities.enable = true; - evolution-data-server.enable = true; - sushi.enable = true; - tracker.enable = true; - tracker-miners.enable = true; - gnome-settings-daemon.enable = true; - glib-networking.enable = true; - # pass-secret-service is used instead - gnome-keyring.enable = lib.mkForce false; - gnome-online-accounts.enable = true; - gnome-online-miners.enable = true; - }; - environment.systemPackages = [ pkgs.pass-secret-service ]; environment.gnome.excludePackages = [ pkgs.gnome-console pkgs.gnome.evince pkgs.gnome.eog ]; diff --git a/profiles/workspace/kde/qt.nix b/profiles/workspace/kde/qt.nix index f3ec106..e4d3b4e 100644 --- a/profiles/workspace/kde/qt.nix +++ b/profiles/workspace/kde/qt.nix @@ -184,7 +184,7 @@ in { environment.systemPackages = [ desktopTheme ]; xdg.portal.enable = true; - + xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ]; services.dbus.packages = [ pkgs.systemd pkgs.breeze-icons ]; services.udev.packages = [ pkgs.libmtp pkgs.media-player-info ]; diff --git a/profiles/workspace/sway/default.nix b/profiles/workspace/sway/default.nix index c2b43d0..935e343 100755 --- a/profiles/workspace/sway/default.nix +++ b/profiles/workspace/sway/default.nix @@ -2,8 +2,6 @@ let thm = pkgs.my-lib.thmHash config.themes.colors; apps = config.defaultApplications; - lock_fork = pkgs.writeShellScript "lock_fork" - "sudo /run/current-system/sw/bin/lock all &"; lock = pkgs.writeShellScript "lock" "swaymsg 'output * dpms off'; sudo /run/current-system/sw/bin/lock all; swaymsg 'output * dpms on'"; htmlify = pkgs.writeShellScript "htmlify" '' @@ -32,6 +30,9 @@ in { } ''; + xdg.portal.wlr.enable = true; + xdg.portal.xdgOpenUsePortal = true; + home-manager.users.balsoft.wayland.windowManager.sway = { enable = true; config = rec { @@ -149,6 +150,7 @@ in { "Shift+j" = "move down"; "Shift+l" = "move right"; "Shift+h" = "move left"; + "u" = "focus parent"; "f" = "fullscreen toggle; floating toggle"; "Shift+f" = "floating toggle";