From 48659e786d56e6360821065f1504afa0df4a8550 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar <3998+srid@users.noreply.github.com> Date: Fri, 9 Apr 2021 15:59:07 -0400 Subject: [PATCH] Add Xmonad (#4) * Import my old xmonad config * import taffybar as well * xmonad working * break features into individual files * break features into individual files * Add fonts, and enable taffybar * trackpad behaviour --- features/desktopish/README.md | 1 + features/desktopish/default.nix | 10 ++ features/desktopish/fonts.nix | 23 +++++ features/desktopish/hidpi.nix | 11 +++ features/desktopish/light-terminal.nix | 16 +++ features/desktopish/screencapture.nix | 13 +++ features/desktopish/swap-caps-ctrl.nix | 5 + features/desktopish/touchpad-trackpoint.nix | 11 +++ features/taffybar/default.nix | 20 ++++ features/taffybar/taffybar-srid/.gitignore | 2 + .../taffybar-srid/.vscode/extensions.json | 8 ++ .../taffybar-srid/.vscode/settings.json | 5 + features/taffybar/taffybar-srid/CHANGELOG.md | 5 + features/taffybar/taffybar-srid/Main.hs | 86 ++++++++++++++++ features/taffybar/taffybar-srid/README.md | 3 + features/taffybar/taffybar-srid/Setup.hs | 2 + features/taffybar/taffybar-srid/bin/run | 3 + features/taffybar/taffybar-srid/default.nix | 24 +++++ .../dep/gitignoresrc/default.nix | 2 + .../dep/gitignoresrc/github.json | 7 ++ .../taffybar-srid/dep/gitignoresrc/thunk.nix | 9 ++ .../taffybar-srid/dep/taffybar/default.nix | 2 + .../taffybar-srid/dep/taffybar/github.json | 7 ++ .../taffybar-srid/dep/taffybar/thunk.nix | 9 ++ features/taffybar/taffybar-srid/hie.yaml | 4 + .../taffybar-srid/taffybar-srid.cabal | 24 +++++ features/xmonad/default.nix | 29 ++++++ features/xmonad/xmonad-srid/.gitignore | 2 + .../xmonad-srid/.vscode/extensions.json | 8 ++ .../xmonad/xmonad-srid/.vscode/settings.json | 5 + features/xmonad/xmonad-srid/CHANGELOG.md | 5 + features/xmonad/xmonad-srid/Main.hs | 99 +++++++++++++++++++ features/xmonad/xmonad-srid/README.md | 11 +++ features/xmonad/xmonad-srid/Setup.hs | 2 + features/xmonad/xmonad-srid/default.nix | 20 ++++ .../xmonad-srid/dep/gitignoresrc/default.nix | 2 + .../xmonad-srid/dep/gitignoresrc/github.json | 7 ++ .../xmonad-srid/dep/gitignoresrc/thunk.nix | 9 ++ features/xmonad/xmonad-srid/hie.yaml | 4 + features/xmonad/xmonad-srid/xmonad-srid.cabal | 20 ++++ flake.nix | 3 + hosts/p71.nix | 6 +- 42 files changed, 542 insertions(+), 2 deletions(-) create mode 100644 features/desktopish/README.md create mode 100644 features/desktopish/default.nix create mode 100644 features/desktopish/fonts.nix create mode 100644 features/desktopish/hidpi.nix create mode 100644 features/desktopish/light-terminal.nix create mode 100644 features/desktopish/screencapture.nix create mode 100644 features/desktopish/swap-caps-ctrl.nix create mode 100644 features/desktopish/touchpad-trackpoint.nix create mode 100644 features/taffybar/default.nix create mode 100644 features/taffybar/taffybar-srid/.gitignore create mode 100644 features/taffybar/taffybar-srid/.vscode/extensions.json create mode 100644 features/taffybar/taffybar-srid/.vscode/settings.json create mode 100644 features/taffybar/taffybar-srid/CHANGELOG.md create mode 100644 features/taffybar/taffybar-srid/Main.hs create mode 100644 features/taffybar/taffybar-srid/README.md create mode 100644 features/taffybar/taffybar-srid/Setup.hs create mode 100755 features/taffybar/taffybar-srid/bin/run create mode 100644 features/taffybar/taffybar-srid/default.nix create mode 100644 features/taffybar/taffybar-srid/dep/gitignoresrc/default.nix create mode 100644 features/taffybar/taffybar-srid/dep/gitignoresrc/github.json create mode 100644 features/taffybar/taffybar-srid/dep/gitignoresrc/thunk.nix create mode 100644 features/taffybar/taffybar-srid/dep/taffybar/default.nix create mode 100644 features/taffybar/taffybar-srid/dep/taffybar/github.json create mode 100644 features/taffybar/taffybar-srid/dep/taffybar/thunk.nix create mode 100644 features/taffybar/taffybar-srid/hie.yaml create mode 100644 features/taffybar/taffybar-srid/taffybar-srid.cabal create mode 100644 features/xmonad/default.nix create mode 100644 features/xmonad/xmonad-srid/.gitignore create mode 100644 features/xmonad/xmonad-srid/.vscode/extensions.json create mode 100644 features/xmonad/xmonad-srid/.vscode/settings.json create mode 100644 features/xmonad/xmonad-srid/CHANGELOG.md create mode 100644 features/xmonad/xmonad-srid/Main.hs create mode 100644 features/xmonad/xmonad-srid/README.md create mode 100644 features/xmonad/xmonad-srid/Setup.hs create mode 100644 features/xmonad/xmonad-srid/default.nix create mode 100644 features/xmonad/xmonad-srid/dep/gitignoresrc/default.nix create mode 100644 features/xmonad/xmonad-srid/dep/gitignoresrc/github.json create mode 100644 features/xmonad/xmonad-srid/dep/gitignoresrc/thunk.nix create mode 100644 features/xmonad/xmonad-srid/hie.yaml create mode 100644 features/xmonad/xmonad-srid/xmonad-srid.cabal diff --git a/features/desktopish/README.md b/features/desktopish/README.md new file mode 100644 index 0000000..8a14163 --- /dev/null +++ b/features/desktopish/README.md @@ -0,0 +1 @@ +Individual features to be added to tiling window managers and such as to provide a desktop-like experience. diff --git a/features/desktopish/default.nix b/features/desktopish/default.nix new file mode 100644 index 0000000..f3eeda7 --- /dev/null +++ b/features/desktopish/default.nix @@ -0,0 +1,10 @@ +{ pkgs, ... }: { + imports = [ + ./hidpi.nix + ./swap-caps-ctrl.nix + ./light-terminal.nix + ./screencapture.nix + ./fonts.nix + ./touchpad-trackpoint.nix + ]; +} diff --git a/features/desktopish/fonts.nix b/features/desktopish/fonts.nix new file mode 100644 index 0000000..b5a5d28 --- /dev/null +++ b/features/desktopish/fonts.nix @@ -0,0 +1,23 @@ +{ config, lib, pkgs, ... }: + +{ + fonts = { + enableDefaultFonts = true; + + fonts = with pkgs; [ + # NOTE: Some fonts may break colour emojis in Chrome + # cf. https://github.com/NixOS/nixpkgs/issues/69073#issuecomment-621982371 + # If this happens , keep noto-fonts-emoji and try disabling others (nerdfonts, etc.) + noto-fonts-emoji + + nerdfonts + + # For fish powerline plugin + powerline-fonts + cascadia-code + + # Doom emacs + emacs-all-the-icons-fonts + ]; + }; +} diff --git a/features/desktopish/hidpi.nix b/features/desktopish/hidpi.nix new file mode 100644 index 0000000..16578ca --- /dev/null +++ b/features/desktopish/hidpi.nix @@ -0,0 +1,11 @@ +{ config, pkgs, ... }: +{ + services.xserver.dpi = 192; + services.xserver.displayManager.sessionCommands = '' + ${pkgs.xorg.xrdb}/bin/xrdb -merge < {} }: +let + inherit (import ./dep/gitignoresrc { inherit (pkgs) lib; }) gitignoreSource; +in + pkgs.haskellPackages.developPackage { + name = "taffybar-srid"; + root = gitignoreSource ./.; + modifier = drv: + pkgs.haskell.lib.addBuildTools drv (with pkgs.haskellPackages; + [ cabal-install + cabal-fmt + ghcid + haskell-language-server + ]); + overrides = self: super: with pkgs.haskell.lib; { + taffybar = dontCheck ( + self.callCabal2nix "taffybar" + (import ./dep/taffybar/thunk.nix) + { inherit (pkgs) gtk3; } + ); + }; + } diff --git a/features/taffybar/taffybar-srid/dep/gitignoresrc/default.nix b/features/taffybar/taffybar-srid/dep/gitignoresrc/default.nix new file mode 100644 index 0000000..2b4d4ab --- /dev/null +++ b/features/taffybar/taffybar-srid/dep/gitignoresrc/default.nix @@ -0,0 +1,2 @@ +# DO NOT HAND-EDIT THIS FILE +import (import ./thunk.nix) \ No newline at end of file diff --git a/features/taffybar/taffybar-srid/dep/gitignoresrc/github.json b/features/taffybar/taffybar-srid/dep/gitignoresrc/github.json new file mode 100644 index 0000000..17d143d --- /dev/null +++ b/features/taffybar/taffybar-srid/dep/gitignoresrc/github.json @@ -0,0 +1,7 @@ +{ + "owner": "hercules-ci", + "repo": "gitignore.nix", + "private": false, + "rev": "c4662e662462e7bf3c2a968483478a665d00e717", + "sha256": "1npnx0h6bd0d7ql93ka7azhj40zgjp815fw2r6smg8ch9p7mzdlx" +} diff --git a/features/taffybar/taffybar-srid/dep/gitignoresrc/thunk.nix b/features/taffybar/taffybar-srid/dep/gitignoresrc/thunk.nix new file mode 100644 index 0000000..bbf2dc1 --- /dev/null +++ b/features/taffybar/taffybar-srid/dep/gitignoresrc/thunk.nix @@ -0,0 +1,9 @@ +# DO NOT HAND-EDIT THIS FILE +let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }: + if !fetchSubmodules && !private then builtins.fetchTarball { + url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256; + } else (import {}).fetchFromGitHub { + inherit owner repo rev sha256 fetchSubmodules private; + }; + json = builtins.fromJSON (builtins.readFile ./github.json); +in fetch json \ No newline at end of file diff --git a/features/taffybar/taffybar-srid/dep/taffybar/default.nix b/features/taffybar/taffybar-srid/dep/taffybar/default.nix new file mode 100644 index 0000000..2b4d4ab --- /dev/null +++ b/features/taffybar/taffybar-srid/dep/taffybar/default.nix @@ -0,0 +1,2 @@ +# DO NOT HAND-EDIT THIS FILE +import (import ./thunk.nix) \ No newline at end of file diff --git a/features/taffybar/taffybar-srid/dep/taffybar/github.json b/features/taffybar/taffybar-srid/dep/taffybar/github.json new file mode 100644 index 0000000..f53d1d4 --- /dev/null +++ b/features/taffybar/taffybar-srid/dep/taffybar/github.json @@ -0,0 +1,7 @@ +{ + "owner": "taffybar", + "repo": "taffybar", + "private": false, + "rev": "4d3227e9cd8308c1e43846496a8a7ab417ef8e5b", + "sha256": "1x6f3scjglaj9my0lgkrz8hbr25sv1xs6ssdkydq8w6lqqm15ydb" +} diff --git a/features/taffybar/taffybar-srid/dep/taffybar/thunk.nix b/features/taffybar/taffybar-srid/dep/taffybar/thunk.nix new file mode 100644 index 0000000..bbf2dc1 --- /dev/null +++ b/features/taffybar/taffybar-srid/dep/taffybar/thunk.nix @@ -0,0 +1,9 @@ +# DO NOT HAND-EDIT THIS FILE +let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }: + if !fetchSubmodules && !private then builtins.fetchTarball { + url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256; + } else (import {}).fetchFromGitHub { + inherit owner repo rev sha256 fetchSubmodules private; + }; + json = builtins.fromJSON (builtins.readFile ./github.json); +in fetch json \ No newline at end of file diff --git a/features/taffybar/taffybar-srid/hie.yaml b/features/taffybar/taffybar-srid/hie.yaml new file mode 100644 index 0000000..7451d2a --- /dev/null +++ b/features/taffybar/taffybar-srid/hie.yaml @@ -0,0 +1,4 @@ +cradle: + cabal: + - path: "./" + component: "exe:taffybar-srid" diff --git a/features/taffybar/taffybar-srid/taffybar-srid.cabal b/features/taffybar/taffybar-srid/taffybar-srid.cabal new file mode 100644 index 0000000..fcff099 --- /dev/null +++ b/features/taffybar/taffybar-srid/taffybar-srid.cabal @@ -0,0 +1,24 @@ +cabal-version: 3.0 +name: taffybar-srid +version: 0.1.0.0 +license: BSD-3-Clause +author: Sridhar Ratnakumar +maintainer: srid@srid.ca +extra-source-files: CHANGELOG.md + +executable taffybar-srid + main-is: Main.hs + build-depends: + , base + , taffybar + , xmonad + , xmonad-contrib + , xmobar + , containers + , text + , time + , dbus + , gi-gtk + , hslogger + ghc-options: -threaded -rtsopts -with-rtsopts=-N + default-language: Haskell2010 diff --git a/features/xmonad/default.nix b/features/xmonad/default.nix new file mode 100644 index 0000000..e7a6f70 --- /dev/null +++ b/features/xmonad/default.nix @@ -0,0 +1,29 @@ +{ config, pkgs, ... }: +{ + environment.systemPackages = with pkgs; [ + xorg.xdpyinfo + xorg.xrandr + arandr + autorandr + + dmenu + gmrun + xmobar + dzen2 + # For taffybar? + hicolor-icon-theme + ]; + + services.xserver = { + enable = true; + windowManager.xmonad = { + enable = true; + extraPackages = haskellPackages: [ + haskellPackages.xmonad-contrib + ]; + enableContribAndExtras = true; + config = pkgs.lib.readFile ./xmonad-srid/Main.hs; + }; + }; + services.xserver.displayManager.defaultSession = "none+xmonad"; +} diff --git a/features/xmonad/xmonad-srid/.gitignore b/features/xmonad/xmonad-srid/.gitignore new file mode 100644 index 0000000..1f594a8 --- /dev/null +++ b/features/xmonad/xmonad-srid/.gitignore @@ -0,0 +1,2 @@ +result +dist-newstyle diff --git a/features/xmonad/xmonad-srid/.vscode/extensions.json b/features/xmonad/xmonad-srid/.vscode/extensions.json new file mode 100644 index 0000000..7539f1d --- /dev/null +++ b/features/xmonad/xmonad-srid/.vscode/extensions.json @@ -0,0 +1,8 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=827846 + // for the documentation about the extensions.json format + "recommendations": [ + "haskell.haskell", + "arrterian.nix-env-selector" + ] +} \ No newline at end of file diff --git a/features/xmonad/xmonad-srid/.vscode/settings.json b/features/xmonad/xmonad-srid/.vscode/settings.json new file mode 100644 index 0000000..7575832 --- /dev/null +++ b/features/xmonad/xmonad-srid/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "nixEnvSelector.nixShellConfig": "${workspaceRoot}/default.nix", + "editor.formatOnType": true, + "editor.formatOnSave": true +} \ No newline at end of file diff --git a/features/xmonad/xmonad-srid/CHANGELOG.md b/features/xmonad/xmonad-srid/CHANGELOG.md new file mode 100644 index 0000000..8de4ee0 --- /dev/null +++ b/features/xmonad/xmonad-srid/CHANGELOG.md @@ -0,0 +1,5 @@ +# Revision history for xmonad-srid + +## 0.1.0.0 -- YYYY-mm-dd + +* First version. Released on an unsuspecting world. diff --git a/features/xmonad/xmonad-srid/Main.hs b/features/xmonad/xmonad-srid/Main.hs new file mode 100644 index 0000000..d7ce4c4 --- /dev/null +++ b/features/xmonad/xmonad-srid/Main.hs @@ -0,0 +1,99 @@ +{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE TypeApplications #-} + +import qualified Data.Map.Strict as M +import XMonad +import XMonad.Hooks.EwmhDesktops (ewmh) +import XMonad.Hooks.ManageDocks (ToggleStruts (..), avoidStruts, docks) +import XMonad.Layout.NoBorders (withBorder) +import XMonad.Layout.Spacing (Border (Border), spacingRaw) +import XMonad.Layout.ThreeColumns (ThreeCol (..)) + +-- NOTE: +-- Chromium won't respect Xmonad's border width, until this is done: +-- https://wiki.archlinux.org/index.php/xmonad#Chrome/Chromium_not_displaying_defined_window_border_color + +main :: IO () +main = do + xmonad $ docks $ ewmh cfg + where + cfg = + def + { modMask = mod4Mask, -- Use Super instead of Alt + terminal = "myst", + layoutHook = + borderSpacing $ + avoidStruts $ + ThreeColMid 1 (3 / 100) (1 / 2) ||| layoutHook def, + keys = myKeys, + -- https://htmlcolorcodes.com/ + focusedBorderColor = "#50CBE8" + } + -- Add border spacing between windows + myKeys baseConfig@XConfig {modMask = modKey} = + keys def baseConfig + <> M.fromList + [ ((modKey, xK_q), restart "/run/current-system/sw/bin/xmonad" True), + ((modKey, xK_f), spawn "screenshot"), + ((modKey, xK_b), sendMessage ToggleStruts) + -- ... + ] + borderSpacing = + withBorder 5 + . spacingRaw + -- Apply borders only when there are 2 or more windows + True + -- Screen border + (Border 0 10 10 10) + -- Enable screen border? + False + -- Window borders + (Border 10 10 10 10) + -- Enable window border? + True + +{- old status bar; remove after configuring taffybar + +myStatusBar = + statusBar dzenCli pp toggleStrutsKey + where + -- -dock is necessary for https://github.com/xmonad/xmonad/issues/21 + -- https://github.com/xmonad/xmonad-contrib/pull/203 + dzenCli = "dzen2 -dock -fn CascadiaCode:pixelsize=26" + pp = + dzenPP + { -- ppSep = "🔥", Neither unicode, nor emoji work with dzen2 + ppTitleSanitize = + shorten 15 . dzenEscape, + ppExtras = + [ padL $ pure $ Just "|", + battery, + padL $ pure $ Just "|", + moment + ] + } + toggleStrutsKey :: XConfig t -> (KeyMask, KeySym) + toggleStrutsKey XConfig {modMask = modm} = (modm, xK_b) + +moment :: Logger +moment = do + now <- liftIO getZonedTime + pure $ do + pure $ formatTime defaultTimeLocale "%d/%a %R" now + +battery :: Logger +battery = do + s <- + fmap trim . liftIO . readFile $ + "/sys/class/power_supply/BAT0/capacity" + pure $ do + pct <- readMaybe @Int s + let fmt + | pct < 33 = dzenColor "white" "red" + | pct < 66 = dzenColor "white" "orange" + | otherwise = id + pure $ fmt $ show pct <> "%" + where + trim = T.unpack . T.strip . T.pack + +-} diff --git a/features/xmonad/xmonad-srid/README.md b/features/xmonad/xmonad-srid/README.md new file mode 100644 index 0000000..24f6ab3 --- /dev/null +++ b/features/xmonad/xmonad-srid/README.md @@ -0,0 +1,11 @@ +# Srid's XMonad configuration + +See https://www.srid.ca/xmonad-conf-ide.html + +## Reloading running XMonad + +Once the new `xmonad` binary is in $PATH (as a result of running `nixos-rebuild` which uses this package), run: + +``` +xmonad --restart +``` \ No newline at end of file diff --git a/features/xmonad/xmonad-srid/Setup.hs b/features/xmonad/xmonad-srid/Setup.hs new file mode 100644 index 0000000..9a994af --- /dev/null +++ b/features/xmonad/xmonad-srid/Setup.hs @@ -0,0 +1,2 @@ +import Distribution.Simple +main = defaultMain diff --git a/features/xmonad/xmonad-srid/default.nix b/features/xmonad/xmonad-srid/default.nix new file mode 100644 index 0000000..3db8c49 --- /dev/null +++ b/features/xmonad/xmonad-srid/default.nix @@ -0,0 +1,20 @@ +# Since the xmonad config will be built by nixos-rebuild, we use the +# nix-channel's nixpkgs. +{ pkgs ? import {} }: +let + inherit (import ./dep/gitignoresrc { inherit (pkgs) lib; }) gitignoreSource; +in + pkgs.haskellPackages.developPackage { + name = "xmonad-srid"; + root = gitignoreSource ./.; + modifier = drv: + pkgs.haskell.lib.addBuildTools drv (with pkgs.haskellPackages; + [ cabal-install + cabal-fmt + ghcid + haskell-language-server + ]); + overrides = self: super: with pkgs.haskell.lib; { + # dulwich = dontCheck super.dulwich; + }; + } \ No newline at end of file diff --git a/features/xmonad/xmonad-srid/dep/gitignoresrc/default.nix b/features/xmonad/xmonad-srid/dep/gitignoresrc/default.nix new file mode 100644 index 0000000..2b4d4ab --- /dev/null +++ b/features/xmonad/xmonad-srid/dep/gitignoresrc/default.nix @@ -0,0 +1,2 @@ +# DO NOT HAND-EDIT THIS FILE +import (import ./thunk.nix) \ No newline at end of file diff --git a/features/xmonad/xmonad-srid/dep/gitignoresrc/github.json b/features/xmonad/xmonad-srid/dep/gitignoresrc/github.json new file mode 100644 index 0000000..17d143d --- /dev/null +++ b/features/xmonad/xmonad-srid/dep/gitignoresrc/github.json @@ -0,0 +1,7 @@ +{ + "owner": "hercules-ci", + "repo": "gitignore.nix", + "private": false, + "rev": "c4662e662462e7bf3c2a968483478a665d00e717", + "sha256": "1npnx0h6bd0d7ql93ka7azhj40zgjp815fw2r6smg8ch9p7mzdlx" +} diff --git a/features/xmonad/xmonad-srid/dep/gitignoresrc/thunk.nix b/features/xmonad/xmonad-srid/dep/gitignoresrc/thunk.nix new file mode 100644 index 0000000..bbf2dc1 --- /dev/null +++ b/features/xmonad/xmonad-srid/dep/gitignoresrc/thunk.nix @@ -0,0 +1,9 @@ +# DO NOT HAND-EDIT THIS FILE +let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }: + if !fetchSubmodules && !private then builtins.fetchTarball { + url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256; + } else (import {}).fetchFromGitHub { + inherit owner repo rev sha256 fetchSubmodules private; + }; + json = builtins.fromJSON (builtins.readFile ./github.json); +in fetch json \ No newline at end of file diff --git a/features/xmonad/xmonad-srid/hie.yaml b/features/xmonad/xmonad-srid/hie.yaml new file mode 100644 index 0000000..bba9462 --- /dev/null +++ b/features/xmonad/xmonad-srid/hie.yaml @@ -0,0 +1,4 @@ +cradle: + cabal: + - path: "./" + component: "exe:xmonad-srid" diff --git a/features/xmonad/xmonad-srid/xmonad-srid.cabal b/features/xmonad/xmonad-srid/xmonad-srid.cabal new file mode 100644 index 0000000..3c8bda0 --- /dev/null +++ b/features/xmonad/xmonad-srid/xmonad-srid.cabal @@ -0,0 +1,20 @@ +cabal-version: 3.0 +name: xmonad-srid +version: 0.1.0.0 +license: BSD-3-Clause +author: Sridhar Ratnakumar +maintainer: srid@srid.ca +extra-source-files: CHANGELOG.md + +executable xmonad-srid + main-is: Main.hs + build-depends: + , base + , xmonad + , xmonad-contrib + , xmobar + , containers + , text + , time + ghc-options: -threaded -rtsopts -with-rtsopts=-N + default-language: Haskell2010 diff --git a/flake.nix b/flake.nix index 9d7a330..33734f6 100644 --- a/flake.nix +++ b/flake.nix @@ -23,6 +23,9 @@ # ./features/virtualization.nix ./features/email ./features/monitor-brightness.nix + ./features/xmonad + ./features/desktopish + ./features/taffybar # HACK: This should really go under ./features/email ({ diff --git a/hosts/p71.nix b/hosts/p71.nix index 8be3d03..ac7c44d 100644 --- a/hosts/p71.nix +++ b/hosts/p71.nix @@ -63,7 +63,7 @@ }; # Enable the GNOME 3 Desktop Environment. - services.xserver.displayManager.gdm.enable = true; + #services.xserver.displayManager.gdm.enable = true; services.xserver.desktopManager.gnome3.enable = true; services.openssh.enable = true; services.ipfs.enable = true; @@ -79,9 +79,11 @@ environment.systemPackages = with pkgs; [ gnome3.gnome-tweaks brave - vscode nodejs-12_x # Need this node https://nixos.wiki/wiki/Vscode + vscode + nodejs-12_x # Need this node https://nixos.wiki/wiki/Vscode obsidian signal-desktop + ripgrep ];