From f35832d52ac5ec8344b0879460fcc2e7a3130b78 Mon Sep 17 00:00:00 2001 From: Nathan McCarty Date: Wed, 14 Jun 2023 01:22:25 -0400 Subject: [PATCH] More migration to hyprland --- flake.nix | 1 - home-manager/linux/programs/sway.nix | 78 ++-------------------------- packages/layman/default.nix | 19 ------- sources/layman.json | 4 -- sources/update-sources.sh | 12 ----- 5 files changed, 5 insertions(+), 109 deletions(-) delete mode 100644 packages/layman/default.nix delete mode 100644 sources/layman.json diff --git a/flake.nix b/flake.nix index cd441db..b2ac907 100644 --- a/flake.nix +++ b/flake.nix @@ -268,7 +268,6 @@ electron = pkgs.electron_22; }; swayimg = pkgs.callPackage ./packages/swayimg/default.nix { }; - layman = pkgs.callPackage ./packages/layman/default.nix { }; }; }); } diff --git a/home-manager/linux/programs/sway.nix b/home-manager/linux/programs/sway.nix index fdef285..7aae099 100644 --- a/home-manager/linux/programs/sway.nix +++ b/home-manager/linux/programs/sway.nix @@ -6,7 +6,6 @@ in with lib; { inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.swaylock-effects; swaylock-command = '' ${swaylock-package}/bin/swaylock --screenshots --grace 30 --indicator --clock --timestr "%-I:%M:%S %p" --datestr "%A %Y-%M-%d" --effect-blur 20x3''; - layman-package = inputs.self.packages.${pkgs.system}.layman; wob-package = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.wob; in { home.packages = with pkgs; [ @@ -46,15 +45,13 @@ in with lib; { # Productivity libreoffice-fresh ## Sway addons - # sworkstyle - Automatic workspace renaming - swayest-workstyle font-awesome - layman-package wob-package # For fancy x11 scaling sommelier # Polkit libsForQt5.polkit-kde-agent + polkit_gnome ]; ######################### ## Hyprland @@ -173,7 +170,7 @@ in with lib; { bindm = $mainMod, mouse:273, resizewindow # systemd integration - exec-once=dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP && sleep 1 && systemctl --user start hyprland-session.target + exec-once=dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP && sleep 2 && systemctl --user start hyprland-session.target ''; }; @@ -350,74 +347,6 @@ in with lib; { ######################### ## Sway Addons ######################### - ## swayest_workstyle - # first setup the service - systemd.user.services.sworkstyle = { - Unit = { - Description = "sworkstyle - sway workspace renamer"; - After = [ "graphical-session.target" ]; - }; - Service = { - Type = "simple"; - ExecStart = '' - ${pkgs.swayest-workstyle}/bin/sworkstyle - ''; - Restart = "always"; - }; - Install = { WantedBy = [ "graphical-session.target" ]; }; - }; - # then setup the configuration - xdg.configFile."sworkstyle" = { - target = "sworkstyle/config.toml"; - text = '' - [matching] - 'firefox-beta' = '' - 'emacs' = '' - 'signal' = '' - 'chrome-messages.google.com__web-Default' = '' - 'chrome-app.cinny.in__-Default' = '' - 'chrome-messenger.com__-Default' = '' - 'chrome-localhost__iris_-Default' = '' - 'org.jellyfin.' = '' - 'Mattermost' = '' - ''; - }; - ## layman - # First setup the service - systemd.user.services.layman = { - Unit = { - Description = "layman - sway layout manager"; - After = [ "graphical-session.target" ]; - }; - Service = { - Type = "simple"; - ExecStart = '' - ${layman-package}/bin/layman - ''; - Restart = "always"; - }; - Install = { WantedBy = [ "graphical-session.target" ]; }; - }; - # then setup the configuration - xdg.configFile."layman" = { - target = "layman/config.toml"; - text = '' - # The `layman` section configures options that apply to the layman daemon, and any fallback - # values for options not set in a [workspace] or [output] section. - [layman] - defaultLayout = "none" # The default WLM to assign to a workspace - excludedWorkspaces = [] # Numbers of workspaces to be excuded - excludedOutputs = [] # Names of outputs to be excuded - debug = true # Enable logging debug messages globaly - depthLimit = 0 # Autotiling: Default depth limit (disabled) for all workspaces - stackLayout = "splitv" # MasterStack: Default stack layout for all workspaces - stackSidet = "left" # MasterStack: Default stack position for all workspaces - masterWidth = 70 # MasterStack: Default master width for all workspaces - ''; - onChange = '' - ${layman-package}/bin/layman || true - ''; - }; # Setup polkit as a service systemd.user.services.polkit-gnome = { Unit = { @@ -490,6 +419,9 @@ in with lib; { } ]; }; + systemd.user.services.swayidle = { + Install = { WantedBy = [ "hyprland-session.target" ]; }; + }; ######################### ## Waybar ######################### diff --git a/packages/layman/default.nix b/packages/layman/default.nix deleted file mode 100644 index 55b164d..0000000 --- a/packages/layman/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ pkgs, lib, pythonPkgs ? pkgs.python311Packages }: -let - vals = builtins.fromJSON (builtins.readFile ../../sources/layman.json); - inherit pythonPkgs; - f = { buildPythonPackage, i3ipc, setproctitle, tomli, setuptools }: - buildPythonPackage rec { - pname = "layman"; - version = "0.0.1"; - format = "pyproject"; - src = pkgs.fetchFromGitHub { - owner = "frap129"; - repo = "layman"; - rev = vals.rev; - hash = vals.hash; - }; - nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ i3ipc setproctitle tomli ]; - }; -in pythonPkgs.callPackage f { } diff --git a/sources/layman.json b/sources/layman.json deleted file mode 100644 index d04a6c1..0000000 --- a/sources/layman.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "rev": "67d8f95f4693d3a1ffa2e7d4dccba4e066dc56a0", - "hash": "sha256-SuedE7AUmZha50zwD0iuBMrQsYoLiJFPbkV4BgnKnCc=" -} diff --git a/sources/update-sources.sh b/sources/update-sources.sh index 47c8e8e..a4bfbbc 100755 --- a/sources/update-sources.sh +++ b/sources/update-sources.sh @@ -15,15 +15,3 @@ jq --null-input \ '{"version": $version, "url": $url, "hash": $hash}' \ > $DIRECTORY/swayimg.json echo "swayimg now at $SWAYIMG_VERSION" - -# Update layman -LAYMAN_BRANCH=$(curl https://api.github.com/repos/frap129/layman | jq -r '.default_branch') -LAYMAN_REV=$(curl https://api.github.com/repos/frap129/layman/git/refs/heads/$LAYMAN_BRANCH | \ - jq -r '.object.sha') -LAYMAN_HASH=$(nix-prefetch fetchFromGitHub --owner frap129 --repo layman --rev $LAYMAN_REV) -jq --null-input \ - --arg rev "$LAYMAN_REV" \ - --arg hash "$LAYMAN_HASH" \ - '{"rev": $rev, "hash": $hash}' \ - > $DIRECTORY/layman.json -echo "layman now at $LAYMAN_REV"