Some changes:

- FOSDEM wifi
- Started trying to use eww (I think I added a base16 theming system?)
- Custom exa aliases!

dotfiles/neovim/lazy-lock.json

@@ -2,6 +2,7 @@
   "LuaSnip": { "branch": "master", "commit": "5570fd797eae0790affb54ea669a150cad76db5d" },
   "abbreinder.nvim": { "branch": "main", "commit": "5b2b5ff08a9ada42238d733aeebc6d3d96314d77" },
   "abbremand.nvim": { "branch": "main", "commit": "d633341f632b0b2666dfc6dfe6b9842ba1610a1d" },
+  "catppuccin": { "branch": "main", "commit": "3020af75aae098a77737d91ee37c7147c8450d99" },
   "clipboard-image.nvim": { "branch": "main", "commit": "d1550dc26729b7954f95269952e90471b838fa25" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "23c51b2a3c00f6abc4e922dbd7c3b9aca6992063" },
@@ -47,7 +48,6 @@
   "presence.nvim": { "branch": "main", "commit": "c1c54758824cbecd4e18065d37191f7666fdd097" },
   "purescript-vim": { "branch": "main", "commit": "7af25a840d38dc6767c85edd1f35c1f835618071" },
   "rasi.vim": { "branch": "main", "commit": "a3c5eaf37f2f778f4d62dad2f1e3dbb4596ac6eb" },
-  "rose-pine": { "branch": "main", "commit": "845a6ad5443e3559dde42910c4523a5835c9233b" },
   "scrap.nvim": { "branch": "main", "commit": "16db44ae9403ec9c4b140394f294475d1af80a18" },
   "smart-splits.nvim": { "branch": "master", "commit": "fdd158ce7554dc830fb86e0fe952cd9476cdf726" },
   "telescope-file-browser.nvim": { "branch": "master", "commit": "304508fb7bea78e3c0eeddd88c4837501e403ae8" },
@@ -61,5 +61,6 @@
   "vim-tmux-navigator": { "branch": "master", "commit": "18f0c7fc1e7181e6422247505727d7111c5da544" },
   "vim-wakatime": { "branch": "master", "commit": "7d8ca4667f46e783388609ca7f04a65e4389338a" },
   "vimux": { "branch": "master", "commit": "616fcb4799674a7a809b14ca2dc155bb6ba25788" },
-  "which-key.nvim": { "branch": "main", "commit": "8682d3003595017cd8ffb4c860a07576647cc6f8" }
+  "which-key.nvim": { "branch": "main", "commit": "8682d3003595017cd8ffb4c860a07576647cc6f8" },
+  "yuck.vim": { "branch": "master", "commit": "9b5e0370f70cc30383e1dabd6c215475915fe5c3" }
 }

dotfiles/neovim/lua/my/plugins/init.lua

@@ -12,6 +12,12 @@ return {
     cond = env.vscode.not_active(),
   },
 
