steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

feat: re-enable dunst, switch salut -> dunst, add&change packages

Browse source
This commit is contained in:
steveej 2023-10-15 21:01:13 +02:00
parent f111bf1de5
commit 207b30f0a5
4 changed files with 54 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

30
nix/devShells.nix
View file

@ -68,36 +68,6 @@ pkgs.stdenv.mkDerivation {
hedgedoc-cli
xwayland
(banana-accounting.overrideDerivation (attrs:
with inputs'.nixpkgs-2211.legacyPackages; {
# dontWrapGApps = true;
srcs = builtins.fetchurl {
# hosted via https://web3.storage
url = "https://bafybeiabi4m2i4izummipbl5wzhwxjyjt2rylgsrahhkh7i63piwd37n4u.ipfs.w3s.link/mfpcksczayaqqx8fdacp0627zm36c001-bananaplus.tgz";
sha256 = "09666iqzqdw2526pf6bg5kd0hfw0wblw8ag636ki72dsiw6bmbf1";
};
# nativeBuildInputs =
# attrs.nativeBuildInputs
# ++ [
# qt5.qtbase
# qt5.wrapQtAppsHook
# ];
# buildInputs =
# attrs.buildInputs
# ++ [
# qt5.qtwayland
# ];
# preFixup =
# (attrs.preFixup or "")
# + ''
# qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
# '';
}))
]);
# Set Environment Variables

46
nix/home-manager/configuration/graphical-fullblown.nix
View file

@ -4,14 +4,13 @@
# these come in via home-manager.extraSpecialArgs and are specific to each node
nodeFlake,
packages',
repoFlake,
# repoFlake,
# repoFlakeInputs',
...
}: let
pkgsMaster = nodeFlake.inputs.nixpkgs-master.legacyPackages.${pkgs.system};
pkgsUnstableSmall = nodeFlake.inputs.nixpkgs-unstable-small.legacyPackages.${pkgs.system};
# pkgsMaster = nodeFlake.inputs.nixpkgs-master.legacyPackages.${pkgs.system};
pkgsUnstableSmall = import nodeFlake.inputs.nixpkgs-unstable-small { inherit (pkgs) system config; };
pkgs2211 = nodeFlake.inputs.nixpkgs-2211.legacyPackages.${pkgs.system};
pkgsUnstableSmallRepo = repoFlake.nixpkgs-unstable-small.${pkgs.system}.legacyPackages;
in {
imports = [
../profiles/common.nix
@ -28,7 +27,7 @@ in {
../programs/gpg-agent.nix
../programs/pass.nix
# ../programs/espanso.nix
../programs/espanso.nix
../programs/firefox.nix
../programs/chromium.nix
@ -116,7 +115,7 @@ in {
# FIXME: depends on insecure openssl 1.1.1t
# kotatogram-desktop
tdesktop
pkgsUnstableSmall.signal-desktop-beta
pkgsUnstableSmall.signal-desktop
#(let
# version = "6.20.0-beta.1";
#in
@ -183,7 +182,7 @@ in {
remmina
freerdp
teamviewer
rustdesk
pkgsUnstableSmall.rustdesk
# Audio/Video Players
ffmpeg
@ -299,8 +298,41 @@ in {
# shotcut
# openshot-qt
# introduces python: screenkey
avidemux
handbrake
pkgsUnstableSmall.ledger-live-desktop
(banana-accounting.overrideDerivation (attrs:
with inputs'.nixpkgs-2211.legacyPackages; {
# dontWrapGApps = true;
srcs = builtins.fetchurl {
# hosted via https://web3.storage
url = "https://bafybeiabi4m2i4izummipbl5wzhwxjyjt2rylgsrahhkh7i63piwd37n4u.ipfs.w3s.link/mfpcksczayaqqx8fdacp0627zm36c001-bananaplus.tgz";
sha256 = "09666iqzqdw2526pf6bg5kd0hfw0wblw8ag636ki72dsiw6bmbf1";
};
# nativeBuildInputs =
# attrs.nativeBuildInputs
# ++ [
# qt5.qtbase
# qt5.wrapQtAppsHook
# ];
# buildInputs =
# attrs.buildInputs
# ++ [
# qt5.qtwayland
# ];
# preFixup =
# (attrs.preFixup or "")
# + ''
# qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
# '';
}))
]);
systemd.user.startServices = true;

8
nix/home-manager/profiles/sway-desktop.nix
View file

@ -2,7 +2,7 @@
pkgs,
config,
lib,
packages',
# packages',
repoFlakeInputs',
...
}: let
@ -16,7 +16,7 @@ in {
imports = [
../profiles/wayland-desktop.nix
../programs/waybar.nix
../programs/salut.nix
# ../programs/salut.nix
];
# TODO: autostart
@ -32,6 +32,10 @@ in {
# flameshot.enable = true;
};
services.dunst = {
enable = true;
};
services.gpg-agent.pinentryFlavor = "gnome3";
nixpkgs.overlays = [

12
nix/home-manager/programs/espanso.nix
View file

@ -1,6 +1,5 @@
{
pkgs,
config,
...
}: {
services.espanso = {
@ -8,11 +7,17 @@
# # src =
# })
enable = true;
settings = {
configs = {
default = {
# backend = "Inject";
# backend = "Clipboard";
};
};
matches = let
playerctl = ''
${pkgs.coreutils}/bin/env DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/$(${pkgs.coreutils}/bin/id -u)/bus" ${pkgs.playerctl}/bin/playerctl'';
in [
in {
default = { matches = [
{
trigger = ":vpos";
replace = "{{output}}";
@ -60,6 +65,7 @@
replace = "¯\\_(ツ)_/¯";
}
];
};
};
};
}