rollback update, electron build failure

https://nixpk.gs/pr-tracker.html?pr=302544
This commit is contained in:
NullBite 2024-04-10 00:29:20 -04:00
parent 1c096e0a70
commit abdb159a22
Signed by: nullbite
GPG Key ID: 6C4D545385D4925A
5 changed files with 34 additions and 32 deletions

48
flake.lock generated
View File

@ -114,11 +114,11 @@
]
},
"locked": {
"lastModified": 1712688495,
"narHash": "sha256-NrVLXkpT9ZigiI8md6NIzHS+3lE4QTj30IgXG57O9iM=",
"lastModified": 1712390667,
"narHash": "sha256-ebq+fJZfobqpsAdGDGpxNWSySbQejRwW9cdiil6krCo=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "b00d0e4fe9cba0047f54e77418ddda5f17e6ef2c",
"rev": "b787726a8413e11b074cde42704b4af32d95545c",
"type": "github"
},
"original": {
@ -143,11 +143,11 @@
]
},
"locked": {
"lastModified": 1712434681,
"narHash": "sha256-qwmR2p1oc48Bj7gUDvb1oGL19Rjs2PmEmk4ChV01A5o=",
"lastModified": 1712339458,
"narHash": "sha256-j8pv3tL2EFLGuvFoO64dHWD8YzNvD77hRb4EEx5ADgE=",
"owner": "hyprwm",
"repo": "hyprcursor",
"rev": "818d8c4b69e0997483d60b75f701fe14b561a7a3",
"rev": "981b6617822dadc40246a6c70194d02dfc12e4c6",
"type": "github"
},
"original": {
@ -189,11 +189,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1712676164,
"narHash": "sha256-CDxfxIUTu+2nkLjq46LWHa98WB85AcdglURwi5obgAM=",
"lastModified": 1712448441,
"narHash": "sha256-dQ+5CYpy/dbpX0hvIFBYF/FDjWal4wAYpTHfUzGoDRg=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "1343aa865d04d80313b0e674c28ecfdbeb90e876",
"rev": "9f1604e4b0afec40cfa9bc095d6613a7f749b2c1",
"type": "github"
},
"original": {
@ -322,11 +322,11 @@
]
},
"locked": {
"lastModified": 1712625448,
"narHash": "sha256-fDG6tfMuMrL70nG33m877qKJh8bFa41YzLf9hGY4F9Q=",
"lastModified": 1712452966,
"narHash": "sha256-Gr+zYWObfRO6L0yLZRelKBYZ1udEs6FLcRbgAwdyG9o=",
"owner": "infinidoge",
"repo": "nix-minecraft",
"rev": "722a952ba2c14bb08124f45bf2bd32d17ce9c4ec",
"rev": "03e8f8869168a43799729cf161e8639940c7bfad",
"type": "github"
},
"original": {
@ -382,11 +382,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1712439257,
"narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=",
"lastModified": 1712163089,
"narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599",
"rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
"type": "github"
},
"original": {
@ -398,11 +398,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1712666087,
"narHash": "sha256-WwjUkWsjlU8iUImbivlYxNyMB1L5YVqE8QotQdL9jWc=",
"lastModified": 1712482522,
"narHash": "sha256-Ai/xNgZpbwGcw0TSXwEPwwbPi8Iu906sB9M9z3o6UgA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a76c4553d7e741e17f289224eda135423de0491d",
"rev": "efe8ce06ca261f370d672def5b1e0be300c726e1",
"type": "github"
},
"original": {
@ -414,11 +414,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1712588820,
"narHash": "sha256-y31s5idk3jMJMAVE4Ud9AdI7HT3CgTAeMTJ0StqKN7Y=",
"lastModified": 1712437997,
"narHash": "sha256-g0whLLwRvgO2FsyhY8fNk+TWenS3jg5UdlWL4uqgFeo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d272ca50d1f7424fbfcd1e6f1c9e01d92f6da167",
"rev": "e38d7cb66ea4f7a0eb6681920615dfcc30fc2920",
"type": "github"
},
"original": {
@ -470,11 +470,11 @@
]
},
"locked": {
"lastModified": 1712715149,
"narHash": "sha256-uOx7GaLV+5hekAYtm/CBr627Pi7+d1Yh70hwKmVjYYo=",
"lastModified": 1712456031,
"narHash": "sha256-vPM+DLCyiT3eKGdDBIxqsgBrbbB7lL0TR6R7FLhX1v8=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "9ef1eca23bee5fb8080863909af3802130b2ee57",
"rev": "0e5eaa43f116d798c289b0bb831320a353efc905",
"type": "github"
},
"original": {

View File

@ -38,12 +38,12 @@
sessions.hyprland.enable = false;
sessions.plasma.enable = true;
};
services.displayManager.sddm.enable = lib.mkForce true;
services.xserver.displayManager.sddm.enable = lib.mkForce true;
services.xserver.displayManager.startx.enable = lib.mkForce false;
};
# who needs a display manager?
services.displayManager.sddm.enable = false;
services.xserver.displayManager.sddm.enable = false;
nixfiles = {
profile.pc.enable = true;

View File

@ -24,6 +24,9 @@ in
# shell config
programs.zsh.enable = true;
programs.fzf.enable = true;
programs.fzf = {
keybindings = true;
fuzzyCompletion = true;
};
};
}

View File

@ -6,7 +6,7 @@ let
inherit (lib) optional optionals;
optionalsSet = val: optionals (!(isNull val));
optionalSet = val: optional (!(isNull val));
sessions = config.services.displayManager.sessionData.desktops;
sessions = config.services.xserver.displayManager.sessionData.desktops;
xsessions = "${sessions}/share/xsessions";
wayland-sessions = "${sessions}/share/wayland-sessions";
@ -27,8 +27,7 @@ in
command = let
st = cfg.settings;
args = [ "${pkgs.greetd.tuigreet}/bin/tuigreet" "--asterisks" "--remember" "--remember-session"
"--sessions" "${xsessions}:${wayland-sessions}"
]
"--sessions" "${xsessions}:${wayland-sessions}" ]
++ optionalsSet st.greeting [ "--greeting" st.greeting ]
++ optional st.time "--time"
++ optionalsSet st.command [ "--cmd" st.finalCommand ]

View File

@ -17,9 +17,9 @@ in
config = mkIf cfg.enable {
nixfiles.common.desktop.enable = true;
services.displayManager.sddm.enable = mkDefault true;
services.xserver.displayManager.sddm.enable = mkDefault true;
services.xserver.desktopManager.plasma5.enable = true;
services.displayManager.defaultSession = "plasmawayland";
services.xserver.displayManager.defaultSession = "plasmawayland";
programs.kdeconnect.enable = mkDefault true;
nixfiles.meta.wayland = true;