all repos — nixfiles @ 017d0672aaa6ff6d05f5bce4f7f7bdc19f679b26

System and user configuration, managed by nix and home-manager

Banish unstable overlay

Alan Pearce
commit

017d0672aaa6ff6d05f5bce4f7f7bdc19f679b26

parent

880f752dc8d2f8c2457ddabd64623a7f4ec5a717

M user/settings/base.nixuser/settings/base.nix
@@ -46,40 +46,46 @@ XDG_CONFIG_HOME = "${HOME}/.config";
XDG_DATA_HOME = "${HOME}/.local/share"; }; - programs.zsh.shellAliases = { - make = "${pkgs.remake}/bin/remake"; - }; - programs.htop = { - enable = true; - settings = { - header_margin = 0; - tree_view = 1; - hide_kernel_threads = 1; - hide_userland_threads = 1; + programs.zsh.shellAliases = { + make = "${pkgs.remake}/bin/remake"; }; - }; - home.packages = with pkgs; [ - pv - fd - sd - entr - ripgrep - iftop - nmap - moreutils - mtr - tree - abduco - dvtm - unstable.vimv - ] ++ ( - if !stdenv.isDarwin - then [ - file - ldns - lsof - unar - zip - ] else [ - ]); + programs.htop = { + enable = true; + settings = { + header_margin = 0; + tree_view = 1; + hide_kernel_threads = 1; + hide_userland_threads = 1; + }; + }; + home.packages = with pkgs; + [ + pv + fd + sd + entr + ripgrep + iftop + nmap + moreutils + mtr + tree + abduco + dvtm + vimv + ] ++ + ( + if !stdenv.isDarwin + then + [ + file + ldns + lsof + unar + zip + ] + else + [ + ] + ); }
M user/settings/darwin.nixuser/settings/darwin.nix
@@ -39,7 +39,7 @@ aspellDicts.en
darwin-zsh-completions ]; - programs.emacs.package = pkgs.unstable.emacsMacport; + programs.emacs.package = pkgs.emacsMacport; home.file.".hushlogin".text = "";
M user/settings/development/web.nixuser/settings/development/web.nix
@@ -5,6 +5,6 @@ vscode-css-languageserver-bin
vscode-html-languageserver-bin csslint ] ++ [ - pkgs.unstable.nodePackages.stylelint + pkgs.nodePackages.stylelint ]; }
M user/settings/gaming.nixuser/settings/gaming.nix
@@ -1,15 +1,12 @@
{ config, pkgs, ... }: -let - unstablePkgs = import <nixos-unstable> {}; -in { - home.packages = with unstablePkgs; [ + home.packages = with pkgs; [ steam wineWowPackages.stable # winetricks - pkgs.lutris + lutris discord ]; }
M user/settings/nixpkgs.nixuser/settings/nixpkgs.nix
@@ -3,7 +3,6 @@
let inherit (pkgs) stdenv; stableConfig = config.nixpkgs.config; - unstablePkgs = if stdenv.isDarwin then import <nixpkgs-unstable> { config = stableConfig; } else import <nixos-unstable> {}; in { imports = [
@@ -13,7 +12,6 @@ nixpkgs.overlays = [
(self: super: { firefox-bin-unwrapped = super.firefox-bin-unwrapped.override { systemLocale = "en-GB"; }; firefox-devedition-bin-unwrapped = super.firefox-devedition-bin-unwrapped.override { systemLocale = "en-GB"; }; - unstable = unstablePkgs; }) ]; }
M user/settings/satoshipay.nixuser/settings/satoshipay.nix
@@ -16,7 +16,7 @@ home.sessionVariables = {
KUBECTX_IGNORE_FZF = "1"; }; home.packages = with pkgs; ([ - unstable.caddy + caddy openssl mongodb-tools pgcli
@@ -37,9 +37,9 @@ kubernetes-helm
helmfile ] ++ (lib.optionals (!stdenv.isDarwin) [ - unstable.docker-compose + docker-compose - unstable.ripcord + ripcord robo3t ]));
M user/settings/user-interface.nixuser/settings/user-interface.nix
@@ -19,7 +19,7 @@ enablePlasmaBrowserIntegration = true;
}; home.packages = with pkgs; [ librewolf - unstable.logseq + logseq ] ++ lib.optionals (!stdenv.isDarwin) (with pkgs; [ falkon mu