9 files changed, 73 insertions, 63 deletions

diff --git a/flake.lock b/flake.lock
index 300d0af..df6b66f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,10 +2,7 @@
   "nodes": {
     "fenix": {
       "inputs": {
-        "nixpkgs": [
-          "statix",
-          "nixpkgs"
-        ],
+        "nixpkgs": "nixpkgs_4",
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
@@ -55,10 +52,7 @@
     },
     "gitignore": {
       "inputs": {
-        "nixpkgs": [
-          "statix",
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs_5"
       },
       "locked": {
         "lastModified": 1635165013,
@@ -99,7 +93,7 @@
       "inputs": {
         "flake-compat": "flake-compat",
         "neovim-flake": "neovim-flake",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
         "lastModified": 1639901638,
@@ -118,10 +112,7 @@
     "neovim-flake": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "neovim",
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs"
       },
       "locked": {
         "dir": "contrib",
@@ -156,6 +147,22 @@
     },
     "nixpkgs": {
       "locked": {
+        "lastModified": 1640319671,
+        "narHash": "sha256-ZkKmakwaOaLiZOpIZWbeJZwap5CzJ30s4UJTfydYIYc=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "eac07edbd20ed4908b98790ba299250b5527ecdf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
         "lastModified": 1639699734,
         "narHash": "sha256-tlX6WebGmiHb2Hmniff+ltYp+7dRfdsBxw9YczLsP60=",
         "owner": "nixos",
@@ -170,7 +177,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1640443850,
         "narHash": "sha256-s3EhD+iNjyIE/gZkV5vES6d0eI4dJ2WBlaXyUsEmaek=",
@@ -186,7 +193,37 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1640319671,
+        "narHash": "sha256-ZkKmakwaOaLiZOpIZWbeJZwap5CzJ30s4UJTfydYIYc=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "eac07edbd20ed4908b98790ba299250b5527ecdf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1640418986,
+        "narHash": "sha256-a8GGtxn2iL3WAkY5H+4E0s3Q7XJt6bTOvos9qqxT5OQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "5c37ad87222cfc1ec36d6cd1364514a9efc2f7f2",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1638036523,
         "narHash": "sha256-ZL6gogsuBmhBvIro+YwRKrypYhwVPCOOO7FmhOV/xyE=",
@@ -207,7 +244,7 @@
         "home-manager": "home-manager",
         "neovim": "neovim",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "statix": "statix"
       }
     },
@@ -232,7 +269,7 @@
       "inputs": {
         "fenix": "fenix",
         "gitignore": "gitignore",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
         "lastModified": 1639455627,
diff --git a/home.nix b/home.nix
index 2341bc5..a51f12f 100644
--- a/home.nix
+++ b/home.nix
@@ -25,7 +25,6 @@
     curl
     tmux
     weechat
-    rofi
     firefox
     xclip
     ripgrep
diff --git a/hosts/olive/configuration.nix b/hosts/olive/configuration.nix
index f25e6e4..9ad0e09 100644
--- a/hosts/olive/configuration.nix
+++ b/hosts/olive/configuration.nix
@@ -88,14 +88,18 @@
   };
 
   sound.enable = true;
-  hardware.pulseaudio = {
-    enable = true;
-    package = pkgs.pulseaudioFull;
-    extraConfig = "load-module module-switch-on-connect";
-  };
 
-  hardware.bluetooth.enable = true;
-  hardware.bluetooth.powerOnBoot = true;
+  hardware = {
+    pulseaudio = {
+      enable = true;
+      package = pkgs.pulseaudioFull;
+      extraConfig = "load-module module-switch-on-connect";
+    };
+    bluetooth = {
+      enable = true;
+      powerOnBoot = true;
+    };
+  };
 
   # Enable the X11 windowing system.
   services.xserver = {
@@ -121,7 +125,7 @@
   nix = {
     package = pkgs.nixUnstable;
     extraOptions = ''
-      experimental-features = nix-command flakes ca-references ca-derivations
+      experimental-features = nix-command flakes ca-derivations
       warn-dirty = false
       keep-outputs = true
       keep-derivations = true
diff --git a/programs/default.nix b/programs/default.nix
index 3175c64..8157c8a 100644
--- a/programs/default.nix
+++ b/programs/default.nix
@@ -49,5 +49,6 @@
       enableBashIntegration = true;
     };
     gpg.enable = true;
+    info.enable = true;
   };
 }
diff --git a/programs/fzf.nix b/programs/fzf.nix
index 92614f6..f6b7f55 100644
--- a/programs/fzf.nix
+++ b/programs/fzf.nix
@@ -2,7 +2,7 @@
   programs.fzf = {
     enable = true;
     enableBashIntegration = true;
-    defaultOptions = [ "--height 40%" "--layout=reverse" "--color=bw" ];
+    defaultOptions = [ "--height 40%" "--layout reverse" "--color bw" ];
     defaultCommand = "rg -L --files";
     changeDirWidgetCommand = "fd --type d";
   };
diff --git a/programs/readline.nix b/programs/readline.nix
index e7b7b33..8afdd82 100644
--- a/programs/readline.nix
+++ b/programs/readline.nix
@@ -7,7 +7,7 @@
   programs.readline = {
     enable = true;
     bindings = {
-      "\\C-o" = ''tmux-fzf\n'';
+      "\\C-o" = ''"tmux-fzf\n"'';
       "\\t" = "menu-complete";
       "\\e[Z" = "menu-complete-backward";
     };
diff --git a/services/dunst.nix b/services/dunst.nix
index 41cbc2a..6037d67 100644
--- a/services/dunst.nix
+++ b/services/dunst.nix
@@ -12,7 +12,7 @@ with theme;
       global = {
         font = "Input 9";
         allow_markup = "no";
-        format = "%s\n%b";
+        format = ''%s\n%b'';
         sort = "yes";
         indicate_hidden = "yes";
         alignment = "right";
@@ -35,7 +35,7 @@ with theme;
         padding = "20";
         horizontal_padding = "20";
         separator_color = "auto";
-        startup_notification = "true";
+        startup_notification = "false";
       };
 
       urgency_normal = {
@@ -57,8 +57,8 @@ with theme;
       };
 
       frame = {
-        width = 2;
-        color = base01;
+        width = 0;
+        color = base00;
       };
 
       shortcuts = {
diff --git a/x/default.nix b/x/default.nix
index cd64f61..01adb7a 100644
--- a/x/default.nix
+++ b/x/default.nix
@@ -8,7 +8,6 @@
   imports = [
     ./2bwm.nix
     ./xft.nix
-    ./rofi.nix
     ./rxvt.nix
   ];
 }
diff --git a/x/rofi.nix b/x/rofi.nix
deleted file mode 100644
index ff80b05..0000000
--- a/x/rofi.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ config
-, pkgs
-, theme
-, ...
-}:
-
-with theme;
-{
-  xresources.properties = {
-    "rofi.color-enabled" = true;
-
-    "rofi.color-window" = "${base00}, ${base00}, ${base00}, ${base00}, ${base03}";
-    "rofi.color-normal" = "${base00}, ${base03}, ${base00}, ${base00}, ${base07}";
-    "rofi.color-active" = "${base03}, ${base0E}, ${base00}, ${base0B}, ${base00}";
-    "rofi.color-urgent" = "${base00}, ${base03}, ${base00}, ${base00}, ${base03}";
-
-    "rofi.fake-transparency" = true;
-    "rofi.font" = "Input 13";
-    "rofi.columns" = 1;
-    "rofi.separator-style" = "none";
-    "rofi.hide-scrollbar" = true;
-    "rofi.location" = 1;
-    "rofi.yoffset" = 20;
-    "rofi.xoffset" = 20;
-    "rofi.padding" = 32;
-    "rofi.fullscreen" = false;
-    "rofi.width" = 300;
-    "rofi.lines" = 6;
-  };
-}