diff --git a/fst/him/nvim-nrw/lua/handdara/carrot.lua b/fst/him/nvim-nrw/lua/handdara/carrot.lua index a0058ca..184cb68 100644 --- a/fst/him/nvim-nrw/lua/handdara/carrot.lua +++ b/fst/him/nvim-nrw/lua/handdara/carrot.lua @@ -10,3 +10,13 @@ vim.keymap.set('n', 'ce', function () vim.cmd 'edit' end end, { desc = '[c]arrot: [e]val code block' }) +vim.keymap.set('n', 'cE', function () + local prev_ft = vim.bo.filetype + if prev_ft == "telekasten" then + vim.bo.filetype = "markdown" + c.execute_all() + vim.bo.filetype = prev_ft + vim.cmd 'write' + vim.cmd 'edit' + end +end, { desc = '[c]arrot: [E]val all code block' }) diff --git a/hix/configuration.nix b/hix/configuration.nix index fdf4ff5..afb5163 100644 --- a/hix/configuration.nix +++ b/hix/configuration.nix @@ -42,10 +42,10 @@ }; services.xserver = { - enable = true; # Enable the X11 windowing system. + enable = true; # Enable the X11 windowing system. displaylink driver set up for x11 displayManager.gdm.enable = true; # Enable the GNOME Display Manager desktopManager.gnome.enable = true; - displayManager.gdm.wayland = opts.sys.useWayland; # displaylink driver set up for x11 + displayManager.gdm.wayland = opts.sys.useWayland; xkb = { # Configure keymap in X11 layout = "us"; variant = ""; diff --git a/hix/options.nix b/hix/options.nix index 8e98a76..a378fd0 100644 --- a/hix/options.nix +++ b/hix/options.nix @@ -6,7 +6,7 @@ timezone = "America/New_York"; locale = "en_US.UTF-8"; useDisplayLink = true; - useWayland = true; + useWayland = false; }; user = rec { username = "handdara"; diff --git a/hix/system/hardware/displaylink/default.nix b/hix/system/hardware/displaylink/default.nix index be59d87..cad4da8 100644 --- a/hix/system/hardware/displaylink/default.nix +++ b/hix/system/hardware/displaylink/default.nix @@ -1,4 +1,4 @@ -{config, pkgs, lib, ... }: +{pkgs, lib, ... }: { # ALERT: This uses unfree software, here is a helpful log report: # *** diff --git a/justfile b/justfile index aa6e23e..c3f5286 100644 --- a/justfile +++ b/justfile @@ -16,13 +16,12 @@ test: just {{dotfiles_dir}}/hix/ test-home-mngr # rebuild nixos and home-manager using most up-to-date method and switch -switch: +switch: && switch-home just {{dotfiles_dir}}/hix/ switch-nixos - just {{dotfiles_dir}}/hix/ switch-home-mngr # rebuild only home-manager using most up-to-date method and switch switch-home: - just {{dotfiles_dir}}/hix/ rebuild-home-mngr + just {{dotfiles_dir}}/hix/ switch-home-mngr # unlink directories needed to switch home-manager unlink-all: