back to kde
This commit is contained in:
parent
9ce1d71fc9
commit
3641ba79fd
24
flake.lock
24
flake.lock
@ -2,11 +2,11 @@
|
|||||||
"nodes": {
|
"nodes": {
|
||||||
"cachix": {
|
"cachix": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1615028506,
|
"lastModified": 1616005387,
|
||||||
"narHash": "sha256-OiRfJ81e/kDAtg6YOlaVbvXLZ6tbo2Av/SEC1qs4WnE=",
|
"narHash": "sha256-WzADBBE8c6I/GjvOwYK8fYJh0lk5t2aSGEP2v/4Ynic=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "37b47da04ca50d17934881192e65ad2df83704b5",
|
"rev": "12d9950bf47e0ac20d4d04e189448ee075242117",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -23,11 +23,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1615419569,
|
"lastModified": 1616028420,
|
||||||
"narHash": "sha256-+ewB0sQGeoYryWZk2Ww2Lm/5jeqhlYTjGy6zEX2Mm1I=",
|
"narHash": "sha256-mdMOVkS7ofiQPZVC1dl7ARgf5AzQij3d0r0vWOVEmF8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "040ea28e448a93d24540b7cf2eda4b25300c5ab1",
|
"rev": "6245dd11cf59698aacdf8b153e3e7070abbef36f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -74,11 +74,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1615259932,
|
"lastModified": 1615888535,
|
||||||
"narHash": "sha256-IXecmbqCr+XCtFwzBO3tHEd8PoJ4X4EyPZebKbV2ioE=",
|
"narHash": "sha256-wR49KkuahcNq1xU3Tk+Mfbob3g2/B/fpbWPw8X+1wsg=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "29b0d4d0b600f8f5dd0b86e3362a33d4181938f9",
|
"rev": "1f77a4c8c74bbe896053994836790aa9bf6dc5ba",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -99,11 +99,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1615122150,
|
"lastModified": 1616037936,
|
||||||
"narHash": "sha256-Qebx+7aIk7PL+nf7d2RraYYHapZDI4ZywahZ5UnlK5s=",
|
"narHash": "sha256-euuVhp/g2WxGonRqEpe1te+/CMjCv2WvoH35uQfFv0s=",
|
||||||
"owner": "colemickens",
|
"owner": "colemickens",
|
||||||
"repo": "nixpkgs-wayland",
|
"repo": "nixpkgs-wayland",
|
||||||
"rev": "8c63e6ee0f05eeace26612fc18b4260cccab5e1e",
|
"rev": "37ac713598c031c9421695d5d2a3a07bf480016a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -38,7 +38,7 @@
|
|||||||
gnome3 = {
|
gnome3 = {
|
||||||
gnome-keyring.enable = true;
|
gnome-keyring.enable = true;
|
||||||
};
|
};
|
||||||
/*xserver = {
|
xserver = {
|
||||||
enable = true;
|
enable = true;
|
||||||
desktopManager = {
|
desktopManager = {
|
||||||
plasma5.enable = true;
|
plasma5.enable = true;
|
||||||
@ -58,7 +58,7 @@
|
|||||||
sddm.enable = true;
|
sddm.enable = true;
|
||||||
startx.enable = false;
|
startx.enable = false;
|
||||||
};
|
};
|
||||||
};*/
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.user.services.gnome-session-restart-dbus.serviceConfig = {
|
systemd.user.services.gnome-session-restart-dbus.serviceConfig = {
|
||||||
|
@ -134,8 +134,8 @@ let
|
|||||||
|
|
||||||
bgColor = colorScheme.primary.normal.background;
|
bgColor = colorScheme.primary.normal.background;
|
||||||
fgColor = colorScheme.primary.bright.foreground;
|
fgColor = colorScheme.primary.bright.foreground;
|
||||||
acColor = colorScheme.normal.red;
|
acColor = colorScheme.normal.blue;
|
||||||
acColor2 = colorScheme.normal.yellow;
|
acColor2 = colorScheme.bright.cyan;
|
||||||
|
|
||||||
alacrittyColors = {
|
alacrittyColors = {
|
||||||
primary = {
|
primary = {
|
||||||
@ -214,7 +214,6 @@ in
|
|||||||
(nerdfonts.override { fonts = [ "Iosevka" ]; })
|
(nerdfonts.override { fonts = [ "Iosevka" ]; })
|
||||||
# Programs
|
# Programs
|
||||||
audacity
|
audacity
|
||||||
kdenlive
|
|
||||||
krita
|
krita
|
||||||
gnome3.seahorse
|
gnome3.seahorse
|
||||||
wine-staging
|
wine-staging
|
||||||
@ -234,10 +233,9 @@ in
|
|||||||
steam-run
|
steam-run
|
||||||
lutris
|
lutris
|
||||||
xdg_utils
|
xdg_utils
|
||||||
discord
|
|
||||||
ripcord
|
|
||||||
tagref
|
tagref
|
||||||
libreoffice-fresh
|
libreoffice-fresh
|
||||||
|
mako
|
||||||
] ++ kideDeps;
|
] ++ kideDeps;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -247,7 +245,7 @@ in
|
|||||||
inherit font;
|
inherit font;
|
||||||
};
|
};
|
||||||
sway = {
|
sway = {
|
||||||
enable = true;
|
enable = false;
|
||||||
extraSessionCommands = ''
|
extraSessionCommands = ''
|
||||||
export SDL_VIDEODRIVER=wayland
|
export SDL_VIDEODRIVER=wayland
|
||||||
# needs qt5.qtwayland in systemPackages
|
# needs qt5.qtwayland in systemPackages
|
||||||
@ -475,15 +473,15 @@ in
|
|||||||
# use this if they aren't displayed properly:
|
# use this if they aren't displayed properly:
|
||||||
export _JAVA_AWT_WM_NONREPARENTING=1
|
export _JAVA_AWT_WM_NONREPARENTING=1
|
||||||
'';
|
'';
|
||||||
loginExtra =
|
# loginExtra =
|
||||||
let
|
# 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!");
|
# 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
|
# in
|
||||||
''
|
# ''
|
||||||
if [ "$(${pkgs.coreutils}/bin/tty)" = "/dev/tty1" ]; then
|
# if [ "$(${pkgs.coreutils}/bin/tty)" = "/dev/tty1" ]; then
|
||||||
exec startplasma-x11
|
# exec ${deCmd}
|
||||||
fi
|
# fi
|
||||||
'';
|
# '';
|
||||||
initExtra = ''
|
initExtra = ''
|
||||||
bindkey "$terminfo[kRIT5]" forward-word
|
bindkey "$terminfo[kRIT5]" forward-word
|
||||||
bindkey "$terminfo[kLFT5]" backward-word
|
bindkey "$terminfo[kLFT5]" backward-word
|
||||||
@ -520,7 +518,7 @@ in
|
|||||||
acc = "#${acColor}";
|
acc = "#${acColor}";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
enable = true;
|
enable = false;
|
||||||
colors = {
|
colors = {
|
||||||
window = {
|
window = {
|
||||||
background = bgc;
|
background = bgc;
|
||||||
|
Loading…
Reference in New Issue
Block a user