diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 584b769..31d757f 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -303,16 +303,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "lastModified": 1729251725, + "narHash": "sha256-KmIA2i7s3jcVQWgUt6wqY9/5DkIp9uxsVhcwUxSnKHY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "rev": "babe2c97edf3750d3924c1c5eaa1fe94ac94e8d8", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "master", "repo": "nixpkgs", "type": "github" } diff --git a/etcnixos/flake.nix b/etcnixos/flake.nix index 75772fb..d8c03c5 100644 --- a/etcnixos/flake.nix +++ b/etcnixos/flake.nix @@ -2,7 +2,9 @@ description = "A simple NixOS flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/master"; + lanzaboote = { url = "github:nix-community/lanzaboote"; inputs.nixpkgs.follows = "nixpkgs"; @@ -38,16 +40,12 @@ hostname = nixpkgs.lib.strings.removeSuffix "\n" (builtins.readFile /etc/hostname); system = "x86_64-linux"; - # pkgs = import nixpkgs { - # config.replaceStdenv = { pkgs }: pkgs.clangStdenv; - # }; pkgs = import nixpkgs { config.allowUnfreePredicate = pkg: builtins.elem (nixpkgs.lib.getName pkg) [ + "steam-unwrapped" "steam" - "steam-original" - "steam-run" ]; }; in diff --git a/home-manager/flake.lock b/home-manager/flake.lock index fab84f3..49f9f6e 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -72,11 +72,11 @@ ] }, "locked": { - "lastModified": 1729174520, - "narHash": "sha256-QxCAdgQdeIOaCiE0Sr23s9lD0+T1b/wuz5pSiGwNrCQ=", + "lastModified": 1729260213, + "narHash": "sha256-jAvHoU/1y/yCuXzr2fNF+q6uKmr8Jj2xgAisK4QB9to=", "owner": "nix-community", "repo": "home-manager", - "rev": "e78cbb20276f09c1802e62d2f77fc93ec32da268", + "rev": "09a0c0c02953318bf94425738c7061ffdc4cba75", "type": "github" }, "original": { @@ -98,11 +98,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1729189676, - "narHash": "sha256-oTvN+vxzOW+zzkmSnRUtItzismkOL+Z5kAU26Tf2HSE=", + "lastModified": 1729237583, + "narHash": "sha256-DmbzRBqTP+LIzyPkle92bN83GOjO02pPxW0OAL6yTsI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "c547a861a5f968b0b783de5dbfad159303c6c19a", + "rev": "1ca158ad24664a2608d9fe5f6627274bb7c6e939", "type": "github" }, "original": { @@ -131,11 +131,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1729144746, - "narHash": "sha256-Ocq+8Kc4gp8PLPziHkMZN0F+HuCS9mbxusJHtFdKoP8=", + "lastModified": 1729235169, + "narHash": "sha256-SPlS9YtGRWUjZZZRXlimHbSho+0hfrqGycErlI9XVXk=", "owner": "YaLTeR", "repo": "niri", - "rev": "8d08782eba427a46607a478d088744d023a292c3", + "rev": "dd8b2be044c6c67a1c9bf07f287b3967e958b8aa", "type": "github" }, "original": { diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index fcee89f..63aec80 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -29,7 +29,12 @@ ]; } - { command = [ "${pkgs.xwayland-satellite-unstable}/bin/xwayland-satellite" ]; } + { + command = [ + "${pkgs.xwayland-satellite-unstable}/bin/xwayland-satellite" + (builtins.toString config.programs.niri.settings.environment.DISPLAY) + ]; + } ]; window-rules = [ diff --git a/home-manager/system-mreow.nix b/home-manager/system-mreow.nix index 99ae2ba..98d28a3 100644 --- a/home-manager/system-mreow.nix +++ b/home-manager/system-mreow.nix @@ -19,8 +19,7 @@ # manage bluetooth devices blueman - xwayland-satellite-unstable - + # used by /etc/nixos logic to launch niri config.programs.niri.package ];