- Removed hyprland
- Upgraded everything - using ssddm
This commit is contained in:
1 parent
1bf5f5c4ed
commit
d9be46e935
10 files changed
+49
-600
No files matched your search
@@ -25,19 +25,17 @@ in
|
||||
"https://cache.nixos.org"
|
||||
"https://cache.flox.dev"
|
||||
"https://devenv.cachix.org"
|
||||
"https://hyprland.cachix.org"
|
||||
"https://cuda-maintainers.cachix.org"
|
||||
"https://cuda-maintainers.cachix.org"
|
||||
] ++ cfg.urls;
|
||||
nix.settings.trusted-substituters = [
|
||||
"https://cache.flox.dev"
|
||||
"https://devenv.cachix.org"
|
||||
"https://cuda-maintainers.cachix.org"
|
||||
"https://cuda-maintainers.cachix.org"
|
||||
] ++ cfg.urls;
|
||||
nix.settings.trusted-public-keys = [
|
||||
"flox-cache-public-1:7F4OyH7ZCnFhcze3fJdfyXYLQw/aV7GEed86nQ7IsOs="
|
||||
"devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
|
||||
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
|
||||
"cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
|
||||
"cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
|
||||
] ++ cfg.keys;
|
||||
nix.settings.trusted-users = [ "root" skygUser.name ];
|
||||
};
|
||||
|
||||
@@ -4,7 +4,6 @@ let
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
./hyprland
|
||||
./kde.nix
|
||||
./cosmic.nix
|
||||
./wayland.nix
|
||||
@@ -20,12 +19,16 @@ in
|
||||
};
|
||||
};
|
||||
config = lib.mkIf cfg.desktop.enable {
|
||||
services.displayManager.sddm.enable = false;
|
||||
services.displayManager.sddm.wayland.enable = false;
|
||||
services.xserver.displayManager.gdm.enable = true;
|
||||
services.displayManager.enable = true;
|
||||
services.displayManager.sddm.enable = true;
|
||||
services.displayManager.sddm.wayland.enable = true;
|
||||
services.displayManager.sddm.wayland.compositor = "kwin";
|
||||
# security.pam.services.<name>.kwallet.enable = true;
|
||||
|
||||
services.xserver.displayManager.gdm.enable = false;
|
||||
services.xserver.displayManager.gdm.autoSuspend = false;
|
||||
services.xserver.displayManager.gdm.banner = ''Ari's PC'';
|
||||
services.xserver.displayManager.gdm.wayland = true;
|
||||
services.xserver.displayManager.gdm.wayland = false;
|
||||
xdg = {
|
||||
autostart.enable = true;
|
||||
mime.enable = true;
|
||||
@@ -35,16 +38,15 @@ in
|
||||
terminal-exec.enable = true;
|
||||
portal = {
|
||||
enable = true;
|
||||
wlr.enable = true;
|
||||
xdgOpenUsePortal = true;
|
||||
config = {
|
||||
common.default = [ "gtk" ];
|
||||
hyprland.default = [ "gtk" "hyprland" ];
|
||||
plasma6.default = [ "gtk" "kde" ];
|
||||
};
|
||||
extraPortals = [
|
||||
pkgs.xdg-desktop-portal-gtk
|
||||
];
|
||||
# wlr.enable = true;
|
||||
# xdgOpenUsePortal = true;
|
||||
# config = {
|
||||
# common.default = [ "*" ];
|
||||
# plasma6.default = [ "gtk" "kde" ];
|
||||
# };
|
||||
# extraPortals = [
|
||||
# pkgs.xdg-desktop-portal-gtk
|
||||
# ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,49 +0,0 @@
|
||||
{ config, lib, pkgs, inputs, ... }:
|
||||
let
|
||||
cfg = config.skyg.nixos.desktop.hyprland;
|
||||
in
|
||||
{
|
||||
config =
|
||||
let
|
||||
hyprpkgs =
|
||||
if cfg.useDevelopmentMode then inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}
|
||||
else pkgs
|
||||
;
|
||||
in
|
||||
lib.mkIf cfg.enable {
|
||||
programs.hyprland = {
|
||||
enable = true;
|
||||
package = hyprpkgs.hyprland;
|
||||
portalPackage = hyprpkgs.xdg-desktop-portal-hyprland;
|
||||
xwayland.enable = true;
|
||||
systemd.setPath.enable = true;
|
||||
};
|
||||
|
||||
xdg.portal.extraPortals = [ hyprpkgs.xdg-desktop-portal-hyprland ];
|
||||
services.hypridle.enable = true;
|
||||
environment.sessionVariables = { NIXOS_OZONE_WL = "1"; };
|
||||
environment.systemPackages = with pkgs; [
|
||||
# sound
|
||||
pavucontrol
|
||||
|
||||
# notification daemon
|
||||
dunst
|
||||
libnotify
|
||||
|
||||
# App Support
|
||||
xwaylandvideobridge
|
||||
lxqt.lxqt-policykit
|
||||
xdg-desktop-portal
|
||||
auto-cpufreq
|
||||
|
||||
# general utilities
|
||||
brightnessctl # brightness ctl
|
||||
networkmanagerapplet # networking
|
||||
];
|
||||
# <Sound
|
||||
services.mpd.enable = true;
|
||||
services.pipewire.wireplumber.enable = true;
|
||||
users.users.${config.skyg.user.name}.extraGroups = [ "input" ];
|
||||
# Sound />
|
||||
};
|
||||
}
|
||||
@@ -1,18 +0,0 @@
|
||||
{ lib, ... }:
|
||||
{
|
||||
imports = [
|
||||
./common.nix
|
||||
./mine.nix
|
||||
./nwg-shell.nix
|
||||
];
|
||||
options = {
|
||||
skyg.nixos.desktop.hyprland = with lib; {
|
||||
enable = mkEnableOption
|
||||
"Hyprland";
|
||||
useNWG = mkEnableOption
|
||||
"nwg-shell experience";
|
||||
useDevelopmentMode = mkEnableOption
|
||||
"use the dev mode of hyprland";
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,41 +0,0 @@
|
||||
{ config, lib, pkgs, inputs, system, ... }:
|
||||
let
|
||||
cfg = config.skyg.nixos.desktop.hyprland;
|
||||
in
|
||||
{
|
||||
config = lib.mkIf (cfg.enable && !cfg.useNWG) {
|
||||
home-manager.users.${config.skyg.user.name}.wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
xwayland.enable = true;
|
||||
extraConfig = ''
|
||||
source = ~/.config/hypr/hyprland.d/*.conf
|
||||
debug:enable_stdout_logs = true
|
||||
'';
|
||||
};
|
||||
programs.hyprlock.enable = true;
|
||||
environment.systemPackages =
|
||||
(with pkgs; [
|
||||
# general utilities
|
||||
swappy # screenshot editor
|
||||
hyprshot # screenshots
|
||||
cliphist # clipboard manager
|
||||
gnome.nautilus # file manager
|
||||
wofi # app launcher
|
||||
wl-screenrec # screen recorder
|
||||
slurp # helper selection tools
|
||||
waypaper # wallpaper manager
|
||||
swww # wallpaper service
|
||||
waybar # top bar
|
||||
nwg-panel # top bar
|
||||
nwg-dock-hyprland # bottom bar
|
||||
nwg-displays # display management
|
||||
nwg-bar # logout window
|
||||
]);
|
||||
system.userActivationScripts.hyprlandMineConfig.text = ''
|
||||
ln -sfn "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/hypr" "$HOME/.config/hypr"
|
||||
ln -sfn "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/waybar" "$HOME/.config/waybar"
|
||||
ln -sfn "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/nwg-bar" "$HOME/.config/nwg-bar"
|
||||
ln -sfn "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/dunst" "$HOME/.config/dunst"
|
||||
'';
|
||||
};
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.skyg.nixos.desktop.hyprland;
|
||||
in
|
||||
{
|
||||
config = mkIf (cfg.enable && cfg.useNWG) {
|
||||
programs.hyprlock.enable = true;
|
||||
environment.systemPackages = with pkgs; [
|
||||
# general utilities
|
||||
nwg-bar
|
||||
nwg-menu
|
||||
nwg-look
|
||||
nwg-panel
|
||||
nwg-hello
|
||||
nwg-drawer
|
||||
nwg-wrapper
|
||||
nwg-displays
|
||||
nwg-launchers
|
||||
nwg-dock-hyprland
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -7,12 +7,6 @@ in
|
||||
config = lib.mkIf cfg.enable {
|
||||
# Flatpak
|
||||
services.flatpak.enable = true;
|
||||
services.flatpak.remotes = [
|
||||
{
|
||||
name = "flathub";
|
||||
location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
|
||||
}
|
||||
];
|
||||
# Mobile Connect
|
||||
programs.kdeconnect.enable = true;
|
||||
environment.systemPackages = [ ghostty ] ++ (with pkgs; [
|
||||
|
||||
Reference in new issue
Block a user