diff options
| author | devhell <devhell@mailfresser.de> | 2022-12-05 12:43:58 +0000 |
|---|---|---|
| committer | devhell <devhell@mailfresser.de> | 2022-12-05 12:43:58 +0000 |
| commit | 2ff13ca70b4cca8aad20b36eea026e3481ada632 (patch) | |
| tree | 5dd8395f432b236f6ecc6a6a6d5c287e013e0947 /machines | |
| parent | 32b8af8c826fb7be143e692d3f13b9572841d318 (diff) | |
treewide: switch from Xorg to wayland/sway
Diffstat (limited to 'machines')
| -rw-r--r-- | machines/devhell/gunnr.nix | 26 | ||||
| -rw-r--r-- | machines/devhell/herja.nix | 40 |
2 files changed, 0 insertions, 66 deletions
diff --git a/machines/devhell/gunnr.nix b/machines/devhell/gunnr.nix index fdaa377d..3ff2abd3 100644 --- a/machines/devhell/gunnr.nix +++ b/machines/devhell/gunnr.nix @@ -107,32 +107,6 @@ services.zfs.autoScrub.enable = true; - services.xserver = { - enable = true; - layout = "dvorak"; - videoDrivers = [ "amdgpu" ]; - - # XXX: Factor out and make DRY, because a lot of the stuff here is - # duplicated in the other machine configurations. - displayManager.sessionCommands = '' - ${pkgs.xbindkeys}/bin/xbindkeys & - ${pkgs.nitrogen}/bin/nitrogen --restore & - ${pkgs.rofi}/bin/rofi & - ${pkgs.xorg.xrdb}/bin/xrdb "${pkgs.writeText "xrdb.conf" '' - Xft.dpi: 96 - Xft.antialias: true - Xft.hinting: full - Xft.hintstyle: hintslight - Xft.rgba: rgb - Xft.lcdfilter: lcddefault - Xft.autohint: 1 - Xcursor.theme: Vanilla-DMZ-AA - Xcursor.size: 22 - *.charClass:33:48,35:48,37:48,43:48,45-47:48,61:48,63:48,64:48,95:48,126:48,35:48,58:48 - ''}" - ''; - }; - services.timesyncd = { servers = [ "ntp.canterbury.ac.uk" ]; }; diff --git a/machines/devhell/herja.nix b/machines/devhell/herja.nix index 904b69d1..d7ee2ecf 100644 --- a/machines/devhell/herja.nix +++ b/machines/devhell/herja.nix @@ -41,7 +41,6 @@ }; }; - fileSystems."/" = { device = "/dev/disk/by-uuid/34c21c91-6722-427d-882b-6da0e2f57f50"; fsType = "btrfs"; @@ -120,45 +119,6 @@ services.illum.enable = true; services.fwupd.enable = true; - services.xserver = { - enable = true; - layout = "gb"; - videoDrivers = [ "amdgpu" ]; - - libinput = { - enable = true; - touchpad = { - disableWhileTyping = true; - middleEmulation = true; - }; - }; -# synaptics = { -# enable = true; -# twoFingerScroll = true; -# palmDetect = true; -# }; - - # XXX: Factor out and make DRY, because a lot of the stuff here is - # duplicated in the other machine configurations. - displayManager.sessionCommands = '' - ${pkgs.xbindkeys}/bin/xbindkeys & - ${pkgs.nitrogen}/bin/nitrogen --restore & - ${pkgs.rofi}/bin/rofi & - ${pkgs.xorg.xrdb}/bin/xrdb "${pkgs.writeText "xrdb.conf" '' - Xft.dpi: 96 - Xft.antialias: true - Xft.hinting: full - Xft.hintstyle: hintslight - Xft.rgba: rgb - Xft.lcdfilter: lcddefault - Xft.autohint: 1 - Xcursor.theme: Vanilla-DMZ-AA - Xcursor.size: 22 - *.charClass:33:48,35:48,37:48,43:48,45-47:48,61:48,63:48,64:48,95:48,126:48,35:48,58:48 - ''}" - ''; - }; - #### Machine-specific packages configuration #### vuizvui.user.devhell.profiles.packages.enable = true; |