Almost working flakes

hm/common.nix

@@ -20,7 +20,10 @@ in
 {
 
   nixpkgs.config.allowUnfree = true;
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+  nix = {
+    package = lib.mkDefault pkgs.nixFlakes;
+    settings.experimental-features = [ "nix-command" "flakes" ];
+  };
 
   programs =
     let
@@ -429,7 +432,6 @@ in
       neofetch
 
       # nix utils
-      nix
       nix-diff
       nix-tree
       nix-output-monitor

hm/default.nix

@@ -10,6 +10,6 @@
     ./ssh.nix
     ./style.nix
     ./usernix
-    # ./vim.nix # FIXME Complains that it's using fetchtarball without a sha256 argument... but it's not?
+    ./vim.nix
   ];
 }

hm/desktop.nix

@@ -1,11 +1,6 @@
 { pkgs, config, lib, ... }:
 let
-  nixglsrc = builtins.fetchTarball {
-    url = "https://github.com/nix-community/nixGL/archive/489d6b095ab9d289fe11af0219a9ff00fe87c7c5.tar.gz";
-    sha256 = "16b9jh46a02m79swsk5i5xw44738zy1i31al77mm1k8y4nxc8d9b";
-  };
-  nixgl = import (nixglsrc) { };
-  nixGLIntelPrefix = "${nixgl.nixVulkanIntel}/bin/nixVulkanIntel ${nixgl.nixGLIntel}/bin/nixGLIntel ";
+  nixGLIntelPrefix = "${pkgs.nixgl.nixVulkanIntel}/bin/nixVulkanIntel ${pkgs.nixgl.nixGLIntel}/bin/nixGLIntel ";
   wmPrefix = "${lib.optionalString config.frogeye.desktop.nixGLIntel nixGLIntelPrefix}";
 in
 {

hm/flake.nix

@@ -1,29 +0,0 @@
-{
-  description = "Home Manager configuration of geoffrey";
-
-  inputs = {
-    # Specify the source of Home Manager and Nixpkgs.
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    home-manager = {
-      url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-  };
-
-  outputs = { nixpkgs, home-manager, ... }:
-    let
-      system = "x86_64-linux";
-      pkgs = nixpkgs.legacyPackages.${system};
-    in {
-      homeConfigurations."geoffrey" = home-manager.lib.homeManagerConfiguration {
-        inherit pkgs;
-
-        # Specify your home configuration modules here, for example,
-        # the path to your home.nix.
-        modules = [ ./. ];
-
-        # Optionally use extraSpecialArgs
-        # to pass through arguments to home.nix
-      };
-    };
-}

hm/style.nix

@@ -1,10 +1,6 @@
 { pkgs, config, lib, ... }:
 let
   # Currently last commit in https://github.com/danth/stylix/pull/194
-  stylix = builtins.fetchTarball {
-    url = "https://github.com/willemml/stylix/archive/2ed2b0086b41d582aca26e083c19c0e47c8991e3.tar.gz";
-    sha256 = "1mwhpbfmw4n1lmy22s0dhbklzd8b0r7mn0mg7vbz44ac35m7kzf2";
-  };
   polarityFile = "${config.xdg.stateHome}/theme_polarity";
   polarityFromFile = if builtins.pathExists polarityFile then lib.strings.fileContents polarityFile else "light";
   polarity = if config.frogeye.polarity == "dynamic" then polarityFromFile else config.frogeye.polarity;
@@ -16,9 +12,8 @@ let
   cfg = config.frogeye.desktop.phasesBrightness;
 in
 {
-  imports = [ (import stylix).homeManagerModules.stylix ];
-
   stylix = {
+
     base16Scheme = "${pkgs.base16-schemes}/share/themes/solarized-${polarity}.yaml";
     image = builtins.fetchurl {
       url = "https://get.wallhere.com/photo/sunlight-abstract-minimalism-green-simple-circle-light-leaf-wave-material-line-wing-computer-wallpaper-font-close-up-macro-photography-124350.png";

hm/vim.nix

@@ -1,10 +1,5 @@
 { pkgs, lib, config, ... }:
 let
-  nixvim = builtins.fetchTarball {
-    url = "https://github.com/nix-community/nixvim/archive/c96d7b46d05a78e695ed1c725d1596b65509b4f9.tar.gz";
-    # 24.05 Anythin after this commit works
-    sha256 = "0brzl3k11qjy81wvs1i8ngbk4kkxild9ps3ammnbr912ldvq9nac";
-  };
   vim-shot-f = pkgs.vimUtils.buildVimPlugin {
     pname = "vim-shot-f";
     version = "2016-02-05";
@@ -29,7 +24,6 @@ let
   };
 in
 {
-  imports = [ (import nixvim).homeManagerModules.nixvim ];
 
   programs.nixvim = {
     enable = true;