From 264b1d0ac44af65b3d240c6f8c1217686bd37bc4 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Mon, 13 Dec 2021 13:08:43 +0100 Subject: [PATCH] `blender` and `org-roam-ui` --- flake.nix | 1 + pkgs/emacs/default.nix | 2 ++ profiles/adb/default.nix | 3 ++- users/ccr/default.nix | 4 ++-- users/profiles/blender/default.nix | 8 ++++++++ users/profiles/cura/default.nix | 6 ++++++ users/profiles/emacs/default.nix | 17 +++++++++++------ .../profiles/emacs/emacs.d/config/config-org.el | 6 ++++++ 8 files changed, 38 insertions(+), 9 deletions(-) create mode 100644 users/profiles/blender/default.nix create mode 100644 users/profiles/cura/default.nix diff --git a/flake.nix b/flake.nix index e214459..88637e5 100644 --- a/flake.nix +++ b/flake.nix @@ -169,6 +169,7 @@ browser = [ firefox chromium qutebrowser tor-browser ]; multimedia = [ mpv zathura ]; dev = [ vim emacs vscode lorri direnv ]; + modelling = [ blender cura ]; }; }; }; diff --git a/pkgs/emacs/default.nix b/pkgs/emacs/default.nix index 5390a0d..d9da135 100644 --- a/pkgs/emacs/default.nix +++ b/pkgs/emacs/default.nix @@ -11,6 +11,7 @@ emacsWithPackages ( all-the-icons company dap-mode + # dirvish doom-modeline evil evil-collection @@ -30,6 +31,7 @@ emacsWithPackages ( org-download org-fragtog org-roam + org-roam-ui org-superstar projectile psc-ide diff --git a/profiles/adb/default.nix b/profiles/adb/default.nix index 435add8..5c476aa 100644 --- a/profiles/adb/default.nix +++ b/profiles/adb/default.nix @@ -1,3 +1,4 @@ +{ pkgs, ... }: { - programs.adb.enable = true; + # programs.adb.enable = !pkgs.stdenv.hostPlatform.isAarch64; } diff --git a/users/ccr/default.nix b/users/ccr/default.nix index d2305b7..fe89721 100644 --- a/users/ccr/default.nix +++ b/users/ccr/default.nix @@ -3,7 +3,7 @@ home-manager.users.ccr = { suites, ... }: { imports = with suites; shell ++ base ++ (if config.networking.hostName != "hs" then ( - gui ++ browser ++ multimedia ++ emails ++ dev + gui ++ browser ++ multimedia ++ emails ++ dev ++ modelling ) else [ ]); home.packages = with pkgs; [ @@ -12,7 +12,7 @@ ] ++ (if config.networking.hostName != "hs" then [ imv calibre - scrcpy + # scrcpy # TODO: create a profile only for x86_64 (not available for aarch64) element-desktop gtk-engine-murrine gtk_engines diff --git a/users/profiles/blender/default.nix b/users/profiles/blender/default.nix new file mode 100644 index 0000000..053d4bc --- /dev/null +++ b/users/profiles/blender/default.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + ] ++ (if !stdenv.hostPlatform.isAarch64 then [ + blender + ] + else [ ]); +} diff --git a/users/profiles/cura/default.nix b/users/profiles/cura/default.nix new file mode 100644 index 0000000..fa555b2 --- /dev/null +++ b/users/profiles/cura/default.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + cura + ]; +} diff --git a/users/profiles/emacs/default.nix b/users/profiles/emacs/default.nix index 5b0ba5d..ebd23e0 100644 --- a/users/profiles/emacs/default.nix +++ b/users/profiles/emacs/default.nix @@ -31,17 +31,22 @@ }; in with pkgs; [ - python3Full - fd ag - nixpkgs-fmt - rnix-lsp - haskell-language-server - stylish-haskell + fd + ffmpegthumbnailer graphviz-nox + haskell-language-server hunspell hunspellDicts.en_US hunspellDicts.it_IT + imagemagick + mediainfo + nixpkgs-fmt + poppler_utils + python3Full + rnix-lsp + stylish-haskell + unzip ( makeDesktopItem { name = "org-protocol"; diff --git a/users/profiles/emacs/emacs.d/config/config-org.el b/users/profiles/emacs/emacs.d/config/config-org.el index e586f1f..1716b77 100644 --- a/users/profiles/emacs/emacs.d/config/config-org.el +++ b/users/profiles/emacs/emacs.d/config/config-org.el @@ -126,5 +126,11 @@ (org-roam-db-autosync-mode) (require 'org-roam-protocol)) +(use-package org-roam-ui + :after org-roam + :config (setq org-roam-ui-sync-theme t + org-roam-ui-follow t + org-roam-ui-update-on-save t + org-roam-ui-open-on-start t)) (provide 'config-org)