From 524cf30e8d3a465bfaa6163cd0080ebf200df4bc Mon Sep 17 00:00:00 2001 From: Alexander Kobjolke Date: Mon, 16 Jun 2025 20:57:41 +0200 Subject: [PATCH] dregil: Use gnome for now by default --- flake.nix | 14 ++++---------- home/alex/default.nix | 3 --- home/alex/home.nix | 18 +++++++++--------- home/alex/programs/xmonad/default.nix | 13 ++++++++++--- hosts/dregil/configuration.nix | 6 +----- modules/wm/x.nix | 3 ++- 6 files changed, 26 insertions(+), 31 deletions(-) diff --git a/flake.nix b/flake.nix index 1f9095c..23f2062 100644 --- a/flake.nix +++ b/flake.nix @@ -28,16 +28,6 @@ inputs.nixpkgs.follows = "nixpkgs-droid"; }; - # emacs = { - # url = "github:nix-community/emacs-overlay"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; - # - # simplex-chat = { - # url = "github:simplex-chat/simplex-chat"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; - # age for nix to store encrypted passwords conveniently agenix = { url = "github:ryantm/agenix"; @@ -129,6 +119,10 @@ modules = [ ./hosts/igor ]; }; + homeConfigurations."alex@dregil" = home-manager.lib.homeManagerConfiguration { + + }; + nixOnDroidConfigurations.default = with inputs; nix-on-droid.lib.nixOnDroidConfiguration { diff --git a/home/alex/default.nix b/home/alex/default.nix index 8e99ff4..62ee3b3 100644 --- a/home/alex/default.nix +++ b/home/alex/default.nix @@ -5,9 +5,6 @@ inputs, ... }: -let - electron-overlay = final: prev: { electron = final.electron_25; }; -in { imports = [ ]; diff --git a/home/alex/home.nix b/home/alex/home.nix index b576544..220259c 100644 --- a/home/alex/home.nix +++ b/home/alex/home.nix @@ -9,19 +9,19 @@ imports = [ ./cli.nix ./programs/rofi - ./programs/xmonad - #./programs/i3 + # ./programs/xmonad + # ./programs/i3 ./programs/jitsi-meet ./programs/simplex-chat ./programs/zathura ./programs/autorandr - ./services/polybar - ./services/dunst - ./services/udiskie + # ./services/polybar + # ./services/dunst + # ./services/udiskie # ./services/picom - ./services/screen-locker - ./services/blueman-applet - ./services/network-manager + # ./services/screen-locker + # ./services/blueman-applet + # ./services/network-manager ./services/syncthing ./services/git-sync ./modules/email.nix @@ -100,7 +100,7 @@ { enable = true; loginExtra = auth-socket-env; - initExtra = auth-socket-env; + initContent = auth-socket-env; }; }; diff --git a/home/alex/programs/xmonad/default.nix b/home/alex/programs/xmonad/default.nix index 486cc14..9256cb8 100644 --- a/home/alex/programs/xmonad/default.nix +++ b/home/alex/programs/xmonad/default.nix @@ -1,5 +1,9 @@ -{ config, lib, pkgs, ... }: - +{ + config, + lib, + pkgs, + ... +}: { config.xsession.windowManager.xmonad = { enable = true; @@ -8,5 +12,8 @@ }; # control backlight - config.home.packages = [ pkgs.xorg.xbacklight pkgs.scrot ]; + config.home.packages = [ + pkgs.xorg.xbacklight + pkgs.scrot + ]; } diff --git a/hosts/dregil/configuration.nix b/hosts/dregil/configuration.nix index f89f65e..3001398 100644 --- a/hosts/dregil/configuration.nix +++ b/hosts/dregil/configuration.nix @@ -50,11 +50,7 @@ in extraLocaleSettings = { TIME_STYLE = "iso"; }; - supportedLocales = [ - "C.UTF-8/UTF-8" - "en_US.UTF-8/UTF-8" - "de_DE.UTF-8/UTF-8" - ]; + extraLocales = "all"; }; console = { diff --git a/modules/wm/x.nix b/modules/wm/x.nix index d186430..c96b0fe 100644 --- a/modules/wm/x.nix +++ b/modules/wm/x.nix @@ -28,9 +28,10 @@ }; desktopManager.xfce.enable = true; - desktopManager.gnome.enable = true; }; + desktopManager.gnome.enable = true; + # Enable touchpad support (enabled default in most desktopManager). libinput = { enable = true;