flake.lock

@@ -54,11 +54,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713173848,
+        "lastModified": 1713166406,
-        "narHash": "sha256-TTQ2XLqng7TMLnRsLDb/50yyHYuMSPZJ4H+7CEFWQQ0=",
+        "narHash": "sha256-lPAdHkIQBydROJ2e6t0nFP9X220GQ4sEwb5lFQBGYb0=",
         "owner": "atuinsh",
         "repo": "atuin",
-        "rev": "a0231a70950fbec9dcc3403e37066d891d1fc833",
+        "rev": "50a73f055288d72eeeb128233e2a04bc88a5d5e8",
         "type": "github"
       },
       "original": {
@@ -192,11 +192,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713204594,
+        "lastModified": 1713152224,
-        "narHash": "sha256-5yyHYBWFZUKXkJvOccPBeX83hH2iED54NLnWs2eWgS0=",
+        "narHash": "sha256-k1aV06cotPwWO3FW+ho+dEoGjxNM303+UmhiG2o6XPs=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "d51114dc1bf3cfaba2b6644aabd16ff0c9909af5",
+        "rev": "bb5ba68ebb73b5ca7996b64e1457fe885891e78e",
         "type": "github"
       },
       "original": {
@@ -216,11 +216,11 @@
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1713200735,
+        "lastModified": 1713154103,
-        "narHash": "sha256-6qPfZsYW3BvyJq+BahgygLdFd5bdqrFue8QGat4lSQo=",
+        "narHash": "sha256-7tpbjpUI7YDpxP0ciM9bWBxzAT3jsZP9l8EGWFQVBmU=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "cf218237d0d80f1ec8109677ebc82ded2ca84c43",
+        "rev": "1b01966ee01008bcec18702ea5e543b93236ecef",
         "type": "github"
       },
       "original": {
@@ -584,11 +584,11 @@
         "spectrum": "spectrum"
       },
       "locked": {
-        "lastModified": 1713189110,
+        "lastModified": 1712654305,
-        "narHash": "sha256-c/yG/AsPmMBMe4RAxn4KOkOaR4rsW5s3AjtfriOQKD8=",
+        "narHash": "sha256-CNdpLnGOUZfIhBanAFVF7t1xstaQGL4w6sQPrVeLlus=",
         "owner": "astro",
         "repo": "microvm.nix",
-        "rev": "a1341f7195e34d9bb88c12314cc3b0c4429f9b0a",
+        "rev": "ee0068ca87bdabbde3cc39b7af807c0302d0304c",
         "type": "github"
       },
       "original": {
@@ -838,13 +838,13 @@
         "lastModified": 1712897695,
         "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=",
         "owner": "cachix",
-        "repo": "git-hooks.nix",
+        "repo": "pre-commit-hooks.nix",
         "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8",
         "type": "github"
       },
       "original": {
         "owner": "cachix",
-        "repo": "git-hooks.nix",
+        "repo": "pre-commit-hooks.nix",
         "type": "github"
       }
     },
@@ -873,8 +873,7 @@
         "pre-commit-hooks": "pre-commit-hooks",
         "rust-overlay": "rust-overlay_2",
         "sops": "sops",
-        "sunshine": "sunshine",
+        "sunshine": "sunshine"
-        "treefmt-nix": "treefmt-nix"
       }
     },
     "rust-overlay": {
@@ -933,11 +932,11 @@
         "nixpkgs-stable": "nixpkgs-stable_4"
       },
       "locked": {
-        "lastModified": 1713174909,
+        "lastModified": 1713066950,
-        "narHash": "sha256-APoDs2GtzVrsE+Z9w72qpHzEtEDfuinWcNTN7zhwLxg=",
+        "narHash": "sha256-ZaefFyvt5369XdjzSw43NhfbPM9MN5b9YXhzx4lFIRc=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "cc535d07cbcdd562bcca418e475c7b1959cefa4b",
+        "rev": "226062b47fe0e2130ba3ee9f4f1c880dc815cf87",
         "type": "github"
       },
       "original": {
@@ -1031,26 +1030,6 @@
         "repo": "default",
         "type": "github"
       }
-    },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1711963903,
-        "narHash": "sha256-N3QDhoaX+paWXHbEXZapqd1r95mdshxToGowtjtYkGI=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "49dc4a92b02b8e68798abd99184f228243b6e3ac",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -18,18 +18,13 @@
     nixos-hardware.url = "github:NixOS/nixos-hardware";
 
     pre-commit-hooks = {
-      url = "github:cachix/git-hooks.nix";
+      url = "github:cachix/pre-commit-hooks.nix";
       inputs = {
         flake-utils.follows = "flake-utils";
         nixpkgs.follows = "nixpkgs";
       };
     };
 
