Skip to content

Commit

Permalink
config: remove redundant experimental command
Browse files Browse the repository at this point in the history
  • Loading branch information
moni-dz committed Dec 24, 2021
1 parent 9c16334 commit 1146f47
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 20 deletions.
4 changes: 2 additions & 2 deletions config/nix-conf.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
'';
Expand Down
11 changes: 5 additions & 6 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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;
})
Expand Down
7 changes: 0 additions & 7 deletions hosts/superfluous/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,6 @@ in
media-session.config = import ./config/pipewire/media-session.nix;
};

thelounge.enable = true;
usbmuxd.enable = true;
upower.enable = true;

Expand All @@ -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; };
Expand Down
7 changes: 2 additions & 5 deletions users/fortuneteller2k/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ in
python3
qutebrowser
speedtest-cli
spotify-wrapped
# spotify-wrapped
# sublime4
# teams
# torrential
Expand Down Expand Up @@ -161,10 +161,7 @@ in

direnv = {
enable = true;
nix-direnv = {
enable = true;
enableFlakes = true;
};
nix-direnv.enable = true;
};

emacs = {
Expand Down

0 comments on commit 1146f47

Please sign in to comment.