Skip to content

Commit d1324df

Browse files
authored
fix: bump lanzaboote (#83)
* fix: bump lanzaboote * fix: use niri-unstable * fix: switch testvm to graphical * chore: cleanup dead code
1 parent 35d736a commit d1324df

File tree

6 files changed

+35
-53
lines changed

6 files changed

+35
-53
lines changed

flake.lock

Lines changed: 21 additions & 38 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
sops-nix.url = "github:Mic92/sops-nix";
7878
sops-nix.inputs.nixpkgs.follows = "nixpkgs";
7979

80-
lanzaboote.url = "github:nix-community/lanzaboote/v0.4.2";
80+
lanzaboote.url = "github:nix-community/lanzaboote/v0.4.3";
8181
lanzaboote.inputs.nixpkgs.follows = "nixpkgs";
8282

8383
niri.url = "github:sodiboo/niri-flake";

flake/default.nix

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
# { self, ... }:
2-
# let
3-
# inherit (self.lib.helpers) listImportableRecursive;
4-
# in
51
{
6-
# imports = listImportableRecursive ./.;
72
imports = [
83
./checks/formatting.nix
94
./lib

modules/home/programs/gui/niri.nix

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,18 @@
99
let
1010
inherit (lib.modules) mkIf;
1111
inherit (self.lib.programs) mkProgram;
12-
inherit (self.lib.validators) hasProfile;
12+
inherit (self.lib.validators) isWayland hasProfile;
1313

1414
cfg = config.nixfiles.programs.gui.niri;
1515
in
1616
{
1717
options.nixfiles.programs.gui = {
1818
niri = mkProgram pkgs "niri" {
19-
enable.default = config.nixfiles.programs.gui.enable && (hasProfile osConfig [ "laptop" ]);
19+
enable.default =
20+
config.nixfiles.programs.gui.enable
21+
&& (hasProfile osConfig [ "laptop" ])
22+
&& (hasProfile osConfig [ "graphical" ])
23+
&& (isWayland osConfig);
2024
};
2125
};
2226

modules/nixos/profiles/graphical/desktopManagers/niri.nix

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
lib,
33
self,
44
config,
5+
pkgs,
56
...
67
}:
78
let
@@ -12,9 +13,9 @@ in
1213
config =
1314
mkIf ((hasProfile config [ "graphical" ]) && (hasProfile config [ "laptop" ]) && (isWayland config))
1415
{
15-
programs = {
16-
niri.enable = true;
17-
# niri.package = pkgs.niri-unstable;
16+
programs.niri = {
17+
enable = true;
18+
package = pkgs.niri-unstable;
1819
};
1920
};
2021
}

systems/x86_64-nixos/testvm/default.nix

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,16 @@
1414
nixfiles = {
1515
device.profiles = [
1616
"vm"
17-
# "desktop"
18-
"headless"
17+
"desktop"
18+
# FIXME: non graphical appears broken because of niri & stylix?
19+
# "headless"
1920
];
2021
virtualisation.incus.enable = true;
2122
storage = {
2223
type = "btrfs";
2324
mainDevice = "/dev/vda";
2425
impermanence.enable = true;
2526
};
26-
# FIXME: some issues with the headless profile?
27-
system.boot.plymouth = false;
2827
};
2928

3029
disko.memSize = 8096;

0 commit comments

Comments
 (0)