configure helix

Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/587719494ed18a184c98c4d55dde9469af4446bf' (2024-03-14)
  → 'github:nix-community/home-manager/80546b220e95a575c66c213af1b09fe255299438' (2024-04-02)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/0ad13a6833440b8e238947e47bea7f11071dc2b2' (2024-03-12)
  → 'github:NixOS/nixpkgs/d8fe5e6c92d0d190646fb9f1056741a229980089' (2024-03-29)
• Updated input 'nixpkgs-stable':
    'github:NixOS/nixpkgs/51063ed4f2343a59fdeebb279bb81d87d453942b' (2024-03-12)
  → 'github:NixOS/nixpkgs/219951b495fc2eac67b1456824cc1ec1fd2ee659' (2024-03-28)

flake.lock

@@ -190,11 +190,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710423955,
-        "narHash": "sha256-6N/65EqYVqCaz5SVoPMx2HgA+DJZAlw5lW+U9VHSSbE=",
+        "lastModified": 1712093955,
+        "narHash": "sha256-94I0sXz6fiVBvUAk2tg6t3UpM5rOImj4JTSTNFbg64s=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "587719494ed18a184c98c4d55dde9469af4446bf",
+        "rev": "80546b220e95a575c66c213af1b09fe255299438",
         "type": "github"
       },
       "original": {
@@ -345,11 +345,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1710283656,
-        "narHash": "sha256-nI+AOy4uK6jLGBi9nsbHjL1EdSIzoo8oa+9oeVhbyFc=",
+        "lastModified": 1711668574,
+        "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "51063ed4f2343a59fdeebb279bb81d87d453942b",
+        "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659",
         "type": "github"
       },
       "original": {
@@ -358,6 +358,21 @@
         "type": "indirect"
       }
     },
+    "nixpkgs-unstable-small": {
+      "locked": {
+        "lastModified": 1712132741,
+        "narHash": "sha256-44ZLixE1FGUmz01/G/1ZMfJG8P+i8y2SkOVRia0xRkk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "7781caa09d74b971a059a0240a03c5dd68acf3e5",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-unstable-small",
+        "type": "indirect"
+      }
+    },
     "nixpkgs_10": {
       "locked": {
         "lastModified": 1675614288,
@@ -466,11 +481,11 @@
     },
     "nixpkgs_8": {
       "locked": {
-        "lastModified": 1710272261,
-        "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
+        "lastModified": 1711703276,
+        "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2",
+        "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
         "type": "github"
       },
       "original": {
@@ -505,6 +520,7 @@
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_8",
         "nixpkgs-stable": "nixpkgs-stable",
+        "nixpkgs-unstable-small": "nixpkgs-unstable-small",
         "wordsofgod": "wordsofgod"
       }
     },

flake.nix

@@ -4,6 +4,7 @@
   inputs = {
     nixpkgs.url = "nixpkgs/nixos-unstable";
     nixpkgs-stable.url = "nixpkgs/nixos-23.11";
+    nixpkgs-unstable-small.url = "nixpkgs/nixos-unstable-small";
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -26,12 +27,14 @@
     self,
     nixpkgs,
     nixpkgs-stable,
+    nixpkgs-unstable-small,
     home-manager,
     nixos-hardware,
     mac-brcm-fw,
     ...
   } @ inputs: let
     pkgs = nixpkgs.legacyPackages."x86_64-linux";
+    pkgs-unstable-small = nixpkgs-unstable-small.legacyPackages."x86_64-linux";
   in {
     devShells."x86_64-linux".default = pkgs.mkShell {
       buildInputs = [
@@ -49,7 +52,7 @@
     nixosConfigurations = {
       monosodium-glutamate-g = nixpkgs.lib.nixosSystem {
         specialArgs = {
-          inherit inputs;
+          inherit inputs pkgs-unstable-small;
         };
         system = "x86_64-linux";
         modules = [
@@ -71,7 +74,7 @@
       };
       catbook-j = nixpkgs.lib.nixosSystem {
         specialArgs = {
-          inherit inputs;
+          inherit inputs pkgs-unstable-small;
         };
         system = "x86_64-linux";
         modules = [
@@ -93,7 +96,7 @@
       };
       potatobook-g = nixpkgs.lib.nixosSystem {
         specialArgs = {
-          inherit inputs;
+          inherit inputs pkgs-unstable-small;
         };
         system = "x86_64-linux";
         modules = [

modules/desktop/creative.nix

@@ -3,12 +3,18 @@
     home.packages = with pkgs; [
       audacity
       krita
-      gimp-with-plugins
+      # gimp-with-plugins
+      gimp
       inkscape-with-extensions
       obs-studio
       kdenlive
       fspy
+
       scribus
+      lilypond
+      gnuplot
+      graphviz
+      povray
 
       fontforge-gtk
 

modules/desktop/default.nix

@@ -44,7 +44,18 @@ in
     virtualisation.libvirtd.enable = true;
 
     services = {
-      printing.enable = true;
+      printing = {
+        enable = true;
+        drivers = [
+          pkgs.gutenprint
+          pkgs.gutenprintBin
+          pkgs.hplip
+          pkgs.brlaser
+          pkgs.brgenml1lpr
+          pkgs.brgenml1cupswrapper
+          pkgs.ptouch-driver
+        ];
+      };
       gnome.gnome-keyring.enable = true;
     };
 
@@ -54,8 +65,11 @@ in
     };
 
     services.illum.enable = true;
-    services.avahi.enable = true;
-
+    services.avahi = {
+      enable = true;
+      nssmdns = true;
+      openFirewall = true;
+    };
     services.smartd = {
       enable = true;
       notifications.x11.enable = true;

modules/desktop/fonts.nix

@@ -1,6 +1,6 @@
 {pkgs, ...}: {
   fonts.packages = with pkgs; [
-    (nerdfonts.override {fonts = ["FiraCode"];})
+    (nerdfonts.override {fonts = ["FiraCode" "AnonymousPro"];})
     montserrat
     noto-fonts
     atkinson-hyperlegible

modules/desktop/networking.nix

@@ -63,6 +63,7 @@ in {
         networkmanagerapplet
         mullvad-vpn
         speedtest-cli
+        macchanger
       ];
     };
   };

modules/shell/helix.nix

@@ -1,12 +1,9 @@
-{config, ...}: {
-  home-manager.users.jade = {pkgs, ...}: let
-    typstGrammar = pkgs.fetchFromGitHub {
-      owner = "uben0";
-      repo = "tree-sitter-typst";
-      rev = "baddc325e858afff90501dbefa00ecfa28528931";
-      sha256 = "sha256-XZAgnpb1B8EZ2WXPj/JYSZGsmpKsnDiBFCDF0XjunOM";
-    };
-  in {
+{
+  config,
+  pkgs-unstable-small,
+  ...
+}: {
+  home-manager.users.jade = {pkgs, ...}: {
     home = {
       sessionVariables.EDITOR = "hx";
       packages = [
@@ -17,13 +14,9 @@
         pkgs.typst-lsp
       ];
     };
-    home.file = {
-      ".config/helix/runtime/queries" = {
-        source = "${typstGrammar}/queries";
-      };
-    };
     programs.helix = {
       enable = true;
+      package = pkgs-unstable-small.helix;
       settings = {
         theme = "gruvbox";
         editor = {
@@ -35,6 +28,8 @@
             display-messages = true;
             display-inlay-hints = true;
           };
+          completion-replace = true;
+          popup-border = "popup";
           shell = ["nu" "-c"];
           statusline.left = [
             "mode"
@@ -52,6 +47,7 @@
             "workspace-diagnostics"
             "register"
             "position"
+            "selections"
             "file-encoding"
             "file-type"
           ];
@@ -141,22 +137,11 @@
             args = ["--language-server"];
           };
           "typst-lsp" = {
-            command = "typst-lsp";
             config = {
               exportPdf = "onType";
             };
           };
         };
-        grammar = [
-          {
-            name = "typst";
-            source = {
-              git = "https://github.com/uben0/tree-sitter-typst";
-              rev = "baddc325e858afff90501dbefa00ecfa28528931";
-              # path = "${typstGrammar}";
-            };
-          }
-        ];
         language = [
           {
             name = "nu";
@@ -166,30 +151,6 @@
             name = "php";
             language-servers = ["psalm"];
           }
-          {
-            name = "typst";
-            scope = "source.typst";
-            file-types = ["typ" "typst"];
-            injection-regex = "typ(st)?";
-            comment-token = "//";
-            indent = {
-              tab-width = 2;
-              unit = "  ";
-            };
-            roots = ["typst.toml"];
-            formatter = {
-              command = "${pkgs.typstfmt}/bin/typstfmt";
-            };
-            auto-format = true;
-            language-servers = ["typst-lsp"];
-            auto-pairs = {
-              "(" = ")";
-              "{" = "}";
-              "[" = "]";
-              "$" = "$";
-              "\"" = "\"";
-            };
-          }
           {
             name = "nix";
             formatter = {

other/config.nu

@@ -790,7 +790,8 @@ def nsp [
 def lcr [
     file_extension: string
 ] {
-    ls $"**/*.($file_extension)" 
+    ls **/*
+    | where name ends-with $".($file_extension)" 
     | each {|file| 
         open $file.name 
         | lines --skip-empty