8 files changed, 99 insertions, 25 deletions

diff --git a/flake.lock b/flake.lock
index 83e07d2..2eecc91 100644
--- a/flake.lock
+++ b/flake.lock
@@ -38,11 +38,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1631573611,
-        "narHash": "sha256-u2E/wstadWNcn6vOIoK1xY86QPOzzBZQfT1FbePfdaI=",
+        "lastModified": 1634544068,
+        "narHash": "sha256-RlRQBaAHfdWqfRyHdWuDPMkplBTYwuyDQqDcNbP/Sog=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7d9ba15214004c979d2c8733f8be12ce6502cf8a",
+        "rev": "ff2bed9dac84fb202bbb3c49fdcfe30c29d0b12f",
         "type": "github"
       },
       "original": {
@@ -52,6 +52,37 @@
         "type": "github"
       }
     },
+    "import-cargo": {
+      "locked": {
+        "lastModified": 1594305518,
+        "narHash": "sha256-frtArgN42rSaEcEOYWg8sVPMUK+Zgch3c+wejcpX3DY=",
+        "owner": "edolstra",
+        "repo": "import-cargo",
+        "rev": "25d40be4a73d40a2572e0cc233b83253554f06c5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "import-cargo",
+        "type": "github"
+      }
+    },
+    "mozillapkgs": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1629225446,
+        "narHash": "sha256-HJX4Pc5ZUAg4apxB/XHuJ+6ukzvRQqeZMjscOBst2bA=",
+        "owner": "mozilla",
+        "repo": "nixpkgs-mozilla",
+        "rev": "0510159186dd2ef46e5464484fbdf119393afa58",
+        "type": "github"
+      },
+      "original": {
+        "owner": "mozilla",
+        "repo": "nixpkgs-mozilla",
+        "type": "github"
+      }
+    },
     "neovim": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -59,11 +90,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1632643930,
-        "narHash": "sha256-7MGPPBLI/E8D+wLBBA+9AmZQ6O2JqMuCR9SDIEHHm7g=",
+        "lastModified": 1635322515,
+        "narHash": "sha256-PdD6Q+Fo+0uahqj5uYDZ2T8s647W1WDx6HgQ5LDDp5Q=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "2abb3014b87c0b63bb30be4e199c7bf280d05807",
+        "rev": "fe10413485850c15c53744644721fd0c8a351d70",
         "type": "github"
       },
       "original": {
@@ -82,11 +113,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1632620331,
-        "narHash": "sha256-6KqtlHdteNmeaPez9egvYebcytvT7PcGkIQ2giSNOEQ=",
+        "lastModified": 1635277393,
+        "narHash": "sha256-pFFB7267CdwMXK/rrWpmLFYzA3e7+2AD8MAh2EX1+PI=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "b3b02eb52943fdc8ba74af3b485e9d11655bc9c9",
+        "rev": "a5d6f36fc7e67aa008b4ae8a72b1367a765660b8",
         "type": "github"
       },
       "original": {
@@ -98,11 +129,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1632267580,
-        "narHash": "sha256-AvNXdmaPHYs6idbfgu1H40vEw4Wq15xLAgCnpCN1l1A=",
+        "lastModified": 1635319124,
+        "narHash": "sha256-Ldh40imhLYF8kGy9wSI2NWW6qiB/9lJ0C6CT2Yr1L6E=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "3cc8c47af31798040ea62499090540413279f832",
+        "rev": "0bb7b0906c353703c2eea36bd73134f0216f3e62",
         "type": "github"
       },
       "original": {
@@ -113,11 +144,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1632411313,
-        "narHash": "sha256-lekODc44lVo9/0EwGiX6LoEt2KhiPdcfNopealMJ7n4=",
+        "lastModified": 1634782485,
+        "narHash": "sha256-psfh4OQSokGXG0lpq3zKFbhOo3QfoeudRcaUnwMRkQo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "51bcdc4cdaac48535dabf0ad4642a66774c609ed",
+        "rev": "34ad3ffe08adfca17fcb4e4a47bb5f3b113687be",
         "type": "github"
       },
       "original": {
@@ -129,11 +160,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1632639184,
-        "narHash": "sha256-fRLxre+gPxIkjFVj17O68pyAWU1cxT20XFOiulIWzRw=",
+        "lastModified": 1635280654,
+        "narHash": "sha256-n0DKD1rG4gLZx6vDnalrQ5obZA9Y7uaOShTDSaOWGhM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fd8a7fd07da0f3fc0e27575891f45c2f88e5dd44",
+        "rev": "5ebb1dca9bb056649cbd023f953c0c4e7970bb72",
         "type": "github"
       },
       "original": {
@@ -143,12 +174,50 @@
         "type": "github"
       }
     },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1633422745,
