diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix index 8a47df3..5e9f9f8 100644 --- a/modules/profiles/desktop.nix +++ b/modules/profiles/desktop.nix @@ -42,10 +42,6 @@ with lib; ms-azuretools.vscode-docker ms-python.python shardulm94.trailing-spaces - ] ++ - optionals config.sconfig.xmonad.enable [ - vscode-extensions.haskell.haskell - vscode-extensions.justusadam.language-haskell ]; }) @@ -80,9 +76,6 @@ with lib; dconf write /org/gnome/shell/extensions/dash-to-panel/show-window-previews false '') - ] ++ - optionals config.sconfig.xmonad.enable [ - haskell-language-server ]; sconfig.user-settings = '' diff --git a/modules/xmonad/default.nix b/modules/xmonad/default.nix deleted file mode 100644 index bce10fe..0000000 --- a/modules/xmonad/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ config, pkgs, lib, ... }: -let - cfg = config.sconfig.xmonad; -in -{ - options.sconfig.xmonad.enable = lib.mkEnableOption "xmonad"; - - # extraSessionCommands = '' - # echo 'Xft.dpi: 96' | xrdb -merge - # echo 'Xcursor.size: 24' | xrdb -merge - # xsetroot -solid '#333333' - # ''; - - config = lib.mkIf cfg.enable { - services.xserver.windowManager.xmonad = { - enable = true; - extraPackages = haskellPackages: [ - haskellPackages.dbus - haskellPackages.List - haskellPackages.monad-logger - haskellPackages.xmobar - haskellPackages.xmonad - haskellPackages.xmonad-contrib - haskellPackages.xmonad-extras - ]; - }; - - hardware.pulseaudio.enable = true; - - environment.etc."xdg/gtk-3.0/settings.ini".text = '' - [Settings] - gtk-theme-name=Adwaita-dark - ''; - - services.gvfs.enable = true; - networking.networkmanager.enable = true; - - services.xserver = { - enable = true; - libinput.enable = true; - libinput.touchpad.naturalScrolling = true; - displayManager.sddm.enable = true; - }; - - environment.systemPackages = with pkgs; [ - brightnessctl - dmenu - gnome-themes-extra - networkmanagerapplet - gnome3.file-roller - gnome3.adwaita-icon-theme - mate.mate-terminal - xfce.thunar - xfce.thunar-archive-plugin - caffeine-ng - i3status-rust - xmobar - - (haskellPackages.ghcWithPackages (p: [ - p.dbus - p.List - p.monad-logger - p.xmobar - p.xmonad - p.xmonad-contrib - p.xmonad-extras - ])) - - (writeTextFile { - name = "index.theme"; - destination = "/share/icons/default/index.theme"; - text = '' - [Icon Theme] - Name=Adwaita - Inherits=Adwaita - ''; - }) - - (runCommand "x-terminal-emulator" { } '' - mkdir -p $out/bin - ln -s ${alacritty}/bin/alacritty $out/bin/x-terminal-emulator - '') - ]; - }; -}