removed niri

This commit is contained in:
twoneis 2023-11-24 04:08:20 +01:00
parent 8252fc9f31
commit 9e3f371c46
7 changed files with 4 additions and 3793 deletions

View file

@ -14,11 +14,6 @@
nixos-hardware = { nixos-hardware = {
url = "github:nixos/nixos-hardware/master"; url = "github:nixos/nixos-hardware/master";
}; };
niri = {
url = "github:twoneis/niri";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = { nixpkgs, home-manager, nixos-hardware, ... }: outputs = { nixpkgs, home-manager, nixos-hardware, ... }:

View file

@ -10,4 +10,8 @@
settings = import ./helix-config.nix; settings = import ./helix-config.nix;
themes = import ./helix-theme.nix; themes = import ./helix-theme.nix;
}; };
programs.emacs = {
enable = true;
};
} }

View file

@ -1,15 +0,0 @@
{ pkgs, ... }:
let
niri = pkgs.callPackage ./niri {};
niriSession = pkgs.writeShellScriptBin "niri-session" ./niri/niri-session;
niriService = ./niri/service.nix;
in {
imports = [
niriService
];
environment.systemPackages = [ niri niriSession];
services.xserver.displayManager.sessionPackages = [
niriSession
];
}

File diff suppressed because it is too large Load diff

View file

@ -1,42 +0,0 @@
{ pkgs, ... }:
pkgs.rustPlatform.buildRustPackage {
pname = "niri";
version = "unstable-2023-11-21";
src = pkgs.fetchFromGitHub {
owner = "YaLTeR";
repo = "niri";
rev = "19cafffe0f3f1eefc6984dc446134b0fd93d1e28";
hash = "sha256-mDeJh3N6Zt3FNpyFmRkY8zOLIBad3CoV45WjB+RUkhA=";
};
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"smithay-0.3.0" = "sha256-1BEJEdmGCt6jtPEcBt4R1d/LdKWLLJYJpcOn4SbvkRk=";
};
};
nativeBuildInputs = with pkgs; [
pkg-config
rustPlatform.bindgenHook
];
buildInputs = with pkgs; [
libxkbcommon
pipewire
seatd
udev
wayland
libinput
mesa
libglvnd
];
RUSTFLAGS = map (a: "-C link-arg=${a}") [
"-Wl,--push-state,--no-as-needed"
"-lEGL"
"-lwayland-client"
"-Wl,--pop-state"
];
}

View file

@ -1,44 +0,0 @@
#!/bin/sh
if [ -n "$SHELL" ] &&
grep -q "$SHELL" /etc/shells &&
! (echo "$SHELL" | grep -q "false") &&
! (echo "$SHELL" | grep -q "nologin"); then
if [ "$1" != '-l' ]; then
exec bash -c "exec -l '$SHELL' -c '$0 -l $*'"
else
shift
fi
fi
# Make sure there's no already running session.
if systemctl --user -q is-active niri.service; then
echo 'A niri session is already running.'
exit 1
fi
# Reset failed state of all user units.
systemctl --user reset-failed
# Set the current desktop for xdg-desktop-portal.
export XDG_CURRENT_DESKTOP=niri
# Ensure the session type is set to Wayland for xdg-autostart apps.
export XDG_SESSION_TYPE=wayland
# Import the login manager environment.
systemctl --user import-environment
# DBus activation environment is independent from systemd. While most of
# dbus-activated services are already using `SystemdService` directive, some
# still don't and thus we should set the dbus environment with a separate
# command.
if hash dbus-update-activation-environment 2>/dev/null; then
dbus-update-activation-environment --all
fi
# Start niri and wait for it to terminate.
systemctl --user --wait start niri.service
# Unset environment that we've set.
systemctl --user unset-environment WAYLAND_DISPLAY XDG_SESSION_TYPE XDG_CURRENT_DESKTOP

View file

@ -1,16 +0,0 @@
{ ... }: {
systemd.services.niri = {
enable = true;
description = "A scrollable-tiling wayland compositor";
bindsTo = [ "graphical-session.target" ];
before = [ "graphical-session.target" "xdg-desktop-autostart.target" ];
after = [ "graphical-session-pre.target" ];
wants = [ "graphical-session-pre.target" "xdg-desktop-autostart.target" ];
serviceConfig = {
Type = "notify";
ExecStart = "/usr/bin/env niri";
};
};
}