back to kde

This commit is contained in:
dusk 2021-03-18 17:12:44 +03:00
parent 9ce1d71fc9
commit 3641ba79fd
Signed by: dusk
GPG Key ID: 1D8F8FAF2294D6EA
3 changed files with 28 additions and 30 deletions

View File

@ -2,11 +2,11 @@
"nodes": {
"cachix": {
"locked": {
"lastModified": 1615028506,
"narHash": "sha256-OiRfJ81e/kDAtg6YOlaVbvXLZ6tbo2Av/SEC1qs4WnE=",
"lastModified": 1616005387,
"narHash": "sha256-WzADBBE8c6I/GjvOwYK8fYJh0lk5t2aSGEP2v/4Ynic=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "37b47da04ca50d17934881192e65ad2df83704b5",
"rev": "12d9950bf47e0ac20d4d04e189448ee075242117",
"type": "github"
},
"original": {
@ -23,11 +23,11 @@
]
},
"locked": {
"lastModified": 1615419569,
"narHash": "sha256-+ewB0sQGeoYryWZk2Ww2Lm/5jeqhlYTjGy6zEX2Mm1I=",
"lastModified": 1616028420,
"narHash": "sha256-mdMOVkS7ofiQPZVC1dl7ARgf5AzQij3d0r0vWOVEmF8=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "040ea28e448a93d24540b7cf2eda4b25300c5ab1",
"rev": "6245dd11cf59698aacdf8b153e3e7070abbef36f",
"type": "github"
},
"original": {
@ -74,11 +74,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1615259932,
"narHash": "sha256-IXecmbqCr+XCtFwzBO3tHEd8PoJ4X4EyPZebKbV2ioE=",
"lastModified": 1615888535,
"narHash": "sha256-wR49KkuahcNq1xU3Tk+Mfbob3g2/B/fpbWPw8X+1wsg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "29b0d4d0b600f8f5dd0b86e3362a33d4181938f9",
"rev": "1f77a4c8c74bbe896053994836790aa9bf6dc5ba",
"type": "github"
},
"original": {
@ -99,11 +99,11 @@
]
},
"locked": {
"lastModified": 1615122150,
"narHash": "sha256-Qebx+7aIk7PL+nf7d2RraYYHapZDI4ZywahZ5UnlK5s=",
"lastModified": 1616037936,
"narHash": "sha256-euuVhp/g2WxGonRqEpe1te+/CMjCv2WvoH35uQfFv0s=",
"owner": "colemickens",
"repo": "nixpkgs-wayland",
"rev": "8c63e6ee0f05eeace26612fc18b4260cccab5e1e",
"rev": "37ac713598c031c9421695d5d2a3a07bf480016a",
"type": "github"
},
"original": {

View File

@ -38,7 +38,7 @@
gnome3 = {
gnome-keyring.enable = true;
};
/*xserver = {
xserver = {
enable = true;
desktopManager = {
plasma5.enable = true;
@ -58,7 +58,7 @@
sddm.enable = true;
startx.enable = false;
};
};*/
};
};
systemd.user.services.gnome-session-restart-dbus.serviceConfig = {

View File

@ -134,8 +134,8 @@ let
bgColor = colorScheme.primary.normal.background;
fgColor = colorScheme.primary.bright.foreground;
acColor = colorScheme.normal.red;
acColor2 = colorScheme.normal.yellow;
acColor = colorScheme.normal.blue;
acColor2 = colorScheme.bright.cyan;
alacrittyColors = {
primary = {
@ -214,7 +214,6 @@ in
(nerdfonts.override { fonts = [ "Iosevka" ]; })
# Programs
audacity
kdenlive
krita
gnome3.seahorse
wine-staging
@ -234,10 +233,9 @@ in
steam-run
lutris
xdg_utils
discord
ripcord
tagref
libreoffice-fresh
mako
] ++ kideDeps;
};
@ -247,7 +245,7 @@ in
inherit font;
};
sway = {
enable = true;
enable = false;
extraSessionCommands = ''
export SDL_VIDEODRIVER=wayland
# needs qt5.qtwayland in systemPackages
@ -475,15 +473,15 @@ in
# use this if they aren't displayed properly:
export _JAVA_AWT_WM_NONREPARENTING=1
'';
loginExtra =
let
#deCmd = if config.wayland.windowManager.sway.enable then "sway" else (if config.wayland.windowManager.hikari.enable then "hikari" else throw "Need a window manager to start!");
in
''
if [ "$(${pkgs.coreutils}/bin/tty)" = "/dev/tty1" ]; then
exec startplasma-x11
fi
'';
# loginExtra =
# let
# deCmd = if config.wayland.windowManager.sway.enable then "sway" else (if config.wayland.windowManager.hikari.enable then "hikari" else throw "Need a window manager to start!");
# in
# ''
# if [ "$(${pkgs.coreutils}/bin/tty)" = "/dev/tty1" ]; then
# exec ${deCmd}
# fi
# '';
initExtra = ''
bindkey "$terminfo[kRIT5]" forward-word
bindkey "$terminfo[kLFT5]" backward-word
@ -520,7 +518,7 @@ in
acc = "#${acColor}";
in
{
enable = true;
enable = false;
colors = {
window = {
background = bgc;