some fixes

This commit is contained in:
Dmitriy Kholkin 2020-08-08 23:23:15 +04:00
parent 0dcbe85cc3
commit a4a02134dd
5 changed files with 18 additions and 28 deletions

View File

@ -39,18 +39,6 @@
}; };
}; };
# outputs = inputs@{ nixpkgs, ... }: {
# nixosConfigurations.NixOS-VM =
# let
# name = "NixOS-VM";
# in nixpkgs.lib.nixosSystem {
# modules = [ (import ./default.nix) ];
# # Select the target system here.
# system = "x86_64-linux";
# specialArgs = { inherit inputs name; };
# };
# };
outputs = { nixpkgs, nix, self, ... }@inputs: { outputs = { nixpkgs, nix, self, ... }@inputs: {
nixosConfigurations = with nixpkgs.lib; nixosConfigurations = with nixpkgs.lib;
let let
@ -66,17 +54,5 @@
legacyPackages.x86_64-linux = legacyPackages.x86_64-linux =
(builtins.head (builtins.attrValues self.nixosConfigurations)).pkgs; (builtins.head (builtins.attrValues self.nixosConfigurations)).pkgs;
# nix run github:serokell/deploy
# Because sudo requires local presence of my Yubikey, we have to manually activate the system
# sudo nix-env -p /nix/var/nix/profiles/system --set /nix/var/nix/profiles/per-user/alukard/system;
# sudo /nix/var/nix/profiles/system/bin/switch-to-configuration switch
deploy = {
user = "alukard";
nodes = builtins.mapAttrs (_: conf: {
hostname = conf.config.networking.hostName;
profiles.system.path = conf.config.system.build.toplevel;
}) self.nixosConfigurations;
};
}; };
} }

Binary file not shown.

View File

@ -24,7 +24,6 @@ in {
cifs-utils cifs-utils
] ++ lib.optionals isLaptop [ ] ++ lib.optionals isLaptop [
# acpi # acpi
#
] ++ lib.optionals (!isVM) [ ] ++ lib.optionals (!isVM) [
# rust-stable # rust-stable
] ++ lib.optionals (device == "AMD-Workstation") [ ] ++ lib.optionals (device == "AMD-Workstation") [
@ -60,13 +59,14 @@ in {
nomino # rust build nomino # rust build
bpytop bpytop
nnn nnn
micro
# vimv # vimv
# cli # cli
ranger ranger
youtube-dl youtube-dl
pywal pywal
# python27Packages.pygtk python27Packages.pygtk # pywal GTK2 reload
# python2 python2 # pywal GTK2 reload
# ncmpcpp # ncmpcpp
(youtube-to-mpv.override { isLaptop = isLaptop; }) (youtube-to-mpv.override { isLaptop = isLaptop; })

View File

@ -24,6 +24,20 @@
bpytop = pkgs.callPackage ./applications/bpytop.nix { }; bpytop = pkgs.callPackage ./applications/bpytop.nix { };
# micro = super.micro.overrideAttrs (old: rec {
# version = "2.0.6";
# src = inputs.micro;
# });
discord = super.discord.overrideAttrs (old: rec {
version = "0.0.11";
src = pkgs.fetchurl {
url = "https://dl.discordapp.net/apps/linux/0.0.11/discord-0.0.11.tar.gz";
sha256 = "1saqwigi1gjgy4q8rgnwyni57aaszi0w9vqssgyvfgzff8fpcx54";
};
});
# git-with-libsecret = super.git.override { withLibsecret = true; }; # git-with-libsecret = super.git.override { withLibsecret = true; };
# spotifyd = super.spotifyd.override { withPulseAudio = true; }; # spotifyd = super.spotifyd.override { withPulseAudio = true; };