thilobillerbeck/dotfiles
1
0
Fork 0
mirror of https://github.com/thilobillerbeck/dotfiles.git synced 2024-12-22 20:13:04 +01:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: thilobillerbeck:51d50ad3534ebc9353bb72cf5f3fa3ff937a08c7
Branches Tags
thilobillerbeck:main
..
compare: thilobillerbeck:884de0c3a4e99f22afd6af5367c182a8821eed2d
Branches Tags
thilobillerbeck:main

No commits in common. "51d50ad3534ebc9353bb72cf5f3fa3ff937a08c7" and "884de0c3a4e99f22afd6af5367c182a8821eed2d" have entirely different histories.
51d50ad353 ... 884de0c3a4

8 changed files with 94 additions and 133 deletions
Show stats Expand all files Collapse all files

7
configs/fedora/home.nix
View file

@ -10,7 +10,7 @@ in {
isGeneric = true; isGeneric = true;
isGnome = false; isGnome = false;
noiseSuppression.enable = false; noiseSuppression.enable = false;
isGraphical = true; isGraphical = false;
}; };
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
@ -18,4 +18,9 @@ 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)
];
} }

77
flake.lock
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714131597, "lastModified": 1713273854,
"narHash": "sha256-ucAlX+UadBzeNYRcbNhQ4Tey+0eGfRL2xlvL9whHhCA=", "narHash": "sha256-KNq2YJa9SsPKb7BvRtoJyyGKS4pw3TPKSTuhlj+sWCg=",
"owner": "dagger", "owner": "dagger",
"repo": "nix", "repo": "nix",
"rev": "1b634d4d8d78e50c6cbf8899238c946964b10249", "rev": "dd0199825d18b6f47c692c4345dd28a6f6122958",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -93,11 +93,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714203603, "lastModified": 1713906585,
"narHash": "sha256-eT7DENhYy7EPLOqHI9zkIMD9RvMCXcqh6gGqOK5BWYQ=", "narHash": "sha256-fv84DCOkBtjF6wMATt0rfovu7e95L8rdEkSfNbwKR3U=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c1609d584a6b5e9e6a02010f51bd368cb4782f8e", "rev": "bfa7c06436771e3a0c666ccc6ee01e815d4c33aa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -263,16 +263,14 @@
"nixpkgs-update": { "nixpkgs-update": {
"inputs": { "inputs": {
"mmdoc": "mmdoc", "mmdoc": "mmdoc",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3"
"runtimeDeps": "runtimeDeps",
"treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1714270547, "lastModified": 1712805493,
"narHash": "sha256-s77XshW+9EoghBWmOf0tFVQZ+8rX4+bOCz0StL+TkvQ=", "narHash": "sha256-hClY8qu4zwty2x37iiAlwTh9XaNEHzsPR5NvLLJL/gE=",
"owner": "ryantm", "owner": "ryantm",
"repo": "nixpkgs-update", "repo": "nixpkgs-update",
"rev": "df23e62c3322a6471671ec8cb4ad0da36ab7f8a7", "rev": "fbd0e11caeb71d55ab880b09b9929cdc8e2e956e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -283,11 +281,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1714076141, "lastModified": 1713714899,
"narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", "rev": "6143fc5eeb9c4f00163267708e26191d1e918932",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -313,11 +311,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1713805509, "lastModified": 1713254108,
"narHash": "sha256-YgSEan4CcrjivCNO5ZNzhg7/8ViLkZ4CB/GrGBVSudo=", "narHash": "sha256-0TZIsfDbHG5zibtlw6x0yOp3jkInIGaJ35B7Y4G8Pec=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1e1dc66fe68972a76679644a5577828b6a7e8be4", "rev": "2fd19c8be2551a61c1ddc3d9f86d748f4db94f00",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -340,33 +338,17 @@
"w17": "w17" "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": { "suyu": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1714016451, "lastModified": 1713412554,
"narHash": "sha256-7dvQhBvf8IGL2djRtVeWFLqo+AK7cvYxyj8PDJ/qvh0=", "narHash": "sha256-jl6MEqKa+mc511xkj2X2q1jKqc8ndi/WcGSYVcH7j/0=",
"owner": "Noodlez1232", "owner": "Noodlez1232",
"repo": "suyu-flake", "repo": "suyu-flake",
"rev": "b3904f149f124bc485e1cb61b4e824ed9ec5c7e7", "rev": "5b5b36c4896820b632bf57e5fe7f238d8ad097c7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -420,27 +402,6 @@
"type": "github" "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": { "utils": {
"inputs": { "inputs": {
"systems": "systems_3" "systems": "systems_3"

10
home-manager/modules/machine.nix
View file

@ -126,6 +126,16 @@ 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" ];
}; };

122
home-manager/modules/packages.nix
View file

@ -2,11 +2,9 @@
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: {
@ -78,70 +76,60 @@ in
nix-output-monitor nix-output-monitor
nodePackages.pnpm nodePackages.pnpm
npm-check-updates npm-check-updates
] ++ ( ] ++ (if config.machine.isGraphical then [
if ( corefonts
config.machine.isGraphical vistafonts
) then [ jetbrains.webstorm
(nixGL insomnia) jetbrains.phpstorm
] else jetbrains.rust-rover
[ ] jetbrains.goland
) ++ ( element-desktop
if ( ludusavi
config.machine.isGraphical && !config.machine.isGeneric dbeaver
) then [ insomnia
corefonts onlyoffice-bin
vistafonts spotify
jetbrains.webstorm vesktop
jetbrains.phpstorm (lutris.override {
jetbrains.rust-rover extraLibraries = _: [ gnome3.adwaita-icon-theme ];
jetbrains.goland extraPkgs = _: [
element-desktop wineWowPackages.full
ludusavi winetricks
dbeaver gnome3.adwaita-icon-theme
onlyoffice-bin ];
spotify })
vesktop bottles
(lutris.override { protontricks
extraLibraries = _: [ gnome3.adwaita-icon-theme ]; heroic
extraPkgs = _: [ (vscode.override { commandLineArgs = electronFlags; })
wineWowPackages.full quickemu
winetricks quickgui
gnome3.adwaita-icon-theme trilium-desktop
]; anki
}) inputs.muse-sounds-manager.packages.x86_64-linux.muse-sounds-manager
bottles jetbrains-toolbox
protontricks mumble
heroic prusa-slicer
(vscode.override { commandLineArgs = electronFlags; }) trayscale
quickemu gnome.gnome-disk-utility
quickgui inkscape
trilium-desktop musescore
anki obsidian
# inputs.muse-sounds-manager.packages.x86_64-linux.muse-sounds-manager syncthingtray
jetbrains-toolbox reaper
mumble yabridge
prusa-slicer inputs.suyu.packages.x86_64-linux.suyu
trayscale inputs.nix-alien.packages.x86_64-linux.nix-alien
gnome.gnome-disk-utility kdePackages.kdenlive
inkscape audacity
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 ] else
[ ]); [ ]) ++ (if config.machine.isGnome then [
gnomeExtensions.blur-my-shell
gnomeExtensions.dash-to-panel
gnomeExtensions.user-themes
gnomeExtensions.vitals
gnomeExtensions.custom-accent-colors
] else
[ ]);
}; };
} }

5
home-manager/programs/alacritty.nix
View file

@ -1,11 +1,8 @@
{ 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";

2
home-manager/programs/chromium.nix
View file

@ -19,7 +19,7 @@ let
"bmnlcjabgnpnenekpadlanbbkooimhnj" # Honey "bmnlcjabgnpnenekpadlanbbkooimhnj" # Honey
"kbfnbcaeplbcioakkpcpgfkobkghlhen" # Grammarly "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 ]; dictionaries = with pkgs.hunspellDictsChromium; [ en_US de_DE ];
commandLineArgs = [ commandLineArgs = [
"--enable-wayland-ime" "--enable-wayland-ime"

2
home-manager/programs/firefox.nix
View file

@ -2,6 +2,6 @@
{ {
programs.firefox = { programs.firefox = {
enable = if (config.machine.isGraphical && !config.machine.isGeneric) then true else false; enable = if config.machine.isGraphical then true else false;
}; };
} }

2
home-manager/programs/mpv.nix
View file

@ -2,7 +2,7 @@
{ {
programs.mpv = { 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 ]; scripts = with pkgs.mpvScripts; [ autoload mpris sponsorblock ];
}; };
} }