~vonfry/dotfiles

edc09547a42b57738ae33756c996f5e4a926719f — Vonfry 2 months ago 97bafdd + 7808982 20220918
Merge branch 'release/20220918'
M etc/nixos/modules/overlay/_sources/generated.json => etc/nixos/modules/overlay/_sources/generated.json +5 -5
@@ 25,7 25,7 @@
            "type": "url",
            "url": "https://wiki.haskell.org/wikistatic/haskellwiki_logo.png"
        },
        "version": "2022-05-31"
        "version": "2022-08-17"
    },
    "fcitx5-material-color": {
        "cargoLocks": null,


@@ 154,11 154,11 @@
            "name": null,
            "owner": "KyleBing",
            "repo": "rime-wubi86-jidian",
            "rev": "90d10df2a6a3fd0ef8f8e2a4b0a96c3abc49f1d2",
            "sha256": "sha256-Bbp8VlQm9TRwdnZYrHqMwh4+K/r0SBq2z44M0YPQAGo=",
            "rev": "435e91703cdc83b45461379a034fe4fa40641917",
            "sha256": "sha256-04DPknoSVusFrrY+jw8lzb8F6Q0cpO0lB213AsK9MNU=",
            "type": "github"
        },
        "version": "90d10df2a6a3fd0ef8f8e2a4b0a96c3abc49f1d2"
        "version": "435e91703cdc83b45461379a034fe4fa40641917"
    },
    "sddm-chili": {
        "cargoLocks": null,


@@ 210,6 210,6 @@
            "type": "url",
            "url": "https://vonfry.name/images/default/logo-white.png"
        },
        "version": "2022-05-31"
        "version": "2022-08-17"
    }
}
\ No newline at end of file

