From 1146f47f98c51bbeff9a15e833217c1beec104bb Mon Sep 17 00:00:00 2001
From: fortuneteller2k <lythe1107@gmail.com>
Date: Fri, 24 Dec 2021 08:59:17 +0800
Subject: [PATCH] config: remove redundant experimental command

---
 config/nix-conf.nix                 |  4 ++--
 flake.nix                           | 11 +++++------
 hosts/superfluous/configuration.nix |  7 -------
 users/fortuneteller2k/default.nix   |  7 ++-----
 4 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/config/nix-conf.nix b/config/nix-conf.nix
index d40a0b7..02aacd9 100644
--- a/config/nix-conf.nix
+++ b/config/nix-conf.nix
@@ -19,11 +19,11 @@ rec {
     "fortuneteller2k.cachix.org-1:kXXNkMV5yheEQwT0I4XYh1MaCSz+qg72k8XAi2PthJI="
   ];
 
-  daemonNiceLevel = 1;
+  daemonCPUSchedPolicy = "idle";
   daemonIONiceLevel = 1;
 
   extraOptions = ''
-    experimental-features = ca-references ca-derivations nix-command flakes
+    experimental-features = ca-derivations nix-command flakes
     keep-outputs = true
     keep-derivations = true
   '';
diff --git a/flake.nix b/flake.nix
index 38a014e..0a8bb90 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,21 +15,21 @@
     agenix.url = "github:ryantm/agenix";
     agenix.inputs.nixpkgs.follows = "nixpkgs";
     emacs.url = "github:nix-community/emacs-overlay";
-    home.url = "git+https://github.com/nix-community/home-manager";
+    home.url = "github:nix-community/home-manager";
     home.inputs.nixpkgs.follows = "nixpkgs";
     manix.url = "github:mlvzk/manix";
     manix.inputs.nixpkgs.follows = "nixpkgs";
     neovim.url = "github:neovim/neovim?dir=contrib";
     neovim.inputs.nixpkgs.follows = "nixpkgs";
-    nixpkgs-f2k.url = "git+https://github.com/fortuneteller2k/nixpkgs-f2k";
+    nixpkgs-f2k.url = "github:fortuneteller2k/nixpkgs-f2k";
     nixpkgs-f2k.inputs.nixpkgs.follows = "nixpkgs";
     review.url = "github:Mic92/nixpkgs-review";
     review.inputs.nixpkgs.follows = "nixpkgs";
 
     # Nixpkgs branches
-    master.url = "git+https://github.com/nixos/nixpkgs";
+    master.url = "github:nixos/nixpkgs";
     stable.url = "github:nixos/nixpkgs/nixos-21.05";
-    unstable.url = "git+https://github.com/nixos/nixpkgs?ref=nixos-unstable";
+    unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
     /*
       NOTE: don't use this, if you're not me or a maintainer of the XanMod kernel in Nixpkgs
@@ -39,7 +39,7 @@
     kernel.url = "github:fortuneteller2k/nixpkgs/xanmod-5.13";
 
     # Default Nixpkgs for packages and modules
-    nixpkgs.follows = "unstable";
+    nixpkgs.follows = "master";
   };
 
   outputs = { self, agenix, home, nixpkgs, ... } @ inputs:
@@ -80,7 +80,6 @@
             picom = picom-git;
             slock = slock-fancy;
             iosevka-ft-bin = iosevka;
-            weechat-unwrapped = weechat-unwrapped-git;
             xdg-desktop-portal-wlr = xdg-desktop-portal-wlr-git;
             river = river-git;
           })
diff --git a/hosts/superfluous/configuration.nix b/hosts/superfluous/configuration.nix
index a8f2632..6f277ae 100644
--- a/hosts/superfluous/configuration.nix
+++ b/hosts/superfluous/configuration.nix
@@ -330,7 +330,6 @@ in
       media-session.config = import ./config/pipewire/media-session.nix;
     };
 
-    thelounge.enable = true;
     usbmuxd.enable = true;
     upower.enable = true;
 
@@ -353,12 +352,6 @@ in
         */
         "2bwm".enable = false;
 
-        # FIXME: bling can't be detected
-        # awesome = {
-        #   enable = false;
-        #   luaModules = with pkgs; [ bling ];
-        # };
-
         xmonad = with pkgs; {
           enable = config.services.xserver.enable;
           config = import ./config/xmonad.nix { inherit config pkgs theme; };
diff --git a/users/fortuneteller2k/default.nix b/users/fortuneteller2k/default.nix
index c04d529..b40cb75 100644
--- a/users/fortuneteller2k/default.nix
+++ b/users/fortuneteller2k/default.nix
@@ -104,7 +104,7 @@ in
       python3
       qutebrowser
       speedtest-cli
-      spotify-wrapped
+      # spotify-wrapped
       # sublime4
       # teams
       # torrential
@@ -161,10 +161,7 @@ in
 
     direnv = {
       enable = true;
-      nix-direnv = {
-        enable = true;
-        enableFlakes = true;
-      };
+      nix-direnv.enable = true;
     };
 
     emacs = {