Start the process of switching to nixpkgs-unstable

common/themes/default.nix

@@ -13,7 +13,7 @@ let
 
     catppuccin-latte = {
       stylix = {
-        image = ./wallpapers/watercag.png;
+        image = ./wallpapers/needygirloverdose.jpg;
         base16Scheme = "${inputs.catppuccin-base16}/base16/latte.yaml";
         polarity = "light";
       };

dotfiles/neovim/ftplugin/tex.lua

@@ -52,8 +52,8 @@ local abbreviations = {
   { "tmat", "^T" }, -- Tranpose of a matrix
   { "cmat", "^*" }, -- Conjugate of a matrix
   { "sneg", "^C" }, -- Set complement
-  { "ortco",  "^{\\bot}" },  -- Orthogonal complement
+  { "ortco", "^\\bot" }, -- Orthogonal complement
-  { "sinter", "^{\\circ}" }, -- Interior of a set
+  { "sinter", "^\\circ" }, -- Interior of a set
 
   -- Basic commands
   { "mangle", "\\measuredangle" },

dotfiles/neovim/lua/my/plugins/obsidian.lua

@@ -21,6 +21,7 @@ return {
       prepend_note_id = true,
     },
     mappings = {},
+    disable_frontmatter = true,
   },
   keys = {
     { "<C-O>", "<cmd>ObsidianQuickSwitch<cr>" },

flake.nix

@@ -4,13 +4,13 @@
   # {{{ Inputs
   inputs = {
     # Nixpkgs
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
     # Nixpkgs-unstable
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
     # Home manager
-    home-manager.url = "github:nix-community/home-manager/release-23.05";
+    home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     # NUR

home/features/cli/default.nix

@@ -1,6 +1,6 @@
 { pkgs, inputs, ... }: {
   imports = [
-    ./exa.nix
+    ./eza.nix
     ./bat.nix
     ./ssh.nix
     ./gpg.nix

home/features/cli/eza.nix

@@ -1,16 +1,17 @@
-{ pkgs, ... }: {
+{ upkgs, lib, ... }: {
-  home.packages = [ pkgs.exa ];
+  # REASON: not yet in nixpkgs-stable
+  home.packages = [ upkgs.eza ];
 
   # TODO: generalize alias creation to all shells
   programs.fish.shellAliases =
-    let exa = "${pkgs.exa}/bin/exa";
+    let eza = lib.getExe upkgs.eza;
     in
     rec {
-      ls = "${exa} --icons --long";
+      ls = "${eza} --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";
+      tree = "${eza} --icons --tree";
     };
 }

home/features/neovim/default.nix

@@ -12,7 +12,8 @@ let
     nil # nix
     inputs.nixd.packages.${system}.nixd # nix
     haskell-language-server # haskell
-    dhall-lsp-server # dhall
+    # REASON: marked as broken
+    # dhall-lsp-server # dhall
     tectonic # something related to latex (?)
     texlab # latex
     nodePackages_latest.vscode-langservers-extracted # web stuff

home/features/wayland/hyprland/default.nix

@@ -14,7 +14,8 @@ in
 
   wayland.windowManager.hyprland = {
     enable = true;
-    recommendedEnvironment = true;
+    package = inputs.hyprland.packages.${pkgs.system}.hyprland;
+    settings = { };
     extraConfig = ''
       ${builtins.readFile ./hyprland.conf}
       ${hyprland-monitors}

home/global/default.nix

@@ -6,7 +6,6 @@ let
     inputs.homeage.homeManagerModules.homeage
     inputs.nur.nixosModules.nur
     inputs.impermanence.nixosModules.home-manager.impermanence
-    inputs.hyprland.homeManagerModules.default
     inputs.spicetify-nix.homeManagerModules.spicetify
     inputs.anyrun.homeManagerModules.default
 

hosts/nixos/common/global/openssh.nix

@@ -40,7 +40,7 @@ in
 
   # Passwordless sudo when SSH'ing with keys
   # TODO: is this safe? Can we ssh back and gain root access this way?
-  security.pam.enableSSHAgentAuth = true;
+  # security.pam.enableSSHAgentAuth = true;
 
   # SSH on slow connections
   programs.mosh.enable = true;

hosts/nixos/common/optional/hyprland.nix

@@ -1,3 +1,6 @@
-{
+{ inputs, pkgs, ... }: {
+
   programs.hyprland.enable = true;
+  programs.hyprland.package =
+    inputs.hyprland.packages.${pkgs.system}.hyprland;
 }

hosts/nixos/common/optional/syncthing.nix

@@ -15,6 +15,7 @@ in
     overrideDevices = true;
     overrideFolders = true;
 
+    settings = {
       devices = {
         enceladus.id = "QWOAERM-V2FNXPI-TB7NFUS-LKW7JTB-IZY4OEZ-FYDPJNP-6IKPW4Y-YREXDQM";
         lapetus.id = "VVHM7RC-ZSDOZJI-EGBIJR4-2DOGAXG-OEJZWSH-OYUK5XT-7CDMWSL-3AVM2AZ";
@@ -27,4 +28,5 @@ in
         };
       };
     };
+  };
 }

hosts/nixos/common/users/adrielus.nix

@@ -13,7 +13,7 @@
       isNormalUser = true;
 
       # File containing my password, managed by agenix
-      passwordFile = config.age.secrets.adrielusPassword.path;
+      hashedPasswordFile = config.age.secrets.adrielusPassword.path;
 
       # Set default shell
       shell = pkgs.fish;

hosts/nixos/lapetus/services/syncthing.nix

@@ -6,6 +6,6 @@
   services.syncthing = {
     guiAddress = "0.0.0.0:8384"; # TODO: put this behind nginx
 
-    folders = { };
+    settings.folders = { };
   };
 }

hosts/nixos/tethys/services/syncthing.nix

@@ -1,7 +1,7 @@
 {
   imports = [ ../../common/optional/syncthing.nix ];
 
-  services.syncthing.folders = {
+  services.syncthing.settings.folders = {
     "mythical-vault" = {
       path = "/home/adrielus/.password-store";
       devices = [ "enceladus" "lapetus" ];

modules/nixos/default.nix

@@ -2,5 +2,4 @@
 
 {
   # example = import ./example.nix;
-  font-compat = import ./font-compat.nix;
 }

modules/nixos/font-compat.nix

@@ -1,7 +0,0 @@
-{ lib, config, ... }: {
-  options.fonts.packages = lib.mkOption {
-    type = lib.types.listOf lib.types.package;
-  };
-
-  config.fonts.fonts = config.fonts.packages;
-}

pkgs/vimclip.nix

@@ -15,13 +15,15 @@ let vimclip = pkgs.stdenv.mkDerivation rec {
     cp ./vimclip $out/bin/vimclip
     chmod +x $out/bin/vimclip
   '';
+
+  meta.mainProgram = "vimclip";
 }; in
 pkgs.writeShellScriptBin "vimclip" ''
   if [ "wayland" = $XDG_SESSION_TYPE ]
   then
     export VIMCLIP_CLIPBOARD_COMMAND=${pkgs.wl-clipboard}/bin/wl-copy
   else
-    export VIMCLIP_CLIPBOARD_COMMAND=${lib.getExe pkgs.xsel}
+    export VIMCLIP_CLIPBOARD_COMMAND=${pkgs.xsel}/bin/xsel
   fi
 
   ${lib.getExe vimclip}