Merge pull request #1 from tomasriveral/laptop

Merges Multiplle commits from Laptop to branch.

hosts/laptop/configuration.nix

@@ -227,7 +227,6 @@
       ]))
     iamb # matrix client
     direnv
-    vivify # for nvimnotes
     # utils for dev
     pkg-config
     gdb
@@ -258,6 +257,9 @@
     papirus-folders
     inkscape
     birdtray # thunderbird tray app
+    #vivify # for NoteWrapper
+    # this is more up to date
+    (callPackage ../../modules/packages/vivify.nix {})
   ];
 
   # fonts

hosts/laptop/home.nix

@@ -36,7 +36,7 @@
     #../../modules/home-manager/obsidian.nix obsidian was replaced with a custom solution
     ../../modules/home-manager/thunderbird.nix # email client
     ../../modules/home-manager/eza.nix # ls replacement
-
+    ../../modules/home-manager/vivify.nix # neovim markdown viewer (has also config for qutebrowser
     ../../modules/other/desktopEntries.nix # creates .desktop files
   ];
 
@@ -84,6 +84,7 @@
     (pkgs.callPackage ../../modules/scripts/man.nix {})
     (pkgs.callPackage ../../modules/scripts/trimmer.nix {})
     (pkgs.callPackage ../../modules/qt/qtbatticon.nix {})
+
     #(pkgs.callPackage ../../modules/scripts/obsidianbackup.nix {}) # periodically syncs obsidian's note to kdrive
     #(pkgs.callPackage ../../modules/scripts/obsidianprofiles.nix {}) # fzf vault selector # obsidian was replaced with a custom solution
     # no longer used scripts for quickshell. see caelestia-shell

modules/home-manager/caelestia.nix

@@ -432,7 +432,7 @@ in {
           reboot = "cached";
         };
         commands = {
-          logout = ["loginctl" "terminate-user"];
+          logout = ["hyprctl" "dispatch exit"];
           shutdown = ["systemctl" "poweroff"];
           hibernate = ["systemctl" "hibernate"];
           reboot = ["systemctl" "reboot"];

modules/home-manager/hyprland.nix

@@ -221,7 +221,7 @@ in {
       "custom-gitnotify"
       #"custom-obsidianbackup" # backups the obsidian notes to kdrive and to a timed hidden dir (~/.Notes.backup/)
       #"QS-notifycache" # builds the cache that will be used for the notification history
-      "sleep 2 & caelestia-shell" #works better if it sleeps a bit before
+      "sleep 4 & caelestia-shell" #works better if it sleeps a bit before
       /*
          We stopped using that ######################### maybe we should desactivate those scripts
       # login autostart
@@ -235,7 +235,7 @@ in {
       ######################
       */
     ];
-
+    splash = false; # remove default background on startup
     # gestures (also keybindings)
     gesture = [
       "3, right, move, +col"

modules/home-manager/neovim.nix

@@ -289,7 +289,7 @@
               init_options = {
           clangdFileStatus = true,
           usePlaceholders = true,
-          completeUnimported = true,
+          completeUnimported = false, -- this adds a bunch of #include even thought they are #included in another header file
           semanticHighlighting = true}
             })
             vim.lsp.config("nixd", {

modules/home-manager/vivify.nix

@@ -0,0 +1,24 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  home.file.".config/vivify/config.json" = {
+    enable = true;
+    text = ''
+{
+      "browserOptions": {
+        "name": "qutebrowser",
+        "arguments": ["-T"]
+      }
+  }'';
+};
+programs.qutebrowser = {
+  enable = true;
+  settings = {
+    auto_save.session = false;
+    changelog_after_upgrade = "never";
+    content.cookies.accept = "never";
+  };
+};
+}

modules/home-manager/zsh.nix

@@ -24,7 +24,7 @@
         fi
       }
       eval "$(direnv hook zsh)"
-      export PATH="$PATH:$HOME/NoteWrapper/result/bin" # some project im coding
+      export PATH="$PATH:$HOME/NoteWrapper" # some project im coding
             fastfetch''\n'';
     shellAliases = {
       ".." = "z ..";

modules/packages/README.md

@@ -0,0 +1,3 @@
+Used for custom package derivation.
+
+For example, to use a newer package version that is still not in nixpkgs-unstable.

modules/packages/vivify.nix

@@ -0,0 +1,88 @@
+{
+  lib,
+  stdenv,
+  nix-update-script,
+  fetchYarnDeps,
+  fetchFromGitHub,
+  yarnConfigHook,
+  npmHooks,
+  nodejs,
+  zip,
+  file,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "vivify";
+  version = "0.14.0";
+
+  src = fetchFromGitHub {
+    owner = "jannis-baum";
+    repo = "Vivify";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-CszMG+c0bNHfXWqcI3b4iGpeFJ+FmzHDzxflPS+wEe0=";
+  };
+
+  yarnOfflineCache = fetchYarnDeps {
+    yarnLock = "${finalAttrs.src}/yarn.lock";
+    hash = "sha256-svgEanFiBSQn0TdTuB0CnLR71lkANABEaDiKB+Vc0Rc=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    yarn install
+
+    substituteInPlace node_modules/.bin/tsc \
+      --replace-fail '/usr/bin/env node' '${lib.getExe nodejs}'
+
+    substituteInPlace node_modules/.bin/webpack \
+      --replace-fail '/usr/bin/env node' '${lib.getExe nodejs}'
+
+    substituteInPlace node_modules/.bin/postject \
+      --replace-fail '/usr/bin/env node' '${lib.getExe nodejs}'
+
+    make VIV_VERSION=${finalAttrs.version} linux
+
+    mkdir -p $out/bin
+    install -Dm755 ./build/linux/viv $out/bin/viv
+    install -Dm755 ./build/linux/vivify-server $out/bin/vivify-server
+
+    wrapProgram $out/bin/viv \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          nodejs
+          file
+        ]
+      }
+  '';
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    npmHooks.npmInstallHook
+    zip
+
+    nodejs
+    file
+  ];
+
+  # Stripping 'unneeded symbols' causes vivify-server executable to break
+  # (segmentation fault)
+  dontStrip = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Live Markdown viewer";
+    longDescription = ''
+      Vivify brings your files to life in the browser!
+      Vivify is primarily made to render Markdown and Jupyter Notebooks, but will also
+      serve as a directory browser and let you view code files with syntax highlighting.
+    '';
+    homepage = "https://github.com/jannis-baum/Vivify";
+    changelog = "https://github.com/jannis-baum/Vivify/releases/tag/v${finalAttrs.src.tag}";
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ skohtv ];
+    platforms = lib.platforms.linux;
+    mainProgram = "viv";
+  };
+})