add notes.nix

provision/nixos/additional-setup.md

@@ -31,13 +31,7 @@ linux-mount-<network drive name>
 
 Syncthing is used to sync folders between various computers and android. The 
 ansible script should setup and run the service, but shares must be setup
-via the web gui. Currently four shares exists:
+via the web gui. 
-- `.warrior` - `.task` and `.timewarrior` folders to sync taskwarrior tasks.
-These two folders are symlinked to the home folder where taskwarrior/timewarrior 
-expects them.
-- `warrior` - contains text files associated with taskwarrior (mostly from
-taskopen).
-- `vimwiki` - contains text files associate with my personal vimwiki.
 
 ## Git-annex
 

provision/nixos/hosts/bulwark/configuration.nix

@@ -75,7 +75,7 @@
     advcpmv
     neovim
   ] ++ [
-      pkgs-unstable.brave
+      pkgs-unstable.ungoogled-chromium
   ];
 
   # Enable user services

provision/nixos/hosts/kestrel/configuration.nix

@@ -53,7 +53,6 @@
   users.users.${user} = {
     isNormalUser = true;
     extraGroups = [ "wheel" "docker" "libvirtd" ]; # Enable ‘sudo’ for the user.
-    #shell = pkgs.bash;
   };
 
   # Enable modules
@@ -66,6 +65,7 @@
       tooling.enable = true;
       python.enable = true;
       engineering.enable = true;
+      notes.enable = true;
     };
     gaming = {
       steam.enable = true;

provision/nixos/hosts/kestrel/home-configuration.nix

@@ -12,10 +12,6 @@
   };
 
   home.packages = with pkgs; [
-    chezmoi
-    rbw 
-    zk
-    bat
   ];
 
   home.stateVersion = "23.05";

provision/nixos/modules/desktop/sway.nix

@@ -61,7 +61,7 @@ in {
       p7zip
       pavucontrol
     ] ++ [
-      pkgs-unstable.brave
+      pkgs-unstable.ungoogled-chromium
     ];
 
     # xdg-desktop-portal works by exposing a series of D-Bus interfaces
@@ -82,20 +82,20 @@ in {
         defaultApplications = {
           "text/plain" = [ "nvim.desktop" ];
           "inode/directory" = [ "pcmanfm.desktop" ];
-          "text/html" = [ "brave-browser.desktop" ];
+          "text/html" = [ "chromium-browser.desktop" ];
-          "x-scheme-handler/http" = [ "brave-browser.desktop" ];
+          "x-scheme-handler/http" = [ "chromium-browser.desktop" ];
-          "x-scheme-handler/https" = [ "brave-browser.desktop" ];
+          "x-scheme-handler/https" = [ "chromium-browser.desktop" ];
-          "x-scheme-handler/ftp" = [ "brave-browser.desktop" ];
+          "x-scheme-handler/ftp" = [ "chromium-browser.desktop" ];
-          "x-scheme-handler/chrome" = [ "brave-browser.desktop" ];
+          "x-scheme-handler/chrome" = [ "chromium-browser.desktop" ];
-          "x-scheme-handler/about" = [ "brave-browser.desktop" ];
+          "x-scheme-handler/about" = [ "chromium-browser.desktop" ];
-          "x-scheme-handler/unknown" = [ "brave-browser.desktop" ];
+          "x-scheme-handler/unknown" = [ "chromium-browser.desktop" ];
-          "application/x-extension-htm" = [ "brave-browser.desktop" ];
+          "application/x-extension-htm" = [ "chromium-browser.desktop" ];
-          "application/x-extension-html" = [ "brave-browser.desktop" ];
+          "application/x-extension-html" = [ "chromium-browser.desktop" ];
-          "application/x-extension-shtml" = [ "brave-browser.desktop" ];
+          "application/x-extension-shtml" = [ "chromium-browser.desktop" ];
-          "application/xhtml+xml" = [ "brave-browser.desktop" ];
+          "application/xhtml+xml" = [ "chromium-browser.desktop" ];
-          "application/x-extension-xhtml" = [ "brave-browser.desktop" ];
+          "application/x-extension-xhtml" = [ "chromium-browser.desktop" ];
-          "application/x-extension-xht" = [ "brave-browser.desktop" ];
+          "application/x-extension-xht" = [ "chromium-browser.desktop" ];
-          "application/pdf" = [ "brave-browser.desktop" ];
+          "application/pdf" = [ "chromium-browser.desktop" ];
         };
       };
     };

provision/nixos/modules/devel/engineering.nix

@@ -8,7 +8,6 @@ in {
   options.modules.devel.engineering.enable = lib.mkEnableOption "engineering";
   config = lib.mkIf cfg.enable {
 
-    # Install packages
     environment.systemPackages = with pkgs; [ super-slicer freecad blender ];
   };
 }

provision/nixos/modules/devel/notes.nix

@@ -0,0 +1,18 @@
+{ config, lib, pkgs, user, ... }:
+
+let
+  cfg = config.modules.devel.notes;
+in {
+  options.modules.devel.notes.enable = lib.mkEnableOption "notes";
+  config = lib.mkIf cfg.enable {
+
+    environment.systemPackages = with pkgs; [
+      pandoc
+      gollum
+
+      zk
+      # for zk
+        bat
+    ];
+  };
+}

provision/nixos/modules/devel/python.nix

@@ -15,7 +15,6 @@ in {
   options.modules.devel.python.enable = lib.mkEnableOption "python";
   config = lib.mkIf cfg.enable {
 
-    # Install packages
     environment.systemPackages = with pkgs; [ 
       (python3.withPackages my-python-packages)
       beancount 

provision/nixos/modules/devel/tooling.nix

@@ -7,15 +7,12 @@ let
 in {
   options.modules.devel.tooling.enable = lib.mkEnableOption "tooling";
   config = lib.mkIf cfg.enable {
-    # Install packages
+
     environment.systemPackages = with pkgs; [
       cmake
       gcc
       coreutils
       gnumake
-      # TODO: Move somewhere else
-      pandoc
-      gollum
     ];
   };
 }

provision/nixos/modules/services/syncthing.nix

@@ -4,7 +4,7 @@ let cfg = config.modules.services.syncthing;
 in {
   options.modules.services.syncthing.enable = lib.mkEnableOption "syncthing";
   config = lib.mkIf cfg.enable {
-    # Install packages
+
     environment.systemPackages = with pkgs; [ syncthing ];
     services.syncthing = {
       enable = true;

provision/nixos/modules/system/terminal.nix

@@ -4,23 +4,34 @@ let cfg = config.modules.system.terminal;
 in {
   options.modules.system.terminal.enable = lib.mkEnableOption "terminal";
   config = lib.mkIf cfg.enable {
-    # Install packages
+
     environment.systemPackages = with pkgs; [
-      bash
-      bash-completion
-      neovim
-      ripgrep
-      tmux
-      tmuxp
       git
       git-annex
       killall
       pciutils
-      pinentry-curses 
+      chezmoi
-      trash-cli
+
-      unzip
+      rbw 
+      # for rbw
+        pinentry-curses 
+
+      bash
+      # for bash
+        bash-completion
+        tmux
+        tmuxp
+
       nnn
-      advcpmv
+      # for nnn
+        advcpmv
+        unzip
+        trash-cli
+
+      neovim
+      # for neovim
+        nodejs 
+        ripgrep
     ];
   };
 }