From df402becefbd361419a6c127e98cecc2c7b1e36b Mon Sep 17 00:00:00 2001 From: Jade Date: Sat, 22 Apr 2023 12:52:11 +0200 Subject: [PATCH] switch to xmonad --- haskell/xmonad/xmonad.hs | 330 +++++++++++++++++++++++ modules/desktop/default.nix | 43 +-- modules/desktop/xmonad.nix | 10 + modules/neovim.nix | 4 + monosodium-glutamate-g/configuration.nix | 41 +-- todo.md | 7 +- 6 files changed, 393 insertions(+), 42 deletions(-) create mode 100644 haskell/xmonad/xmonad.hs create mode 100644 modules/desktop/xmonad.nix diff --git a/haskell/xmonad/xmonad.hs b/haskell/xmonad/xmonad.hs new file mode 100644 index 0000000..0332554 --- /dev/null +++ b/haskell/xmonad/xmonad.hs @@ -0,0 +1,330 @@ +-- +-- xmonad example config file. +-- +-- A template showing all available configuration hooks, +-- and how to override the defaults in your own xmonad.hs conf file. +-- +-- Normally, you'd only override those defaults you care about. +-- + +import XMonad +import Data.Monoid +import System.Exit + +import qualified XMonad.StackSet as W +import qualified Data.Map as M + +import XMonad.Layout.Spacing + +-- The preferred terminal program, which is used in a binding below and by +-- certain contrib modules. +-- +myTerminal = "kitty" + +-- Whether focus follows the mouse pointer. +myFocusFollowsMouse :: Bool +myFocusFollowsMouse = False + +-- Whether clicking on a window to focus also passes the click to the window +myClickJustFocuses :: Bool +myClickJustFocuses = False + +-- Width of the window border in pixels. +-- +myBorderWidth = 2 + +-- modMask lets you specify which modkey you want to use. The default +-- is mod1Mask ("left alt"). You may also consider using mod3Mask +-- ("right alt"), which does not conflict with emacs keybindings. The +-- "windows key" is usually mod4Mask. +-- +myModMask = mod4Mask + +-- The default number of workspaces (virtual screens) and their names. +-- By default we use numeric strings, but any string may be used as a +-- workspace name. The number of workspaces is determined by the length +-- of this list. +-- +-- A tagging example: +-- +-- > workspaces = ["web", "irc", "code" ] ++ map show [4..9] +-- +myWorkspaces = ["comms","browser","3","4","5","6","7","8","9"] + +-- Border colors for unfocused and focused windows, respectively. +-- +myNormalBorderColor = "#3c3836" +myFocusedBorderColor = "#504945" + +------------------------------------------------------------------------ +-- Key bindings. Add, modify or remove key bindings here. +-- +myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $ + + -- launch a terminal + [ ((modm, xK_Return), spawn $ XMonad.terminal conf) + + -- launch gmrun + , ((modm, xK_d ), spawn "rofi -show drun") + + -- close focused window + , ((modm .|. shiftMask, xK_q ), kill) + + -- Rotate through the available layout algorithms + , ((modm, xK_space ), sendMessage NextLayout) + + -- Reset the layouts on the current workspace to default + , ((modm .|. shiftMask, xK_space ), setLayout $ XMonad.layoutHook conf) + + -- Resize viewed windows to the correct size + , ((modm, xK_n ), refresh) + + -- Move focus to the next window + , ((modm, xK_Tab ), windows W.focusDown) + + -- Move focus to the next window + , ((modm, xK_j ), windows W.focusDown) + + -- Move focus to the previous window + , ((modm, xK_k ), windows W.focusUp ) + + -- Move focus to the master window + , ((modm, xK_m ), windows W.focusMaster ) + + -- Swap the focused window and the master window + , ((modm, xK_Return), windows W.swapMaster) + + -- Swap the focused window with the next window + , ((modm .|. shiftMask, xK_j ), windows W.swapDown ) + + -- Swap the focused window with the previous window + , ((modm .|. shiftMask, xK_k ), windows W.swapUp ) + + -- Shrink the master area + , ((modm, xK_h ), sendMessage Shrink) + + -- Expand the master area + , ((modm, xK_l ), sendMessage Expand) + + -- Push window back into tiling + , ((modm, xK_t ), withFocused $ windows . W.sink) + + -- Increment the number of windows in the master area + , ((modm , xK_comma ), sendMessage (IncMasterN 1)) + + -- Deincrement the number of windows in the master area + , ((modm , xK_period), sendMessage (IncMasterN (-1))) + + -- Toggle the status bar gap + -- Use this binding with avoidStruts from Hooks.ManageDocks. + -- See also the statusBar function from Hooks.DynamicLog. + -- + -- , ((modm , xK_b ), sendMessage ToggleStruts) + + , ((modm .|. shiftMask, xK_e ), io (exitWith ExitSuccess)) + + -- Restart xmonad + --, ((modm , xK_q ), spawn "xmonad --recompile; xmonad --restart") + + -- Run xmessage with a summary of the default keybindings (useful for beginners) + , ((modm .|. shiftMask, xK_slash ), spawn ("echo \"" ++ help ++ "\" | xmessage -file -")) + ] + ++ + + -- + -- mod-[1..9], Switch to workspace N + -- mod-shift-[1..9], Move client to workspace N + -- + [((m .|. modm, k), windows $ f i) + | (i, k) <- zip (XMonad.workspaces conf) [xK_1 .. xK_9] + , (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)]] + ++ + + -- + -- mod-{w,e,r}, Switch to physical/Xinerama screens 1, 2, or 3 + -- mod-shift-{w,e,r}, Move client to screen 1, 2, or 3 + -- + [((m .|. modm, key), screenWorkspace sc >>= flip whenJust (windows . f)) + | (key, sc) <- zip [xK_w, xK_e, xK_r] [0..] + , (f, m) <- [(W.view, 0), (W.shift, shiftMask)]] + + +------------------------------------------------------------------------ +-- Mouse bindings: default actions bound to mouse events +-- +myMouseBindings (XConfig {XMonad.modMask = modm}) = M.fromList $ + + -- mod-button1, Set the window to floating mode and move by dragging + [ ((modm, button1), (\w -> focus w >> mouseMoveWindow w + >> windows W.shiftMaster)) + + -- mod-button2, Raise the window to the top of the stack + , ((modm, button2), (\w -> focus w >> windows W.shiftMaster)) + + -- mod-button3, Set the window to floating mode and resize by dragging + , ((modm, button3), (\w -> focus w >> mouseResizeWindow w + >> windows W.shiftMaster)) + + -- you may also bind events to the mouse scroll wheel (button4 and button5) + ] + +------------------------------------------------------------------------ +-- Layouts: + +-- You can specify and transform your layouts by modifying these values. +-- If you change layout bindings be sure to use 'mod-shift-space' after +-- restarting (with 'mod-q') to reset your layout state to the new +-- defaults, as xmonad preserves your old layout settings by default. +-- +-- The available layouts. Note that each layout is separated by |||, +-- which denotes layout choice. +-- +myLayout = tiled ||| Mirror tiled ||| Full + where + -- default tiling algorithm partitions the screen into two panes + tiled = Tall nmaster delta ratio + + -- The default number of windows in the master pane + nmaster = 1 + + -- Default proportion of screen occupied by master pane + ratio = 1/2 + + -- Percent of screen to increment by when resizing panes + delta = 3/100 + +------------------------------------------------------------------------ +-- Window rules: + +-- Execute arbitrary actions and WindowSet manipulations when managing +-- a new window. You can use this to, for example, always float a +-- particular program, or have a client always appear on a particular +-- workspace. +-- +-- To find the property name associated with a program, use +-- > xprop | grep WM_CLASS +-- and click on the client you're interested in. +-- +-- To match on the WM_NAME, you can use 'title' in the same way that +-- 'className' and 'resource' are used below. +-- +myManageHook = composeAll + [ className =? "MPlayer" --> doFloat + , className =? "Gimp" --> doFloat + , resource =? "desktop_window" --> doIgnore + , resource =? "kdesktop" --> doIgnore ] + +------------------------------------------------------------------------ +-- Event handling + +-- * EwmhDesktops users should change this to ewmhDesktopsEventHook +-- +-- Defines a custom handler function for X Events. The function should +-- return (All True) if the default handler is to be run afterwards. To +-- combine event hooks use mappend or mconcat from Data.Monoid. +-- +myEventHook = mempty + +------------------------------------------------------------------------ +-- Status bars and logging + +-- Perform an arbitrary action on each internal state change or X event. +-- See the 'XMonad.Hooks.DynamicLog' extension for examples. +-- +myLogHook = return () + +------------------------------------------------------------------------ +-- Startup hook + +-- Perform an arbitrary action each time xmonad starts or is restarted +-- with mod-q. Used by, e.g., XMonad.Layout.PerWorkspace to initialize +-- per-workspace layout choices. +-- +-- By default, do nothing. +myStartupHook = return () + +------------------------------------------------------------------------ +-- Now run xmonad with all the defaults we set up. + +-- Run xmonad with the settings you specify. No need to modify this. +-- +main = xmonad defaults + +-- A structure containing your configuration settings, overriding +-- fields in the default config. Any you don't override, will +-- use the defaults defined in xmonad/XMonad/Config.hs +-- +-- No need to modify this. +-- +defaults = def + -- simple stuff + { terminal = myTerminal + , focusFollowsMouse = myFocusFollowsMouse + , clickJustFocuses = myClickJustFocuses + , borderWidth = myBorderWidth + , modMask = myModMask + , workspaces = myWorkspaces + , normalBorderColor = myNormalBorderColor + , focusedBorderColor = myFocusedBorderColor + + -- key bindings + , keys = myKeys + , mouseBindings = myMouseBindings + -- hooks, layouts + , layoutHook = myLayout + , manageHook = myManageHook + , handleEventHook = myEventHook + , logHook = myLogHook + , startupHook = myStartupHook + } + +-- | Finally, a copy of the default bindings in simple textual tabular format. +help :: String +help = unlines ["The default modifier key is 'alt'. Default keybindings:", + "", + "-- launching and killing programs", + "mod-Shift-Enter Launch xterminal", + "mod-p Launch dmenu", + "mod-Shift-p Launch gmrun", + "mod-Shift-c Close/kill the focused window", + "mod-Space Rotate through the available layout algorithms", + "mod-Shift-Space Reset the layouts on the current workSpace to default", + "mod-n Resize/refresh viewed windows to the correct size", + "", + "-- move focus up or down the window stack", + "mod-Tab Move focus to the next window", + "mod-Shift-Tab Move focus to the previous window", + "mod-j Move focus to the next window", + "mod-k Move focus to the previous window", + "mod-m Move focus to the master window", + "", + "-- modifying the window order", + "mod-Return Swap the focused window and the master window", + "mod-Shift-j Swap the focused window with the next window", + "mod-Shift-k Swap the focused window with the previous window", + "", + "-- resizing the master/slave ratio", + "mod-h Shrink the master area", + "mod-l Expand the master area", + "", + "-- floating layer support", + "mod-t Push window back into tiling; unfloat and re-tile it", + "", + "-- increase or decrease number of windows in the master area", + "mod-comma (mod-,) Increment the number of windows in the master area", + "mod-period (mod-.) Deincrement the number of windows in the master area", + "", + "-- quit, or restart", + "mod-Shift-q Quit xmonad", + "mod-q Restart xmonad", + "mod-[1..9] Switch to workSpace N", + "", + "-- Workspaces & screens", + "mod-Shift-[1..9] Move client to workspace N", + "mod-{w,e,r} Switch to physical/Xinerama screens 1, 2, or 3", + "mod-Shift-{w,e,r} Move client to screen 1, 2, or 3", + "", + "-- Mouse bindings: default actions bound to mouse events", + "mod-button1 Set the window to floating mode and move by dragging", + "mod-button2 Raise the window to the top of the stack", + "mod-button3 Set the window to floating mode and resize by dragging"] diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index 9856e5e..b91878f 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -53,6 +53,7 @@ in with lib; { #./xkeysnail.nix ./mail.nix ./specific-hardware + ./xmonad.nix ]).content; options.jade.desktop = { enable = mkEnableOption "Enable the i3 setup"; @@ -78,6 +79,7 @@ in with lib; { virtualisation.libvirtd.enable = true; + environment.systemPackages = with pkgs; [ gnome.gdm ]; services = { printing.enable = true; gnome.gnome-keyring.enable = true; @@ -98,30 +100,12 @@ in with lib; { }; displayManager = { - defaultSession = "none+i3"; + #defaultSession = "none+i3"; gdm.enable = true; }; - windowManager.i3 = { + windowManager.xmonad = { enable = true; - extraPackages = with pkgs; [ - gnome.gdm - i3lock-fancy - rofi - rofimoji - feh - xorg.xinput - dunst - arandr - flameshot - tesseract5 - imagemagick - xclip - xmacro - libwacom - wacomtablet - xorg.xev - ]; }; }; @@ -152,7 +136,24 @@ in with lib; { # - every custom script its own flake n stuff home-manager.users.jade = { pkgs, ... }: { + programs.rofi.theme = ../../other/rofi-themes/applauncher.rasi; home.packages = with pkgs; [ + i3lock-fancy + rofi + rofimoji + feh + xorg.xinput + dunst + arandr + flameshot + tesseract5 + imagemagick + xclip + xmacro + libwacom + wacomtablet + xorg.xev + # categories # filemanager xfce.thunar @@ -228,7 +229,7 @@ in with lib; { xsession = { enable = true; windowManager.i3 = { - enable = true; + enable = false; config = { bars = []; workspaceAutoBackAndForth = true; diff --git a/modules/desktop/xmonad.nix b/modules/desktop/xmonad.nix new file mode 100644 index 0000000..79ece69 --- /dev/null +++ b/modules/desktop/xmonad.nix @@ -0,0 +1,10 @@ +{ config, lib, pkgs, ... }: +with lib; { + home-manager.users.jade = { pkgs, ... }: { + xsession.windowManager.xmonad = { + enable = true; + enableContribAndExtras = true; + config = ../../haskell/xmonad/xmonad.hs; + }; + }; +} diff --git a/modules/neovim.nix b/modules/neovim.nix index 5c49482..c1eb155 100644 --- a/modules/neovim.nix +++ b/modules/neovim.nix @@ -23,6 +23,10 @@ in with lib; { vim-devicons vim-nix vim-pug + + statix + haskell-tools-nvim + coc-rust-analyzer coc-git coc-fzf diff --git a/monosodium-glutamate-g/configuration.nix b/monosodium-glutamate-g/configuration.nix index 7d432c9..8989eb3 100644 --- a/monosodium-glutamate-g/configuration.nix +++ b/monosodium-glutamate-g/configuration.nix @@ -10,23 +10,23 @@ ../modules ]; - nixpkgs = { - overlays = [ - (self: super: { - linux_zen_xeniafied = pkgs.linuxPackagesFor (pkgs.linuxKernel.kernels.linux_zen.override { - structuredExtraConfig = with lib.kernel; { + #nixpkgs = { + #overlays = [ + #(self: super: { + #linux_zen_xeniafied = pkgs.linuxPackagesFor (pkgs.linuxKernel.kernels.linux_zen.override { + #structuredExtraConfig = with lib.kernel; { #"FB" = yes; #"FRAMEBUFFER_CONSOLE" = yes; #"VGA_CONSOLE" = yes; #"VIDEO_SELECT" = yes; - LOGO = lib.mkForce yes; - LOGO_LINUX_CLUT224 = yes; - }; - ignoreConfigErrors = true; - }); - }) - ]; - }; + #LOGO = lib.mkForce yes; + #LOGO_LINUX_CLUT224 = yes; + #}; + #ignoreConfigErrors = true; + #}); + #}) + #]; + #}; jade = { flatpak.enable = true; @@ -55,13 +55,14 @@ boot.loader.efi.canTouchEfiVariables = true; # latest linux kernel #boot.kernelPackages = pkgs.linuxPackages_latest; - boot.kernelPackages = pkgs.linux_zen_xeniafied; - boot.kernelPatches = [ - { - name = "fomx"; - patch = ../other/0001-fomx.patch; - } - ]; + #boot.kernelPackages = pkgs.linux_zen_xeniafied; + boot.kernelPackages = pkgs.linuxPackages_zen; + #boot.kernelPatches = [ + #{ + #name = "fomx"; + #patch = ../other/0001-fomx.patch; + #} + #]; programs.corectrl.enable = true; diff --git a/todo.md b/todo.md index d50e0f8..f234e19 100644 --- a/todo.md +++ b/todo.md @@ -1,10 +1,15 @@ # TODOs +- sort through configs and fix this fucking mess +- make hosts fodler +- proper dir structure - add rofi thingy for editing rust stuff (with nix shell integration) or config -- "temp"/"normal" clipboard via permaclip - proper coc bindings + - nix - fixing - looking at type - extract/others - format - project manager rofi script for opening tools in shell without open terminal + +