File tree Expand file tree Collapse file tree 6 files changed +35
-53
lines changed
nixos/profiles/graphical/desktopManagers
systems/x86_64-nixos/testvm Expand file tree Collapse file tree 6 files changed +35
-53
lines changed Original file line number Diff line number Diff line change 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" ;
Original file line number Diff line number Diff line change 1- # { self, ... }:
2- # let
3- # inherit (self.lib.helpers) listImportableRecursive;
4- # in
51{
6- # imports = listImportableRecursive ./.;
72 imports = [
83 ./checks/formatting.nix
94 ./lib
Original file line number Diff line number Diff line change 99let
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 ;
1515in
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
Original file line number Diff line number Diff line change 22 lib ,
33 self ,
44 config ,
5+ pkgs ,
56 ...
67} :
78let
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}
Original file line number Diff line number Diff line change 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 ;
You can’t perform that action at this time.
0 commit comments