Switched to unstable and has fixed portal regression

This commit is contained in:
Tyler Kelley 2024-01-23 16:07:04 -06:00
parent 5615ef4177
commit 8ba8f708a0
5 changed files with 34 additions and 26 deletions

View File

@ -16,6 +16,7 @@
shellAliases = { shellAliases = {
sv="sudo vim"; sv="sudo vim";
flake-rebuild="sudo nixos-rebuild switch --flake ${flakeDir}"; flake-rebuild="sudo nixos-rebuild switch --flake ${flakeDir}";
flake-update="sudo nix flake update ${flakeDir}";
gcCleanup="nix-collect-garbage --delete-old && sudo nix-collect-garbage -d && sudo /run/current-system/bin/switch-to-configuration boot"; gcCleanup="nix-collect-garbage --delete-old && sudo nix-collect-garbage -d && sudo /run/current-system/bin/switch-to-configuration boot";
v="vim"; v="vim";
ls="lsd"; ls="lsd";

View File

@ -1,20 +1,20 @@
{ pkgs, ... }: { pkgs, ... }:
pkgs.writeShellScriptBin "trnoffmon" '' pkgs.writeShellScriptBin "trnoffmon" ''
IDLECOMMAND=$(swayidle -w timeout 5 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on') # IDLECOMMAND=$(swayidle -w timeout 5 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on')
while : # while :
do # do
done # done
if [ $SWAYIDLESTATE == 1 ]; then # if [ $SWAYIDLESTATE == 1 ]; then
export SWAYIDLESTATE=2 # export SWAYIDLESTATE=2
pkill swayidle # pkill swayidle
else # else
IDLESTATE=true # IDLESTATE=true
$IDLECOMMAND # $IDLECOMMAND
fi # fi
pkill swayidle # pkill swayidle
IDLESTATE=true # IDLESTATE=true
$IDLECOMMAND # $IDLECOMMAND
'' ''

View File

@ -23,16 +23,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1705659542, "lastModified": 1706001011,
"narHash": "sha256-WA3xVfAk1AYmFdwghT7mt/erYpsU6JPu9mdTEP/e9HQ=", "narHash": "sha256-J7Bs9LHdZubgNHZ6+eE/7C18lZ1P6S5/zdJSdXFItI4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "10cd9c53115061aa6a0a90aad0b0dde6a999cdb9", "rev": "3df2a80f3f85f91ea06e5e91071fa74ba92e5084",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.11", "ref": "master",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -178,16 +178,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1705774713, "lastModified": 1705856552,
"narHash": "sha256-j6ADaDH9XiumUzkTPlFyCBcoWYhO83lfgiSqEJF2zcs=", "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1b64fc1287991a9cce717a01c1973ef86cb1af0b", "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-23.11", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

View File

@ -2,8 +2,8 @@
description = "ZaneyOS"; description = "ZaneyOS";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager.url = "github:nix-community/home-manager/release-23.11"; home-manager.url = "github:nix-community/home-manager/master";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
nix-colors.url = "github:misterio77/nix-colors"; nix-colors.url = "github:misterio77/nix-colors";
hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "github:hyprwm/Hyprland";

View File

@ -57,6 +57,7 @@
programs.hyprland = { programs.hyprland = {
enable = true; enable = true;
package = inputs.hyprland.packages.${pkgs.system}.hyprland; package = inputs.hyprland.packages.${pkgs.system}.hyprland;
xwayland.enable = true;
}; };
# Some programs need SUID wrappers, can be configured further or are # Some programs need SUID wrappers, can be configured further or are
@ -73,7 +74,14 @@
# Optimization settings and garbage collection automation # Optimization settings and garbage collection automation
nix = { nix = {
settings.auto-optimise-store = true; settings = {
auto-optimise-store = true;
experimental-features = [ "nix-command" "flakes" ];
substituters = ["https://hyprland.cachix.org"];
trusted-public-keys = [
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
];
};
gc = { gc = {
automatic = true; automatic = true;
dates = "weekly"; dates = "weekly";
@ -82,5 +90,4 @@
}; };
system.stateVersion = "23.11"; system.stateVersion = "23.11";
nix.settings.experimental-features = [ "nix-command" "flakes" ];
} }