-    treefmt-nix = {
-      url = "github:numtide/treefmt-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     naersk = {
       url = "github:nix-community/naersk";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -178,10 +173,7 @@
         "aarch64-linux"
       ];
 
-      imports = [
+      imports = [ inputs.pre-commit-hooks.flakeModule ];
-        inputs.pre-commit-hooks.flakeModule
-        inputs.treefmt-nix.flakeModule
-      ];
 
       flake = {
         lib = import ./lib inputs;
@@ -259,28 +251,9 @@
             };
           };
 
-          treefmt = {
-            projectRootFile = "flake.lock";
-
-            programs = {
-              black.enable = true;
-              deadnix.enable = true;
-              nixfmt = {
-                enable = true;
-                package = pkgs.nixfmt-rfc-style;
-              };
-              shellcheck.enable = true;
-              shfmt = {
-                enable = true;
-                indent_size = 0;
-              };
-            };
-          };
-
           packages = {
             git-repo-go = pkgs.callPackage ./pkgs/git-repo-go { };
             gitu = pkgs.callPackage ./pkgs/gitu { };
-            headscale-ui = pkgs.callPackage ./pkgs/headscale-ui { };
             incus-ui = pkgs.callPackage ./pkgs/incus-ui { };
             openfga = pkgs.callPackage ./pkgs/openfga { };
             zed = pkgs.callPackage ./pkgs/zed { };
@@ -339,6 +312,8 @@
               name = "install";
               packages = [ inputs'.disko.packages.disko ];
             };
+
+          formatter = pkgs.nixfmt-rfc-style;
         };
     };
 }

home-manager/modules/atuin/default.nix

@@ -15,10 +15,6 @@ in
 
       settings = {
         dialect = "uk";
-
-        sync = {
-          records = true;
-        };
       };
     };
   };

home-manager/modules/fish/default.nix

@@ -40,7 +40,6 @@ in
 
         shellAliases = {
           ls = "${pkgs.eza}/bin/eza --long --git --git-repos --header --classify --binary";
-          tree = "${pkgs.eza}/bin/eza --tree --icons";
 
           vimdiff = mkIf config.eboskma.programs.neovim.enable "nvim -d";
           vim = mkIf config.eboskma.programs.neovim.enable "nvim";

home-manager/modules/i3/default.nix

@@ -217,16 +217,20 @@ in
           workspaceAutoBackAndForth = true;
           workspaceOutputAssign = builtins.concatLists (
             builtins.attrValues (
-              builtins.mapAttrs (
+              builtins.mapAttrs
+                (
                   name: workspaces:
                   let
                     output = if name == "right" then "DP-0" else "DP-4";
                   in
-                builtins.map (ws: {
+                  builtins.map
+                    (ws: {
                       inherit output;
                       workspace = toString ws;
-                }) workspaces
+                    })
-              ) workspacePartition
+                    workspaces
+                )
+                workspacePartition
             )
           );
           # [

home-manager/modules/nnn/default.nix

@@ -17,7 +17,8 @@ in
     programs.nnn = {
       enable = true;
       package =
-        (pkgs.nnn.overrideAttrs (_prevAttrs: {
+        (pkgs.nnn.overrideAttrs (
+          _prevAttrs: {
             version = "unstable-2023-10-08";
             src = pkgs.fetchFromGitHub {
               owner = "jarun";
@@ -25,7 +26,8 @@ in
               rev = "7f63bef4d6c9f70b99a4c98435c9c0a68e05be44";
               sha256 = "B9WRQW4wbs3+lJ9ACFheTaO+0+G/r67yJZJJPMDIQXI=";
             };
-        })).override
+          }
+        )).override
           {
             withNerdIcons = true;
             extraMakeFlags = [

home-manager/modules/rclone/default.nix

@@ -19,11 +19,13 @@ let
 
   rcloneRemote =
     with types;
-    attrsOf (oneOf [
+    attrsOf (
+      oneOf [
         str
         int
         bool
-    ]);
+      ]
+    );
 
   rcloneMount =
     with types;
@@ -59,7 +61,8 @@ in
     home.packages = [ pkgs.rclone ];
 
     systemd.user.services = builtins.listToAttrs (
-      builtins.map (
+      builtins.map
+        (
           mount:
           let
             localPath = toString mount.local;
@@ -89,7 +92,8 @@ in
               };
             };
           }
-      ) cfg.mounts
+        )
+        cfg.mounts
     );
   };
 }

