mirror of
https://github.com/thilobillerbeck/dotfiles.git
synced 2025-05-29 02:14:17 +02:00
cleanup and format
This commit is contained in:
parent
1121201acd
commit
07a1841fda
37 changed files with 336 additions and 427 deletions
|
|
@ -1,6 +1,5 @@
|
|||
{ lib, pkgs, config, ... }:
|
||||
with lib;
|
||||
{
|
||||
with lib; {
|
||||
imports = [
|
||||
./../programs/alacritty.nix
|
||||
./../programs/bat.nix
|
||||
|
|
@ -70,8 +69,9 @@ with lib;
|
|||
include "/usr/share/nano/*.nanorc"
|
||||
'';
|
||||
".ssh/config_source" = {
|
||||
source = ./../dotfiles/ssh-config;
|
||||
onChange = ''cat ~/.ssh/config_source > ~/.ssh/config && chmod 600 ~/.ssh/config'';
|
||||
source = ./../dotfiles/ssh-config;
|
||||
onChange =
|
||||
"cat ~/.ssh/config_source > ~/.ssh/config && chmod 600 ~/.ssh/config";
|
||||
};
|
||||
".gitignore".source = ./../dotfiles/.gitignore;
|
||||
".config/pipewire/pipewire.conf.d/99-noise-suppression.conf".text = ''
|
||||
|
|
|
|||
|
|
@ -2,128 +2,126 @@
|
|||
|
||||
with lib;
|
||||
let
|
||||
electronFlags = "--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime --disable-gpu-shader-disk-cache -n";
|
||||
electronFlags =
|
||||
"--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime --disable-gpu-shader-disk-cache -n";
|
||||
in {
|
||||
config = {
|
||||
nixpkgs.overlays = [
|
||||
(final: prev: {
|
||||
(_: prev: {
|
||||
quickemu = prev.quickemu.overrideAttrs (old: {
|
||||
patches = (old.patches or [ ]) ++ [
|
||||
./../patches/quickemu.patch
|
||||
];
|
||||
patches = (old.patches or [ ]) ++ [ ./../patches/quickemu.patch ];
|
||||
});
|
||||
})
|
||||
];
|
||||
|
||||
home.packages = with pkgs; [
|
||||
up
|
||||
htop
|
||||
rustc
|
||||
cargo
|
||||
nixfmt
|
||||
nodejs
|
||||
bun
|
||||
deno
|
||||
devbox
|
||||
tldr
|
||||
flutter
|
||||
nurl
|
||||
hcloud
|
||||
tea
|
||||
dgraph
|
||||
nix-init
|
||||
nodePackages.nodemon
|
||||
pocketbase
|
||||
thefuck
|
||||
hub
|
||||
httpie
|
||||
manix
|
||||
(pkgs.writeShellScriptBin "ssh-fix-permissions"
|
||||
(builtins.readFile ./../scripts/ssh-fix-permissions.sh))
|
||||
(pkgs.writeShellScriptBin "yt-dlp-audio"
|
||||
(builtins.readFile ./../scripts/yt-dlp-audio.sh))
|
||||
(pkgs.writeShellScriptBin "nix-shell-init"
|
||||
(builtins.readFile ./../scripts/nix-shell-init.sh))
|
||||
(pkgs.writeShellScriptBin "http-server" ''
|
||||
${pkgs.caddy}/bin/caddy file-server --listen :2345
|
||||
'')
|
||||
(pkgs.writeShellScriptBin "nix-build-default" ''
|
||||
nix-build -E 'with import <nixpkgs> { }; callPackage ./default.nix { }'
|
||||
'')
|
||||
(callPackage ./../pkgs/toggl-time-grouper/package.nix {
|
||||
inherit lib;
|
||||
})
|
||||
nixpkgs-fmt
|
||||
toolbox
|
||||
distrobox
|
||||
ddev
|
||||
act
|
||||
mkcert
|
||||
pulumi
|
||||
kubectl
|
||||
pulumiPackages.pulumi-language-nodejs
|
||||
ncdu
|
||||
inputs.devenv.packages.x86_64-linux.devenv
|
||||
inputs.nixpkgs-update.packages.x86_64-linux.nixpkgs-update
|
||||
inputs.dagger.packages.x86_64-linux.dagger
|
||||
unzip
|
||||
gh
|
||||
nil
|
||||
nixd
|
||||
unrar
|
||||
] ++ (if config.machine.isGraphical then [
|
||||
(pkgs.nerdfonts.override {
|
||||
fonts = [ "JetBrainsMono" "FiraCode" "FiraMono" ];
|
||||
})
|
||||
corefonts
|
||||
vistafonts
|
||||
jetbrains.webstorm
|
||||
jetbrains.phpstorm
|
||||
jetbrains.rust-rover
|
||||
jetbrains.goland
|
||||
element-desktop
|
||||
ludusavi
|
||||
dbeaver
|
||||
insomnia
|
||||
onlyoffice-bin
|
||||
spotify
|
||||
vesktop
|
||||
(lutris.override {
|
||||
extraLibraries = pkgs: [
|
||||
gnome3.adwaita-icon-theme
|
||||
];
|
||||
extraPkgs = pkgs: [
|
||||
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
|
||||
] else [ ]) ++ (if config.machine.isGnome then [
|
||||
gnomeExtensions.blur-my-shell
|
||||
gnomeExtensions.dash-to-panel
|
||||
gnomeExtensions.user-themes
|
||||
gnomeExtensions.vitals
|
||||
gnomeExtensions.custom-accent-colors
|
||||
] else [ ]);
|
||||
home.packages = with pkgs;
|
||||
[
|
||||
up
|
||||
htop
|
||||
rustc
|
||||
cargo
|
||||
nixfmt
|
||||
nodejs
|
||||
bun
|
||||
deno
|
||||
devbox
|
||||
tldr
|
||||
flutter
|
||||
nurl
|
||||
hcloud
|
||||
tea
|
||||
dgraph
|
||||
nix-init
|
||||
nodePackages.nodemon
|
||||
pocketbase
|
||||
thefuck
|
||||
hub
|
||||
httpie
|
||||
manix
|
||||
(pkgs.writeShellScriptBin "ssh-fix-permissions"
|
||||
(builtins.readFile ./../scripts/ssh-fix-permissions.sh))
|
||||
(pkgs.writeShellScriptBin "yt-dlp-audio"
|
||||
(builtins.readFile ./../scripts/yt-dlp-audio.sh))
|
||||
(pkgs.writeShellScriptBin "nix-shell-init"
|
||||
(builtins.readFile ./../scripts/nix-shell-init.sh))
|
||||
(pkgs.writeShellScriptBin "http-server" ''
|
||||
${pkgs.caddy}/bin/caddy file-server --listen :2345
|
||||
'')
|
||||
(pkgs.writeShellScriptBin "nix-build-default" ''
|
||||
nix-build -E 'with import <nixpkgs> { }; callPackage ./default.nix { }'
|
||||
'')
|
||||
(callPackage ./../pkgs/toggl-time-grouper/package.nix { inherit lib; })
|
||||
nixpkgs-fmt
|
||||
toolbox
|
||||
distrobox
|
||||
ddev
|
||||
act
|
||||
mkcert
|
||||
pulumi
|
||||
kubectl
|
||||
pulumiPackages.pulumi-language-nodejs
|
||||
ncdu
|
||||
inputs.devenv.packages.x86_64-linux.devenv
|
||||
inputs.nixpkgs-update.packages.x86_64-linux.nixpkgs-update
|
||||
inputs.dagger.packages.x86_64-linux.dagger
|
||||
unzip
|
||||
gh
|
||||
nil
|
||||
nixd
|
||||
unrar
|
||||
] ++ (if config.machine.isGraphical then [
|
||||
(pkgs.nerdfonts.override {
|
||||
fonts = [ "JetBrainsMono" "FiraCode" "FiraMono" ];
|
||||
})
|
||||
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
|
||||
] 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,7 +1,4 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "docker-craft-cms-dev-env";
|
||||
|
|
@ -20,7 +17,8 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Docker image for local development of sites based on Craft CMS";
|
||||
description =
|
||||
"Docker image for local development of sites based on Craft CMS";
|
||||
homepage = "https://github.com/codemonauts/docker-craft-cms-dev-env";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
|
|
|
|||
|
|
@ -1,8 +1,4 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
{ lib, buildNpmPackage, fetchFromGitHub }:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "spx-gc";
|
||||
|
|
@ -25,7 +21,8 @@ buildNpmPackage rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "SPX is a graphics control client for live video productions and live streams using CasparCG, OBS, vMix, or similar software";
|
||||
description =
|
||||
"SPX is a graphics control client for live video productions and live streams using CasparCG, OBS, vMix, or similar software";
|
||||
homepage = "https://github.com/TuomoKu/SPX-GC#npminstall";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ];
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, python3Packages }:
|
||||
{ python3Packages }:
|
||||
with python3Packages;
|
||||
buildPythonApplication {
|
||||
name = "toggl-time-grouper";
|
||||
src = ./.;
|
||||
propagatedBuildInputs = [ pandas ];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
{ config, ... }:
|
||||
|
||||
{
|
||||
programs.alacritty = {
|
||||
|
|
|
|||
|
|
@ -1,5 +1 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
programs.bat = { enable = true; };
|
||||
}
|
||||
{ programs.bat = { enable = true; }; }
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
programs.beets = {
|
||||
enable = false;
|
||||
|
|
|
|||
|
|
@ -22,30 +22,23 @@ let
|
|||
isEnabled = if config.machine.isGraphical then true else false;
|
||||
dictionaries = with pkgs.hunspellDictsChromium; [ en_US de_DE ];
|
||||
commandLineArgs = [
|
||||
"--ignore-gpu-blocklist"
|
||||
"--enable-gpu-rasterization"
|
||||
"--enable-zero-copy"
|
||||
"--enable-features=VaapiVideoDecoder,VaapiVideoEncoder,WebRTCPipeWireCapturer"
|
||||
"--disable-features=UseChromeOSDirectVideoDecoder"
|
||||
"--use-vulkan"
|
||||
"--ozone-platform-hint=auto"
|
||||
"--enable-hardware-overlays"
|
||||
"--ignore-gpu-blocklist"
|
||||
"--enable-gpu-rasterization"
|
||||
"--enable-zero-copy"
|
||||
"--enable-features=VaapiVideoDecoder,VaapiVideoEncoder,WebRTCPipeWireCapturer"
|
||||
"--disable-features=UseChromeOSDirectVideoDecoder"
|
||||
"--use-vulkan"
|
||||
"--ozone-platform-hint=auto"
|
||||
"--enable-hardware-overlays"
|
||||
];
|
||||
extensions = map
|
||||
(eid: {
|
||||
id = eid;
|
||||
})
|
||||
chromium_extension;
|
||||
in
|
||||
{
|
||||
extensions = map (eid: { id = eid; }) chromium_extension;
|
||||
in {
|
||||
programs.chromium = {
|
||||
inherit dictionaries commandLineArgs extensions;
|
||||
enable = isEnabled;
|
||||
dictionaries = dictionaries;
|
||||
commandLineArgs = commandLineArgs;
|
||||
extensions = extensions;
|
||||
};
|
||||
programs.google-chrome = {
|
||||
inherit commandLineArgs;
|
||||
enable = isEnabled;
|
||||
commandLineArgs = commandLineArgs;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
programs.command-not-found = { enable = true; };
|
||||
}
|
||||
{ programs.command-not-found = { enable = true; }; }
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
programs.dircolors = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
programs.direnv = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -4,4 +4,4 @@
|
|||
programs.firefox = {
|
||||
enable = if config.machine.isGraphical then true else false;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
programs.fzf = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
programs.git = {
|
||||
|
|
@ -27,7 +27,5 @@
|
|||
branch = { autosetuprebase = "always"; };
|
||||
};
|
||||
};
|
||||
programs.git-credential-oauth = {
|
||||
enable = true;
|
||||
};
|
||||
programs.git-credential-oauth = { enable = true; };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
programs.go = {
|
||||
enable = true;
|
||||
};
|
||||
}
|
||||
{ programs.go = { enable = true; }; }
|
||||
|
|
|
|||
|
|
@ -1,5 +1 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
programs.hstr = { enable = true; };
|
||||
}
|
||||
{ programs.hstr = { enable = true; }; }
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
programs.htop = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -5,4 +5,4 @@
|
|||
enable = if config.machine.isGraphical then true else false;
|
||||
scripts = with pkgs.mpvScripts; [ autoload mpris sponsorblock ];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
programs.neovim = {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
programs.starship = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -1,7 +1 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
services.syncthing = {
|
||||
enable = true;
|
||||
};
|
||||
}
|
||||
{ services.syncthing = { enable = true; }; }
|
||||
|
|
|
|||
|
|
@ -1,7 +1,10 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
{ config, ... }:
|
||||
|
||||
let
|
||||
configPath = if config.machine.isGeneric then "${config.home.homeDirectory}/.config/home-manager" else "${config.home.homeDirectory}/.nixos-config";
|
||||
configPath = if config.machine.isGeneric then
|
||||
"${config.home.homeDirectory}/.config/home-manager"
|
||||
else
|
||||
"${config.home.homeDirectory}/.nixos-config";
|
||||
in {
|
||||
programs.topgrade = {
|
||||
enable = true;
|
||||
|
|
@ -13,18 +16,13 @@ in {
|
|||
pre_sudo = false;
|
||||
cleanup = true;
|
||||
skip_notify = true;
|
||||
disable = [
|
||||
"bun"
|
||||
"tldr"
|
||||
"flutter"
|
||||
];
|
||||
disable = [ "bun" "tldr" "flutter" ];
|
||||
};
|
||||
git.repos = [
|
||||
configPath
|
||||
];
|
||||
git.repos = [ configPath ];
|
||||
firmware = { upgrade = true; };
|
||||
pre_commands = {
|
||||
flakeUpgrade = "cd ${configPath} && nix flake update --commit-lock-file --verbose --repair";
|
||||
flakeUpgrade =
|
||||
"cd ${configPath} && nix flake update --commit-lock-file --verbose --repair";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,6 +1,2 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
programs.yt-dlp = { enable = true; };
|
||||
}
|
||||
{ programs.yt-dlp = { enable = true; }; }
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
omz-plugins = [
|
||||
"git"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
|
||||
{ config, pkgs, lib, ... }:
|
||||
{ pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
chromeArgs = lib.strings.concatStringsSep " " [
|
||||
|
|
@ -16,15 +15,15 @@ let
|
|||
"--ozone-platform-hint=auto"
|
||||
"--enable-features=WaylandWindowDecorations"
|
||||
];
|
||||
code-wrapper = (pkgs.writeShellScriptBin "code" ''
|
||||
code-wrapper = pkgs.writeShellScriptBin "code" ''
|
||||
exec /usr/bin/code ${codeArgs} "$@"
|
||||
'');
|
||||
chrome-wrapper = (pkgs.writeShellScriptBin "google-chrome" ''
|
||||
'';
|
||||
chrome-wrapper = pkgs.writeShellScriptBin "google-chrome" ''
|
||||
exec /usr/bin/google-chrome ${chromeArgs} "$@"
|
||||
'');
|
||||
chrome-stable-wrapper = (pkgs.writeShellScriptBin "google-chrome-stable" ''
|
||||
'';
|
||||
chrome-stable-wrapper = pkgs.writeShellScriptBin "google-chrome-stable" ''
|
||||
exec /usr/bin/google-chrome-stable ${chromeArgs} "$@"
|
||||
'');
|
||||
'';
|
||||
in {
|
||||
home.packages = with pkgs; [
|
||||
code-wrapper
|
||||
|
|
@ -202,7 +201,7 @@ in {
|
|||
Name[vi]=Cửa sổ Mới
|
||||
Name[zh_CN]=新建窗口
|
||||
Name[zh_TW]=開新視窗
|
||||
Exec=/usr/bin/google-chrome-stable ${chromeArgs}
|
||||
Exec=/usr/bin/google-chrome-stable ${chromeArgs}
|
||||
|
||||
[Desktop Action new-private-window]
|
||||
Name=New Incognito Window
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue