mirror of
https://github.com/thilobillerbeck/dotfiles.git
synced 2024-12-22 03:53:05 +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;
|
||||
isGnome = false;
|
||||
noiseSuppression.enable = false;
|
||||
isGraphical = false;
|
||||
isGraphical = true;
|
||||
};
|
||||
|
||||
fonts.fontconfig.enable = true;
|
||||
|
@ -18,9 +18,4 @@ in {
|
|||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
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
|
||||
'';
|
||||
};
|
||||
} // 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" ];
|
||||
};
|
||||
|
|
|
@ -2,9 +2,11 @@
|
|||
|
||||
with lib;
|
||||
let
|
||||
nixGL = import ./../../home-manager/utils/nixGLWrap.nix { inherit pkgs config; };
|
||||
electronFlags =
|
||||
"--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime --disable-gpu-shader-disk-cache -n";
|
||||
in {
|
||||
in
|
||||
{
|
||||
config = {
|
||||
nixpkgs.overlays = [
|
||||
(_: prev: {
|
||||
|
@ -76,60 +78,70 @@ in {
|
|||
nix-output-monitor
|
||||
nodePackages.pnpm
|
||||
npm-check-updates
|
||||
] ++ (if config.machine.isGraphical then [
|
||||
corefonts
|
||||
vistafonts
|
||||
jetbrains.webstorm
|
||||
jetbrains.phpstorm
|
||||
jetbrains.rust-rover
|
||||
jetbrains.goland
|
||||
element-desktop
|
||||
ludusavi
|
||||
dbeaver
|
||||
insomnia
|
||||
onlyoffice-bin
|
||||
spotify
|
||||
vesktop
|
||||
(lutris.override {
|
||||
extraLibraries = _: [ gnome3.adwaita-icon-theme ];
|
||||
extraPkgs = _: [
|
||||
wineWowPackages.full
|
||||
winetricks
|
||||
gnome3.adwaita-icon-theme
|
||||
];
|
||||
})
|
||||
bottles
|
||||
protontricks
|
||||
heroic
|
||||
(vscode.override { commandLineArgs = electronFlags; })
|
||||
quickemu
|
||||
quickgui
|
||||
trilium-desktop
|
||||
anki
|
||||
inputs.muse-sounds-manager.packages.x86_64-linux.muse-sounds-manager
|
||||
jetbrains-toolbox
|
||||
mumble
|
||||
prusa-slicer
|
||||
trayscale
|
||||
gnome.gnome-disk-utility
|
||||
inkscape
|
||||
musescore
|
||||
obsidian
|
||||
syncthingtray
|
||||
reaper
|
||||
yabridge
|
||||
inputs.suyu.packages.x86_64-linux.suyu
|
||||
inputs.nix-alien.packages.x86_64-linux.nix-alien
|
||||
kdePackages.kdenlive
|
||||
audacity
|
||||
] else
|
||||
[ ]) ++ (if config.machine.isGnome then [
|
||||
gnomeExtensions.blur-my-shell
|
||||
gnomeExtensions.dash-to-panel
|
||||
gnomeExtensions.user-themes
|
||||
gnomeExtensions.vitals
|
||||
gnomeExtensions.custom-accent-colors
|
||||
] ++ (
|
||||
if (
|
||||
config.machine.isGraphical
|
||||
) then [
|
||||
(nixGL insomnia)
|
||||
] else
|
||||
[ ]);
|
||||
[ ]
|
||||
) ++ (
|
||||
if (
|
||||
config.machine.isGraphical && !config.machine.isGeneric
|
||||
) then [
|
||||
corefonts
|
||||
vistafonts
|
||||
jetbrains.webstorm
|
||||
jetbrains.phpstorm
|
||||
jetbrains.rust-rover
|
||||
jetbrains.goland
|
||||
element-desktop
|
||||
ludusavi
|
||||
dbeaver
|
||||
onlyoffice-bin
|
||||
spotify
|
||||
vesktop
|
||||
(lutris.override {
|
||||
extraLibraries = _: [ gnome3.adwaita-icon-theme ];
|
||||
extraPkgs = _: [
|
||||
wineWowPackages.full
|
||||
winetricks
|
||||
gnome3.adwaita-icon-theme
|
||||
];
|
||||
})
|
||||
bottles
|
||||
protontricks
|
||||
heroic
|
||||
(vscode.override { commandLineArgs = electronFlags; })
|
||||
quickemu
|
||||
quickgui
|
||||
trilium-desktop
|
||||
anki
|
||||
# inputs.muse-sounds-manager.packages.x86_64-linux.muse-sounds-manager
|
||||
jetbrains-toolbox
|
||||
mumble
|
||||
prusa-slicer
|
||||
trayscale
|
||||
gnome.gnome-disk-utility
|
||||
inkscape
|
||||
musescore
|
||||
obsidian
|
||||
syncthingtray
|
||||
reaper
|
||||
yabridge
|
||||
inputs.suyu.packages.x86_64-linux.suyu
|
||||
inputs.nix-alien.packages.x86_64-linux.nix-alien
|
||||
kdePackages.kdenlive
|
||||
audacity
|
||||
] else
|
||||
[ ]
|
||||
) ++ (if config.machine.isGnome then [
|
||||
gnomeExtensions.blur-my-shell
|
||||
gnomeExtensions.dash-to-panel
|
||||
gnomeExtensions.user-themes
|
||||
gnomeExtensions.vitals
|
||||
gnomeExtensions.custom-accent-colors
|
||||
] else
|
||||
[ ]);
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,8 +1,11 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
let
|
||||
nixGL = import ./../../home-manager/utils/nixGLWrap.nix { inherit pkgs config; };
|
||||
in {
|
||||
programs.alacritty = {
|
||||
enable = if config.machine.isGraphical then true else false;
|
||||
package = (nixGL pkgs.alacritty);
|
||||
settings = {
|
||||
window = {
|
||||
decorations = "full";
|
||||
|
|
|
@ -19,7 +19,7 @@ let
|
|||
"bmnlcjabgnpnenekpadlanbbkooimhnj" # Honey
|
||||
"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 ];
|
||||
commandLineArgs = [
|
||||
"--enable-wayland-ime"
|
||||
|
|
|
@ -2,6 +2,6 @@
|
|||
|
||||
{
|
||||
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 = {
|
||||
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 ];
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue