Backup before server rebuild

common/default.nix

@@ -1,8 +1,10 @@
 # This directory contains modules which can be loaded on both nixos and home-manager!
 {
-  imports = [ ./fonts.nix ./themes ];
+  imports = [
+    ./fonts.nix
+    ./themes
+    ./nixpkgs.nix
+  ];
 
-  # {{{ ad-hoc toggles
+  satellite.toggles.neovim-nightly.enable = true;
-  satellite.toggles.neovim-nightly.enable = false;
-  # }}}
 }

common/nixpkgs.nix

@@ -0,0 +1,17 @@
+{ outputs, ... }:
+{
+  nixpkgs = {
+    # Add all overlays defined in the overlays directory
+    overlays = builtins.attrValues outputs.overlays;
+
+    config.allowUnfree = true;
+
+    config.permittedInsecurePackages = [
+      "electron-25.9.0"
+      "nix-2.15.3"
+      "dotnet-runtime-6.0.36"
+      "dotnet-sdk-wrapped-6.0.428"
+      "dotnet-sdk-6.0.428"
+    ];
+  };
+}

common/themes/default.nix

@@ -24,7 +24,7 @@ let
     # {{{ Catppuccin latte
     catppuccin-latte = {
       stylix = {
-        image = ./wallpapers/needygirloverdose.jpg;
+        image = ./wallpapers/sketchy-peaks.png;
         base16Scheme = base16 "catppuccin-latte";
         opacity = transparency 0.7;
         polarity = "light";
@@ -96,6 +96,8 @@ in
     }
   ];
 
+  stylix.enable = true;
+
   # Requires me to manually turn targets on!
   stylix.autoEnable = false;
 }

flake.nix

@@ -4,7 +4,7 @@
   # {{{ Inputs
   inputs = {
     # {{{ Nixpkgs instances
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     # }}}
     # {{{ Additional package repositories
@@ -23,7 +23,7 @@
     disko.inputs.nixpkgs.follows = "nixpkgs";
     # }}}
 
-    home-manager.url = "github:nix-community/home-manager/release-24.05";
+    home-manager.url = "github:nix-community/home-manager/release-24.11";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     nix-index-database.url = "github:Mic92/nix-index-database";
@@ -50,7 +50,6 @@
     # }}}
 
     anyrun.url = "github:Kirottu/anyrun";
-    anyrun.inputs.nixpkgs.follows = "nixpkgs";
 
     miros.url = "github:prescientmoon/miros";
     miros.inputs.nixpkgs.follows = "nixpkgs";
@@ -63,7 +62,7 @@
     darkmatter-grub-theme.url = "gitlab:VandalByte/darkmatter-grub-theme";
     darkmatter-grub-theme.inputs.nixpkgs.follows = "nixpkgs";
 
-    stylix.url = "github:danth/stylix/a33d88cf8f75446f166f2ff4f810a389feed2d56";
+    stylix.url = "github:danth/stylix";
     # stylix.inputs.nixpkgs.follows = "nixpkgs";
     # stylix.inputs.home-manager.follows = "home-manager";
 
@@ -201,14 +200,14 @@
   nixConfig = {
     extra-substituters = [
       "https://nix-community.cachix.org"
-      # "https://anyrun.cachix.org"
+      "https://anyrun.cachix.org"
       "https://smos.cachix.org"
       "https://intray.cachix.org"
     ];
 
     extra-trusted-public-keys = [
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-      # "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s="
+      "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s="
       "smos.cachix.org-1:YOs/tLEliRoyhx7PnNw36cw2Zvbw5R0ASZaUlpUv+yM="
       "intray.cachix.org-1:qD7I/NQLia2iy6cbzZvFuvn09iuL4AkTmHvjxrQlccQ="
     ];

home/features/cli/fish/config.fish

@@ -27,6 +27,6 @@ end
 # }}}
 # {{{ Helpers
 function take -d "Create a directory and cd into it"
-  mkdir $argv; and cd $argv
+  mkdir -p $argv; and cd $argv
 end
 # }}}

home/features/desktop/firefox/default.nix

@@ -269,6 +269,24 @@ in
             ];
           };
 
+          "Yu-Gi-Oh! wiki" = mkBasicSearchEngine {
+            url = "https://yugipedia.com/index.php";
+            param = "search";
+            aliases = [
+              "@ygo"
+              "@yugioh-wiki"
+            ];
+          };
+
+          "Yu-Gi-Oh! card prices" = mkBasicSearchEngine {
+            url = "https://www.cardmarket.com/en/YuGiOh/Products/Search";
+            param = "searchString";
+            aliases = [
+              "@cm"
+              "@cardmarket"
+            ];
+          };
+
           "Moonythm" = mkBasicSearchEngine {
             url = "https://search.moonythm.dev/search";
             param = "q";

home/features/neovim/config/lazy-lock.json

@@ -1,57 +1,59 @@
 {
-  "catppuccin": { "branch": "main", "commit": "9703f227bfab20d04bcee62d2f08f1795723b4ae" },
+  "catppuccin": { "branch": "main", "commit": "faf15ab0201b564b6368ffa47b56feefc92ce3f4" },
   "clipboard-image": { "branch": "main", "commit": "4ab6f7f1fa4ea97866c0e0f6160f6a36ef174438" },
-  "cmp": { "branch": "main", "commit": "7e348da6e5085ac447144a2ef4b637220ba27209" },
+  "cmp": { "branch": "main", "commit": "3403e2e9391ed0a28c3afddd8612701b647c8e26" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
   "cmp-emoji": { "branch": "main", "commit": "e8398e2adf512a03bb4e1728ca017ffeac670a9f" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
+  "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
-  "conform": { "branch": "master", "commit": "cd75be867f2331b22905f47d28c0c270a69466aa" },
+  "conform": { "branch": "master", "commit": "f4e8837878fc5712d053ba3091a73d27d96a09e2" },
-  "crates": { "branch": "main", "commit": "c3fd47391de6999f4c939af89494d08443f71916" },
+  "crates": { "branch": "main", "commit": "8bf8358ee326d5d8c11dcd7ac0bcc9ff97dbc785" },
-  "dressing": { "branch": "master", "commit": "6741f1062d3dc6e4755367a7e9b347b553623f04" },
+  "dap": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" },
+  "dressing": { "branch": "master", "commit": "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b" },
   "fidget": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
-  "flash": { "branch": "main", "commit": "d0799ae43a581d9f190e182e2a1f389d2887c42a" },
+  "flash": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" },
   "ftft": { "branch": "master", "commit": "f3e43c9584e14b27f04c27a95a9d9f0e58dfec02" },
   "github-actions": { "branch": "master", "commit": "728374ef59b11a5f5991ea2560d149a4ae33fd22" },
   "gitlinker": { "branch": "master", "commit": "cc59f732f3d043b626c8702cb725c82e54d35c25" },
-  "harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" },
+  "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" },
   "haskell-tools": { "branch": "master", "commit": "92e097c6832405fb64e4c44a7ce8bebe7836cae6" },
   "hyprland": { "branch": "main", "commit": "71760fe0cad972070657b0528f48456f7e0027b2" },
-  "idris": { "branch": "main", "commit": "8bff02984a33264437e70fd9fff4359679d910da" },
+  "idris": { "branch": "main", "commit": "fd051fa8dde6541a6d345e020a05d2cc8f7a3f8d" },
-  "indent-blankline": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" },
+  "indent-blankline": { "branch": "master", "commit": "259357fa4097e232730341fa60988087d189193a" },
   "lastplace": { "branch": "main", "commit": "0bb6103c506315044872e0f84b1f736c4172bb20" },
-  "lean": { "branch": "main", "commit": "182703184edb866d7bfe878be358295e189c8223" },
+  "lean": { "branch": "main", "commit": "202513a398e780dac32d36159181a8299d9cfd12" },
   "live-command": { "branch": "main", "commit": "d460067d47948725a6f25b20f31ea8bbfdfe4622" },
-  "lspconfig": { "branch": "master", "commit": "216deb2d1b5fbf24398919228208649bbf5cbadf" },
+  "lspconfig": { "branch": "master", "commit": "b1729954329236f59d075bec79fdee7a6f3ce88b" },
-  "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
+  "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
   "luasnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
-  "mini.ai": { "branch": "main", "commit": "45587078f323eaf41b9f701bbc04f8d1ab008979" },
+  "mini.ai": { "branch": "main", "commit": "ebb04799794a7f94628153991e6334c3304961b8" },
-  "mini.comment": { "branch": "main", "commit": "080f00bb91fea4bab799820bd2ce835a88d0703a" },
+  "mini.comment": { "branch": "main", "commit": "a56581c40c19fa26f2b39da72504398de3173c5a" },
-  "mini.files": { "branch": "main", "commit": "acfc4e46f6722a0690ce640632c5b5515ddade70" },
+  "mini.files": { "branch": "main", "commit": "84efb81e5207ae8c41f54abdafb79c6212fc0971" },
-  "mini.operators": { "branch": "main", "commit": "7d30c0bc5baaa1f0d3a63dd18b35c8581bc164f4" },
+  "mini.operators": { "branch": "main", "commit": "7cb4dc66c51a3d736d347bbc517dc73dc7d28888" },
-  "mini.pairs": { "branch": "main", "commit": "927d19cbdd0e752ab1c7eed87072e71d2cd6ff51" },
+  "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" },
-  "mini.statusline": { "branch": "main", "commit": "ec7e2c509c7262fef85a28a772f60ebe146297db" },
+  "mini.statusline": { "branch": "main", "commit": "813854243156472c9d0bc9c64ea0af159b9b37ca" },
-  "mini.surround": { "branch": "main", "commit": "57caca9525cec0ea771a67326b0ee637d056078a" },
+  "mini.surround": { "branch": "main", "commit": "aa5e245829dd12d8ff0c96ef11da28681d6049aa" },
   "navigator": { "branch": "master", "commit": "91d86506ac2a039504d5205d32a1d4bc7aa57072" },
-  "neoconf": { "branch": "main", "commit": "23f24edab5f78465a0bc3320678e038664b9aa6e" },
+  "neoconf": { "branch": "main", "commit": "05d25c121e07c464d6b4203204aa113453eca152" },
   "neodev": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
-  "neotest": { "branch": "master", "commit": "6d6ad113f56edc7c3f2a77a0836ea8c1b955ebea" },
+  "neotest": { "branch": "master", "commit": "6d3d22cdad49999ef774ebe1bc250a4994038964" },
-  "neotest-haskell": { "branch": "master", "commit": "10cd953fb7c81de82ce8dc618e0614e0ab5fa1e3" },
+  "neotest-haskell": { "branch": "master", "commit": "af2b3a37d46cbfb50735da306a7b584c6a643716" },
-  "nui": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" },
+  "nui": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
   "null-ls": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" },
+  "nvim-dap": { "branch": "master", "commit": "a6070b4e9e9a8ff1bc513c3748eff27080b0f44a" },
   "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" },
   "obsidian": { "branch": "main", "commit": "6ddc2d4dbe044b8e114c52633c04391077f1f734" },
-  "plenary": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
+  "plenary": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
   "purescript": { "branch": "main", "commit": "82348352e6568fcc0385bd7c99a8ead3a479feea" },
-  "quicker.nvim": { "branch": "master", "commit": "183041a46d6c908eefb1c23ea02cce9c8f41256e" },
+  "quicker.nvim": { "branch": "master", "commit": "049d66534d3de5920663ee1b8dd0096d70f55a67" },
-  "rustacean": { "branch": "master", "commit": "5c0c44149e43b907dae2e0fe053284ad56226eb7" },
+  "rustacean": { "branch": "master", "commit": "a244210b28f9055c2b4cfa85c92c8a71c13671c9" },
   "rzip": { "branch": "master", "commit": "f65400fed27b27c7cff7ef8d428c4e5ff749bf28" },
   "scrap": { "branch": "main", "commit": "cc8453ed613932c744c3d1ec42f379b78bd8b92c" },
   "telescope": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
-  "typst": { "branch": "main", "commit": "4d18ced62599ffe5b3c0e5e49566d5456121bc02" },
+  "typst": { "branch": "main", "commit": "8ce752f1ba1277046429cb469c17ff2e1abc718f" },
-  "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
+  "undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" },
-  "wakatime": { "branch": "master", "commit": "3cb40867cb5a3120f9bef76eff88edc7f1dc1a23" },
+  "wakatime": { "branch": "master", "commit": "cf51327a9e08935569614d1cb24e779ee9f45519" },
-  "web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }
+  "web-devicons": { "branch": "master", "commit": "e73d2774d12d0ecf9e05578d692ba1ea50508cf2" }
-}
+}

home/features/neovim/config/lua/my/helpers/folding.lua

@@ -2,8 +2,8 @@ local M = {}
 
 local function createFold(name)
   local commentstring = vim.o.commentstring
-  local start_comment = string.gsub(commentstring, "%%s", " {{{ " .. name)
+  local start_comment = string.gsub(commentstring, "%%s", "{{{ " .. name)
-  local end_comment = string.gsub(commentstring, "%%s", " }}}")
+  local end_comment = string.gsub(commentstring, "%%s", "}}}")
 
   -- Leave visual mode
   local esc = vim.api.nvim_replace_termcodes("<esc>", true, false, true)

home/features/neovim/config/lua/my/lazy.lua

@@ -15,6 +15,7 @@ function M.setup()
     unpack(require("nix").lazy),
   }, {
     defaults = { lazy = true },
+    rocks = { enabled = false },
     install = {
       -- install missing plugins on startup. this doesn't increase startup time.
       missing = true,

home/features/neovim/default.nix

@@ -258,36 +258,13 @@ let
           autocmds = {
             event = "LspAttach";
             group = "UserLspConfig";
-            action =
+            action = {
-              let
+              mkContext = event: {
-                nmap =
+                bufnr = lua event /buf;
-                  mapping: action: desc:
+                client = vim /lsp/get_client_by_id (lua event /data/client_id);
-                  nlib.nmap mapping (vim /lsp/buf/${action}) desc;
-              in
-              {
-                mkContext = event: {
-                  bufnr = lua event /buf;
-                  client = vim /lsp/get_client_by_id (lua event /data/client_id);
-                };
-                keys = [
-                  (nlib.nmap "<leader>li" "<cmd>LspInfo<cr>" "[L]sp [i]nfo")
-                  (nmap "gd" "definition" "[G]o to [d]efinition")
-                  (nmap "<leader>gi" "implementation" "[G]o to [i]mplementation")
-                  (nmap "<leader>gr" "references" "[G]o to [r]eferences")
-                  (nmap "L" "signature_help" "Signature help")
-                  (nmap "<leader>c" "code_action" "[C]ode actions")
-                  (keymap "v" "<leader>c" ":'<,'> lua vim.lsp.buf.range_code_action()" "[C]ode actions")
-                  (nmap "<leader>wa" "add_workspace_folder" "[W]orkspace [A]dd Folder")
-                  (nmap "<leader>wr" "remove_workspace_folder" "[W]orkspace [R]emove Folder")
-                  (nlib.nmap "<leader>wl" (
-                    _: print (vim /inspect (vim /ps/buf/list_workspace_folders none))
-                  ) "[W]orkspace [L]ist Folders")
-                ];
-                callback = {
-                  cond = ctx: return (lua ctx /client/supports_method "textDocument/hover");
-                  keys = nmap "K" "hover" "Hover";
-                };
               };
+              keys = [ ];
+            };
           };
           # }}}
         };
@@ -865,6 +842,7 @@ let
             in
             lib.flatten [
               (operator "=")
+              (operator "m")
               (operator "x")
               (operator "r")
               (operator "s")
@@ -1010,11 +988,12 @@ let
 
           event = "VeryLazy";
 
+          keys = nmap "<leader>li" "<cmd>LspInfo<cr>" "[L]sp [i]nfo";
           config =
             _:
             importFrom ./plugins/lspconfig.lua "config" {
               # We handle formatting using null-ls and prettierd
-              tsserver.on_attach = client: ''
+              ts_ls.on_attach = client: ''
                 ${client}.server_capabilities.documentFormattingProvider = false
               '';
 
@@ -1081,6 +1060,7 @@ let
               dhall_lsp_server = { };
               elmls = { };
               csharp_ls = { };
+              ols = { }; # Odin
             };
         };
         # }}}
@@ -1229,6 +1209,15 @@ let
           # }}}
         };
         # }}}
+        # {{{ dap
+        dap = {
+          package = "rcarriga/nvim-dap-ui";
+          dependencies.lua = [
+            "mfussenegger/nvim-dap"
+            "nvim-neotest/nvim-nio"
+          ];
+        };
+        # }}}
         # }}}
         # {{{ language support
         # {{{ haskell support
@@ -1265,6 +1254,10 @@ let
           dependencies.nix = lib.lists.optionals packedTargets.rust [
             pkgs.rust-analyzer
             pkgs.rustfmt
+
+            # Recommended by rustacean.nvim as providing a better experience
+            # than raw lldb
+            pkgs.vscode-extensions.vadimcn.vscode-lldb.adapter
           ];
 
           lazy = false; # This plugin is already lazy
@@ -1647,7 +1640,11 @@ let
   # }}}
   # {{{ Clients
   neovim = wrapClient {
-    base = if config.satellite.toggles.neovim-nightly.enable then pkgs.neovim-nightly else upkgs.neovim;
+    base =
+      if config.satellite.toggles.neovim-nightly.enable then
+        inputs.neovim-nightly-overlay.packages.${pkgs.system}.default
+      else
+        upkgs.neovim;
     name = "nvim";
   };
 

home/features/neovim/snippets/common/math-phrases.miros

@@ -6,9 +6,9 @@ block auto !word
     abbr wpbd we will prove the statement in both directions.
     abbr itf it then follows
 
-    for who <- @⟨which,this⟩
+    -- for who <- @⟨which,this⟩
-    for what <- @⟨means,implies⟩
+    -- for what <- @⟨means,implies⟩
-    abbr @⟨@who:ww,tt⟩@⟨@what:m,i⟩ @who @what
+    -- abbr @⟨@who:ww,tt⟩@⟨@what:m,i⟩ @who @what
 
   abbr stam statement
   abbr cox counterexample

home/features/neovim/snippets/tex.miros

@@ -39,6 +39,16 @@ block auto !math start
 
   string item
     snip \item$|1⟨,[$1] $0⟩
+
+  for kind <- @⟨chapter,section,subsection,subsubsection⟩
+
+  string @kind
+    name @kind environment
+    snip
+      \\@kind⋄{$1}
+      $0
+
+
   -- }}}
 
 block text
@@ -220,7 +230,6 @@ block math
     abbr niinf -\ifty
     abbr eniinf ^{-\ifty}
     abbr sniinf _{-\ifty}
-    abbr ccan \cancel
     abbr mul \cdot
     abbr nlnl \pm
     abbr limsup \lim\sup
@@ -248,7 +257,7 @@ block math
     for noperator <- @⟨ordop,land,lor,equiv,pmod,ldots,cdots,perp,angle,sup⟩
     abbr @noperator \\@noperator
 
-    for operator <- @⟨overline,hat,bar,abs,norm,prob,diprod,sin,cos,sqrt,ln,lrb,zmod,gen,pmob⟩
+    for operator <- @⟨cancel,overline,hat,tilde,vec,bar,abs,norm,prob,diprod,sin,cos,sqrt,ln,lrb,zmod,gen,pmob⟩
     string @operator
       snip \\@operator$|1⟨{$1}, $0⟩
 

home/features/wayland/hyprland/hyprland.conf

@@ -54,6 +54,7 @@ animations {
 
 # Execute apps at launch
 exec-once = foot & firefox & vesktop & gtk-launch obsidiantui & gtk-launch smostui & Spotify
+exec-once = fcitx5
 
 # Without this, xdg-open doesn't work
 exec = systemctl --user import-environment PATH && systemctl --user restart xdg-desktop-portal.service
@@ -92,6 +93,7 @@ bind = $mod, Q, exec, wlogout # Show logout menu
 bind = $mod, L, exec, loginctl lock-session # Lock screen
 bind = $mod, P, exec, anyrun
 bind = $mod, B, exec, wlsunset-toggle # Toggle blue light filter thingy
+bind = $mod SHIFT, B, exec, notify-sent $(acpi)
 bind = $mod, V, exec, foot vimclip # Vim anywhere!
 bind = $mod, W, exec, ~/projects/form-filler/type.sh
 
@@ -170,6 +172,6 @@ binde=, XF86MonBrightnessDown, exec, swayosd-client --brightness    lower
 # }}}
 # {{{ App-specific global keybinds
 # OBS
-bind = SUPER, F4, pass, ^(com\.obsproject\.Studio)$ # Start / Stop recording
+# bind = SUPER, F4, pass, ^(com\.obsproject\.Studio)$ # Start / Stop recording
 # }}}
 # }}}

home/global.nix

@@ -35,21 +35,6 @@ in
   # Import all modules defined in modules/home-manager
   imports = builtins.attrValues outputs.homeManagerModules ++ imports;
 
-  # {{{ Nixpkgs
-  nixpkgs = {
-    # Add all overlays defined in the overlays directory
-    overlays =
-      builtins.attrValues outputs.overlays
-      ++ lib.lists.optional config.satellite.toggles.neovim-nightly.enable inputs.neovim-nightly-overlay.overlay;
-
-    config.allowUnfree = true;
-
-    config.permittedInsecurePackages = [
-      "electron-25.9.0"
-      "nix-2.15.3"
-    ];
-  };
-  # }}}
   # {{{ Enable the home-manager and git clis
   programs = {
     home-manager.enable = true;

home/tethys.nix

@@ -10,6 +10,7 @@
     ./features/cli/zellij.nix
     ./features/desktop/discord
     ./features/desktop/firefox
+    ./features/desktop/gaming/edopro.nix
     ./features/desktop/foot.nix
     ./features/desktop/obsidian.nix
     ./features/desktop/spotify.nix
@@ -45,14 +46,15 @@
     qbittorrent # Torrent client
     # google-chrome # Not my primary browser, but sometimes needed in webdev
     # plover.dev # steno engine
-
     overskride # Bluetooth client
+    freetube # youtube client
     # }}}
     # {{{ Media playing/recording
     mpv # Video player
     imv # Image viewer
     # peek # GIF recorder
     # obs-studio # video recorder
+    wl-screenrec
     # }}}
   ];
 

hosts/nixos/calypso/hardware/default.nix

@@ -11,7 +11,7 @@
   # }}}
   # {{{ Misc
   hardware.enableAllFirmware = true;
-  hardware.opengl.enable = true;
+  hardware.graphics.enable = true;
   hardware.opentabletdriver.enable = true;
   hardware.keyboard.qmk.enable = true;
   # }}}

hosts/nixos/common/global/default.nix

@@ -2,8 +2,8 @@
 {
   inputs,
   lib,
-  config,
   outputs,
+  pkgs,
   ...
 }:
 let
@@ -52,15 +52,6 @@ in
   boot.initrd.systemd.enable = true;
   # }}}
 
-  nixpkgs = {
-    # Add all overlays defined in the overlays directory
-    overlays =
-      builtins.attrValues outputs.overlays
-      ++ lib.lists.optional config.satellite.toggles.neovim-nightly.enable inputs.neovim-nightly-overlay.overlay;
-
-    config.allowUnfree = true;
-  };
-
   # Root domain used throughout my config
   satellite.dns.domain = "moonythm.dev";
 }

hosts/nixos/common/optional/bluetooth.nix

@@ -2,4 +2,5 @@
 {
   hardware.bluetooth.enable = true;
   hardware.bluetooth.powerOnBoot = true;
+  systemd.services.bluetooth.serviceConfig.ConfigurationDirectoryMode = "755";
 }

hosts/nixos/common/optional/pipewire.nix

@@ -12,14 +12,17 @@
   };
 
   # https://nixos.wiki/wiki/PipeWire
-  environment.etc = {
+  services.pipewire.wireplumber.extraConfig.bluetoothEnhancements = {
-    "wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = ''
+    "monitor.bluez.properties" = {
-      bluez_monitor.properties = {
+      "bluez5.enable-sbc-xq" = true;
-        ["bluez5.enable-sbc-xq"] = true,
+      "bluez5.enable-msbc" = true;
-        ["bluez5.enable-msbc"] = true,
+      "bluez5.enable-hw-volume" = true;
-        ["bluez5.enable-hw-volume"] = true,
+      "bluez5.roles" = [
-        ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]"
+        "hsp_hs"
-      }
+        "hsp_ag"
-    '';
+        "hfp_hf"
+        "hfp_ag"
+      ];
+    };
   };
 }

hosts/nixos/common/optional/services/wpa_supplicant.nix

