youwen5/liminalOS
1
0
Fork 0
mirror of https://github.com/youwen5/nixos.git synced 2025-02-22 03:31:11 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: switch back to upstream nh and use doas-sudo-shim
Some checks are pending
Check flake / check (push) Waiting to run
Details

Browse source
This commit is contained in:
Youwen Wu 2025-02-10 21:12:24 -08:00
parent b63c4c3cd1
commit 588ed29f96
Signed by: youwen5
GPG key ID: 865658ED1FE61EC3
3 changed files with 5 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
flake.lock
View file

@ -648,26 +648,6 @@
"type": "github" "type": "github"
} }
}, },
"nh-doas": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1738564910,
"narHash": "sha256-rd1pnAiRYolXH1R1Zbs6UQFjW1b5DdEJeyq2udUnjCo=",
"owner": "youwen5",
"repo": "nh",
"rev": "f4d93dfda62f034bbc08dc3bfea78213ec99b3be",
"type": "github"
},
"original": {
"owner": "youwen5",
"repo": "nh",
"type": "github"
}
},
"nix-darwin": { "nix-darwin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -943,7 +923,6 @@
"homebrew-core": "homebrew-core", "homebrew-core": "homebrew-core",
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
"musnix": "musnix", "musnix": "musnix",
"nh-doas": "nh-doas",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nix-flatpak": "nix-flatpak", "nix-flatpak": "nix-flatpak",
"nix-homebrew": "nix-homebrew", "nix-homebrew": "nix-homebrew",

5
flake.nix
View file

@ -106,11 +106,6 @@
url = "github:musnix/musnix"; url = "github:musnix/musnix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nh-doas = {
url = "github:youwen5/nh";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = outputs =

10
modules/linux/core/default.nix
View file

@ -65,7 +65,8 @@ in
] ]
++ [ ++ [
config.liminalOS.defaultEditor config.liminalOS.defaultEditor
]; ]
++ lib.optionals cfg.replaceSudoWithDoas [ doas-sudo-shim ];
# tells electron apps to use Wayland # tells electron apps to use Wayland
environment.sessionVariables = lib.mkIf cfg.waylandFixes { environment.sessionVariables = lib.mkIf cfg.waylandFixes {
@ -129,12 +130,11 @@ in
extraArgs = "--keep-since 4d --keep 3"; extraArgs = "--keep-since 4d --keep 3";
}; };
flake = config.liminalOS.flakeLocation; flake = config.liminalOS.flakeLocation;
package = lib.mkIf config.security.doas.enable inputs.nh-doas.packages.${pkgs.system}.default;
}; };
environment.variables = lib.mkIf (cfg.useNh && config.security.doas.enable) { # environment.variables = lib.mkIf (cfg.useNh && config.security.doas.enable) {
NH_FLAKE = config.programs.nh.flake; # NH_FLAKE = config.programs.nh.flake;
}; # };
programs.nix-ld = { programs.nix-ld = {
enable = true; enable = true;