home-manager/modules/wallpapers/default.nix

@@ -13,14 +13,16 @@ let
       "${pkgs.nitrogen}/bin/nitrogen --set-color=${cfg.backgroundColor} --set-tiled ${cfg.images}"
     else
       builtins.concatStringsSep "\n" (
-        map (
+        map
+          (
             { fst, snd }:
             let
               image = fst;
               monitor = toString snd;
             in
             "${pkgs.nitrogen}/bin/nitrogen --head=${monitor} --set-color=${cfg.backgroundColor} --set-tiled ${image}"
-        ) (zipLists cfg.images (builtins.genList (x: x) (builtins.length cfg.images)))
+          )
+          (zipLists cfg.images (builtins.genList (x: x) (builtins.length cfg.images)))
       )
   );
 

modules/nix-common/default.nix

@@ -20,11 +20,14 @@ in
   };
 
   imports = [
-    (mkRemovedOptionModule [
+    (mkRemovedOptionModule
+      [
         "eboskma"
         "nix-common"
         "disable-cache"
-    ] "The option `disable-cache` is no longer used")
+      ]
+      "The option `disable-cache` is no longer used"
+    )
   ];
 
   config = mkIf cfg.enable {

modules/wireguard/default.nix

@@ -87,13 +87,19 @@ in
         listenPort = cfg.port;
         privateKeyFile = cfg.privateKeyFile;
 
-        postSetup = concatMapStringsSep "\n" (range: ''
+        postSetup =
+          concatMapStringsSep "\n"
+            (range: ''
               ${pkgs.iptables}/bin/iptables -t nat -A POSTROUTING -s ${range} -o ${cfg.externalInterface} -j MASQUERADE
-        '') cfg.internalIPs;
+            '')
+            cfg.internalIPs;
 
-        postShutdown = concatMapStringsSep "\n" (range: ''
+        postShutdown =
+          concatMapStringsSep "\n"
+            (range: ''
               ${pkgs.iptables}/bin/iptables -t nat -D POSTROUTING -s ${range} -o ${cfg.externalInterface} -j MASQUERADE
-        '') cfg.internalIPs;
+            '')
+            cfg.internalIPs;
 
         peers = cfg.peers;
       };

pkgs/headscale-ui/default.nix

@@ -1,55 +0,0 @@
-{
-  lib,
-  buildNpmPackage,
-  fetchFromGitHub,
-  writeText,
-}:
-let
-  version = "2024.02.24-beta1";
-
-  # Got to love those hand crafted, artisinal patches 😁
-  insertVersionPatch = writeText "0001-headscale-ui-insert-version" ''
-    --- a/src/routes/settings.html/+page.svelte
-    +++ b/src/routes/settings.html/+page.svelte
-    @@ -26,7 +26,7 @@
-     		<ThemeSettings />
-     		<div class="p-4" />
-     		<h1 class="text-2xl bold text-primary mb-4">Version</h1>
-    -		<b>insert-version</b>
-    +		<b>${version}</b>
-     		<div class ="p-4"></div>
-    		<DevSettings></DevSettings>
-     	</div>
-  '';
-in
-buildNpmPackage {
-  pname = "headscale-ui";
-  inherit version;
-
-  src = fetchFromGitHub {
-    owner = "gurucomputing";
-    repo = "headscale-ui";
-    rev = version;
-    hash = "sha256-jbyy8W/qAso2yb/hNsmVHiT0mJXInpEIejU+3IB9wJY=";
-  };
-
-  npmDepsHash = "sha256-SHcsTfX2AnHR8fNCE2+JYV33DtZFQOqN7LSoV+fUu5A=";
-
-  npmPackFlags = [ "--ignore-scripts" ];
-  makeCacheWritable = true;
-
-  patches = [ insertVersionPatch ];
-
-  installPhase = ''
-    cp -a build $out
-  '';
-
-  meta = with lib; {
-    description = "A web frontend for the headscale Tailscale-compatible coordination server";
-    homepage = "https://github.com/gurucomputing/headscale-ui";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
-    mainProgram = "headscale-ui";
-    platforms = platforms.all;
-  };
-}

pkgs/incus-ui/default.nix

@@ -10,7 +10,8 @@
   rsync,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation (
+  finalAttrs: {
     pname = "incus-ui";
     version = "0.6";
 
@@ -85,4 +86,5 @@ stdenv.mkDerivation (finalAttrs: {
       maintainers = with maintainers; [ ];
       platforms = platforms.linux;
     };
-})
+  }
+)