mirror of
https://github.com/thilobillerbeck/dotfiles.git
synced 2024-12-22 20:13:04 +01:00
Compare commits
No commits in common. "51d50ad3534ebc9353bb72cf5f3fa3ff937a08c7" and "884de0c3a4e99f22afd6af5367c182a8821eed2d" have entirely different histories.
51d50ad353
...
884de0c3a4
8 changed files with 94 additions and 133 deletions
|
|
@ -10,7 +10,7 @@ in {
|
|||
isGeneric = true;
|
||||
isGnome = false;
|
||||
noiseSuppression.enable = false;
|
||||
isGraphical = true;
|
||||
isGraphical = false;
|
||||
};
|
||||
|
||||
fonts.fontconfig.enable = true;
|
||||
|
|
@ -18,4 +18,9 @@ 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)
|
||||
];
|
||||
}
|
||||
|
|
|
|||
77
flake.lock
77
flake.lock
|
|
@ -7,11 +7,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1714131597,
|
||||
"narHash": "sha256-ucAlX+UadBzeNYRcbNhQ4Tey+0eGfRL2xlvL9whHhCA=",
|
||||
"lastModified": 1713273854,
|
||||
"narHash": "sha256-KNq2YJa9SsPKb7BvRtoJyyGKS4pw3TPKSTuhlj+sWCg=",
|
||||
"owner": "dagger",
|
||||
"repo": "nix",
|
||||
"rev": "1b634d4d8d78e50c6cbf8899238c946964b10249",
|
||||
"rev": "dd0199825d18b6f47c692c4345dd28a6f6122958",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -93,11 +93,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1714203603,
|
||||
"narHash": "sha256-eT7DENhYy7EPLOqHI9zkIMD9RvMCXcqh6gGqOK5BWYQ=",
|
||||
"lastModified": 1713906585,
|
||||
"narHash": "sha256-fv84DCOkBtjF6wMATt0rfovu7e95L8rdEkSfNbwKR3U=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "c1609d584a6b5e9e6a02010f51bd368cb4782f8e",
|
||||
"rev": "bfa7c06436771e3a0c666ccc6ee01e815d4c33aa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -263,16 +263,14 @@
|
|||
"nixpkgs-update": {
|
||||
"inputs": {
|
||||
"mmdoc": "mmdoc",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"runtimeDeps": "runtimeDeps",
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1714270547,
|
||||
"narHash": "sha256-s77XshW+9EoghBWmOf0tFVQZ+8rX4+bOCz0StL+TkvQ=",
|
||||
"lastModified": 1712805493,
|
||||
"narHash": "sha256-hClY8qu4zwty2x37iiAlwTh9XaNEHzsPR5NvLLJL/gE=",
|
||||
"owner": "ryantm",
|
||||
"repo": "nixpkgs-update",
|
||||
"rev": "df23e62c3322a6471671ec8cb4ad0da36ab7f8a7",
|
||||
"rev": "fbd0e11caeb71d55ab880b09b9929cdc8e2e956e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -283,11 +281,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1714076141,
|
||||
"narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=",
|
||||
"lastModified": 1713714899,
|
||||
"narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856",
|
||||
"rev": "6143fc5eeb9c4f00163267708e26191d1e918932",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -313,11 +311,11 @@
|
|||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1713805509,
|
||||
"narHash": "sha256-YgSEan4CcrjivCNO5ZNzhg7/8ViLkZ4CB/GrGBVSudo=",
|
||||
"lastModified": 1713254108,
|
||||
"narHash": "sha256-0TZIsfDbHG5zibtlw6x0yOp3jkInIGaJ35B7Y4G8Pec=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1e1dc66fe68972a76679644a5577828b6a7e8be4",
|
||||
"rev": "2fd19c8be2551a61c1ddc3d9f86d748f4db94f00",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -340,33 +338,17 @@
|
|||
"w17": "w17"
|
||||
}
|
||||
},
|
||||
"runtimeDeps": {
|
||||
"locked": {
|
||||
"lastModified": 1714247354,
|
||||
"narHash": "sha256-6dFKqP/aCKIdpOgqgIQUrRT0NOfVc14ftNcdELa4Pu4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c8d7c8a78fb516c0842cc65346506a565c88014d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable-small",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"suyu": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_3",
|
||||
"nixpkgs": "nixpkgs_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1714016451,
|
||||
"narHash": "sha256-7dvQhBvf8IGL2djRtVeWFLqo+AK7cvYxyj8PDJ/qvh0=",
|
||||
"lastModified": 1713412554,
|
||||
"narHash": "sha256-jl6MEqKa+mc511xkj2X2q1jKqc8ndi/WcGSYVcH7j/0=",
|
||||
"owner": "Noodlez1232",
|
||||
"repo": "suyu-flake",
|
||||
"rev": "b3904f149f124bc485e1cb61b4e824ed9ec5c7e7",
|
||||
"rev": "5b5b36c4896820b632bf57e5fe7f238d8ad097c7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -420,27 +402,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"treefmt-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs-update",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1711963903,
|
||||
"narHash": "sha256-N3QDhoaX+paWXHbEXZapqd1r95mdshxToGowtjtYkGI=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "49dc4a92b02b8e68798abd99184f228243b6e3ac",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"utils": {
|
||||
"inputs": {
|
||||
"systems": "systems_3"
|
||||
|
|
|
|||
|
|
@ -126,6 +126,16 @@ 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,11 +2,9 @@
|
|||
|
||||
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: {
|
||||
|
|
@ -78,70 +76,60 @@ in
|
|||
nix-output-monitor
|
||||
nodePackages.pnpm
|
||||
npm-check-updates
|
||||
] ++ (
|
||||
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
|
||||
] ++ (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
|
||||
] else
|
||||
[ ]);
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,8 @@
|
|||
{ 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 && !config.machine.isGeneric) then true else false;
|
||||
isEnabled = if config.machine.isGraphical 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 && !config.machine.isGeneric) then true else false;
|
||||
enable = if config.machine.isGraphical then true else false;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
{
|
||||
programs.mpv = {
|
||||
enable = if (config.machine.isGraphical && !config.machine.isGeneric) then true else false;
|
||||
enable = if config.machine.isGraphical then true else false;
|
||||
scripts = with pkgs.mpvScripts; [ autoload mpris sponsorblock ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue