blargh

hosts/denkbrett/configuration.nix

@@ -62,7 +62,6 @@
     pkgs.mobile-broadband-provider-info
     pkgs.modem-manager-gui
     pkgs.wireshark
-    pkgs.jetbrains.idea-ultimate
   ];
 
   # Bootloader.

modules/desktop-legacy/gaming.nix

@@ -17,9 +17,7 @@ with lib;
       { pkgs, ... }:
       {
         home.packages = with pkgs; [
-          lutris
           prismlauncher
-          wineWowPackages.stable
           dxvk_2
           vkd3d-proton
         ];

modules/desktop-legacy/social.nix

@@ -59,7 +59,6 @@ with lib;
           mumble
           element-desktop
           pkgs.evolution-data-server-gtk4
-          iamb
           deltachat-desktop
         ];
       };

modules/desktop/audio.nix

@@ -14,6 +14,6 @@
   environment.systemPackages = with pkgs; [
     playerctl
     pulsemixer
-    helvum
+    crosspipe
   ];
 }

modules/desktop/home/browser.nix

@@ -17,26 +17,20 @@
     };
     policies = {
       DefaultDownloadDirectory = "\${home}/Downloads";
-      Extensions.Install =
-        builtins.map (name: "https://addons.mozilla.org/firefox/downloads/latest/${name}")
-          [
+      Extensions.Install = map (name: "https://addons.mozilla.org/firefox/downloads/latest/${name}") [
         "bitwarden-password-manager"
         "darkreader"
-            "gruvbox-dark-theme"
         "indie-wiki-buddy"
         "kagi-search-for-firefox"
         "multi-account-containers"
         "privacy-badger17"
         "return-youtube-dislikes"
-            "shinigami-eyes"
         "sponsorblock"
         "styl-us"
         "tabby-cat-friend"
-            "terms-of-service-didnt-read"
         "torproject-snowflake"
         "tridactyl-vim"
         "ublock-origin"
-            "view-page-archive"
         "web-clipper-obsidian"
         "web-scrobbler"
       ];
@@ -180,6 +174,21 @@
             icon = "https://lib.rs/favicon.png";
             definedAliases = [ "libs" ];
           };
+          "gleam packages" = {
+            urls = [
+              {
+                template = "https://packages.gleam.run/";
+                params = [
+                  {
+                    name = "search";
+                    value = "{searchTerms}";
+                  }
+                ];
+              }
+            ];
+            icon = "https://packages.gleam.run/static/packages-icon.svg";
+            definedAliases = [ "libs" ];
+          };
           "rust docs" = {
             urls = [
               {
@@ -195,6 +204,16 @@
             icon = "https://docs.rs/-/static/favicon.ico";
             definedAliases = [ "docs" ];
           };
+          "gleam docs direct open" = {
+            urls = [
+              {
+                template = "https://hexdocs.pm/{searchTerms}";
+              }
+            ];
+            definedAliases = [
+              "gd"
+            ];
+          };
           "rust docs direct open" = {
             urls = [
               {
@@ -202,8 +221,7 @@
               }
             ];
             definedAliases = [
-              "doc"
-              "docd"
+              "rd"
             ];
           };
           "rust std docs" = {

modules/desktop/home/niri/shaders/arc.frag

@@ -1,4 +1,6 @@
+
 #define PI 3.14159
+
 #define TAU 6.28319
 
 #define WIDTH 3.

modules/desktop/home/terminal.nix

@@ -4,7 +4,6 @@
     enable = true;
     font.size = 12;
     font.name = "Departure Mono Nerd Font";
-    shellIntegration.enableFishIntegration = false;
     keybindings = {
       "ctrl+shift+n" = "new_os_window_with_cwd";
     };

modules/editors/helix/default.nix

@@ -105,6 +105,13 @@
         };
       };
       language = [
+        {
+          name = "gleam";
+          language-servers = [
+            "gleam"
+            "discord-presence-lsp"
+          ];
+        }
         {
           name = "nu";
           language-servers = [

modules/net/hosts.nix

@@ -1,19 +1,12 @@
-{ ... }:
-{
-  networking.hosts = {
-    "127.0.0.1" = [
-      "www.tiktok.com"
-      "www.twitter.com"
-      "www.instagram.com"
-      "www.facebook.com"
-      "www.snapchat.com"
-
+{ lib, ... }:
+let
+  domains = [
     "tiktok.com"
     "twitter.com"
     "instagram.com"
     "facebook.com"
     "snapchat.com"
-      "lovense.com"
+    # "youtube.com"
 
     "google-analytics.com"
     "stats.g.doubleclick.net"
@@ -22,5 +15,17 @@
     "googletagservices.com"
     "googlesyndication.com"
   ];
+  prefixes = [
+    "www."
+    ""
+  ];
+in
+{
+  networking.hosts =
+    let
+      withPrefixes = prefixes |> map (prefix: map (domain: prefix + domain) domains) |> lib.flatten;
+    in
+    {
+      "127.0.0.1" = withPrefixes;
     };
 }

modules/shell/btop.nix

@@ -1,8 +1,5 @@
-{ ... }:
+{ pkgs, ... }:
 {
-  home-manager.users.jade =
-    { pkgs, ... }:
-    {
   programs.btop = {
     enable = true;
     package = pkgs.btop-rocm;
@@ -18,5 +15,4 @@
       update_ms = 500;
     };
   };
-    };
 }

modules/shell/default.nix

@@ -1,19 +1,23 @@
 { pkgs, ... }:
 {
   imports = [
-    ./nu.nix
-    ./starship.nix
     ./tty.nix
-    ./git.nix
-    ./mprocs.nix
-    ./btop.nix
     ./sudo.nix
   ];
   programs.mosh.enable = true;
   programs.bat.enable = true;
+  environment.systemPackages = [ pkgs.nushell ];
   home-manager.users.jade =
     { ... }:
     {
+      imports = [
+        ./btop.nix
+        ./mprocs.nix
+        ./git.nix
+        ./starship.nix
+        ./nu.nix
+        ./elvish.nix
+      ];
       programs.broot = {
         enable = true;
         settings = {
@@ -33,5 +37,6 @@
       };
     };
 
-  users.defaultUserShell = pkgs.nushell;
+  # TODO: Proper switch
+  users.defaultUserShell = pkgs.elvish;
 }

modules/shell/elvish.nix

@@ -0,0 +1,8 @@
+{ ... }:
+{
+  xdg.configFile."elvish" = {
+    recursive = true;
+    executable = true;
+    source = ./elvish;
+  };
+}

modules/shell/elvish/lib/direnv.elv

@@ -0,0 +1,18 @@
+## hook for direnv
+set @edit:before-readline = $@edit:before-readline {
+	try {
+		var m = [("/nix/store/kv03kmfwkinhv4ar2hvh79jfkm1n5id5-direnv-2.37.1/bin/direnv" export elvish | from-json)]
+		if (> (count $m) 0) {
+			set m = (all $m)
+			keys $m | each { |k|
+				if $m[$k] {
+					set-env $k $m[$k]
+				} else {
+					unset-env $k
+				}
+			}
+		}
+	} catch e {
+		echo $e
+	}
+}

modules/shell/elvish/rc.elv

@@ -0,0 +1,28 @@
+# <aliases> 
+
+fn gnix {|@a|  cd ~/nix-configs $@a }
+fn grepo {|@a|  cd ~/Documents/repos $@a }
+fn wh {|@a|  wormhole-rs $@a }
+
+fn gc {|@a|  git commit $@a }
+fn gca {|@a|  git commit --all $@a }
+fn gp {|@a|  git push $@a }
+fn gl {|@a|  git pull $@a }
+fn gs {|@a|  git status $@a }
+
+fn cr {|@a|  cargo run $@a }
+fn cl {|@a|  cargo clippy $@a }
+fn cb {|@a|  cargo build $@a }
+fn cch {|@a|  cargo check $@a }
+
+fn jb {|@a|  just build $@a }
+
+fn px {|@a|  pulsemixer $@a }
+
+fn guni {|@a|  cd ~/Docs/uni $@a }
+
+fn juts {|@a|  just $@a }
+
+# </aliases>
+
+use direnv

modules/shell/git.nix

@@ -5,13 +5,6 @@
   ...
 }:
 {
-  home-manager.users.jade =
-    {
-      pkgs,
-      config,
-      ...
-    }:
-    {
   programs.git = {
     enable = true;
     settings = {
@@ -51,5 +44,4 @@
       )
     '';
   };
-    };
 }

modules/shell/mprocs.nix

@@ -1,12 +1,5 @@
-{ ... }:
+{ pkgs, ... }:
 {
-  home-manager.users.jade =
-    {
-      pkgs,
-      lib,
-      ...
-    }:
-    {
   home = {
     packages = [ pkgs.mprocs ];
   };
@@ -27,5 +20,4 @@
       };
     };
   };
-    };
 }

modules/shell/nu.nix

@@ -1,8 +1,5 @@
-{ config, ... }:
+{ pkgs, ... }:
 {
-  home-manager.users.jade =
-    { pkgs, ... }:
-    {
   # Needed for nu_scripts background_task
   services.pueue = {
     enable = true;
@@ -20,8 +17,8 @@
     target = ".config/nushell/shell-startup.nu";
   };
   programs.nushell = {
-        enable = true;
-        package = config.users.defaultUserShell;
+    enable = false;
+    # package = config.users.defaultUserShell;
     configFile.source = ./nu/config.nu;
     envFile.source = ./nu/env.nu;
     extraConfig = ''
@@ -37,10 +34,9 @@
       source ${./nu/aliases.nu};
       nu ${./nu/shell-startup.nu};
     '';
-        extraEnv = '''';
+    extraEnv = "";
   };
   # programs.starship.enableNushellIntegration = true;
   programs.carapace.enableNushellIntegration = true;
   programs.direnv.enableNushellIntegration = true;
-    };
 }

modules/shell/nu/aliases.nu

@@ -1,16 +1,8 @@
-alias gnix = cd ~/nix-configs;
-alias grepo = cd ~/Documents/repos;
-alias wh = wormhole-rs;
 
 alias b = broot; 
 
 alias gg = gitui;
 alias ga = git add;
-alias gc = git commit;
-alias gca = git commit --all;
-alias gp = git push;
-alias gl = git pull;
-alias gs = git status;
 alias clip = xclip -selection c;
 
 alias cr = cargo run;

modules/shell/starship.nix

@@ -1,8 +1,5 @@
 { ... }:
 {
-  home-manager.users.jade =
-    { pkgs, ... }:
-    {
   programs.starship = {
     enable = true;
     enableNushellIntegration = false;
@@ -40,5 +37,4 @@
       };
     };
   };
-    };
 }