Noratrieb/nixos
1
0
Fork 0
mirror of https://github.com/Noratrieb/nixos.git synced 2026-01-14 11:45:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup

Browse source
This commit is contained in:
nora 2023-09-17 21:13:41 +02:00
parent bc6f9e293f
commit 6ab5c496f3
5 changed files with 114 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

11
flake.nix
View file

@ -38,16 +38,5 @@
];
};
};
# Standalone home-manager configuration entrypoint
# Available through 'home-manager --flake .#nils@nixos'
/*homeConfigurations = {
"nils@nixos" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
extraSpecialArgs = { inherit inputs; }; # Pass flake inputs to our config
# > Our main home-manager configuration file <
modules = [ ./home-manager/home.nix ];
};
};*/
};
}

64
home-manager/firefox.nix
View file

@ -1,36 +1,38 @@
{ pkgs }: {
enable = true;
profiles = {
nils = {
id = 0;
name = "nils";
{ pkgs, ... }: {
programs.firefox = {
enable = true;
profiles = {
nils = {
id = 0;
name = "nils";
extensions = with pkgs.nur.repos.rycee.firefox-addons; [
ublock-origin
bitwarden
tampermonkey
];
extensions = with pkgs.nur.repos.rycee.firefox-addons; [
ublock-origin
bitwarden
tampermonkey
];
bookmarks = [
{
name = "Nix sites";
toolbar = true;
bookmarks = [
{
name = "NixOS options";
url = "https://search.nixos.org/options";
}
{
name = "home-manager options";
url = "https://rycee.gitlab.io/home-manager/options.html";
}
{
name = "nixpkgs search";
url = "https://search.nixos.org/packages";
}
];
}
];
bookmarks = [
{
name = "Nix sites";
toolbar = true;
bookmarks = [
{
name = "NixOS options";
url = "https://search.nixos.org/options";
}
{
name = "home-manager options";
url = "https://rycee.gitlab.io/home-manager/options.html";
}
{
name = "nixpkgs search";
url = "https://search.nixos.org/packages";
}
];
}
];
};
};
};
}

42
home-manager/git.nix
View file

@ -1,23 +1,25 @@
{ pkgs }: {
enable = true;
userEmail = "48135649+Nilstrieb@users.noreply.github.com";
userName = "Nilstrieb";
aliases = {
hardupdate = "!git fetch && git reset --hard \"origin/$(git rev-parse --abbrev-ref HEAD)\"";
fpush = "push --force-with-lease";
resq = "rebase --autosquash -i";
pfush = "!echo \"hör uf ume z'pfusche und machs richtig\"";
};
difftastic = {
{ pkgs, ... }: {
programs.git = {
enable = true;
};
extraConfig = {
core.autocrlf = false;
core.editor = "nvim";
pull.ff = "only";
push.autoSetupRemote = true;
init.defaultBranch = "main";
userEmail = "48135649+Nilstrieb@users.noreply.github.com";
userName = "Nilstrieb";
aliases = {
hardupdate = "!git fetch && git reset --hard \"origin/$(git rev-parse --abbrev-ref HEAD)\"";
fpush = "push --force-with-lease";
resq = "rebase --autosquash -i";
pfush = "!echo \"hör uf ume z'pfusche und machs richtig\"";
};
difftastic = {
enable = true;
};
extraConfig = {
core.autocrlf = false;
core.editor = "nvim";
pull.ff = "only";
push.autoSetupRemote = true;
init.defaultBranch = "main";
};
};
}

28
home-manager/home.nix
View file

@ -18,29 +18,11 @@ in
# You can also split up your configuration and import pieces of it here:
# ./nvim.nix
./git.nix
./firefox.nix
./vscode.nix
];
/*nixpkgs = {
# You can add overlays here
overlays = [
# If you want to use overlays exported from other flakes:
# neovim-nightly-overlay.overlays.default
# Or define it inline, for example:
# (final: prev: {
# hi = final.hello.overrideAttrs (oldAttrs: {
# patches = [ ./change-hello-to-hi.patch ];
# });
# })
];
# Configure your nixpkgs instance
config = {
allowUnfree = true;
# Workaround for https://github.com/nix-community/home-manager/issues/2942
allowUnfreePredicate = (_: true);
};
};*/
home = {
username = "nils";
homeDirectory = "/home/nils";
@ -80,10 +62,6 @@ in
programs.home-manager.enable = true;
programs.git = import ./git.nix { inherit pkgs; };
programs.firefox = import ./firefox.nix { inherit pkgs; };
programs.vscode = import ./vscode.nix { inherit pkgs; };
programs.fish = {
enable = true;
interactiveShellInit = ''

110
home-manager/vscode.nix
View file

@ -1,55 +1,57 @@
{ pkgs }: {
enable = true;
package = pkgs.vscode;
extensions = with pkgs.vscode-extensions; [
jnoortheen.nix-ide
usernamehw.errorlens
ms-vscode.cmake-tools
ms-vscode.cpptools
eamodio.gitlens
tamasfe.even-better-toml
ms-vscode-remote.remote-ssh
esbenp.prettier-vscode
dbaeumer.vscode-eslint
ms-python.python
redhat.vscode-yaml
mads-hartmann.bash-ide-vscode
ms-azuretools.vscode-docker
] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
{
publisher = "dtsvet";
name = "vscode-wasm";
version = "1.4.1";
sha256 = "sha256-zs7E3pxf4P8kb3J+5zLoAO2dvTeepuCuBJi5s354k0I=";
}
{
publisher = "redhat";
name = "ansible";
version = "2.7.98";
sha256 = "sha256-b3Z40IeQbtYci2LA4/OlJkfqMB78cWRNTNWd89lfhy4=";
}
{
publisher = "matthewpi";
name = "caddyfile-support";
version = "0.3.0";
sha256 = "sha256-1yiOnvC2w33kiPRdQYskee38Cid/GOj9becLadP1fUY=";
}
] ++ [
(pkgs.vscode-utils.buildVscodeExtension {
name = "riverdelta";
version = "0.1.0";
src = builtins.fetchGit {
url = "https://github.com/Nilstrieb/riverdelta";
rev = "64d81b56084d9a7663517b367b4533fb8ea83a92";
};
vscodeExtPublisher = "Nilstrieb";
vscodeExtName = "riverdelta";
vscodeExtUniqueId = "Nilstrieb.riverdelta";
buildPhase = ''
runHook preBuild;
cd ./vscode
runHook postBuild;
'';
})
];
{ pkgs, ... }: {
programs.vscode = {
enable = true;
package = pkgs.vscode;
extensions = with pkgs.vscode-extensions; [
jnoortheen.nix-ide
usernamehw.errorlens
ms-vscode.cmake-tools
ms-vscode.cpptools
eamodio.gitlens
tamasfe.even-better-toml
ms-vscode-remote.remote-ssh
esbenp.prettier-vscode
dbaeumer.vscode-eslint
ms-python.python
redhat.vscode-yaml
mads-hartmann.bash-ide-vscode
ms-azuretools.vscode-docker
] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
{
publisher = "dtsvet";
name = "vscode-wasm";
version = "1.4.1";
sha256 = "sha256-zs7E3pxf4P8kb3J+5zLoAO2dvTeepuCuBJi5s354k0I=";
}
{
publisher = "redhat";
name = "ansible";
version = "2.7.98";
sha256 = "sha256-b3Z40IeQbtYci2LA4/OlJkfqMB78cWRNTNWd89lfhy4=";
}
{
publisher = "matthewpi";
name = "caddyfile-support";
version = "0.3.0";
sha256 = "sha256-1yiOnvC2w33kiPRdQYskee38Cid/GOj9becLadP1fUY=";
}
] ++ [
(pkgs.vscode-utils.buildVscodeExtension {
name = "riverdelta";
version = "0.1.0";
src = builtins.fetchGit {
url = "https://github.com/Nilstrieb/riverdelta";
rev = "64d81b56084d9a7663517b367b4533fb8ea83a92";
};
vscodeExtPublisher = "Nilstrieb";
vscodeExtName = "riverdelta";
vscodeExtUniqueId = "Nilstrieb.riverdelta";
buildPhase = ''
runHook preBuild;
cd ./vscode
runHook postBuild;
'';
})
];
};
}