+        "narHash": "sha256-gA6Ok64nPbkjHk3Oanq4641EeYkjcKhisDF9wBjLxEk=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "8e1eab9eae4278c9bb1dcae426848a581943db5a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
         "neovim": "neovim",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_2",
+        "statix": "statix"
+      }
+    },
+    "statix": {
+      "inputs": {
+        "import-cargo": "import-cargo",
+        "mozillapkgs": "mozillapkgs",
+        "nixpkgs": "nixpkgs_3"
+      },
+      "locked": {
+        "lastModified": 1635334468,
+        "narHash": "sha256-75TMc5K/lhnUuejvtFMJjnNHU9gElZG1+YIV765terM=",
+        "owner": "nerdypepper",
+        "repo": "statix",
+        "rev": "463577d2375df83854ae2dbe3359808c011a773a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nerdypepper",
+        "ref": "vim-plugin",
+        "repo": "statix",
+        "type": "github"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 330ca03..b454cc9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,6 +9,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     neovim.url = "github:nix-community/neovim-nightly-overlay";
+    statix.url = "github:nerdypepper/statix";
   };
 
   outputs =
@@ -17,11 +18,13 @@
     , nixos-hardware
     , home-manager
     , neovim
+    , statix
     , ...
     } @ inputs: {
 
       overlays = {
         nvim-nightly = neovim.overlay;
+        statix = statix.overlay;
       };
 
       nixosConfigurations = {
@@ -46,7 +49,6 @@
           ];
         };
       };
-
     };
 
 }
diff --git a/home.nix b/home.nix
index 3e52d11..11b5eb7 100644
--- a/home.nix
+++ b/home.nix
@@ -1,6 +1,7 @@
 { config
 , pkgs
 , theme
+, self
 , ...
 }:
 
@@ -62,6 +63,7 @@
     nixpkgs-review
     nixpkgs-fmt
     nix-prefetch-scripts
+    statix
 
   ] ++ (import ./scripts { inherit pkgs; });
 
diff --git a/hosts/olive/configuration.nix b/hosts/olive/configuration.nix
index 3c15f74..f36bc3f 100644
--- a/hosts/olive/configuration.nix
+++ b/hosts/olive/configuration.nix
@@ -65,6 +65,7 @@
 
   nixpkgs.overlays = with self.overlays; [
     nvim-nightly
+    statix
   ];
 
   environment.systemPackages = with pkgs; [
diff --git a/programs/default.nix b/programs/default.nix
index 8efcdf9..74a6ad2 100644
--- a/programs/default.nix
+++ b/programs/default.nix
@@ -1,6 +1,7 @@
 { config
 , pkgs
 , theme
+, self
 , ...
 }:
 
diff --git a/programs/neovim.nix b/programs/neovim.nix
index e163d48..40f3998 100644
--- a/programs/neovim.nix
+++ b/programs/neovim.nix
@@ -1,5 +1,6 @@
 { config
 , pkgs
+, self
 , ...
 }:
 
@@ -23,6 +24,8 @@
       (nvim-treesitter.withPlugins (_: pkgs.tree-sitter.allGrammars))
       completion-nvim
 
+      pkgs.statix-vim
+
       # tpope
       vim-surround
       vim-unimpaired
diff --git a/scripts/webcam.nix b/scripts/webcam.nix
deleted file mode 100644
index 0658dab..0000000
--- a/scripts/webcam.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /usr/bin/env bash
-
-mpv av://v4l2:/dev/video0 \
-    --profile=low-latency \
-    --untimed \
diff --git a/services/dunst.nix b/services/dunst.nix
index 8882ade..41cbc2a 100644
--- a/services/dunst.nix
+++ b/services/dunst.nix
@@ -28,6 +28,7 @@ with theme;
         follow = "mouse";
         sticky_history = "yes";
         history_length = "20";
+        icon_folders = "/usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/";
         show_indicators = "yes";
         line_height = "0";
         separator_height = "0";