feliix42/dotfiles
1
0
Fork 0
mirror of https://github.com/Feliix42/dotfiles.git synced 2024-11-22 14:06:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update to Plasma 6, remove plymouth

Browse source
This commit is contained in:
Felix Suchert 2024-03-22 10:40:02 +01:00
parent 371bf5a568
commit b3275019b7
Signed by: feliix42
GPG key ID: 24363525EA0E8A99
3 changed files with 29 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
entropy/nixos/configuration.nix
View file

@ -44,8 +44,8 @@
# OVERRIDES ########################################################## # OVERRIDES ##########################################################
nixpkgs.config.permittedInsecurePackages = [ nixpkgs.config.permittedInsecurePackages = [
"electron-25.9.0" #"electron-25.9.0"
"freeimage-unstable-2021-11-01" #"freeimage-unstable-2021-11-01"
]; ];
@ -56,10 +56,11 @@
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.plymouth = { # NOTE(feliix42): Didn't work as I wanted it to so...
enable = true; # boot.plymouth = {
theme = "breeze"; # enable = true;
}; # theme = "breeze";
# };
# ------------ kernel ------------------------------------------------------- # ------------ kernel -------------------------------------------------------
boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_7; boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_7;
@ -291,6 +292,7 @@
## git and friends ## git and friends
gitAndTools.delta gitAndTools.delta
gitAndTools.gitui gitAndTools.gitui
difftastic
## terminal, browsers, text editing, note taking ## terminal, browsers, text editing, note taking
alacritty alacritty
# TODO(feliix42): Fix at some point! # TODO(feliix42): Fix at some point!

32
entropy/nixos/modules/kde.nix
View file

@ -1,25 +1,27 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
services.xserver = { services.desktopManager.plasma6.enable = true;
enable = false;
autorun = false;
desktopManager.plasma5 = { # services.xserver = {
enable = true; # enable = false;
}; # autorun = false;
# use startx to run plasma # desktopManager.plasma5 = {
displayManager.startx.enable = true; # enable = true;
# };
# I'd like a log please # # use startx to run plasma
logFile = "/var/log/Xorg.0.log"; # displayManager.startx.enable = true;
};
environment.etc."X11/xinit/xinitrc".text = '' # # I'd like a log please
export DESKTOP_SESSION=plasma # logFile = "/var/log/Xorg.0.log";
exec ${pkgs.libsForQt5.plasma-workspace}/bin/startplasma-x11 # };
'';
# environment.etc."X11/xinit/xinitrc".text = ''
# export DESKTOP_SESSION=plasma
# exec ${pkgs.libsForQt5.plasma-workspace}/bin/startplasma-x11
# '';
#environment.variables = { #environment.variables = {
#GDK_SCALE = "2"; #GDK_SCALE = "2";

6
entropy/nixos/modules/sway.nix
View file

@ -111,9 +111,11 @@ in
environment.etc."greetd/environments".text = '' environment.etc."greetd/environments".text = ''
${pkgs.sway}/bin/sway ${pkgs.sway}/bin/sway
${pkgs.xorg.xinit}/bin/startx sway
${pkgs.libsForQt5.plasma-workspace}/bin/startplasma-wayland startplasma-wayland
${pkgs.fish}/bin/fish ${pkgs.fish}/bin/fish
''; '';
# ${pkgs.xorg.xinit}/bin/startx
# ${pkgs.libsForQt5.plasma-workspace}/bin/startplasma-wayland
} }