+  {
+    "elkowar/yuck.vim",
+    ft = "yuck",
+    cond = env.vscode.not_active(),
+  },
+
   {
     "Fymyte/rasi.vim",
     ft = "rasi",
@@ -177,7 +183,7 @@ return {
     "ruifm/gitlinker.nvim", -- generate permalinks for code
     -- dependencies = { "plenary.nvim" },
     config = {
-      mappings = "<leader>yg"
+      mappings = "<leader>yg",
     },
     init = function()
       local status, wk = pcall(require, "which-key")

home/adrielus/features/cli/default.nix

@@ -6,7 +6,6 @@
 
   # Install clis
   home.packages = with pkgs; [
-    tree # Print directory structure
     ranger # Terminal file explorer
     comma # Intstall and run programs by sticking a , before them
     bc # Calculator

home/adrielus/features/cli/exa.nix

@@ -1,6 +1,16 @@
-{
+{ pkgs, ... }: {
-  programs.exa = {
+  home.packages = [ pkgs.exa ];
-    enable = true;
+
-    enableAliases = true;
+  # TODO: generalize alias creation to all shells
-  };
+  programs.fish.shellAliases =
+    let exa = "${pkgs.exa}/bin/exa";
+    in
+    rec {
+      ls = "${exa} --icons --long";
+      la = "${ls} --all";
+      lt = "${ls} --tree"; # Similar to tree, but also has --long!
+
+      # I am used to using pkgs.tree, so this is nice to have!
+      tree = "${exa} --icons --tree";
+    };
 }

home/adrielus/features/desktop/common/eww/default.nix

@@ -1,4 +1,18 @@
-{ config, ... }: {
+{ config, pkgs, ... }:
-  programs.eww.enable = true;
+let
-  programs.eww.configDir = config.satellite-dev.path "home/adrielus/features/desktop/common/eww/widgets";
+  base16-eww = {
+    template = builtins.readFile ./template.yuck;
+  };
+
+  widgets = config.satellite-dev.path "home/adrielus/features/desktop/common/eww/widgets";
+in
+{
+  home.packages = [ pkgs.eww ];
+  xdg.configFile."eww/eww.yuck".text = ''
+    # Color scheme
+    (include ${config.scheme base16-eww})
+
+    # My widgets
+    (include ${widgets}/dashboard)
+  '';
 }

home/adrielus/features/desktop/common/eww/template.yuck

@@ -0,0 +1,16 @@
+(defvar base00 "{{base00-hex}}")
+(defvar base01 "{{base01-hex}}")
+(defvar base02 "{{base02-hex}}")
+(defvar base03 "{{base03-hex}}")
+(defvar base04 "{{base04-hex}}")
+(defvar base05 "{{base05-hex}}")
+(defvar base06 "{{base06-hex}}")
+(defvar base07 "{{base07-hex}}")
+(defvar base08 "{{base08-hex}}")
+(defvar base09 "{{base09-hex}}")
+(defvar base0A "{{base0A-hex}}")
+(defvar base0B "{{base0B-hex}}")
+(defvar base0C "{{base0C-hex}}")
+(defvar base0D "{{base0D-hex}}")
+(defvar base0E "{{base0E-hex}}")
+(defvar base0F "{{base0F-hex}}")

home/adrielus/features/desktop/common/eww/widgets/dashboard.yuck

@@ -0,0 +1,12 @@
+(defwindow dashboard
+  :stacking "bg"
+  ; :windowtype "normal"
+  :wm-ignore false
+  :reserve (struts :distance "40px" :side "left")
+  :geometry (geometry
+              :width "40px"
+              :height "100%")
+  (dashboard_layout))
+
+(defwidget dashboard_layout [] 
+  (label :text "A"))

home/adrielus/features/desktop/common/eww/widgets/eww.yuck

@@ -0,0 +1 @@
+/nix/store/2qd1b6nv5v7kjlv4s5rdqrhql169g814-home-manager-files/.config/eww/eww.yuck

home/adrielus/global/default.nix

@@ -40,7 +40,7 @@ in
   };
 
   # Set default theme
-  scheme = lib.mkDefault "${inputs.catppuccin-base16}/base16/frappe.yaml";
+  scheme = lib.mkDefault "${inputs.catppuccin-base16}/base16/latte.yaml";
   # scheme = lib.mkDefault "${inputs.rosepine-base16}/rose-pine-dawn.yaml";
 
   # Set reasonable defaults for some settings

hosts/nixos/common/global/default.nix

@@ -16,7 +16,7 @@
     "/etc/ssh/ssh_host_ed25519_key"
   ];
 
-  scheme = lib.mkDefault "${inputs.catppuccin-base16}/base16/frappe.yaml";
+  scheme = lib.mkDefault "${inputs.catppuccin-base16}/base16/latte.yaml";
 
   nixpkgs = {
     # Add all overlays defined in the overlays directory

hosts/nixos/common/global/wireless/default.nix

@@ -12,6 +12,7 @@
       "Neptune".psk = "@PHONE_HOTSPOT_PASS@";
       "TP-Link_522C".psk = "@TG_HOME_PASS@";
       "Sailhorse".psk = "@NL_SAILHORSE_PASS@";
+      "FOSDEM-Dualstack" = {};
     };
 
     # Imperative