Change to GNOME

This commit is contained in:
thiloho
2023-07-04 00:01:57 +02:00
parent ca875dbf4c
commit 691aa29108

View File

@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ ... }:
{
services = {
@@ -9,122 +9,16 @@
pulse.enable = true;
jack.enable = true;
};
xserver.desktopManager = {
gnome.enable = true;
gdm.enable = true;
};
gnome.core-utilities.enable = false;
};
hardware.opengl.enable = true;
# Make swaylock work
security.pam.services.swaylock = {};
xdg.portal = {
enable = true;
extraPortals = with pkgs; [
xdg-desktop-portal-wlr
xdg-desktop-portal-gtk
];
};
fonts = {
enableDefaultFonts = true;
fonts = with pkgs; [
noto-fonts-cjk-sans
nerdfonts
];
};
programs.gnupg.agent = {
enable = true;
enableSSHSupport = true;
pinentryFlavor = "gtk2";
};
# Home manager configuration
home-manager.users.thiloho = { pkgs, lib, config, ... }: {
wayland.windowManager.sway = {
enable = true;
wrapperFeatures.gtk = true;
config = {
modifier = "Mod4";
terminal = "alacritty";
menu = ''
tofi-run --width "100%" --height "100%" --border-width 0 --outline-width 0 --padding-left "35%" --padding-top "35%" --result-spacing 25 --num-results 5 --font "monospace" --background-color "#000A" | xargs swaymsg exec --
'';
bars = [
{ command = "waybar"; }
];
keybindings = let
modifier = config.wayland.windowManager.sway.config.modifier;
in lib.mkOptionDefault {
"${modifier}+Shift+S" = ''exec grim -g "$(slurp)" - | swappy -f -'';
};
};
xwayland = false;
extraConfig = ''
default_border pixel 2
default_floating_border pixel 2
'';
};
programs = {
waybar = {
enable = true;
settings = [
{
modules-left = [ "sway/workspaces" ];
modules-center = [ "sway/window" ];
modules-right = [ "user" "memory" "disk" "cpu" "clock" ];
user = {
format = "{user} - Uptime: {work_H}:{work_M}h";
};
memory = {
format = "Memory: {used}GiB";
};
disk = {
format = "Disk: {free}";
};
cpu = {
format = "CPU: {usage}%";
};
clock = {
interval = 60;
format = "{:%Y-%m-%d - %H:%M}";
};
}
];
style = ''
* {
border: none;
border-radius: 0;
font-size: 0.875rem;
}
window#waybar {
background-color: #1a1a1a;
color: #e6e6e6;
}
#workspaces button, #user, #memory, #disk, #cpu, #clock {
padding-top: 0.125rem;
padding-bottom: 0.125rem;
padding-left: 0.5rem;
padding-right: 0.5rem;
background-color: #262626;
border: 0.0625rem solid #404040;
}
'';
};
swaylock = {
enable = true;
settings = let
wallpaper = pkgs.callPackage ./wallpaper.nix {};
in {
image = "${wallpaper}";
};
};
bash = {
enable = true;
shellAliases = {
@@ -137,7 +31,6 @@
helix = {
enable = true;
settings = {
theme = "gruvbox_transparent";
editor = {
line-number = "relative";
cursorline = true;
@@ -151,19 +44,10 @@
hidden = false;
};
};
themes = {
gruvbox_transparent = {
"inherits" = "gruvbox";
"ui.background" = "{}";
};
};
};
alacritty = {
enable = true;
settings = {
window.opacity = 0.75;
font.size = 11.00;
};
settings.font.size = 11.00;
};
firefox.enable = true;
chromium = {
@@ -183,13 +67,6 @@
};
};
};
gtk = {
enable = true;
theme = {
package = pkgs.gnome.gnome-themes-extra;
name = "Adwaita-dark";
};
};
home = {
sessionVariables = {
NIXOS_OZONE_WL = "1";
@@ -206,7 +83,6 @@
nodePackages.svelte-language-server
nodePackages.vscode-langservers-extracted
postgresqlJitPackages.plpgsql_check
dconf
tofi
wl-clipboard
xdg-utils
@@ -215,7 +91,6 @@
swappy
kooha
ventoy
lapce
tldr
];
};