Commit unstaged changes

This commit is contained in:
PapaTutuWawa 2021-12-06 13:39:37 +01:00
parent 1a8be4181d
commit d915ba331b
6 changed files with 34 additions and 20 deletions

View File

@ -22,18 +22,18 @@
replaysorcery # Custom package replaysorcery # Custom package
#evdev-proxy # Custom package #evdev-proxy # Custom package
vfio-isolate # Custom Package vfio-isolate # Custom Package
steam-wrapped steam-wrapped discord-wrapped # Custom package
discord-wrapped # Custom package
superpaper # Custom package
mumble mumble
piper piper
anime-dl trackma # Custom package trackma # Custom package
anime-dl # Custom package
thunderbird thunderbird
multimc-wrapped # Custom package multimc-wrapped # Custom package
nwg-launchers nwg-launchers
gnome-podcasts gnome-podcasts
cantata cantata
newsflash newsflash
sublime-music-no-test
]; ];
ptw = { ptw = {
@ -42,7 +42,7 @@
primaryScreen = "C27F398"; primaryScreen = "C27F398";
enable = true; enable = true;
}; };
sway.enable = true; #sway.enable = true;
alacritty.enable = true; alacritty.enable = true;
emacs.enable = true; emacs.enable = true;
firefox.enable = true; firefox.enable = true;
@ -55,6 +55,7 @@
}; };
xournalpp.enable = true; xournalpp.enable = true;
zsh.enable = true; zsh.enable = true;
plasma.enable = true;
}; };
services = { services = {
gamemode.enable = true; gamemode.enable = true;
@ -93,7 +94,7 @@
}; };
}; };
}; };
swaync.enable = true; #swaync.enable = true;
key-mapper.enable = true; key-mapper.enable = true;
}; };
system = { system = {
@ -165,12 +166,12 @@
layout = "de"; layout = "de";
libinput.enable = true; libinput.enable = true;
displayManager.gdm = { displayManager.gdm = {
enable = true;
wayland = true; wayland = true;
enable = true;
}; };
}; };
}; };
# TODO: Move into modules # TODO: Move into modules
systemd.user.services = { systemd.user.services = {
scream = { scream = {

View File

@ -98,7 +98,7 @@ in {
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
"firmwareLinuxNonfree" "microcodeAmd" "microcodeIntel" "firmwareLinuxNonfree" "microcodeAmd" "microcodeIntel"
"steam" "steam-original" "steam-runtime" "steam" "steam-original" "steam-runtime"
"discord" "discord" "minecraft"
]; ];
services = { services = {

View File

@ -25,6 +25,7 @@ in {
libsForQt5.kdeconnect-kde libsForQt5.kdeconnect-kde
index-fm index-fm
kasts-git kasts-git
rsibreak
]; ];
}; };
} }

View File

@ -14,7 +14,7 @@ in {
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
home-manager.users."${config.ptw.system.singleUser}" = { home-manager.users."${config.ptw.system.singleUser}" = {
xdg.configFile."waybar/style.css".source = ./style.css; xdg.configFile."waybar/style.css".source = lib.mkForce ./style.css;
programs.waybar = { programs.waybar = {
enable = true; enable = true;
style = builtins.readFile ./style.css; style = builtins.readFile ./style.css;

View File

@ -61,14 +61,26 @@ key-mapper = prev.callPackage ./tools/games/key-mapper {};
multimc-wrapped = wrapInSandbox { multimc-wrapped = wrapInSandbox {
name = "multimc"; name = "multimc";
package = prev.multimc; package = prev.multimc.override {
jdk = prev.jdk11;
jdk8 = prev.jdk11;
};
binaryName = "multimc"; binaryName = "multimc";
mountInHome = [ ".local/share/multimc" ]; mountInHome = [ ".local/share/multimc" ];
additionalBlacklist = [ "/mnt" ]; additionalBlacklist = [ "/mnt" ];
chdirTo = "/home/$USER"; chdirTo = "/home/$USER";
extraEnv = { #extraEnv = {
DRI_PRIME = "1"; # DRI_PRIME = "1";
}; #};
};
minecraft-wrapped = wrapInSandbox {
name = "minecraft-launcher";
package = prev.minecraft;
binaryName = "minecraft-launcher";
mountInHome = [ ".local/share/minecraft" ".minecraft" ];
additionalBlacklist = [ "/mnt" ];
chdirTo = "/home/$USER";
}; };
steam-wrapped = wrapInSandbox { steam-wrapped = wrapInSandbox {
@ -98,10 +110,10 @@ key-mapper = prev.callPackage ./tools/games/key-mapper {};
xournalpp-git = prev.xournalpp.overrideAttrs (old: { xournalpp-git = prev.xournalpp.overrideAttrs (old: {
version = "1.1.1"; version = "1.1.1";
src = prev.fetchFromGitHub { src = prev.fetchFromGitHub {
owner = "xournalpp"; owner = "bhennion";
repo = "xournalpp"; repo = "xournalpp";
rev = "master"; rev = "5d1545b0c4303e45b4ddf4ef8a1565eba822a9af";
sha256 = "1scwnjzlp27vx5gqx8zk3zy9swwn0xhv550ig4nmjjx609ic1j7n"; sha256 = "1d17lvydlny9pvaxa9xy53wxs7i6d563lp5r9g3r1xpgnb7zli8v";
}; };
}); });
@ -126,7 +138,7 @@ key-mapper = prev.callPackage ./tools/games/key-mapper {};
kasts-git = prev.libsForQt5.kasts.overrideAttrs (old: { kasts-git = prev.libsForQt5.kasts.overrideAttrs (old: {
src = builtins.fetchTarball { src = builtins.fetchTarball {
url = "https://invent.kde.org/plasma-mobile/kasts/-/archive/master/kasts-master.tar.gz"; url = "https://invent.kde.org/plasma-mobile/kasts/-/archive/master/kasts-master.tar.gz";
sha256 = "1n7j4011hgscmjj728iyjgifpbnwc1sy32b5aw834n1vgxfkq00l"; sha256 = "sha256:1n7j4011hgscmjj728iyjgifpbnwc1sy32b5aw834n1vgxfkq00l";
}; };
buildInputs = old.buildInputs ++ [ prev.taglib prev.libsForQt5.qtkeychain ]; buildInputs = old.buildInputs ++ [ prev.taglib prev.libsForQt5.qtkeychain ];

View File

@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
src = fetchgit { src = fetchgit {
url = "https://github.com/matanui159/${pname}.git"; url = "https://github.com/matanui159/${pname}.git";
rev = "d8d5921988b5161004aed6209bd88251d721611d"; rev = version;
sha256 = "14m67mlfp0zh9s0bhz1qxppivw2aignxqb51xb5cy3v8farxmcv4"; sha256 = "sha256-nzilMEAOOLrdtfal+y81WJr6LwOVaQpuheIsSN5m83A=";
deepClone = true; deepClone = true;
}; };