Compare commits
2 Commits
058921bd56
...
43626bc483
Author | SHA1 | Date |
---|---|---|
Johannes Hendrik Gerard van der Weide | 43626bc483 | |
Johannes Hendrik Gerard van der Weide | b227ca8216 |
|
@ -9,8 +9,36 @@
|
|||
polkit.enable = true;
|
||||
rtkit.enable = true;
|
||||
};
|
||||
environment.etc = {
|
||||
"xdg/gtk-2.0/gtkrc".text = "gtk-error-bell=0";
|
||||
"xdg/gtk-3.0/settings.ini".text = ''
|
||||
[Settings]
|
||||
gtk-error-bell=false
|
||||
'';
|
||||
"xdg/gtk-4.0/settings.ini".text = ''
|
||||
[Settings]
|
||||
gtk-error-bell=false
|
||||
'';
|
||||
};
|
||||
services = {
|
||||
xserver.displayManager.sessionPackages = [ pkgs.sway ];
|
||||
printing = {
|
||||
enable = true;
|
||||
browsing = true;
|
||||
browsedConf = ''
|
||||
BrowseDNSSDSubTypes _cups,_print
|
||||
BrowseLocalProtocols all
|
||||
BrowseRemoteProtocols all
|
||||
CreateIPPPrinterQueues All
|
||||
|
||||
BrowseProtocols all
|
||||
'';
|
||||
};
|
||||
avahi = {
|
||||
enable = true;
|
||||
nssmdns4 = true;
|
||||
openFirewall = true;
|
||||
};
|
||||
pipewire = {
|
||||
enable = true;
|
||||
alsa = {
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
let
|
||||
mini-text = pkgs.callPackage ../../Programs/MiniText { };
|
||||
hyperplane = pkgs.callPackage ../../Programs/Hyperplane { };
|
||||
cosmic-terminal = pkgs.callPackage ../../Programs/Cosmic-Terminal {};
|
||||
in
|
||||
{
|
||||
# Allow unfree packages
|
||||
|
@ -32,7 +31,6 @@ in
|
|||
pamixer
|
||||
hyperplane
|
||||
mini-text
|
||||
cosmic-terminal
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,97 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
rust,
|
||||
rustPlatform,
|
||||
cmake,
|
||||
makeBinaryWrapper,
|
||||
cosmic-icons,
|
||||
just,
|
||||
pkg-config,
|
||||
libxkbcommon,
|
||||
glib,
|
||||
gtk3,
|
||||
libinput,
|
||||
fontconfig,
|
||||
freetype,
|
||||
wayland,
|
||||
xorg
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cosmic-term";
|
||||
version = "unstable-2023-12-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = pname;
|
||||
rev = "bf3f507fdd73a06ab1f9b199a98dca6988aafec2";
|
||||
hash = "sha256-c5RNrC0AZvz+O3nj7VvMQuA/U0sgxZCVHn+cc+4pIN8=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"accesskit-0.11.0" = "sha256-xVhe6adUb8VmwIKKjHxwCwOo5Y1p3Or3ylcJJdLDrrE=";
|
||||
"atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA=";
|
||||
"cosmic-config-0.1.0" = "sha256-V371fmSmLIwUxtx6w+C55cBJ8oyYgN86r3FZ8rGBLEs=";
|
||||
"cosmic-text-0.10.0" = "sha256-/4Hg+7R0LRF4paXIREkMOTtbQ1xgONym5nKb/TuyeD4=";
|
||||
"glyphon-0.3.0" = "sha256-T7hvqtR3zi9wNemFrPPGakq2vEraLpnPkN7umtumwVg=";
|
||||
"sctk-adwaita-0.5.4" = "sha256-yK0F2w/0nxyKrSiHZbx7+aPNY2vlFs7s8nu/COp2KqQ=";
|
||||
"softbuffer-0.3.3" = "sha256-eKYFVr6C1+X6ulidHIu9SP591rJxStxwL9uMiqnXx4k=";
|
||||
"smithay-client-toolkit-0.16.1" = "sha256-z7EZThbh7YmKzAACv181zaEZmWxTrMkFRzP0nfsHK6c=";
|
||||
"taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI=";
|
||||
"winit-0.28.6" = "sha256-FhW6d2XnXCGJUMoT9EMQew9/OPXiehy/JraeCiVd76M=";
|
||||
};
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace justfile --replace '#!/usr/bin/env' "#!$(command -v env)"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
just
|
||||
pkg-config
|
||||
makeBinaryWrapper
|
||||
];
|
||||
buildInputs = [
|
||||
libxkbcommon
|
||||
xorg.libX11
|
||||
libinput
|
||||
fontconfig
|
||||
freetype
|
||||
wayland
|
||||
glib
|
||||
gtk3
|
||||
];
|
||||
|
||||
dontUseJustBuild = true;
|
||||
|
||||
justFlags = [
|
||||
"--set"
|
||||
"prefix"
|
||||
(placeholder "out")
|
||||
"--set"
|
||||
"bin-src"
|
||||
"target/${
|
||||
rust.lib.toRustTargetSpecShort stdenv.hostPlatform
|
||||
}/release/cosmic-term"
|
||||
];
|
||||
|
||||
# LD_LIBRARY_PATH can be removed once tiny-xlib is bumped above 0.2.2
|
||||
postInstall = ''
|
||||
wrapProgram "$out/bin/${pname}" \
|
||||
--suffix XDG_DATA_DIRS : "${cosmic-icons}/share" \
|
||||
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ xorg.libX11 wayland libxkbcommon ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/pop-os/cosmic-term";
|
||||
description = "Terminal for the COSMIC Desktop Environment";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ ahoneybun ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
|
@ -12,5 +12,15 @@
|
|||
services.nginx.virtualHosts.${config.services.nextcloud.hostName} = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://localhost:8181";
|
||||
proxyWebsockets = true; # needed if you need to use WebSocket
|
||||
extraConfig =
|
||||
# required when the target is also TLS server with multiple hosts
|
||||
"proxy_ssl_server_name on;" +
|
||||
# required when the server wants to use HTTP Authentication
|
||||
"proxy_pass_header Authorization;"
|
||||
;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -0,0 +1,11 @@
|
|||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
services.redis.servers = {
|
||||
hermitSearch = {
|
||||
enable = true;
|
||||
port = 6379;
|
||||
openFirewall = true;
|
||||
};
|
||||
};
|
||||
}
|
|
@ -17,6 +17,7 @@ in
|
|||
bottles
|
||||
pavucontrol
|
||||
qbittorrent
|
||||
floorp
|
||||
# Office
|
||||
slack
|
||||
onlyoffice-bin
|
||||
|
@ -44,6 +45,7 @@ in
|
|||
wally-cli
|
||||
# Programming
|
||||
godot_4
|
||||
unityhub
|
||||
lapce
|
||||
signal-desktop
|
||||
blanket
|
||||
|
|
Loading…
Reference in New Issue