diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gnome.nix | 6 | ||||
| -rw-r--r-- | modules/home/common.nix | 20 |
2 files changed, 17 insertions, 9 deletions
diff --git a/modules/gnome.nix b/modules/gnome.nix index 5842149..26d8a8d 100644 --- a/modules/gnome.nix +++ b/modules/gnome.nix @@ -6,8 +6,8 @@ # i dont like how the icon looks :) services.xserver.excludePackages = [ pkgs.xterm ]; - services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome.enable = true; + services.displayManager.gdm.enable = true; + services.desktopManager.gnome.enable = true; environment.gnome.excludePackages = with pkgs; [ gnome-console @@ -27,7 +27,7 @@ }; # legacy apps dark mode support - services.xserver.desktopManager.gnome.extraGSettingsOverrides = '' + services.desktopManager.gnome.extraGSettingsOverrides = '' # set dark theme for legacy applications [org.gnome.desktop.interface] gtk-theme="Adwaita" diff --git a/modules/home/common.nix b/modules/home/common.nix index 0bbb68c..4379a2b 100644 --- a/modules/home/common.nix +++ b/modules/home/common.nix @@ -16,8 +16,6 @@ in programs = { git = { enable = true; - userName = "Mel"; - userEmail = "mel@rnrd.eu"; signing = { key = "D75A C286 ACA7 00B4 D8EC 377D 2082 F8EC 11CC 009B"; signByDefault = true; @@ -27,12 +25,22 @@ in "*~" "[._]*.sw?" ]; - aliases = { - "skip" = "update-index --skip-worktree"; - "unskip" = "update-index --no-skip-worktree"; + + settings = { + user = { + name = "Mel"; + email = "mel@rnrd.eu"; + }; + + alias = { + "skip" = "update-index --skip-worktree"; + "unskip" = "update-index --no-skip-worktree"; + }; + + init.defaultBranch = "main"; + pull.rebase = true; }; - extraConfig.init.defaultBranch = "main"; }; direnv = { |