feat: move to ly

move to ly DM in order to fix the annoying xdg-desktop-portal
This commit is contained in:
2025-05-04 09:24:32 +08:00
parent a0164ce7c0
commit ece19eadb8
5 changed files with 34 additions and 30 deletions

View File

@@ -43,10 +43,7 @@
PATH = "/home/${username}/bin:$PATH";
};
profileExtra = ''
if [ `tty` = "/dev/tty1" -a $XDG_RUNTIME_DIR ]; then
echo 'Starting Niri...'
exec uwsm start niri-uwsm.desktop
elif [ `tty` = "/dev/tty6" ]; then
if [ `tty` = "/dev/tty6" ]; then
clear
fi
'';
@@ -94,10 +91,7 @@
autologin = {
enable = true;
user = username;
ttys = [
1
6
];
ttys = [ 6 ];
};
gpg.enable = true;
@@ -168,7 +162,10 @@
".android"
"Android"
".ssh"
{
directory = ".ssh";
mode = "0700";
}
"bin"
"workspace"

17
flake.lock generated
View File

@@ -594,6 +594,22 @@
"type": "github"
}
},
"infuse": {
"flake": false,
"locked": {
"lastModified": 1738726976,
"narHash": "sha256-N+u3vnK3zyXLUuDj/vr62r9tM7uarhKVCaLHWxjo/YY=",
"ref": "refs/heads/trunk",
"rev": "c8fb7397039215e1444c835e36a0da7dc3c743f8",
"revCount": 48,
"type": "git",
"url": "https://codeberg.org/amjoseph/infuse.nix"
},
"original": {
"type": "git",
"url": "https://codeberg.org/amjoseph/infuse.nix"
}
},
"libgit2": {
"flake": false,
"locked": {
@@ -996,6 +1012,7 @@
"go-musicfox": "go-musicfox",
"home-manager": "home-manager",
"impermanence": "impermanence",
"infuse": "infuse",
"niri": "niri",
"nixos-wsl": "nixos-wsl",
"nixpkgs": [

View File

@@ -145,7 +145,6 @@
inputs.sops-nix.homeManagerModules.sops
inputs.impermanence.nixosModules.home-manager.impermanence
inputs.stylix.homeManagerModules.stylix
inputs.niri.homeModules.niri
# workaround for annoying stylix
(
{ lib, ... }:
@@ -178,6 +177,7 @@
./config/hosts/${hostname}
inputs.sops-nix.nixosModules.sops
inputs.impermanence.nixosModules.impermanence
inputs.niri.nixosModules.niri
inputs.home-manager.nixosModules.default
home
pkgsConf

View File

@@ -85,6 +85,7 @@
};
spawn-at-startup = map (c: { command = c; }) [
[ "waybar" ]
[ "${lib.getExe pkgs.xwayland-satellite-unstable}" ]
[ "${lib.getExe' pkgs.swaynotificationcenter "swaync"}" ]
[
@@ -92,11 +93,6 @@
"-i"
(toString ./wallpaper.png)
]
[
"${lib.getExe pkgs.wl-clip-persist}"
"--clipboard"
"regular"
]
[
"wl-paste"
"--type"

View File

@@ -40,27 +40,21 @@ in
xdg-desktop-portal-gnome
];
};
programs.uwsm = {
services.displayManager.ly = {
enable = true;
waylandCompositors = {
niri = {
prettyName = "niri";
comment = "Niri compositor managed by UWSM";
binPath = pkgs.writeShellScript "niri-session" ''
${lib.getExe pkg} --session
'';
};
settings = {
animation = "matrix";
tty = 12;
};
};
programs.niri = {
enable = true;
package = pkg;
};
my.home = {
programs.niri = {
enable = true;
package = pkg;
};
home.packages = with pkgs; [
wlr-randr
wl-clipboard
wl-clip-persist
cliphist
swaynotificationcenter
nemo-with-extensions
@@ -76,7 +70,7 @@ in
};
programs.waybar = {
enable = true;
systemd.enable = true;
systemd.enable = false;
};
xdg.configFile."waybar/config.jsonc".text = builtins.toJSON (import ./waybar/config.nix args);
xdg.configFile."waybar/style.css" = {