mirror of
https://github.com/thilobillerbeck/dotfiles.git
synced 2024-11-25 09:18:49 +01:00
several adjustments for non nixos systems
This commit is contained in:
parent
e7ec033300
commit
22084114a5
7 changed files with 75 additions and 75 deletions
|
@ -10,7 +10,7 @@ in {
|
||||||
isGeneric = true;
|
isGeneric = true;
|
||||||
isGnome = false;
|
isGnome = false;
|
||||||
noiseSuppression.enable = false;
|
noiseSuppression.enable = false;
|
||||||
isGraphical = false;
|
isGraphical = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
fonts.fontconfig.enable = true;
|
fonts.fontconfig.enable = true;
|
||||||
|
@ -18,9 +18,4 @@ in {
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
||||||
nixGLPrefix = lib.getExe pkgs.nixgl.nixGLIntel;
|
nixGLPrefix = lib.getExe pkgs.nixgl.nixGLIntel;
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
|
||||||
(nixGL insomnia)
|
|
||||||
(nixGL inputs.muse-sounds-manager.packages.x86_64-linux.muse-sounds-manager)
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -126,16 +126,6 @@ with lib; {
|
||||||
${pkgs.nodejs}/bin/npm config set prefix ${config.home.homeDirectory}/.node-global
|
${pkgs.nodejs}/bin/npm config set prefix ${config.home.homeDirectory}/.node-global
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
} // mkIf (config.machine.isGeneric && config.machine.isGraphical) {
|
|
||||||
linkDesktopApplications = {
|
|
||||||
after = [ "writeBoundary" "createXdgUserDirectories" ];
|
|
||||||
before = [ ];
|
|
||||||
data = ''
|
|
||||||
for dir in ${config.home.homeDirectory}/.nix-profile/share/applications/*; do
|
|
||||||
chmod +x $(realpath $dir) -v
|
|
||||||
done
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
sessionPath = [ "${config.home.homeDirectory}/.node-global/bin" ];
|
sessionPath = [ "${config.home.homeDirectory}/.node-global/bin" ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -2,9 +2,11 @@
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
let
|
let
|
||||||
|
nixGL = import ./../../home-manager/utils/nixGLWrap.nix { inherit pkgs config; };
|
||||||
electronFlags =
|
electronFlags =
|
||||||
"--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime --disable-gpu-shader-disk-cache -n";
|
"--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime --disable-gpu-shader-disk-cache -n";
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
config = {
|
config = {
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [
|
||||||
(_: prev: {
|
(_: prev: {
|
||||||
|
@ -76,7 +78,17 @@ in {
|
||||||
nix-output-monitor
|
nix-output-monitor
|
||||||
nodePackages.pnpm
|
nodePackages.pnpm
|
||||||
npm-check-updates
|
npm-check-updates
|
||||||
] ++ (if config.machine.isGraphical then [
|
] ++ (
|
||||||
|
if (
|
||||||
|
config.machine.isGraphical
|
||||||
|
) then [
|
||||||
|
(nixGL insomnia)
|
||||||
|
] else
|
||||||
|
[ ]
|
||||||
|
) ++ (
|
||||||
|
if (
|
||||||
|
config.machine.isGraphical && !config.machine.isGeneric
|
||||||
|
) then [
|
||||||
corefonts
|
corefonts
|
||||||
vistafonts
|
vistafonts
|
||||||
jetbrains.webstorm
|
jetbrains.webstorm
|
||||||
|
@ -86,7 +98,6 @@ in {
|
||||||
element-desktop
|
element-desktop
|
||||||
ludusavi
|
ludusavi
|
||||||
dbeaver
|
dbeaver
|
||||||
insomnia
|
|
||||||
onlyoffice-bin
|
onlyoffice-bin
|
||||||
spotify
|
spotify
|
||||||
vesktop
|
vesktop
|
||||||
|
@ -106,7 +117,7 @@ in {
|
||||||
quickgui
|
quickgui
|
||||||
trilium-desktop
|
trilium-desktop
|
||||||
anki
|
anki
|
||||||
inputs.muse-sounds-manager.packages.x86_64-linux.muse-sounds-manager
|
# inputs.muse-sounds-manager.packages.x86_64-linux.muse-sounds-manager
|
||||||
jetbrains-toolbox
|
jetbrains-toolbox
|
||||||
mumble
|
mumble
|
||||||
prusa-slicer
|
prusa-slicer
|
||||||
|
@ -123,7 +134,8 @@ in {
|
||||||
kdePackages.kdenlive
|
kdePackages.kdenlive
|
||||||
audacity
|
audacity
|
||||||
] else
|
] else
|
||||||
[ ]) ++ (if config.machine.isGnome then [
|
[ ]
|
||||||
|
) ++ (if config.machine.isGnome then [
|
||||||
gnomeExtensions.blur-my-shell
|
gnomeExtensions.blur-my-shell
|
||||||
gnomeExtensions.dash-to-panel
|
gnomeExtensions.dash-to-panel
|
||||||
gnomeExtensions.user-themes
|
gnomeExtensions.user-themes
|
||||||
|
|
|
@ -1,8 +1,11 @@
|
||||||
{ config, pkgs, lib, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
|
|
||||||
{
|
let
|
||||||
|
nixGL = import ./../../home-manager/utils/nixGLWrap.nix { inherit pkgs config; };
|
||||||
|
in {
|
||||||
programs.alacritty = {
|
programs.alacritty = {
|
||||||
enable = if config.machine.isGraphical then true else false;
|
enable = if config.machine.isGraphical then true else false;
|
||||||
|
package = (nixGL pkgs.alacritty);
|
||||||
settings = {
|
settings = {
|
||||||
window = {
|
window = {
|
||||||
decorations = "full";
|
decorations = "full";
|
||||||
|
|
|
@ -19,7 +19,7 @@ let
|
||||||
"bmnlcjabgnpnenekpadlanbbkooimhnj" # Honey
|
"bmnlcjabgnpnenekpadlanbbkooimhnj" # Honey
|
||||||
"kbfnbcaeplbcioakkpcpgfkobkghlhen" # Grammarly
|
"kbfnbcaeplbcioakkpcpgfkobkghlhen" # Grammarly
|
||||||
];
|
];
|
||||||
isEnabled = if config.machine.isGraphical then true else false;
|
isEnabled = if (config.machine.isGraphical && !config.machine.isGeneric) then true else false;
|
||||||
dictionaries = with pkgs.hunspellDictsChromium; [ en_US de_DE ];
|
dictionaries = with pkgs.hunspellDictsChromium; [ en_US de_DE ];
|
||||||
commandLineArgs = [
|
commandLineArgs = [
|
||||||
"--enable-wayland-ime"
|
"--enable-wayland-ime"
|
||||||
|
|
|
@ -2,6 +2,6 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
programs.firefox = {
|
programs.firefox = {
|
||||||
enable = if config.machine.isGraphical then true else false;
|
enable = if (config.machine.isGraphical && !config.machine.isGeneric) then true else false;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
programs.mpv = {
|
programs.mpv = {
|
||||||
enable = if config.machine.isGraphical then true else false;
|
enable = if (config.machine.isGraphical && !config.machine.isGeneric) then true else false;
|
||||||
scripts = with pkgs.mpvScripts; [ autoload mpris sponsorblock ];
|
scripts = with pkgs.mpvScripts; [ autoload mpris sponsorblock ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue