meta: Dump changes
This commit is contained in:
parent
136c3a2340
commit
eb8670c04f
179
flake.lock
179
flake.lock
@ -24,11 +24,11 @@
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1653736770,
|
||||
"narHash": "sha256-Vp8fWSGTEeuWc71rVXsh+ofsHHUPhKunc8aQLGN0ETc=",
|
||||
"lastModified": 1655198178,
|
||||
"narHash": "sha256-S59GMG8VO2r0VkPWNWRktBxCND+jWOei1Km4cWR7XOw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "ff629e757452d010b7c91fdd2597aeca370bcf68",
|
||||
"rev": "25ce68a5d0f177f1cc68f48376ee180dc0f9f292",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -37,6 +37,22 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1650374568,
|
||||
"narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "b4a34015c698c7793d592d66adbab377907a2be8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-helper": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@ -60,11 +76,11 @@
|
||||
},
|
||||
"flake-utils": {
|
||||
"locked": {
|
||||
"lastModified": 1652776076,
|
||||
"narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=",
|
||||
"lastModified": 1653893745,
|
||||
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8",
|
||||
"rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -75,11 +91,11 @@
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"locked": {
|
||||
"lastModified": 1652776076,
|
||||
"narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=",
|
||||
"lastModified": 1653893745,
|
||||
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8",
|
||||
"rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -150,14 +166,18 @@
|
||||
},
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
"flake-compat": "flake-compat",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nmd": "nmd",
|
||||
"nmt": "nmt",
|
||||
"utils": "utils"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1653518057,
|
||||
"narHash": "sha256-cam3Nfae5ADeEs6mRPzr0jXB7+DhyMIXz0/0Q13r/yk=",
|
||||
"lastModified": 1655199284,
|
||||
"narHash": "sha256-R/g2ZWplGWVOfm2TyB4kR+YcOE/uWkgjkYrl/RYgJ/U=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "64831f938bd413cefde0b0cf871febc494afaa4f",
|
||||
"rev": "87d30c164849a7471d99749aa4d2d28b81564f69",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -197,16 +217,16 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1647175256,
|
||||
"narHash": "sha256-7H+veXPM7IwdN1DoZqliwb9sghlN56koV5dnCu1kpsc=",
|
||||
"lastModified": 1653518057,
|
||||
"narHash": "sha256-cam3Nfae5ADeEs6mRPzr0jXB7+DhyMIXz0/0Q13r/yk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "a8d00f5c038cf7ec54e7dac9c57b171c1217f008",
|
||||
"rev": "64831f938bd413cefde0b0cf871febc494afaa4f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-21.11",
|
||||
"ref": "release-22.05",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
@ -219,11 +239,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1650478719,
|
||||
"narHash": "sha256-308c2cM4hW9AW6dSQ080ycXGyEJGkG/OwOINkYL9Mnw=",
|
||||
"lastModified": 1653518057,
|
||||
"narHash": "sha256-cam3Nfae5ADeEs6mRPzr0jXB7+DhyMIXz0/0Q13r/yk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "93a69d07389311ffd6ce1f4d01836bbc2faec644",
|
||||
"rev": "64831f938bd413cefde0b0cf871febc494afaa4f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -303,11 +323,11 @@
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1653463224,
|
||||
"narHash": "sha256-bUxKhqZhki2vPzFTl8HOo1m7pagF7WzY1MZiso8U5ws=",
|
||||
"lastModified": 1654057797,
|
||||
"narHash": "sha256-mXo7C4v7Jj2feBzcReu1Eu/3Rnw5b023E9kOyFsHZQw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "39a7bfc496d2ddfce73fe9542af1f2029ba4fe39",
|
||||
"rev": "0cab18a48de7914ef8cad35dca0bb36868f3e1af",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -336,8 +356,8 @@
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 0,
|
||||
"narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=",
|
||||
"path": "/nix/store/a3i6cnnswvdg4k38jmibnjms65rjvyi7-source",
|
||||
"narHash": "sha256-O3wncIouj9x7gBPntzHeK/Hkmm9M1SGlYq7JI7saTAE=",
|
||||
"path": "/nix/store/d84iknazpzwbjbj1j9zh9wnh6v6dzlfb-source",
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
@ -379,23 +399,27 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 0,
|
||||
"narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=",
|
||||
"path": "/nix/store/a3i6cnnswvdg4k38jmibnjms65rjvyi7-source",
|
||||
"type": "path"
|
||||
"lastModified": 1654230545,
|
||||
"narHash": "sha256-8Vlwf0x8ow6pPOK2a04bT+pxIeRnM1+O0Xv9/CuDzRs=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "236cc2971ac72acd90f0ae3a797f9f83098b17ec",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"type": "indirect"
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1653581809,
|
||||
"narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=",
|
||||
"lastModified": 1655130522,
|
||||
"narHash": "sha256-5dzlxE4okyu+M39yeVtHWQXzDZQxFF5rUB1iY9R6Lb4=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "83658b28fe638a170a19b8933aa008b30640fbd1",
|
||||
"rev": "13f08d71ceff5101321e0291854495a1ec153a5e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -492,13 +516,45 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nmd": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1653339422,
|
||||
"narHash": "sha256-8nc7lcYOgih3YEmRMlBwZaLLJYpLPYKBlewqHqx8ieg=",
|
||||
"owner": "rycee",
|
||||
"repo": "nmd",
|
||||
"rev": "9e7a20e6ee3f6751f699f79c0b299390f81f7bcd",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
"owner": "rycee",
|
||||
"repo": "nmd",
|
||||
"type": "gitlab"
|
||||
}
|
||||
},
|
||||
"nmt": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1648075362,
|
||||
"narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=",
|
||||
"owner": "rycee",
|
||||
"repo": "nmt",
|
||||
"rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
"owner": "rycee",
|
||||
"repo": "nmt",
|
||||
"type": "gitlab"
|
||||
}
|
||||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1653744184,
|
||||
"narHash": "sha256-YzM0ldFW0OtxDOBgCJ7PBTL+NVRLi6SHy2m9U2gDTvw=",
|
||||
"lastModified": 1655199919,
|
||||
"narHash": "sha256-DOwpi0H4SVMKJ+QX/REgNESw6EHVoiQYjdHWyZLOuQs=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nur",
|
||||
"rev": "b6ad2a66f383a92b67f760e63c6fd3c63557e5ef",
|
||||
"rev": "c92906e4e6425ffe1be7d1a52018c1b8d5b40ca6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -546,11 +602,11 @@
|
||||
"rnix-lsp": "rnix-lsp_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1653514768,
|
||||
"narHash": "sha256-TF+BUKHpugRmEG5Fg2PNKBZuP65KBz+27s06oaKZPwM=",
|
||||
"lastModified": 1654961905,
|
||||
"narHash": "sha256-sMIhLZwZ/yMQg4+J3y2ycCUfeXbWzj2PSsg+CGDgI48=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "3f355e8ac0e11bdbb5ab498e12c10c990e578caa",
|
||||
"revCount": 67,
|
||||
"rev": "7513f8c50469f727eadf80fdeca92477e8daef51",
|
||||
"revCount": 71,
|
||||
"type": "git",
|
||||
"url": "https://destiny.ostylk.de/gitea/NixDistro/Home.git"
|
||||
},
|
||||
@ -577,27 +633,27 @@
|
||||
},
|
||||
"pkg-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1647992509,
|
||||
"narHash": "sha256-AG40Nt5OWz0LBs5p457emOuwLKOvTtcv/2fUdnEN3Ws=",
|
||||
"lastModified": 1653733789,
|
||||
"narHash": "sha256-VIYazYCWNvcFNns2XQkHx/mVmCZ3oebZv8W2LS1gLQE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d2caa9377539e3b5ff1272ac3aa2d15f3081069f",
|
||||
"rev": "d1086907f56c5a6c33c0c2e8dc9f42ef6988294f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-21.11",
|
||||
"ref": "nixos-22.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"pkg-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1650161686,
|
||||
"narHash": "sha256-70ZWAlOQ9nAZ08OU6WY7n4Ij2kOO199dLfNlvO/+pf8=",
|
||||
"lastModified": 1653581809,
|
||||
"narHash": "sha256-Uvka0V5MTGbeOfWte25+tfRL3moECDh1VwokWSZUdoY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1ffba9f2f683063c2b14c9f4d12c55ad5f4ed887",
|
||||
"rev": "83658b28fe638a170a19b8933aa008b30640fbd1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -614,7 +670,7 @@
|
||||
"ostylk",
|
||||
"nixpkgs"
|
||||
],
|
||||
"utils": "utils"
|
||||
"utils": "utils_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1640347520,
|
||||
@ -635,7 +691,7 @@
|
||||
"inputs": {
|
||||
"naersk": "naersk_2",
|
||||
"nixpkgs": "nixpkgs_9",
|
||||
"utils": "utils_2"
|
||||
"utils": "utils_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1643586450,
|
||||
@ -668,11 +724,11 @@
|
||||
},
|
||||
"stable": {
|
||||
"locked": {
|
||||
"lastModified": 1645296114,
|
||||
"narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=",
|
||||
"lastModified": 1655034179,
|
||||
"narHash": "sha256-rf1/7AbzuYDw6+8Xvvf3PtEOygymLBrFsFxvext5ZjI=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1",
|
||||
"rev": "046ee4af7a9f016a364f8f78eeaa356ba524ac31",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -721,6 +777,21 @@
|
||||
}
|
||||
},
|
||||
"utils": {
|
||||
"locked": {
|
||||
"lastModified": 1653893745,
|
||||
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"utils_2": {
|
||||
"locked": {
|
||||
"lastModified": 1629481132,
|
||||
"narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
|
||||
@ -735,7 +806,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"utils_2": {
|
||||
"utils_3": {
|
||||
"locked": {
|
||||
"lastModified": 1638122382,
|
||||
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
gajim-mainwindow
|
||||
gajim
|
||||
virt-manager qemu scream
|
||||
replaysorcery # Custom package
|
||||
vfio-isolate # Custom Package
|
||||
@ -49,8 +49,9 @@
|
||||
# Proprietary stuff (yikes)
|
||||
discord-wrapped discord-app-wrapped
|
||||
spotify-wrapped
|
||||
vortex-wrapped
|
||||
zoom-vm
|
||||
|
||||
#lapce
|
||||
];
|
||||
|
||||
ptw = {
|
||||
@ -80,15 +81,14 @@
|
||||
};
|
||||
services = {
|
||||
gamemode.enable = true;
|
||||
gnome.enable = true;
|
||||
gnome.enable = false;
|
||||
logiops.enable = true;
|
||||
input-remapper = {
|
||||
enable = true;
|
||||
postStartCommand = "${pkgs.input-remapper}/bin/input-remapper-control --command start --preset NOOP --device \"Razer Razer Tartarus V2\"";
|
||||
};
|
||||
gdm = {
|
||||
sddm = {
|
||||
enable = true;
|
||||
monitors = ../data/miku/monitors.xml;
|
||||
};
|
||||
};
|
||||
system = {
|
||||
@ -118,7 +118,7 @@
|
||||
};
|
||||
|
||||
boot = let
|
||||
kernel = pkgs.linuxPackages_xanmod;
|
||||
kernel = pkgs.linuxPackages_zen;
|
||||
in {
|
||||
extraModprobeConfig = ''
|
||||
options kvm_amd nested=1
|
||||
|
||||
@ -44,6 +44,7 @@ in inputs.nixpkgs.lib.nixosSystem {
|
||||
emacs.overlay
|
||||
(import ../packages)
|
||||
(import ../overlays/simple.nix)
|
||||
(import ../overlays/phosh.nix)
|
||||
]
|
||||
++ lib.optional bluray (import ../overlays/bluray.nix)
|
||||
++ [
|
||||
|
||||
@ -11,6 +11,7 @@
|
||||
./programs/firefox
|
||||
./programs/gnome
|
||||
./programs/gdm
|
||||
./programs/sddm
|
||||
./programs/gnome-terminal
|
||||
./programs/mpv
|
||||
./programs/git
|
||||
@ -54,5 +55,8 @@
|
||||
|
||||
# Pure options
|
||||
./base.nix
|
||||
|
||||
# Desktop
|
||||
./desktop/phosh.nix
|
||||
];
|
||||
}
|
||||
|
||||
29
modules/desktop/phosh.nix
Normal file
29
modules/desktop/phosh.nix
Normal file
@ -0,0 +1,29 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
cfg = config.ptw.desktop.phosh;
|
||||
in {
|
||||
options.ptw.desktop.phosh = {
|
||||
enable = lib.mkEnableOption "Enable Phosh";
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = config.ptw.services.gdm.enable == false;
|
||||
message = "Phosh conflicts GDM";
|
||||
}
|
||||
{
|
||||
assertion = config.services.xserver.displayManager.sddm.enable == false;
|
||||
message = "Phosh conflicts SDDM";
|
||||
}
|
||||
];
|
||||
|
||||
services.xserver.desktopManager.phosh = {
|
||||
user = config.ptw.system.singleUser;
|
||||
group = "users";
|
||||
#package = pkgs.phosh;
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -21,8 +21,9 @@ in {
|
||||
})
|
||||
|
||||
steam-wrapped # Custom package
|
||||
|
||||
gamescope
|
||||
|
||||
# Broken
|
||||
# gamescope
|
||||
|
||||
corectrl
|
||||
];
|
||||
|
||||
@ -39,7 +39,6 @@ in {
|
||||
# For config
|
||||
dconf # For home-manager
|
||||
];
|
||||
gnome.excludePackages = pkgs.gnome.optionalPackages;
|
||||
};
|
||||
|
||||
services = {
|
||||
@ -72,10 +71,6 @@ in {
|
||||
libinput.enable = true;
|
||||
|
||||
desktopManager.gnome.enable = true;
|
||||
displayManager.gdm = {
|
||||
enable = true;
|
||||
wayland = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
26
modules/programs/sddm/default.nix
Normal file
26
modules/programs/sddm/default.nix
Normal file
@ -0,0 +1,26 @@
|
||||
{ pkgs, config, lib, ... }:
|
||||
|
||||
let
|
||||
cfg = config.ptw.services.sddm;
|
||||
in {
|
||||
options.ptw.services.sddm = {
|
||||
enable = lib.mkEnableOption "Enable SDDM as a display manager";
|
||||
monitors = lib.mkOption {
|
||||
description = "The file to use as a monitors.xml";
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = config.ptw.services.gdm.enable == false;
|
||||
message = "Having two display managers is a bad idea";
|
||||
}
|
||||
];
|
||||
|
||||
services.xserver.displayManager.sddm = {
|
||||
enable = true;
|
||||
autoNumlock = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -58,7 +58,7 @@
|
||||
# TODO: Maybe move this somewhere else
|
||||
services.gpg-agent = {
|
||||
enable = true;
|
||||
pinentryFlavor = "gnome3";
|
||||
pinentryFlavor = "qt";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
46
overlays/phosh.nix
Normal file
46
overlays/phosh.nix
Normal file
@ -0,0 +1,46 @@
|
||||
final: prev:
|
||||
|
||||
rec {
|
||||
phoc = prev.phoc.overrideAttrs (old: rec {
|
||||
version = "0.20.0";
|
||||
|
||||
src = prev.fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
group = "World";
|
||||
owner = "Phosh";
|
||||
repo = "phoc";
|
||||
rev = "v${version}";
|
||||
sha256 = "1mm47n5x7kjgrpxbvb0d0yvpxgzyg90mmmafb6fxhsqklf2dhryy";
|
||||
};
|
||||
|
||||
buildInputs = (map
|
||||
(x: if (prev.lib.getName x) == "wlroots"
|
||||
then prev.wlroots_0_15
|
||||
else x
|
||||
) old.buildInputs);
|
||||
});
|
||||
|
||||
phosh = prev.phosh.overrideAttrs (old: rec {
|
||||
version = "0.20.0";
|
||||
src = prev.fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
group = "World";
|
||||
owner = "Phosh";
|
||||
repo = "phosh";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true; # including gvc and libcall-ui which are designated as subprojects
|
||||
sha256 = "sha256-o/0NJZo1EPpXguN/tkUc+/9XaVTQWaLGe+2pU0B91Cg=";
|
||||
};
|
||||
|
||||
buildInputs = (map
|
||||
(x: if (prev.lib.getName x) == "phoc"
|
||||
then phoc
|
||||
else x
|
||||
) old.buildInputs);
|
||||
|
||||
postFixup = ''
|
||||
mkdir -p $out/share/wayland-sessions
|
||||
ln -s $out/share/applications/sm.puri.Phosh.desktop $out/share/wayland-sessions/
|
||||
'';
|
||||
});
|
||||
}
|
||||
@ -85,6 +85,7 @@ in {
|
||||
additionalBlacklist = [ "/mnt" ];
|
||||
additionalMounts = [
|
||||
"/mnt/Storage/Games/LeagueOfLegends"
|
||||
"/mnt/tmp"
|
||||
];
|
||||
mountInHome = [ ".local/share/lutris" ".config/lutris" "Games" ];
|
||||
chdirTo = "/home/$USER";
|
||||
@ -125,51 +126,4 @@ in {
|
||||
};
|
||||
enableDesktopFile = true;
|
||||
};
|
||||
|
||||
vortex-wrapped = let
|
||||
# The path to the wine prefix Vortex is installed in
|
||||
prefixPath = "/mnt/Storage/Games/NewVortex";
|
||||
|
||||
vortexStartScript = prev.writeShellScriptBin "start-vortex.sh" ''
|
||||
WINEARCH=win64 \
|
||||
WINEPREFIX=${prefixPath} \
|
||||
${prev.wineWowPackages.staging}/bin/wine "C:\Program Files\Black Tree Gaming Ltd\Vortex\Vortex.exe"
|
||||
'';
|
||||
vortexIcon = builtins.fetchurl {
|
||||
url = "https://www.nexusmods.com/bootstrap/images/vortex/vortex-logomark.svg";
|
||||
sha256 = "0237wbbyvgapmmjsq5xab0izzaciqjx1si163r75wa2g7xvz4s22";
|
||||
};
|
||||
in wrapInSandbox {
|
||||
name = "vortex-wrapped";
|
||||
launchScriptName = "vortex";
|
||||
binary = "${vortexStartScript}/bin/start-vortex.sh";
|
||||
|
||||
chdirTo = "/mnt/Storage/Games/";
|
||||
additionalBlacklist = [ "/mnt" ];
|
||||
additionalMounts = [
|
||||
# TODO: It doesn't work if we restrict it more
|
||||
"/mnt/Storage"
|
||||
# Wine prefix
|
||||
#"/mnt/Storage/Games/NewVortex"
|
||||
# Mod cache
|
||||
#"/mnt/Storage/Vortex Mods"
|
||||
# Only access Skyrim: SE
|
||||
#"/mnt/Storage/Games/SteamLibrary/SteamLibrary/steamapps/common/Skyrim\ Special\ Edition/"
|
||||
];
|
||||
mountInHome = [
|
||||
# Mod downloads
|
||||
"Downloads/Skyrim Mods"
|
||||
];
|
||||
|
||||
preDesktopFilePhase = ''
|
||||
mkdir -p $out/share/icons
|
||||
cp ${vortexIcon} $out/share/icons/vortex.svg
|
||||
'';
|
||||
desktopFileAttributes = {
|
||||
name = "vortex-wrapped";
|
||||
icon = "vortex";
|
||||
desktopName = "Vortex Mod Manager (wrapped)";
|
||||
};
|
||||
enableDesktopFile = true;
|
||||
};
|
||||
}
|
||||
|
||||
@ -45,24 +45,6 @@ final: prev:
|
||||
cargoPatches = [ ../patches/myxer/0000-1.2.1-set-gio-version.patch ];
|
||||
});
|
||||
|
||||
phosh = prev.phosh.overrideAttrs (old: {
|
||||
src = prev.fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
group = "World";
|
||||
owner = "Phosh";
|
||||
repo = "phosh";
|
||||
rev = "v0.14.1";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-FILSNVBYpWSPXeDb1Vc4jZ7zJMg0Gj6EY5yoc81gUr0=";
|
||||
};
|
||||
patches = [
|
||||
(builtins.fetchurl {
|
||||
url = "https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/923.patch";
|
||||
sha256 = "0fad4x8hzpaf7aq6acfz90njjjrvyc9ipndxmh4kqnm03n7300x0";
|
||||
})
|
||||
];
|
||||
});
|
||||
|
||||
xournalpp-git = prev.xournalpp.overrideAttrs (old: {
|
||||
version = "1.1.1";
|
||||
src = prev.fetchFromGitHub {
|
||||
@ -73,19 +55,40 @@ final: prev:
|
||||
};
|
||||
});
|
||||
|
||||
/*
|
||||
discord = prev.discord.overrideAttrs (old: {
|
||||
version = "0.0.17";
|
||||
discord = prev.discord.overrideAttrs (old: rec {
|
||||
version = "0.0.18";
|
||||
src = prev.fetchurl {
|
||||
url = "https://dl.discordapp.net/apps/linux/0.0.17/discord-0.0.17.tar.gz";
|
||||
sha256 = "sha256-NGJzLl1dm7dfkB98pQR3gv4vlldrII6lOMWTuioDExU=";
|
||||
url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
|
||||
sha256 = "sha256-BBc4n6Q3xuBE13JS3gz/6EcwdOWW57NLp2saOlwOgMI=";
|
||||
};
|
||||
});
|
||||
*/
|
||||
|
||||
tor-browser-bundle-bin = prev.tor-browser-bundle-bin.override {
|
||||
useHardenedMalloc = false;
|
||||
};
|
||||
|
||||
discord-app = prev.discord-app.override { chromium = prev.ungoogled-chromium; };
|
||||
|
||||
lapce = prev.lapce.overrideAttrs (old: rec {
|
||||
version = "0.1.2";
|
||||
src = prev.fetchFromGitHub {
|
||||
owner = "lapce";
|
||||
repo = "lapce";
|
||||
rev = "v${version}";
|
||||
sha256 = "1pn3ikh72z5y1ywx3bilghrzrwqc1inds2yxnz37l8s1azf3nzlc";
|
||||
};
|
||||
|
||||
cargoDeps = old.cargoDeps.overrideAttrs (_: {
|
||||
inherit src;
|
||||
outputHash = "sha256-spmRgwTh0Sg+OvT/s85xEvOfs2DdCihnX6Ya+sDyePM=";
|
||||
});
|
||||
buildInputs = with prev; old.buildInputs ++ [ libglvnd glibc ];
|
||||
|
||||
preFixup = ''
|
||||
patchelf \
|
||||
--add-needed ${prev.vulkan-loader}/lib/libvulkan.so.1 \
|
||||
--add-needed ${prev.libglvnd}/lib/libGL.so.1 \
|
||||
$out/bin/lapce
|
||||
'';
|
||||
});
|
||||
}
|
||||
|
||||
@ -1,82 +0,0 @@
|
||||
{ lib, fetchurl, gettext, wrapGAppsHook
|
||||
|
||||
# Native dependencies
|
||||
, python3, gtk3, gobject-introspection, gnome
|
||||
, glib-networking, gsound, nbxmpp, gtksourceview4
|
||||
|
||||
# Test dependencies
|
||||
, xvfb-run, dbus
|
||||
|
||||
# Optional dependencies
|
||||
, enableE2E ? true
|
||||
, enableSecrets ? true, libsecret
|
||||
, enableRST ? true, docutils
|
||||
, enableSpelling ? true, gspell
|
||||
, enableUPnP ? true, gupnp-igd
|
||||
, enableOmemoPluginDependencies ? true
|
||||
, enableAppIndicator ? true, libappindicator-gtk3
|
||||
, extraPythonPackages ? ps: []
|
||||
}:
|
||||
|
||||
let
|
||||
commit = "2bbd96644828c43def6c95555f33dfb011df1f5f";
|
||||
in python3.pkgs.buildPythonApplication rec {
|
||||
pname = "gajim";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dev.gajim.org/gajim/gajim/-/archive/${commit}/gajim-${commit}.tar.gz";
|
||||
sha256 = "sha256-8VfV8BU5U9idQ0lP7lZSUUxe8nxXT4X/C2xKegjiHkA=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
gobject-introspection gtk3 gnome.adwaita-icon-theme
|
||||
glib-networking
|
||||
] ++ lib.optional enableSecrets libsecret
|
||||
++ lib.optional enableSpelling gspell
|
||||
++ lib.optional enableUPnP gupnp-igd
|
||||
++ lib.optional enableAppIndicator libappindicator-gtk3;
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext wrapGAppsHook
|
||||
];
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
nbxmpp pygobject3 dbus-python pillow css-parser precis-i18n keyring setuptools gsound
|
||||
gst-python gtksourceview4 packaging
|
||||
] ++ lib.optionals enableE2E [ pycrypto python-gnupg ]
|
||||
++ lib.optional enableRST docutils
|
||||
++ lib.optionals enableOmemoPluginDependencies [ python-axolotl qrcode ]
|
||||
++ extraPythonPackages python3.pkgs;
|
||||
|
||||
checkInputs = [ xvfb-run dbus.daemon ];
|
||||
|
||||
checkPhase = ''
|
||||
# https://dev.gajim.org/gajim/gajim/-/issues/10478
|
||||
rm test/lib/gajim_mocks.py test/unit/test_gui_interface.py
|
||||
|
||||
xvfb-run dbus-run-session \
|
||||
--config-file=${dbus.daemon}/share/dbus-1/session.conf \
|
||||
${python3.interpreter} setup.py test
|
||||
'';
|
||||
doCheck = false;
|
||||
|
||||
# necessary for wrapGAppsHook
|
||||
strictDeps = false;
|
||||
|
||||
meta = {
|
||||
homepage = "http://gajim.org/";
|
||||
description = "Jabber client written in PyGTK";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ raskin abbradar ];
|
||||
downloadPage = "http://gajim.org/downloads.php";
|
||||
updateWalker = true;
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -63,18 +63,6 @@ in {
|
||||
|
||||
trackma = prev.callPackage ./tools/video/trackma {};
|
||||
|
||||
gajim-mainwindow = prev.callPackage ./applications/networking/instant-messengers/gajim {
|
||||
nbxmpp = prev.python3Packages.nbxmpp.overrideAttrs (old: {
|
||||
src = prev.fetchFromGitLab {
|
||||
domain = "dev.gajim.org";
|
||||
owner = "gajim";
|
||||
repo = "python-nbxmpp";
|
||||
rev = "2c74f928f2ff2573b40c7fadc3cc52eaf936e370";
|
||||
sha256 = "045qj3q497lrdgjd7j0xwjrhfbnafhs2qk2a308a52fmpg702xm7";
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
swaync = prev.callPackage ./tools/desktop/swaync {};
|
||||
|
||||
sound-gambit = prev.callPackage tools/audio/sound-gambit {};
|
||||
@ -97,8 +85,6 @@ in {
|
||||
|
||||
razer-cli = prev.callPackage tools/hardware/razer-cli {};
|
||||
|
||||
gamescope = prev.callPackage tools/games/gamescope {};
|
||||
|
||||
wayfire-firedecor = prev.callPackage applications/wayfire/firedecor {
|
||||
wayfire = wayfire-master;
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user