Compare commits

..

No commits in common. "212e521c7300abf21409d91a51b27f16c2a1eef0" and "92c212d721cc340489519492254f47a181b17aaa" have entirely different histories.

6 changed files with 29 additions and 53 deletions

View file

@ -1,17 +0,0 @@
{ ... }:
{
imports = [ ./../../home-manager/modules/machine.nix ];
machine = {
username = "thilo";
isGeneric = true;
isGnome = false;
noiseSuppression.enable = false;
isGraphical = false;
};
fonts.fontconfig.enable = true;
nixpkgs.config.allowUnfree = true;
}

View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713273854, "lastModified": 1712240231,
"narHash": "sha256-KNq2YJa9SsPKb7BvRtoJyyGKS4pw3TPKSTuhlj+sWCg=", "narHash": "sha256-14ovG6W9OlgbGsL0o7VtUifN+pbvjgN0KpJDJPEW9C8=",
"owner": "dagger", "owner": "dagger",
"repo": "nix", "repo": "nix",
"rev": "dd0199825d18b6f47c692c4345dd28a6f6122958", "rev": "a661c2b8c23ad99939be91b7c6ccc7e08caee41d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -93,11 +93,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713453913, "lastModified": 1712989663,
"narHash": "sha256-vbXq52VRlL1defMHrwhsoeHm95O3mFefsSSJyNEghbA=", "narHash": "sha256-r2X/DIAyKOLiHoncjcxUk1TENWDTTaigRBaY53Cts/w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "178e26895b3aef028a00a32fb7e7ed0fc660645c", "rev": "40ab43ae98cb3e6f07eaeaa3f3ed56d589da21b0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -161,11 +161,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713164845, "lastModified": 1710495228,
"narHash": "sha256-6X0H56qGmN/LoEdcBcwm3+apHLEe7r4caO719q1/KMI=", "narHash": "sha256-w0XM85Zo4mNqRLZDZMWUw0wv7LRoODKohCWIaVNnE94=",
"owner": "thiagokokada", "owner": "thiagokokada",
"repo": "nix-alien", "repo": "nix-alien",
"rev": "db5d6107d3c72d5eb0b7a02a30b87b1f0076fcc5", "rev": "75c0c2d5eb1fdd2c5187c49888cab40b060605fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -194,11 +194,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1713067146, "lastModified": 1710120787,
"narHash": "sha256-9D20xjblGKEVRVCnM3qWhiizEa9i6OpK6xQJajwcwOQ=", "narHash": "sha256-tlLuB73OCOKtU2j83bQzSYFyzjJo3rjpITZE5MoofG8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "93aed67288be60c9ef6133ba2f8de128f4ef265c", "rev": "e76ff2df6bfd2abe06abd8e7b9f217df941c1b07",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -230,11 +230,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1712791164, "lastModified": 1709703039,
"narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -281,11 +281,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1713248628, "lastModified": 1712791164,
"narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=", "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8", "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -311,11 +311,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1713254108, "lastModified": 1710889954,
"narHash": "sha256-0TZIsfDbHG5zibtlw6x0yOp3jkInIGaJ35B7Y4G8Pec=", "narHash": "sha256-Pr6F5Pmd7JnNEMHHmspZ0qVqIBVxyZ13ik1pJtm2QXk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2fd19c8be2551a61c1ddc3d9f86d748f4db94f00", "rev": "7872526e9c5332274ea5932a0c3270d6e4724f3b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -344,11 +344,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1713412554, "lastModified": 1711575371,
"narHash": "sha256-jl6MEqKa+mc511xkj2X2q1jKqc8ndi/WcGSYVcH7j/0=", "narHash": "sha256-p88nsfnZI1c7AMuzNihPHrUxuTnhEJHuFCixpZOaMWg=",
"owner": "Noodlez1232", "owner": "Noodlez1232",
"repo": "suyu-flake", "repo": "suyu-flake",
"rev": "5b5b36c4896820b632bf57e5fe7f238d8ad097c7", "rev": "be9564503f7816cb69221cf7a9e98f72b9bae04a",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -68,17 +68,11 @@
]; ];
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
}; };
homeConfigurations."thilo@thilo-pc" =
home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules = [ ./configs/fedora/home.nix ];
extraSpecialArgs = { inherit inputs nixgl; };
};
homeConfigurations."thilo@thilo-pc-win" = homeConfigurations."thilo@thilo-pc-win" =
home-manager.lib.homeManagerConfiguration { home-manager.lib.homeManagerConfiguration {
inherit pkgs; inherit pkgs;
modules = [ ./configs/wsl/home.nix ]; modules = [ ./configs/wsl/home.nix ];
extraSpecialArgs = { inherit inputs nixgl; }; extraSpecialArgs = { inherit inputs; };
}; };
}; };
} }

View file

@ -70,13 +70,11 @@ in {
unrar unrar
inputs.w17.packages.x86_64-linux.default inputs.w17.packages.x86_64-linux.default
aichat aichat
nix-output-monitor
] ++ (if config.machine.isGraphical then [
(pkgs.nerdfonts.override { (pkgs.nerdfonts.override {
fonts = [ "JetBrainsMono" "FiraCode" "FiraMono" ]; fonts = [ "JetBrainsMono" "FiraCode" "FiraMono" ];
}) })
nix-output-monitor
nodePackages.pnpm
npm-check-updates
] ++ (if config.machine.isGraphical then [
corefonts corefonts
vistafonts vistafonts
jetbrains.webstorm jetbrains.webstorm

View file

@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }: { config, ... }:
{ {
programs.alacritty = { programs.alacritty = {

View file

@ -3,6 +3,7 @@
{ {
programs.git = { programs.git = {
enable = true; enable = true;
package = pkgs.gitFull;
lfs.enable = true; lfs.enable = true;
userEmail = "thilo.billerbeck@officerent.de"; userEmail = "thilo.billerbeck@officerent.de";
userName = "Thilo Billerbeck"; userName = "Thilo Billerbeck";