t14: 22 current 2024-09-29 18:27:20 24.05.20240928.fbca5e7 6.6.52 *

7 files changed, 2 insertions, 323 deletions

diff --git a/flake.nix b/flake.nix
index ce8b602..76a2c0d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,6 +31,7 @@
 				specialArgs = {inherit inputs;};
 				modules = [
 					./machines/t14/configuration.nix
+					./modules/gnome.nix
 					inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t14-amd-gen2
 					inputs.home-manager.nixosModules.default
 						{
diff --git a/machines/t14/configuration.nix b/machines/t14/configuration.nix
index db6ffe3..3b0cf44 100644
--- a/machines/t14/configuration.nix
+++ b/machines/t14/configuration.nix
@@ -5,7 +5,6 @@ in {
 	imports =
 		[ # Include the results of the hardware scan.
 		../base.nix
-		../x220-gnome/gnome.nix
 		../x220-gnome/pass.nix
 		./hardware-configuration.nix
 		../x220-gnome/pn.nix
diff --git a/machines/x220-gnome/configuration.nix b/machines/x220-gnome/configuration.nix
index ea23c3e..f5e953b 100644
--- a/machines/x220-gnome/configuration.nix
+++ b/machines/x220-gnome/configuration.nix
@@ -4,7 +4,7 @@
 	imports =
 		[ # Include the results of the hardware scan.
 		../base.nix
-		./gnome.nix
+		../../modules/gnome.nix
 		./pass.nix
 		./hardware-configuration.nix
 		./pn.nix
diff --git a/machines/x220-gnome/gnome.nix b/machines/x220-gnome/gnome.nix
deleted file mode 100644
index e667cea..0000000
--- a/machines/x220-gnome/gnome.nix
+++ /dev/null
@@ -1,111 +0,0 @@
-{ pkgs, ... }:
-{
-# Enable the X11 windowing system.
-	services.xserver.enable = true;
-
-# Enable the GNOME Desktop Environment.
-	services.xserver.displayManager.gdm.enable = true;
-	services.xserver.desktopManager.gnome.enable = true;
-	services.xserver.desktopManager.xterm.enable = false;
-	services.xserver.excludePackages = [ pkgs.xterm ];
-
-	environment.gnome.excludePackages = with pkgs.gnome; [
-		pkgs.epiphany
-		baobab totem yelp file-roller seahorse gnome-clocks pkgs.gnome-connections
-			pkgs.gnome-tour
-	];
-
-	programs.dconf = {
-		enable = true;
-		profiles.user.databases = [
-			{
-				lockAll = true;
-				settings = {
-					"org/gnome/shell" = {
-						favorite-apps = [ "brave-browser.desktop" "org.gnome.Geary.desktop" "org.gnome.Nautilus.desktop" ];
-					};
-
-					"org/gnome/desktop/interface" = {
-						enable-hot-corners = false;
-					};
-
-					"org/gnome/desktop/wm/keybindings" = {
-						close = ["<Super>q"];
-					};
-					
-            				"org/gnome/settings-daemon/plugins/media-keys" = {
-              					custom-keybindings = [
-                					"/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"
-             					 ];
-					};
-
-            				"org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
-              					binding = "<Super>Return";
-              					command = "kgx";
-              					name = "GNOME Console";
-
-            				};
-
-				};
-			}
-		];
-	};
-
-	##services.xserver.desktopManager.gnome.extraGSettingsOverrides = ''
-		##[org.gnome.shell]
-		##favorite-apps = [ "brave-browser.desktop", "org.gnome.Geary.desktop", "org.gnome.Nautilus.desktop" ]
-##
-		##[org.gnome.desktop.wm.keybindings]
-		##close = ["<Super>q"]
-##
-		##[org.gnome.settings-daemon.plugins.media-keys]
-		##custom-keybindings = ["org/gnome/settings-daemon/plugins/media-keys/custom0/"]
-##
-		##[org.gnome.settings-daemon.plugins.media-keys.custom0]
-		##binding = ["<Super><Enter>"]
-		##command = ["kgx"]
-		##name = ["GNOME Console"]
-	##'';
-
-# Configure keymap in X11
-	services.xserver = {
-		xkb.layout = "pl";
-		xkb.variant = "";
-	};
-
-# Configure console keymap
-	console.keyMap = "pl2";
-
-# Enable CUPS to print documents.
-	services.printing.enable = true;
-
-# Enable sound with pipewire.
-	hardware.pulseaudio.enable = false;
-	security.rtkit.enable = true;
-	services.pipewire = {
-		enable = true;
-		alsa.enable = true;
-		alsa.support32Bit = true;
-		pulse.enable = true;
-# If you want to use JACK applications, uncomment this
-#jack.enable = true;
-
-# use the example session manager (no others are packaged yet so this is enabled by default,
-# no need to redefine it in your config for now)
-#media-session.enable = true;
-	};
-
-	environment.systemPackages = with pkgs; [
-		libnotify
-		gnome.gnome-boxes
-		gnome.file-roller
-		brave
-		newsflash
-		spotify
-		fragments
-	];
-
-	nixpkgs.config.allowUnfree = true;
-
-	documentation.nixos.enable = false;
-}
diff --git a/modules/wayland/alacritty.yml b/modules/wayland/alacritty.yml
deleted file mode 100644
index 11e8c0d..0000000
--- a/modules/wayland/alacritty.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-window:
-  padding:
-    x: 2
-    y: 8
-
-font:
-  size: 10
-  normal:
-    family: monospace
-    style: Regular
-
-colors:
-  # Default colors
-  primary:
-    background: '#2c2c2c'
-    foreground: '#d6d6d6'
-
-    dim_foreground:    '#dbdbdb'
-    bright_foreground: '#d9d9d9'
-    dim_background:    '#202020' # not sure
-    bright_background: '#3a3a3a' # not sure
-
-  # Cursor colors
-  cursor:
-    text:   '#2c2c2c'
-    cursor: '#d9d9d9'
-
-  # Normal colors
-  normal:
-    black:   '#5c5c8c'
-    red:     '#bc5653'
-    green:   '#909d63'
-    yellow:  '#ebc17a'
-    blue:    '#7eaac7'
-    magenta: '#aa6292'
-    cyan:    '#86d3ce'
-    white:   '#ffffff'
-
-  # Bright colors
-  bright:
-    black:   '#636363'
-    red:     '#bc5653'
-    green:   '#909d63'
-    yellow:  '#ebc17a'
-    blue:    '#7eaac7'
-    magenta: '#aa6292'
-    cyan:    '#86d3ce'
-    white:   '#f7f7f7'
-
-  # Dim colors
-  dim:
-    black:   '#232323'
-    red:     '#74423f'
-    green:   '#5e6547'
-    yellow:  '#8b7653'
-    blue:    '#556b79'
-    magenta: '#6e4962'
-    cyan:    '#5c8482'
-    white:   '#828282'
diff --git a/modules/wayland/default.nix b/modules/wayland/default.nix
deleted file mode 100644
index 62a72a1..0000000
--- a/modules/wayland/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{pkgs, ...}:
-let
-  terminal = symlinkJoin {
-    name = "alacritty";
-    paths = [ pkgs.alacritty ];
-    buildInputs = [ pkgs.makeWrapper ];
-    postBuild = ''
-      wrapProgram $out/bin/alacritty \
-        --add-flags "--config-file ${./alacritty.yml}"
-    ''
-  };
-  dwl = (pkgs.dwl.overrideDerivation (old: {
-    src = pkgs.fetchFromGitHub {
-      owner = "djpohly";
-      repo = "dwl";
-      rev = "v0.2.1";
-      sha256 = "sha256:0js8xjc2rx1ml6s58s90jrak5n7vh3kj5na2j4yy3qy0cb501xcm";
-    };
-    patches = [];
-  })).override {
-    conf = ./dwl.config.h;
-  };
-in
-  {
-    environment.systemPackages = [
-      pkgs.firefox-wayland
-      terminal
-      dwl
-      pkgs.bemenu
-      pkgs.wl_clipboard
-      pkgs.grim
-      pkgs.slurp
-      pkgs.wf-recorder
-    ];
-  }
diff --git a/modules/wayland/dwl.config.h b/modules/wayland/dwl.config.h
deleted file mode 100644
index 3c1fc9b..0000000
--- a/modules/wayland/dwl.config.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/* appearance */
-static const int sloppyfocus        = 1;  /* focus follows mouse */
-static const unsigned int borderpx  = 1;  /* border pixel of windows */
-static const float rootcolor[]      = {0.3, 0.3, 0.3, 1.0};
-static const float bordercolor[]    = {0.5, 0.5, 0.5, 1.0};
-static const float focuscolor[]     = {1.0, 0.0, 0.0, 1.0};
-
-/* tagging */
-static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
-
-static const Rule rules[] = {
-	/* app_id     title       tags mask     isfloating   monitor */
-	/* examples:
-	{ "Gimp",     NULL,       0,            1,           -1 },
-	{ "firefox",  NULL,       1 << 8,       0,           -1 },
-	*/
-};
-
-/* layout(s) */
-static const Layout layouts[] = {
-	/* symbol     arrange function */
-	{ "[]=",      tile },
-	{ "><>",      NULL },    /* no layout function means floating behavior */
-	{ "[M]",      monocle },
-};
-
-/* monitors
- * The order in which monitors are defined determines their position.
- * Non-configured monitors are always added to the left. */
-static const MonitorRule monrules[] = {
-	/* name       mfact nmaster scale layout       rotate/reflect x y */
-	/* example of a HiDPI laptop monitor:
-	{ "eDP-1",    0.5,  1,      2,    &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, 0, 0 },
-	*/
-	/* defaults */
-	{ NULL,       0.55, 1,      1,    &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, 0, 0 },
-};
-
-/* keyboard */
-static const struct xkb_rule_names xkb_rules = {
-	/* can specify fields: rules, model, layout, variant, options */
-	/* example:
-	.options = "ctrl:nocaps",
-	*/
-};
-
-static const int repeat_rate = 25;
-static const int repeat_delay = 600;
-
-/* Trackpad */
-static const int tap_to_click = 1;
-static const int natural_scrolling = 0;
-
-#define MODKEY WLR_MODIFIER_LOGO
-#define TAGKEYS(KEY,SKEY,TAG) \
-	{ MODKEY,                    KEY,            view,            {.ui = 1 << TAG} }, \
-	{ MODKEY|WLR_MODIFIER_CTRL,  KEY,            toggleview,      {.ui = 1 << TAG} }, \
-	{ MODKEY|WLR_MODIFIER_SHIFT, SKEY,           tag,             {.ui = 1 << TAG} }, \
-	{ MODKEY|WLR_MODIFIER_CTRL|WLR_MODIFIER_SHIFT,SKEY,toggletag, {.ui = 1 << TAG} }
-
-/* helper for spawning shell commands in the pre dwm-5.0 fashion */
-#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
-
-/* commands */
-static const char *termcmd[] = { "alacritty", NULL };
-static const char *menucmd[] = { "bemenu-run", NULL };
-
-static const Key keys[] = {
-	/* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */
-	/* modifier                  key                 function        argument */
-	{ MODKEY,                    XKB_KEY_d,          spawn,          {.v = menucmd} },
-	{ MODKEY,                    XKB_KEY_Return,     spawn,          {.v = termcmd} },
-	{ MODKEY,                    XKB_KEY_j,          focusstack,     {.i = +1} },
-	{ MODKEY,                    XKB_KEY_k,          focusstack,     {.i = -1} },
-	{ MODKEY,                    XKB_KEY_i,          incnmaster,     {.i = +1} },
-	{ MODKEY,                    XKB_KEY_d,          incnmaster,     {.i = -1} },
-	{ MODKEY,                    XKB_KEY_h,          setmfact,       {.f = -0.05} },
-	{ MODKEY,                    XKB_KEY_l,          setmfact,       {.f = +0.05} },
-	{ MODKEY,                    XKB_KEY_Tab,        view,           {0} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_C,          killclient,     {0} },
-	{ MODKEY,                    XKB_KEY_t,          setlayout,      {.v = &layouts[0]} },
-	{ MODKEY,                    XKB_KEY_f,          setlayout,      {.v = &layouts[1]} },
-	{ MODKEY,                    XKB_KEY_m,          setlayout,      {.v = &layouts[2]} },
-	{ MODKEY,                    XKB_KEY_w,          spawn,     SHCMD("$BROWSER") },
-	{ MODKEY,                    XKB_KEY_space,      zoom,      {0} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space,      togglefloating, {0} },
-	{ MODKEY, 					 XKB_KEY_e,    		togglefullscreen, {0} },
-	{ MODKEY,                    XKB_KEY_0,          view,           {.ui = ~0} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright, tag,            {.ui = ~0} },
-	{ MODKEY,                    XKB_KEY_comma,      focusmon,       {.i = WLR_DIRECTION_LEFT} },
-	{ MODKEY,                    XKB_KEY_period,     focusmon,       {.i = WLR_DIRECTION_RIGHT} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_less,       tagmon,         {.i = WLR_DIRECTION_LEFT} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_greater,    tagmon,         {.i = WLR_DIRECTION_RIGHT} },
-	TAGKEYS(          XKB_KEY_1, XKB_KEY_exclam,                     0),
-	TAGKEYS(          XKB_KEY_2, XKB_KEY_at,                         1),
-	TAGKEYS(          XKB_KEY_3, XKB_KEY_numbersign,                 2),
-	TAGKEYS(          XKB_KEY_4, XKB_KEY_dollar,                     3),
-	TAGKEYS(          XKB_KEY_5, XKB_KEY_percent,                    4),
-	TAGKEYS(          XKB_KEY_6, XKB_KEY_caret,                      5),
-	TAGKEYS(          XKB_KEY_7, XKB_KEY_ampersand,                  6),
-	TAGKEYS(          XKB_KEY_8, XKB_KEY_asterisk,                   7),
-	TAGKEYS(          XKB_KEY_9, XKB_KEY_parenleft,                  8),
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Q,          quit,           {0} },
-
-	/* Ctrl-Alt-Backspace and Ctrl-Alt-Fx used to be handled by X server */
-	{ WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_Terminate_Server, quit, {0} },
-#define CHVT(n) { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_XF86Switch_VT_##n, chvt, {.ui = (n)} }
-	CHVT(1), CHVT(2), CHVT(3), CHVT(4), CHVT(5), CHVT(6),
-	CHVT(7), CHVT(8), CHVT(9), CHVT(10), CHVT(11), CHVT(12),
-};
-
-static const Button buttons[] = {
-	{ MODKEY, BTN_LEFT,   moveresize,     {.ui = CurMove} },
-	{ MODKEY, BTN_MIDDLE, togglefloating, {0} },
-	{ MODKEY, BTN_RIGHT,  moveresize,     {.ui = CurResize} },
-};