@@ -8,22 +8,22 @@
     fallbackToWPA2 = false;
 
     # Declarative
-    environmentFile = config.sops.secrets.wireless.path;
+    secretsFile = config.sops.secrets.wireless.path;
     networks = {
-      "Neptune".psk = "@ENCELADUS_HOTSPOT_PASS@";
+      "Neptune".pskRaw = "ext:ENCELADUS_HOTSPOT_PASS";
 
-      "Familia-Matei-PRO".psk = "@TG_HOTSPOT_HOME_PASS@";
+      "Familia-Matei-PRO".pskRaw = "ext:TG_HOTSPOT_HOME_PASS";
-      "Familia-Matei".psk = "@TG_HOTSPOT_HOME_PASS@";
+      "Familia-Matei".pskRaw = "ext:TG_HOTSPOT_HOME_PASS";
 
-      "R15-5365 5g".psk = "@TG_WIFI_HOME_PASS@";
+      "R15-5365 5g".pskRaw = "ext:TG_WIFI_HOME_PASS";
-      "R15-5365".psk = "@TG_WIFI_HOME_PASS@";
+      "R15-5365".pskRaw = "ext:TG_WIFI_HOME_PASS";
 
-      "Sailhorse".psk = "@NL_PLACE_0_PASS@";
+      "Sailhorse".pskRaw = "ext:NL_PLACE_0_PASS";
-      "Ziggo1721699".psk = "@NL_PLACE_1_PASS@";
+      "Ziggo1721699".pskRaw = "ext:NL_PLACE_1_PASS";
-      "Konijntjes".psk = "@NL_PLACE_1_PODS_PASS@";
+      "Konijntjes".pskRaw = "ext:NL_PLACE_1_PODS_PASS";
-      "InfoEdu12".psk = "@INFOEDU_PASS@";
+      "InfoEdu12".pskRaw = "ext:INFOEDU_PASS";
-      "CNU19".psk = "@INFOEDU_PASS@";
+      "CNU19".pskRaw = "ext:INFOEDU_PASS";
-      "ZTE_F7A321".psk = "@MADALINA_PASS@";
+      "ZTE_F7A321".pskRaw = "ext:MADALINA_PASS";
 
       # [Working solution](https://bbs.archlinux.org/viewtopic.php?id=271336)
       # [Other interesting link](https://help.itc.rwth-aachen.de/en/service/b3d9a2c8ae5345b8b8f5128143ef4e3c/article/eaf6d69389a74a5a839c1f383c508df7/)
@@ -33,7 +33,7 @@
         auth = ''
           eap=PEAP
           identity="s5260329@rug.nl"
-          password="@EDUROAM_PASS@"
+          password="ext:EDUROAM_PASS"
         '';
         extraConfig = ''
           phase2="auth=MSCHAPV2"

hosts/nixos/tethys/boot.nix

@@ -1,6 +1,10 @@
-{ inputs, ... }: {
+{ inputs, pkgs, ... }:
+{
   imports = [ inputs.darkmatter-grub-theme.nixosModule ];
 
+  # https://github.com/NixOS/nixpkgs/issues/314425
+  boot.kernelPackages = pkgs.linuxPackages_6_12;
+
   # See [the wiki page](https://nixos.wiki/wiki/Dual_Booting_NixOS_and_Windows)
   boot.loader = {
     efi = {

hosts/nixos/tethys/default.nix

@@ -62,4 +62,15 @@
   # {{{ SSH keys
   users.users.pilot.openssh.authorizedKeys.keyFiles = [ ../calypso/keys/id_ed25519.pub ];
   # }}}
+
+  i18n.inputMethod = {
+    type = "fcitx5";
+    enable = true;
+    fcitx5.addons = with pkgs; [
+      fcitx5-mozc # for japanese input
+      fcitx5-gtk
+    ];
+    fcitx5.waylandFrontend = true;
+  };
+
 }

hosts/nixos/tethys/hardware/default.nix

@@ -11,7 +11,7 @@
   # }}}
   # {{{ Misc
   hardware.enableAllFirmware = true;
-  hardware.opengl.enable = true;
+  hardware.graphics.enable = true;
   hardware.opentabletdriver.enable = true;
   hardware.keyboard.qmk.enable = true;
   # }}}