From 0ed27480b5537912449802ae3578949e3321c24f Mon Sep 17 00:00:00 2001 From: Mikhail Klementev Date: Fri, 20 Nov 2020 18:44:01 +0000 Subject: [PATCH] Get rid of unstable --- README.md | 8 ++++---- configuration.nix | 8 +++----- home-manager.nix | 3 +-- packages.nix | 16 +++++++--------- security.nix | 5 ++--- 5 files changed, 17 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 0e3c6ea..b8b797d 100644 --- a/README.md +++ b/README.md @@ -35,8 +35,8 @@ Notes: cp secrets.nix.example secrets.nix nano secrets.nix - nix-channel --add https://nixos.org/channels/nixos-unstable unstable - nix-channel --add https://nixos.org/channels/nixos-20.03-small nixos-small + nix-channel --add https://nixos.org/channels/nixos-20.09 nixos + nix-channel --add https://nixos.org/channels/nixos-20.09-small nixos-small nix-channel --update nixos-generate-config --root /mnt @@ -48,6 +48,6 @@ Notes: Initial password for `user` is `user`. - sudo nix-channel --add https://nixos.org/channels/nixos-unstable unstable - sudo nix-channel --add https://nixos.org/channels/nixos-20.03-small nixos-small + sudo nix-channel --add https://nixos.org/channels/nixos-20.09 nixos + sudo nix-channel --add https://nixos.org/channels/nixos-20.09-small nixos-small sudo nix-channel --update diff --git a/configuration.nix b/configuration.nix index ac1f9ab..20100f0 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,12 +1,10 @@ -# nix-channel --add https://nixos.org/channels/nixos-20.03 nixos -# nix-channel --add https://nixos.org/channels/nixos-20.03-small nixos-small -# nix-channel --add https://nixos.org/channels/nixos-unstable unstable +# nix-channel --add https://nixos.org/channels/nixos-20.09 nixos +# nix-channel --add https://nixos.org/channels/nixos-20.09-small nixos-small # nix-channel --update # { config, pkgs, ... }: let - unstable = import {}; nixos-small = import {}; in { imports = @@ -55,7 +53,7 @@ in { boot.loader.efi.canTouchEfiVariables = true; boot.tmpOnTmpfs = true; - system.stateVersion = "20.03"; + system.stateVersion = "20.09"; nix = { trustedUsers = [ "root" "user" ]; diff --git a/home-manager.nix b/home-manager.nix index f607c4c..0c4c2e5 100644 --- a/home-manager.nix +++ b/home-manager.nix @@ -1,7 +1,6 @@ { config, pkgs, ... }: let - unstable = import {}; home-manager = builtins.fetchGit { url = "https://github.com/rycee/home-manager.git"; rev = "7b6ebf2785cfc9dd6fc2b101cbbb2152eb68d45c"; # Updated 17 Nov 2020 @@ -133,7 +132,7 @@ in { ln -fs /tmp/chromium .config/ ln -fs /tmp/chromium .cache/ - ln -fs ${unstable.gtk3}/share/gsettings-schemas/gtk+3-*/glib-2.0 .local/share/ + ln -fs ${pkgs.gtk3}/share/gsettings-schemas/gtk+3-*/glib-2.0 .local/share/ kitty --class=viewShiftW3 & emacs & diff --git a/packages.nix b/packages.nix index db29a3a..3bbbf69 100644 --- a/packages.nix +++ b/packages.nix @@ -2,8 +2,6 @@ let nonfree = import { config.allowUnfree = true; }; - unstable = import {}; - unstable-nonfree = import { config.allowUnfree = true; }; in { programs.zsh.enable = true; programs.browserpass.enable = true; @@ -29,7 +27,7 @@ in { services.tor.client.enable = true; environment.systemPackages = with pkgs; [ - unstable-nonfree.codeql + nonfree.codeql # utils wget tmux zsh vim htop acpi bc p7zip mpv @@ -43,7 +41,7 @@ in { pdftk vnstat dunst ghostscript graphicsmagick browsh texlive.combined.scheme-full rubber pandoc jq socat ffmpeg-full exiftool apktool mdl wine zstd - unstable.cointop unstable.tesseract dislocker + cointop tesseract dislocker # gpg-related gnupg yubikey-manager yubikey-personalization @@ -64,7 +62,7 @@ in { binwalk ])) - (unstable.emacsWithPackages(epkgs: + (emacsWithPackages(epkgs: # MELPA (Milkypostman’s Emacs Lisp Package Archive) (with epkgs.melpaPackages; [ # Programming languages modes @@ -105,21 +103,21 @@ in { gnome3.gnome-font-viewer # base x - rofi xlibs.xmodmap xsecurelock unstable.kitty + rofi xlibs.xmodmap xsecurelock kitty libnotify gtk_engines x2x evtest pulsemixer arc-theme xclip gnome3.dconf gnome3.dconf-editor gsettings-desktop-schemas gsettings-qt xorg.xcursorthemes capitaine-cursors gnome3.cheese # x apps - escrotum unstable.wire-desktop evince gimp gnome3.gnome-maps + escrotum wire-desktop evince gimp gnome3.gnome-maps android-file-transfer libreoffice electrum gnome3.nautilus - unstable.signal-desktop + signal-desktop (writeShellScriptBin "git-get" "${git}/bin/git clone https://$1 $GOPATH/src/$1") (writeShellScriptBin "chromium" '' - ${unstable.chromium}/bin/chromium --force-dark-mode \ + ${chromium}/bin/chromium --force-dark-mode \ --start-maximized \ $@ '') diff --git a/security.nix b/security.nix index e78292d..9ab05ad 100644 --- a/security.nix +++ b/security.nix @@ -1,7 +1,6 @@ { config, pkgs, ... }: let - unstable = import {}; fhs = pkgs.writeShellScriptBin "fhs" ("${pkgs.docker}/bin/docker run -v /home/user:/home/user -v /nix:/nix "+ "-e \"HOST_PWD=$PWD\" -it fhs"); @@ -47,7 +46,7 @@ in { %wheel ALL=(ALL:ALL) NOPASSWD: ${pkgs.light}/bin/light %wheel ALL=(captive) NOPASSWD: ${pkgs.firefox}/bin/firefox %wheel ALL=(root) NOPASSWD: ${fhs}/bin/fhs - %wheel ALL=(out-of-tree) NOPASSWD: ${unstable.out-of-tree}/bin/out-of-tree + %wheel ALL=(out-of-tree) NOPASSWD: ${pkgs.out-of-tree}/bin/out-of-tree ''; }; @@ -65,7 +64,7 @@ in { "--cap-add=SYS_PTRACE --security-opt seccomp=unconfined" + " -e \"HOST_PWD=$PWD\" -v /nix=/nix -it fhs")) (writeShellScriptBin "out-of-tree" - "sudo -H -u out-of-tree ${unstable.out-of-tree}/bin/out-of-tree $@") + "sudo -H -u out-of-tree ${pkgs.out-of-tree}/bin/out-of-tree $@") ]; security.wrappers = {