Compare commits
2 Commits
abdb159a22
...
a04af4bde6
Author | SHA1 | Date | |
---|---|---|---|
a04af4bde6 | |||
397103e4fb |
48
flake.lock
generated
48
flake.lock
generated
@ -114,11 +114,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1712390667,
|
||||
"narHash": "sha256-ebq+fJZfobqpsAdGDGpxNWSySbQejRwW9cdiil6krCo=",
|
||||
"lastModified": 1712759992,
|
||||
"narHash": "sha256-2APpO3ZW4idlgtlb8hB04u/rmIcKA8O7pYqxF66xbNY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "b787726a8413e11b074cde42704b4af32d95545c",
|
||||
"rev": "31357486b0ef6f4e161e002b6893eeb4fafc3ca9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -143,11 +143,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1712339458,
|
||||
"narHash": "sha256-j8pv3tL2EFLGuvFoO64dHWD8YzNvD77hRb4EEx5ADgE=",
|
||||
"lastModified": 1712434681,
|
||||
"narHash": "sha256-qwmR2p1oc48Bj7gUDvb1oGL19Rjs2PmEmk4ChV01A5o=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprcursor",
|
||||
"rev": "981b6617822dadc40246a6c70194d02dfc12e4c6",
|
||||
"rev": "818d8c4b69e0997483d60b75f701fe14b561a7a3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -189,11 +189,11 @@
|
||||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1712448441,
|
||||
"narHash": "sha256-dQ+5CYpy/dbpX0hvIFBYF/FDjWal4wAYpTHfUzGoDRg=",
|
||||
"lastModified": 1712835979,
|
||||
"narHash": "sha256-m44SvLfwPc8qPpBQa5ObOtTe6RbVNfQLpn+bCdlHFxQ=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "Hyprland",
|
||||
"rev": "9f1604e4b0afec40cfa9bc095d6613a7f749b2c1",
|
||||
"rev": "185a3b48814cc4a1afbf32a69792a6161c4038cd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -322,11 +322,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1712452966,
|
||||
"narHash": "sha256-Gr+zYWObfRO6L0yLZRelKBYZ1udEs6FLcRbgAwdyG9o=",
|
||||
"lastModified": 1712798291,
|
||||
"narHash": "sha256-RVKaYM0JqcZJwQzKWkd5K89NZY9gt0kGYdSDCFN8pkU=",
|
||||
"owner": "infinidoge",
|
||||
"repo": "nix-minecraft",
|
||||
"rev": "03e8f8869168a43799729cf161e8639940c7bfad",
|
||||
"rev": "6c7f58934ff7d0ccb8034a487ae5d930febd3614",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -382,11 +382,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1712163089,
|
||||
"narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
|
||||
"lastModified": 1712439257,
|
||||
"narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
|
||||
"rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -398,11 +398,11 @@
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1712482522,
|
||||
"narHash": "sha256-Ai/xNgZpbwGcw0TSXwEPwwbPi8Iu906sB9M9z3o6UgA=",
|
||||
"lastModified": 1712757991,
|
||||
"narHash": "sha256-kR7C7Fqt3JP40h0mzmSZeWI5pk1iwqj4CSeGjnUbVHc=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "efe8ce06ca261f370d672def5b1e0be300c726e1",
|
||||
"rev": "d6b3ddd253c578a7ab98f8011e59990f21dc3932",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -414,11 +414,11 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1712437997,
|
||||
"narHash": "sha256-g0whLLwRvgO2FsyhY8fNk+TWenS3jg5UdlWL4uqgFeo=",
|
||||
"lastModified": 1712741485,
|
||||
"narHash": "sha256-bCs0+MSTra80oXAsnM6Oq62WsirOIaijQ/BbUY59tR4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e38d7cb66ea4f7a0eb6681920615dfcc30fc2920",
|
||||
"rev": "b2cf36f43f9ef2ded5711b30b1f393ac423d8f72",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -470,11 +470,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1712456031,
|
||||
"narHash": "sha256-vPM+DLCyiT3eKGdDBIxqsgBrbbB7lL0TR6R7FLhX1v8=",
|
||||
"lastModified": 1712801594,
|
||||
"narHash": "sha256-KZJnVw3TdfDyUhvClzgy3IEoC9tRhvG0yM+lHfqAm34=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "0e5eaa43f116d798c289b0bb831320a353efc905",
|
||||
"rev": "35ebec41fcdeeae8e012e7d62ba153a13645227f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -38,12 +38,12 @@
|
||||
sessions.hyprland.enable = false;
|
||||
sessions.plasma.enable = true;
|
||||
};
|
||||
services.xserver.displayManager.sddm.enable = lib.mkForce true;
|
||||
services.displayManager.sddm.enable = lib.mkForce true;
|
||||
services.xserver.displayManager.startx.enable = lib.mkForce false;
|
||||
};
|
||||
|
||||
# who needs a display manager?
|
||||
services.xserver.displayManager.sddm.enable = false;
|
||||
services.displayManager.sddm.enable = false;
|
||||
|
||||
nixfiles = {
|
||||
profile.pc.enable = true;
|
||||
|
@ -24,9 +24,6 @@ in
|
||||
|
||||
# shell config
|
||||
programs.zsh.enable = true;
|
||||
programs.fzf = {
|
||||
keybindings = true;
|
||||
fuzzyCompletion = true;
|
||||
};
|
||||
programs.fzf.enable = true;
|
||||
};
|
||||
}
|
||||
|
@ -6,7 +6,7 @@ let
|
||||
inherit (lib) optional optionals;
|
||||
optionalsSet = val: optionals (!(isNull val));
|
||||
optionalSet = val: optional (!(isNull val));
|
||||
sessions = config.services.xserver.displayManager.sessionData.desktops;
|
||||
sessions = config.services.displayManager.sessionData.desktops;
|
||||
xsessions = "${sessions}/share/xsessions";
|
||||
wayland-sessions = "${sessions}/share/wayland-sessions";
|
||||
|
||||
@ -27,7 +27,8 @@ 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 ]
|
||||
|
@ -17,9 +17,9 @@ in
|
||||
config = mkIf cfg.enable {
|
||||
nixfiles.common.desktop.enable = true;
|
||||
|
||||
services.xserver.displayManager.sddm.enable = mkDefault true;
|
||||
services.displayManager.sddm.enable = mkDefault true;
|
||||
services.xserver.desktopManager.plasma5.enable = true;
|
||||
services.xserver.displayManager.defaultSession = "plasmawayland";
|
||||
services.displayManager.defaultSession = "plasmawayland";
|
||||
programs.kdeconnect.enable = mkDefault true;
|
||||
nixfiles.meta.wayland = true;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user