Removed a bunch of apps that were linked to Sway specifically (by commenting
them out - they can be put in a separate config file) and added KDE to Randolph.
This commit is contained in:
parent
4042fc2be2
commit
247993df78
|
|
@ -72,11 +72,11 @@
|
|||
###################################
|
||||
|
||||
# Set login and power management options
|
||||
services.logind.lidSwitch = "suspend";
|
||||
services.logind.lidSwitchDocked =
|
||||
"ignore"; # when an external monitor is plugged in
|
||||
services.logind.powerKey = "ignore"; # handle this WM side
|
||||
services.logind.powerKeyLongPress = "poweroff";
|
||||
# services.logind.lidSwitch = "suspend";
|
||||
# services.logind.lidSwitchDocked =
|
||||
# "ignore"; # when an external monitor is plugged in
|
||||
# services.logind.powerKey = "ignore"; # handle this WM side
|
||||
# services.logind.powerKeyLongPress = "poweroff";
|
||||
|
||||
# Enable graphics.
|
||||
hardware.graphics.enable = true;
|
||||
|
|
@ -91,7 +91,7 @@
|
|||
services.printing.enable = true;
|
||||
|
||||
# Enable udisks (handles storage devices, e.g. usb flash drives)
|
||||
services.udisks2.enable = true;
|
||||
# services.udisks2.enable = true;
|
||||
|
||||
# Enable sound.
|
||||
security.rtkit.enable = true; # needed for pipewire
|
||||
|
|
@ -128,7 +128,7 @@
|
|||
home-manager.users.alice = import ./home.nix;
|
||||
|
||||
# Make sure swaylock works (defined in home.nix)
|
||||
security.pam.services.swaylock = { };
|
||||
# security.pam.services.swaylock = { };
|
||||
|
||||
# Make sure suspend actually happens
|
||||
# what this does is set the time it waits before sleeping to 10 (default 30)
|
||||
|
|
@ -186,6 +186,12 @@
|
|||
# Enable zsh; necessary to switch
|
||||
programs.zsh.enable = true;
|
||||
|
||||
# Enable KDE Plasma 6
|
||||
services.xserver.enable = true;
|
||||
services.desktopManager.plasma6.enable = true;
|
||||
services.displayManager.sddm.enable = true;
|
||||
services.displayManager.sddm.wayland.enable = true;
|
||||
|
||||
# Some programs need SUID wrappers, can be configured further or are
|
||||
# started in user sessions.
|
||||
# programs.mtr.enable = true;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
let
|
||||
scripts = ../../scripts;
|
||||
extra = ../../extra;
|
||||
terminal = pkgs.alacritty;
|
||||
# terminal = pkgs.alacritty;
|
||||
in {
|
||||
imports = [
|
||||
../../programs/kdeconnect.nix
|
||||
|
|
@ -90,16 +90,16 @@ in {
|
|||
] ++ # Basic utilities
|
||||
[ bitwarden-cli htop snore hledger hledger-ui ]
|
||||
++ # Personalized selection of command-line (CLI/TUI) apps
|
||||
[ terminal ] ++ # Terminal emulator
|
||||
# [ terminal ] ++ # Terminal emulator
|
||||
[
|
||||
qutebrowser
|
||||
cinnamon.nemo
|
||||
gnome.file-roller
|
||||
cinnamon.nemo-fileroller
|
||||
evince
|
||||
imv
|
||||
# qutebrowser
|
||||
# cinnamon.nemo
|
||||
# gnome.file-roller
|
||||
# cinnamon.nemo-fileroller
|
||||
# evince
|
||||
# imv
|
||||
vlc
|
||||
pavucontrol
|
||||
# pavucontrol
|
||||
] ++ # Basic graphical apps
|
||||
[
|
||||
libreoffice
|
||||
|
|
@ -110,7 +110,7 @@ in {
|
|||
gimp
|
||||
inkscape
|
||||
deluge-gtk
|
||||
shotwell
|
||||
# shotwell
|
||||
lorien
|
||||
keepassxc
|
||||
zulip
|
||||
|
|
@ -119,7 +119,7 @@ in {
|
|||
gwenview
|
||||
] ++ # Personalized selection of graphical apps
|
||||
[ mons shticker-book-unwritten ] ++ # Games
|
||||
[ swaybg bemenu j4-dmenu-desktop ] ++ # Sway- and Wayland-related packages
|
||||
# [ swaybg bemenu j4-dmenu-desktop ] ++ # Sway- and Wayland-related packages
|
||||
[
|
||||
noto-fonts
|
||||
redhat-official-fonts
|
||||
|
|
@ -147,32 +147,32 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
wayland.windowManager.sway = import ../../programs/sway.nix {
|
||||
inherit scripts extra config lib pkgs terminal;
|
||||
};
|
||||
# wayland.windowManager.sway = import ../../programs/sway.nix {
|
||||
# inherit scripts extra config lib pkgs terminal;
|
||||
# };
|
||||
|
||||
programs.waybar =
|
||||
import ../../programs/waybar.nix { inherit scripts config lib pkgs terminal; };
|
||||
# programs.waybar =
|
||||
# import ../../programs/waybar.nix { inherit scripts config lib pkgs terminal; };
|
||||
|
||||
programs.swaylock = {
|
||||
enable = true;
|
||||
settings = { font-size = 14; };
|
||||
};
|
||||
services.swayidle = {
|
||||
enable = true;
|
||||
events = [{
|
||||
event = "before-sleep";
|
||||
command = "${pkgs.lib.getExe pkgs.swaylock} -f";
|
||||
}];
|
||||
};
|
||||
# programs.swaylock = {
|
||||
# enable = true;
|
||||
# settings = { font-size = 14; };
|
||||
# };
|
||||
# services.swayidle = {
|
||||
# enable = true;
|
||||
# events = [{
|
||||
# event = "before-sleep";
|
||||
# command = "${pkgs.lib.getExe pkgs.swaylock} -f";
|
||||
# }];
|
||||
# };
|
||||
|
||||
# Fixes electron apps
|
||||
home.sessionVariables = { NIXOS_OZONE_WL = "1"; };
|
||||
|
||||
# configure fonts correctly
|
||||
fonts.fontconfig.enable = true;
|
||||
xdg.configFile."fontconfig/conf.d/20-default.fonts.conf".source =
|
||||
"${extra}/20-default-fonts.conf";
|
||||
# fonts.fontconfig.enable = true;
|
||||
# xdg.configFile."fontconfig/conf.d/20-default.fonts.conf".source =
|
||||
# "${extra}/20-default-fonts.conf";
|
||||
|
||||
# fix nemo terminal integration
|
||||
# dconf.settings."org/cinnamon/desktop/applications/terminal".exec =
|
||||
|
|
@ -221,25 +221,25 @@ in {
|
|||
programs.pandoc = { enable = true; };
|
||||
|
||||
# Configure notifications
|
||||
services.dunst = {
|
||||
enable = true;
|
||||
settings = {
|
||||
global = {
|
||||
font = "Red Hat Display 12";
|
||||
mouse_left_click = "do_action, close_current";
|
||||
mouse_middle_click = "close_all";
|
||||
mouse_right_click = "close_current";
|
||||
};
|
||||
};
|
||||
};
|
||||
services.batsignal = {
|
||||
enable = true;
|
||||
extraArgs = [
|
||||
"-w 20"
|
||||
"-c 10"
|
||||
"-d 3"
|
||||
];
|
||||
};
|
||||
# services.dunst = {
|
||||
# enable = true;
|
||||
# settings = {
|
||||
# global = {
|
||||
# font = "Red Hat Display 12";
|
||||
# mouse_left_click = "do_action, close_current";
|
||||
# mouse_middle_click = "close_all";
|
||||
# mouse_right_click = "close_current";
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
# services.batsignal = {
|
||||
# enable = true;
|
||||
# extraArgs = [
|
||||
# "-w 20"
|
||||
# "-c 10"
|
||||
# "-d 3"
|
||||
# ];
|
||||
# };
|
||||
|
||||
programs.firefox = import ../../programs/firefox.nix { inherit pkgs; };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue