several tower improvements

This commit is contained in:
Thilo Billerbeck 2025-01-17 00:19:40 +01:00
parent 36d4d13488
commit f29b928443
5 changed files with 15 additions and 40 deletions

21
flake.lock generated
View file

@ -206,26 +206,6 @@
"type": "github" "type": "github"
} }
}, },
"nix-index-database_2": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1736652904,
"narHash": "sha256-8uolHABgroXqzs03QdulHp8H9e5kWQZnnhcda1MKbBM=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "271e5bd7c57e1f001693799518b10a02d1123b12",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-index-database",
"type": "github"
}
},
"nixgl": { "nixgl": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
@ -336,7 +316,6 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"muse-sounds-manager": "muse-sounds-manager", "muse-sounds-manager": "muse-sounds-manager",
"nix-alien": "nix-alien", "nix-alien": "nix-alien",
"nix-index-database": "nix-index-database_2",
"nixgl": "nixgl", "nixgl": "nixgl",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-update": "nixpkgs-update", "nixpkgs-update": "nixpkgs-update",

View file

@ -28,10 +28,6 @@
}; };
suyu.url = "github:Noodlez1232/suyu-flake"; suyu.url = "github:Noodlez1232/suyu-flake";
nix-alien.url = "github:thiagokokada/nix-alien"; nix-alien.url = "github:thiagokokada/nix-alien";
nix-index-database = {
url = "github:nix-community/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
nixConfig = { nixConfig = {
@ -92,7 +88,6 @@
homeConfigurations."thilo@thilo-pc" = home-manager.lib.homeManagerConfiguration { homeConfigurations."thilo@thilo-pc" = home-manager.lib.homeManagerConfiguration {
inherit pkgs; inherit pkgs;
modules = [ modules = [
inputs.nix-index-database.hmModules.nix-index
./configs/fedora/home.nix ./configs/fedora/home.nix
]; ];
extraSpecialArgs = { extraSpecialArgs = {

View file

@ -93,6 +93,9 @@ in
nextpnr nextpnr
icestorm icestorm
icebreaker icebreaker
php
(lib.hiPrio phpPackages.composer)
] ]
++ ( ++ (
if (!config.machine.isGeneric) then if (!config.machine.isGeneric) then

View file

@ -32,6 +32,10 @@ in
pre_commands = { pre_commands = {
flakeUpgrade = "cd ${configPath} && ${pkgs.nixVersions.latest}/bin/nix flake update --commit-lock-file --verbose --repair"; flakeUpgrade = "cd ${configPath} && ${pkgs.nixVersions.latest}/bin/nix flake update --commit-lock-file --verbose --repair";
}; };
post_commands = {
nixCollectGarbage = "nix-collect-garbage -d";
dockerPrune = "docker system prune -f";
};
}; };
}; };
} }

View file

@ -18,21 +18,15 @@
update-local = "bash $HOME/.dotfiles/install"; update-local = "bash $HOME/.dotfiles/install";
sudo = "sudo --preserve-env=PATH env"; sudo = "sudo --preserve-env=PATH env";
}; };
initExtra = '' antidote = {
export PATH=~/.npm-global/bin:$PATH enable = true;
source ${pkgs.nix-index}/etc/profile.d/command-not-found.sh
'';
plugins = [ plugins = [
{ "ohmyzsh/ohmyzsh path:plugins/dotenv"
name = "zsh-nix-shell";
file = "nix-shell.plugin.zsh";
src = pkgs.fetchFromGitHub {
owner = "chisui";
repo = "zsh-nix-shell";
rev = "v0.8.0";
sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7";
};
}
]; ];
}; };
initExtraFirst = ''
ZSH_DOTENV_PROMPT=false
export PATH=~/.npm-global/bin:$PATH
'';
};
} }