Compare commits

..

No commits in common. "ff476b5c666c14c40f2856d756fe56eb33d5bfc5" and "2d17c2c145fcc1a9ffd011c5e3292147de167a3f" have entirely different histories.

8 changed files with 10 additions and 55 deletions

View file

@ -54,23 +54,6 @@ vim.api.nvim_create_autocmd("WinLeave", {
callback = function() vim.wo.cursorline = false end, callback = function() vim.wo.cursorline = false end,
}) })
local auto_linenr = vim.api.nvim_create_augroup("AutoLineNr", {})
vim.api.nvim_create_autocmd({ "VimEnter", "WinEnter", "BufWinEnter" }, {
group = auto_linenr,
callback = function()
-- fugitive, for example, doesn't have numbers
-- if I set relative number I'll get numbers and we don't want that
if vim.wo.number then
vim.wo.relativenumber = true
end
end,
})
vim.api.nvim_create_autocmd("WinLeave", {
group = auto_linenr,
callback = function() vim.wo.relativenumber = false end,
})
vim.api.nvim_create_autocmd({ "VimEnter", "FocusGained", "BufEnter" }, { vim.api.nvim_create_autocmd({ "VimEnter", "FocusGained", "BufEnter" }, {
group = vim.api.nvim_create_augroup("ReloadFileOnChange", {}), group = vim.api.nvim_create_augroup("ReloadFileOnChange", {}),
command = "checktime", command = "checktime",

View file

@ -31,9 +31,6 @@
# bash # bash
pkgs.shfmt pkgs.shfmt
pkgs.nodePackages.bash-language-server pkgs.nodePackages.bash-language-server
# ghc
pkgs.hs-speedscope
]; ];
programs.git = { programs.git = {

View file

@ -80,7 +80,7 @@ myLayout =
$ smartSpacingWithEdge 5 $ smartSpacingWithEdge 5
$ reflectMsg . reflectHoriz $ reflectMsg . reflectHoriz
$ SetMasterNTall $ SetMasterNTall
$ ResizableTall 1 (1/10) (3/7) [1.2, 1, 1, 1.2] $ ResizableTall 1 (1/10) (3/7) []
isSioyek :: Query Bool isSioyek :: Query Bool
isSioyek = className =? "sioyek" isSioyek = className =? "sioyek"

View file

@ -184,8 +184,7 @@ disk_free_priv = False
show_io_stat = True show_io_stat = True
#* Toggles io mode for disks, showing big graphs for disk read/write speeds. #* Toggles io mode for disks, showing big graphs for disk read/write speeds.
# This doesn't seem to have an effect when using btrfs. I'd rather see the disk usage. io_mode = True
io_mode = False
#* Set to True to show combined read/write io graphs in io mode. #* Set to True to show combined read/write io graphs in io mode.
io_graph_combined = False io_graph_combined = False

View file

@ -21,6 +21,10 @@
# idiot protection # idiot protection
chmod = "chmod --preserve-root"; chmod = "chmod --preserve-root";
chown = "chown --preserve-root"; chown = "chown --preserve-root";
# I can't make alias with a space, i.e. `nom shell`
nix-shell = "nix-shell --command fish";
nom-shell = "nom-shell --command fish";
}) })
]; ];
}; };

View file

@ -1,7 +1,7 @@
function nix-build function nix-build
if type -q nom-build if type -q nom-build
command nom-build $argv nom-build $argv
else else
command nix-build $argv nix-build $argv
end end
end end

View file

@ -1,7 +1,7 @@
function nix-shell function nix-shell
if type -q nom-shell if type -q nom-shell
command nom-shell $argv nom-shell $argv
else else
command nix-shell $argv nix-shell $argv
end end
end end

View file

@ -1,28 +0,0 @@
{
haskellPackages,
haskell,
fetchFromGitHub,
fetchpatch,
}:
let
inherit (haskell.lib.compose) appendPatches justStaticExecutables;
drv = haskellPackages.callCabal2nix "hs-speedscope" (fetchFromGitHub {
owner = "mpickering";
repo = "hs-speedscope";
rev = "c34ac00d35f5db52e14dc5b9ba5b228aa9953398";
hash = "sha256-sVTIPIUophj/sgNp1ox1eWHa19zhsZJGjvQt5hUfYk4=";
}) { };
in
appendPatches [
(fetchpatch {
name = "fix-event-dropping-logic";
url = "https://github.com/mpickering/hs-speedscope/commit/1420a9615dc0cafc3051c87cad8a8c463550fcda.patch";
hash = "sha256-kOaMhXHAxSQRhvxhF0uDSD1Us+ywNJcqnrKDfNaU5hA=";
})
(fetchpatch {
name = "passing-rts-options";
url = "https://github.com/mpickering/hs-speedscope/commit/12ad16062325817242f0b7ebefabb40b9af4aa3e.patch";
hash = "sha256-AcL8t+D2xccKGVCCASXgP8t1K4EfHQmDpn2ZmR2Ppxk=";
})
] (justStaticExecutables drv)