This commit is contained in:
Daniel Olsen 2020-07-11 17:53:23 +02:00
commit afb6331393
11 changed files with 109 additions and 128 deletions

View File

@ -10,6 +10,7 @@
profiles.xsession.enable = true; profiles.xsession.enable = true;
profiles.zsh.enable = true; profiles.zsh.enable = true;
profiles.games.enable = true;
programs.home-manager = { programs.home-manager = {
enable = true; enable = true;

View File

@ -7,9 +7,11 @@
eth = "enp0s25"; eth = "enp0s25";
}; };
profiles.base.enable = true; profiles.base.enable = true;
profiles.gui.enable = true;
profiles.xsession.enable = true; profiles.xsession.enable = true;
profiles.zsh.enable = true; profiles.zsh.enable = true;
profiles.games.enable = true;
programs.home-manager = { programs.home-manager = {
enable = true; enable = true;

View File

@ -1,43 +0,0 @@
self: super:
{
ffmpeggit = super.ffmpeg-full.overrideAttrs (old: rec {
version = "4.2.2-0vhi3x2irg";
src = super.fetchurl {
url = "http://www.ffmpeg.org/releases/ffmpeg-snapshot-git.tar.bz2";
sha256 = "14pjy4w7a9g5dn5mssd5lzfl6pz5g8wgqz9fd4cb26dbrfb97i1b";
};
configureFlags = [
"--enable-gpl"
"--enable-version3"
"--disable-debug"
"--enable-static"
"--disable-ffplay"
"--disable-indev=sndio"
"--disable-outdev=sndio"
"--cc=gcc"
"--enable-fontconfig"
"--enable-gnutls"
"--enable-gmp"
"--enable-libgme"
"--enable-gray"
"--enable-libaom"
"--enable-libfribidi"
"--enable-libass"
"--enable-libfreetype"
"--enable-libopencore-amrnb"
"--enable-libopencore-amrwb"
"--enable-libsoxr"
"--enable-libopus"
"--enable-libtheora"
"--enable-libvo-amrwbenc"
"--enable-libwebp"
"--enable-libx264"
"--enable-libdav1d"
];
patches = [];
});
myffmpeg = self.ffmpeggit.override (OldAttr: {
libaom = self.mylibaom;
});
}

View File

@ -1,22 +0,0 @@
self: super:
{
superTuxKartmp = super.superTuxKart.overrideAttrs(old: rec {
name = "superTuxKart-multiplayer";
srcs = [
(super.fetchFromGitHub {
owner = "supertuxkart";
repo = "stk-code";
rev = "bb31d6b2265b86f5128f940584cee5ae3f033eaf";
sha256 = "0dpc3jrwdc7wv12z3hs0xc5xcdmh9i36164l46fi28bhfj9234c0";
name = "stk-code";
})
(super.fetchsvn {
url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets";
rev = "17940";
sha256 = "1nhzvqh7x4jdvrck8k5xm7pvc6vyyjrdkqzlr2jnpx08mgjvgl0d";
name = "stk-assets";
})
];
});
}

View File

@ -18,43 +18,18 @@ in {
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
libguestfs #libguestfs
virtmanager #ansible
virt-viewer #nixops
ansible
nixops
ldns ldns
lsof
htop htop
file file
tmux tmux
# danstable.mangohud
steam
dolphinEmuMaster
dwarf-fortress-packages.dwarf-fortress-full
multimc
superTuxKart
# warsow
minetest
mpv
sxiv
spotify
mumble
dolphin
krename
kdeApplications.dolphin-plugins
ffmpegthumbs
kdeApplications.kdegraphics-thumbnailers
kdeFrameworks.kded
kdeFrameworks.kio
kdeApplications.kio-extras
unzip unzip
p7zip p7zip
parallel parallel
@ -66,45 +41,63 @@ in {
bat bat
ripgrep ripgrep
mkvtoolnix
# unstable.youtubeDL
ffmpeg-full
] ++ lib.optionals config.profiles.gui.enable [
# virtmanager
# virt-viewer
mpv
sxiv
spotify
mumble
dolphin
konsole
krename
kdeApplications.dolphin-plugins
ffmpegthumbs
kdeApplications.kdegraphics-thumbnailers
kdeFrameworks.kded
kdeFrameworks.kio
kdeApplications.kio-extras
dan.rank_photos dan.rank_photos
# ***REMOVED*** # ***REMOVED***
dan.photini
gnome3.gedit gnome3.gedit
unstable.vscode unstable.vscode
texlive.combined.scheme-full # texlive.combined.scheme-full
kile # kile
libreoffice-unwrapped libreoffice-unwrapped
gimp gimp
krita # krita
inkscape # inkscape
digikam # digikam
godot # godot
blender # blender
audacity # audacity
mixxx # mixxx
ardour # ardour
kdenlive kdenlive
frei0r frei0r
mkvtoolnix
unstable.youtubeDL
ffmpeg-full
geogebra geogebra
]; ];
programs.firefox = { programs.firefox = {
enable = true; enable = config.profiles.gui.enable;
package = pkgs.firefox.override { extraNativeMessagingHosts = [ pkgs.dan.radical-native ]; }; package = pkgs.firefox.override { extraNativeMessagingHosts = [ pkgs.dan.radical-native ]; };
}; };
programs.obs-studio = { programs.obs-studio = {
enable = true; enable = config.profiles.gui.enable;
}; };

View File

@ -1 +1 @@
{ imports = [ ./base ./xsession ./zsh ]; } { imports = [ ./base ./xsession ./zsh ./gui.nix ./games ]; }

View File

@ -0,0 +1,32 @@
{ config, lib, pkgs, ... }:
let
cfg = config.profiles.games;
gui = config.profiles.gui;
in {
options.profiles.games = {
enable = lib.mkEnableOption "Whether or not to install video game software";
};
config = lib.mkIf cfg.enable {
home.packages = with pkgs; [
fortune
lolcat
neofetch
pipes
] ++ lib.optionals config.profiles.gui.enable [
steam
multimc
# minetest
# dwarf-fortress-packages.dwarf-fortress-full
# superTuxKart
# warsow
xonotic
zeroad
# dolphinEmuMaster
];
};
}

11
profiles/gui.nix Normal file
View File

@ -0,0 +1,11 @@
{ config, lib, pkgs, ... }:
let
cfg = config.profiles.base;
in {
options.profiles.gui = {
enable = lib.mkEnableOption "Whether or not to install programs with user-interfaces";
};
}

View File

@ -4,6 +4,8 @@
config = lib.mkIf config.profiles.xsession.enable { config = lib.mkIf config.profiles.xsession.enable {
home.packages = [ home.packages = [
pkgs.jack2 pkgs.jack2
] ++ lib.optionals config.profiles.gui.enable [
pkgs.pavucontrol
pkgs.qjackctl pkgs.qjackctl
]; ];

View File

@ -12,13 +12,15 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
profiles.gui.enable = true;
home.keyboard = { home.keyboard = {
layout = "no-latin1"; layout = "no-latin1";
}; };
services.random-background = { services.random-background = {
enable = true; enable = true;
imageDirectory = "%h/wallpapers"; imageDirectory = "${pkgs.dan.wallpapers}";
interval = "30m"; interval = "30m";
}; };
@ -102,7 +104,6 @@ in
home.packages = [ home.packages = [
pkgs.brightnessctl pkgs.brightnessctl
pkgs.pavucontrol
pkgs.xorg.xkill pkgs.xorg.xkill
pkgs.arandr pkgs.arandr

View File

@ -96,7 +96,9 @@ in
ramp-signal-4 = ""; ramp-signal-4 = "";
ramp-signal-foreground = "\${colors.foreground-alt}"; ramp-signal-foreground = "\${colors.foreground-alt}";
}; };
"module/eth" = { "module/eth" = if config.machine.eth != null
then
{
type = "internal/network"; type = "internal/network";
interface = "${config.machine.eth}"; interface = "${config.machine.eth}";
interval = "3.0"; interval = "3.0";
@ -107,7 +109,9 @@ in
label-connected = "%local_ip%"; label-connected = "%local_ip%";
format-disconnected = ""; format-disconnected = "";
}; }
else
null;
"module/filesystem" = { "module/filesystem" = {
type = "internal/fs"; type = "internal/fs";
interval = 25; interval = 25;