M etc/nixos/modules/overlay/_sources/generated.nix => etc/nixos/modules/overlay/_sources/generated.nix +5 -5
@@ 11,7 11,7 @@
  };
  background-image = {
    pname = "background-image";
    version = "2022-05-31";
    version = "2022-08-17";
    src = fetchurl {
      url = "https://wiki.haskell.org/wikistatic/haskellwiki_logo.png";
      sha256 = "sha256-NVUPqd/3lxzRPrTfBCBXgxrXR3blEJC/XiJ1nAEcaPQ=";


@@ 85,13 85,13 @@
  };
  rime-wubi86-jidian = {
    pname = "rime-wubi86-jidian";
    version = "90d10df2a6a3fd0ef8f8e2a4b0a96c3abc49f1d2";
    version = "435e91703cdc83b45461379a034fe4fa40641917";
    src = fetchFromGitHub ({
      owner = "KyleBing";
      repo = "rime-wubi86-jidian";
      rev = "90d10df2a6a3fd0ef8f8e2a4b0a96c3abc49f1d2";
      rev = "435e91703cdc83b45461379a034fe4fa40641917";
      fetchSubmodules = false;
      sha256 = "sha256-Bbp8VlQm9TRwdnZYrHqMwh4+K/r0SBq2z44M0YPQAGo=";
      sha256 = "sha256-04DPknoSVusFrrY+jw8lzb8F6Q0cpO0lB213AsK9MNU=";
    });
  };
  sddm-chili = {


@@ 118,7 118,7 @@
  };
  vonfry-icon = {
    pname = "vonfry-icon";
    version = "2022-05-31";
    version = "2022-08-17";
    src = fetchurl {
      url = "https://vonfry.name/images/default/logo-white.png";
      sha256 = "sha256-57Vf7OS5H6va5M5Tmx87FmpSZtIlqldeiBkwcbrrEm0=";

M etc/nixos/modules/user/development.nix => etc/nixos/modules/user/development.nix +2 -1
@@ 256,6 256,7 @@ in {
      git = {
        userName = "Vonfry";
        userEmail = "mail@vonfry.name";
        package = pkgs.gitAndTools.gitFull;
        signing = mkIf (cfg.git.signKey != null) {
          signByDefault = true;
          key = cfg.git.signKey;


@@ 355,7 356,7 @@ in {

        ".latexmkrc".text = ''
          $out_dir = "latex.out";
          $pdf_mode = 5;
          $pdf_mode = 4;
          $dvi_previewer = 'xdvi -watchfile 1.5';
          $ps_previewer  = 'feh';
          $pdf_previewer = 'zathura';

M etc/nixos/modules/user/files/alacritty.nix => etc/nixos/modules/user/files/alacritty.nix +1 -1
@@ 58,7 58,7 @@
        foreground = "#44475a";
        background = "#ffb86c";
      };
      bar = {
      footer_bar = {
        background = "#282a36";
        foreground = "#f8f8f2";
      };

M etc/nixos/modules/user/files/emacs.d/modules/lang/agda/packages.el => etc/nixos/modules/user/files/emacs.d/modules/lang/agda/packages.el +33 -29
@@ 7,40 7,44 @@
  (+agda--mode-load)
  :general
  (nmap-leader :keymaps 'agda2-mode-map
    "("   'agda2-infer-type-maybe-toplevel
    "&"   'agda2-search-about-toplevel
    ";"   'agda2-module-contents-maybe-toplevel
    ","   'agda2-go-back
    "."   'agda2-goto-definition-keyboard
    ","   'agda2-go-back
    ";"   'agda2-module-contents-maybe-toplevel
    "&"   'agda2-search-about-toplevel
    "r"   'agda2-compile
    "{"   'agda2-auto-maybe-all
    "} ." 'agda2-goal-and-context-and-inferred
    "} ;" 'agda2-goal-and-context-and-checked
    "} t" 'agda2-show-context
    "} r" 'agda2-solve-maybe-all
    "} {" 'agda2-show-goals
    "} n" 'agda2-next-goal
    "} p" 'agda2-previous-goal
    "} t" 'agda2-goal-type
    "} r" 'agda2-refine
    "} c" 'agda2-make-case
    "?"   'agda2-helper-function-type
    "t"   'agda2-goal-and-context
    "["   'agda2-why-in-scope-maybe-toplevel
    "("   'agda2-compute-normalised-maybe-toplevel
    ")"   'agda2-show-constraints
    ")"   'eri-indent
    "("   'eri-indent-reverse
    "c x" 'agda2-comment-dwim-rest-of-buffer
    "' b" 'agda2-load
    "r"   'agda2-compile

    "RET"   'agda2-give
    "' RET" 'agda2-elaborate-give)
  (nmap-mode :keymaps 'agda2-mode-map
    "q" 'agda2-quit
    "R" 'agda2-restart
    "A" 'agda2-abort
    "d" 'agda2-remove-annotations
    "h" 'agda2-display-implicit-arguments
    "i" 'agda2-display-irrelevant-arguments
    "S" 'agda2-set-program-version
    ")" 'eri-indent
    "(" 'eri-indent-reverse))
    "q"   'agda2-quit
    "R"   'agda2-restart
    "A"   'agda2-abort
    "d"   'agda2-remove-annotations
    "h"   'agda2-display-implicit-arguments
    "i"   'agda2-display-irrelevant-arguments
    "S"   'agda2-set-program-version
    "a"   'agda2-auto-maybe-all
    "d"   'agda2-infer-type-maybe-toplevel
    ","   'agda2-goal-and-context
    "."   'agda2-goal-and-context-and-inferred
    ";"   'agda2-goal-and-context-and-checked
    "e"   'agda2-show-context
    "s"   'agda2-solve-maybe-all
    "?"   'agda2-show-goals
    "n"   'agda2-next-goal
    "p"   'agda2-previous-goal
    "t"   'agda2-goal-type
    "r"   'agda2-refine
    "c"   'agda2-make-case
    "N"   'agda2-compute-normalised-maybe-toplevel
    ")"   'agda2-show-constraints
    "w"   'agda2-why-in-scope-maybe-toplevel
    "v"   'agda2-display-program-version
    "V"   'agda2-set-program-version
    "?"   'agda2-helper-function-type
    ))

M etc/nixos/modules/user/files/emacs.d/modules/lang/org/func.el => etc/nixos/modules/user/files/emacs.d/modules/lang/org/func.el +4 -0
@@ 40,3 40,7 @@
  (+org/id-update-recursively org-roam-directory)
  (org-id-update-id-locations)
  (org-id-locations-save))

(defun +org/insert-zero-width-space ()
  (interactive)
  (insert-char ?\u200B)) ;; code for ZERO WIDTH SPACE

M etc/nixos/modules/user/files/emacs.d/modules/lang/org/packages.el => etc/nixos/modules/user/files/emacs.d/modules/lang/org/packages.el +1 -0
@@ 54,6 54,7 @@
  :general
  ("C-c C" 'org-capture-goto-target)
  ("C-c a" 'org-agenda)
  ("C-x 8 s" '+org/insert-zero-width-space)
  (nmap-leader
    "o t i" 'org-clock-in-last
    "o t o" 'org-clock-out

M etc/nixos/modules/user/files/emacs.d/modules/lang/proof/packages.el => etc/nixos/modules/user/files/emacs.d/modules/lang/proof/packages.el +3 -2
@@ 4,20 4,21 @@
(use-package proof-general
  :general
  (nmap-leader :keymaps 'coq-mode-map
    "."      'proof-goto-point
    "\""     'proof-shell-start
    "' x"    'proof-shell-exit
    "' >"    'proof-autosend-toggle
    "' u"    'proof-undo-last-successful-command
    "' b"    'proof-process-buffer
    "&"      'proof-find-theorems
    "DEL"    'proof-undo-and-delete-last-successful-command
    "RET"    'proof-goto-point)
  (nmap-mode :keymaps 'coq-mode-map
    "b"      'proof-process-buffer
    "r"      'proof-retract-buffer
    "p"      'proof-prf
    "t"      'proof-ctxt
    "h"      'proof-help
    "`"      'proof-next-error
    "f"      'proof-find-theorems
    "v"      'proof-minibuffer-cmd
    "b"      'proof-toolbar-toggle
    "c"      'proof-interrupt-process

M etc/nixos/modules/user/files/xmonad/lib/XMonad/Config/Vonfry/Key.hs => etc/nixos/modules/user/files/xmonad/lib/XMonad/Config/Vonfry/Key.hs +8 -8
@@ 185,16 185,16 @@ key conf = mkKeymap conf
    , ("M-<Right>", screenGo R True)

    -- Swap workspaces on adjacent screens
    , ("M-S-<Left>" , screenSwap L True)
    , ("M-S-<Down>" , screenSwap D True)
    , ("M-S-<Up>"   , screenSwap U True)
    , ("M-S-<Right>", screenSwap R True)
    , ("M-C-<Left>" , screenSwap L True)
    , ("M-C-<Down>" , screenSwap D True)
    , ("M-C-<Up>"   , screenSwap U True)
    , ("M-C-<Right>", screenSwap R True)

    -- Send window to adjacent screen
    , ("M-C-<Left>" , windowToScreen L True)
    , ("M-C-<Down>" , windowToScreen D True)
    , ("M-C-<Up>"   , windowToScreen U True)
    , ("M-C-<Right>", windowToScreen R True)
    , ("M-S-<Left>" , windowToScreen L True)
    , ("M-S-<Down>" , windowToScreen D True)
    , ("M-S-<Up>"   , windowToScreen U True)
    , ("M-S-<Right>", windowToScreen R True)

    -- cycle workspace
    , ("M-}"  , nextWS     )

M etc/nixos/modules/user/files/xmonad/lib/XMonad/Config/Vonfry/LayoutHook.hs => etc/nixos/modules/user/files/xmonad/lib/XMonad/Config/Vonfry/LayoutHook.hs +1 -1
@@ 34,7 34,7 @@ layoutHook = beforeLayouts layouts
    splitGrid = SplitGrid GridVariants.L 2 3 (2/3) gridRatio (1/100)
    grid      = Grid gridRatio
    tiled     = Tall 1 (3/100) (1/2)
    drag d    = dragPane d 0.1 0.1
    drag d    = dragPane d 0.1 0.5
    column    = Column 1

    cleanupNames  = renamed [ CutWordsLeft 1 ]

M etc/nixos/modules/user/net.nix => etc/nixos/modules/user/net.nix +1 -0
@@ 216,6 216,7 @@ in {
          content.autoplay = false;
          session.default_name = "autosave";
          auto_save.session = true;
          colors.webpage.preferred_color_scheme = "dark";
        };
        extraConfig = ''
          padding = { "top": 6, "right": 8, "bottom": 6, "left": 8 }