Use plasma for main desktop
Move hyprland specific audio/bluetooth packages into hyprland expression Increase frequency of nix cleanup, same duration
This commit is contained in:
parent
7719862a6f
commit
ee34f667b9
|
@ -6,6 +6,7 @@
|
||||||
./hardware/audio.nix
|
./hardware/audio.nix
|
||||||
./hardware/bluetooth.nix
|
./hardware/bluetooth.nix
|
||||||
./locales/en_GB.nix
|
./locales/en_GB.nix
|
||||||
|
./desktop/plasma.nix
|
||||||
./desktop/hyprland.nix
|
./desktop/hyprland.nix
|
||||||
./desktop/steam.nix
|
./desktop/steam.nix
|
||||||
./syncthing/Vanguard.nix
|
./syncthing/Vanguard.nix
|
||||||
|
@ -19,7 +20,7 @@
|
||||||
services.openssh.enable = true;
|
services.openssh.enable = true;
|
||||||
networking.firewall = { enable = true; allowedTCPPorts = [ 22 ]; };
|
networking.firewall = { enable = true; allowedTCPPorts = [ 22 ]; };
|
||||||
|
|
||||||
services.xserver.displayManager.defaultSession = "steam";
|
services.xserver.displayManager.defaultSession = "plasmawayland";
|
||||||
|
|
||||||
users.users.root.openssh.authorizedKeys.keys = [
|
users.users.root.openssh.authorizedKeys.keys = [
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII1tJFdbiyJApuVZFvo9E9kjlBwvXZeySqVuS2qGdxha tux@monarch"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII1tJFdbiyJApuVZFvo9E9kjlBwvXZeySqVuS2qGdxha tux@monarch"
|
||||||
|
|
|
@ -65,7 +65,7 @@
|
||||||
|
|
||||||
nix.gc = {
|
nix.gc = {
|
||||||
automatic = true;
|
automatic = true;
|
||||||
dates = "weekly";
|
dates = "daily";
|
||||||
options = "--delete-older-than 7d";
|
options = "--delete-older-than 7d";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +0,0 @@
|
||||||
{ pkgs, ... }:
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
|
@ -8,6 +8,12 @@
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
programs.dconf.enable = true;
|
programs.dconf.enable = true;
|
||||||
|
services.blueman.enable = true;
|
||||||
|
environment.systemPackages = [
|
||||||
|
pkgs.pavucontrol
|
||||||
|
pkgs.pamixer
|
||||||
|
pkgs.pulseaudio
|
||||||
|
];
|
||||||
security.pam.services.swaylock = { };
|
security.pam.services.swaylock = { };
|
||||||
programs.hyprland = {
|
programs.hyprland = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -1,18 +1,8 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [ ./xserver.nix ./sddm.nix ];
|
||||||
./xserver.nix
|
|
||||||
./sddm.nix
|
|
||||||
];
|
|
||||||
# Enable the X11 windowing system.
|
|
||||||
services.xserver.enable = true;
|
|
||||||
|
|
||||||
# Enable the KDE Plasma Desktop Environment.
|
|
||||||
services.xserver.desktopManager.plasma5.enable = true;
|
services.xserver.desktopManager.plasma5.enable = true;
|
||||||
services.xserver.displayManager.defaultSession = "plasmawayland";
|
|
||||||
|
|
||||||
programs.kdeconnect.enable = true;
|
programs.kdeconnect.enable = true;
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
libsForQt5.lightly
|
libsForQt5.lightly
|
||||||
libsForQt5.qtstyleplugin-kvantum
|
libsForQt5.qtstyleplugin-kvantum
|
||||||
|
|
|
@ -3,17 +3,12 @@ let
|
||||||
sddm-catppuccin-macchiato = pkgs.callPackage ./pkgs/sddm-catppuccin-macchiato.nix { };
|
sddm-catppuccin-macchiato = pkgs.callPackage ./pkgs/sddm-catppuccin-macchiato.nix { };
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
services.xserver.enable = true;
|
|
||||||
services.xserver.displayManager.sddm = {
|
|
||||||
enable = true;
|
|
||||||
theme = "catppuccin-macchiato";
|
|
||||||
settings = {
|
|
||||||
General = {
|
|
||||||
InputMethod = "";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
sddm-catppuccin-macchiato.sddm-catppuccin-macchiato
|
sddm-catppuccin-macchiato.sddm-catppuccin-macchiato
|
||||||
];
|
];
|
||||||
|
services.xserver.displayManager.sddm = {
|
||||||
|
enable = true;
|
||||||
|
theme = "catppuccin-macchiato";
|
||||||
|
settings = { General = { InputMethod = ""; }; };
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,7 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
environment.systemPackages = [
|
imports = [ ./xserver.nix ./sddm.nix ];
|
||||||
pkgs.mesa
|
environment.systemPackages = [ pkgs.mesa ];
|
||||||
];
|
|
||||||
programs.gamescope.enable = true;
|
programs.gamescope.enable = true;
|
||||||
programs.steam = {
|
programs.steam = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -1,15 +1,10 @@
|
||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
imports = [
|
|
||||||
./default.nix
|
|
||||||
];
|
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
enable = true;
|
enable = true;
|
||||||
layout = "gb";
|
layout = "gb";
|
||||||
xkbVariant = "";
|
xkbVariant = "";
|
||||||
};
|
};
|
||||||
|
|
||||||
console.keyMap = "uk";
|
console.keyMap = "uk";
|
||||||
|
|
||||||
programs.dconf.enable = true;
|
programs.dconf.enable = true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,9 +11,4 @@
|
||||||
pulse.enable = true;
|
pulse.enable = true;
|
||||||
};
|
};
|
||||||
programs.noisetorch.enable = true;
|
programs.noisetorch.enable = true;
|
||||||
environment.systemPackages = [
|
|
||||||
pkgs.pavucontrol
|
|
||||||
pkgs.pamixer
|
|
||||||
pkgs.pulseaudio
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,5 +4,4 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
powerOnBoot = true;
|
powerOnBoot = true;
|
||||||
};
|
};
|
||||||
services.blueman.enable = true;
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue