nix
/
System
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: nix:9b61203506c9f8960daeae50184d36170990f8b5
Branches Tags
nix:trunk
...
compare: nix:0c2f1e67dbf1db6751ea0b4c0f9827bb5022db7a
Branches Tags
nix:trunk

3 Commits
9b61203506 ... 0c2f1e67db

Author SHA1 Message Date
Nathan McCarty 0c2f1e67db
fix swaylock 2023-06-17 01:45:20 -04:00
Nathan McCarty 4975bb0467
Add hyprland-autoname-workspaces package 2023-06-17 00:34:46 -04:00
Nathan McCarty 1fd75c7b1d
Add killall 2023-06-17 00:10:55 -04:00
6 changed files with 48 additions and 0 deletions
Show Stats Expand all files Collapse all files

2
flake.nix
View File

@ -295,6 +295,8 @@
electron = pkgs.electron_22;
};
swayimg = pkgs.callPackage ./packages/swayimg/default.nix { };
hyprland-autoname-workspaces =
pkgs.callPackage ./packages/workspace-renamer/default.nix { };
};
});
}

4
home-manager/linux/programs/hyprland.nix
View File

@ -12,6 +12,8 @@ in with lib; {
inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.swaynotificationcenter;
in {
home.packages = with pkgs; [
# General
killall
# Locking and display management
wdisplays
swaylock-package
@ -58,6 +60,8 @@ in with lib; {
# Polkit
libsForQt5.polkit-kde-agent
polkit_gnome
# Auto workspace renaming
inputs.self.packages.${pkgs.system}.hyprland-autoname-workspaces
];
#########################
## Hyprland

3
modules/linux/hyprland.nix
View File

@ -59,6 +59,9 @@ in with lib; {
hidpi = false;
};
};
# Make swaylock work
# https://github.com/NixOS/nixpkgs/issues/158025
security.pam.services.swaylock = { };
environment.sessionVariables = { MOZ_ENABLE_WAYLAND = "1"; };

22
packages/workspace-renamer/default.nix Normal file
View File

@ -0,0 +1,22 @@
{ config, lib, pkgs, fetchFromGitHub, rustPlatform, ... }:
let
vals = builtins.fromJSON (builtins.readFile ../../sources/autoname.json);
version = "1.0.0";
rev = vals.rev;
hash = vals.hash;
src = fetchFromGitHub {
owner = "hyprland-community";
repo = "hyprland-autoname-workspaces";
inherit rev hash;
};
in rustPlatform.buildRustPackage {
pname = "hyprland-autoname-workspaces";
inherit version;
inherit src;
cargoLock = {
lockFile = "${src}/Cargo.lock";
outputHashes = {
"hyprland-0.3.3" = "sha256-3RhuaVLCjEwvIBQyot2sma5kFLSGVndJ58UUef0bES4=";
};
};
}

4
sources/autoname.json Normal file
View File

@ -0,0 +1,4 @@
{
"rev": "4cbebec3f29c59846c9e2a53bddb1ba6f84ae605",
"hash": "sha256-g+in35ucDRghRiowboQugwkVMfmCDxMXDJXT8oNQxek="
}

13
sources/update-sources.sh
View File

@ -16,6 +16,18 @@ jq --null-input \
> $DIRECTORY/swayimg.json
echo "swayimg now at $SWAYIMG_VERSION"
# Update autoname
# AUTONAME_BRANCH=$(curl https://api.github.com/repos/hyprland-community/hyprland-autoname-workspaces| jq -r '.default_branch')
# AUTONAME_REV=$(curl https://api.github.com/repos/hyprland-community/hyprland-autoname-workspaces/git/refs/heads/$AUTONAME_BRANCH | \
# jq -r '.object.sha')
# AUTONAME_HASH=$(nix-prefetch fetchFromGitHub --owner hyprland-community --repo hyprland-autoname-workspaces --rev $AUTONAME_REV)
# jq --null-input \
# --arg rev "$AUTONAME_REV" \
# --arg hash "$AUTONAME_HASH" \
# '{"rev": $rev, "hash": $hash}' \
# > $DIRECTORY/autoname.json
# echo "autoname now at $AUTONAME_REV"
# Update gamescope
GAMESCOPE_BRANCH=$(curl https://api.github.com/repos/ValveSoftware/gamescope | jq -r '.default_branch')
GAMESCOPE_REV=$(curl https://api.github.com/repos/ValveSoftware/gamescope/git/refs/heads/$GAMESCOPE_BRANCH | \
@ -27,3 +39,4 @@ jq --null-input \
'{"rev": $rev, "hash": $hash}' \
> $DIRECTORY/gamescope.json
echo "gamescope now at $GAMESCOPE_REV"