vleeuwenmenno/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes to bashrc

Browse Source 
adds bunch of extra software
adds ollama
adds emote shortcut
This commit is contained in:
Menno van Leeuwen
2024-11-03 03:06:24 +01:00
parent 93e4f8462e
commit 0c0ccab938
15 changed files with 110 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
config/home-manager/flake.lock generated
View File

@ -53,6 +53,22 @@
"type": "github"
}
},
"nixpkgs-ollama": {
"locked": {
"lastModified": 1728863046,
"narHash": "sha256-DZBO2465PL5V89e8hFSJewyH4QbCPpW3ssws7ckT/0A=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "d4f247e89f6e10120f911e2e2d2254a050d0f732",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"rev": "d4f247e89f6e10120f911e2e2d2254a050d0f732",
"type": "github"
}
},
"nixpkgs-vscode": {
"locked": {
"lastModified": 1728863046,
@ -90,6 +106,7 @@
"home-manager": "home-manager",
"nixpkgs": "nixpkgs",
"nixpkgs-go": "nixpkgs-go",
"nixpkgs-ollama": "nixpkgs-ollama",
"nixpkgs-vscode": "nixpkgs-vscode",
"nixpkgs-zed": "nixpkgs-zed"
}

12
config/home-manager/flake.nix
View File

@ -5,6 +5,7 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
# Pinned versions for specific packages (https://nixhub.io)
nixpkgs-ollama.url = "github:nixos/nixpkgs/d4f247e89f6e10120f911e2e2d2254a050d0f732";
nixpkgs-go.url = "github:nixos/nixpkgs/d4f247e89f6e10120f911e2e2d2254a050d0f732";
nixpkgs-vscode.url = "github:nixos/nixpkgs/d4f247e89f6e10120f911e2e2d2254a050d0f732";
nixpkgs-zed.url = "github:nixos/nixpkgs/41dea55321e5a999b17033296ac05fe8a8b5a257";
@ -22,6 +23,7 @@
nixpkgs-go,
nixpkgs-vscode,
nixpkgs-zed,
nixpkgs-ollama,
home-manager,
}:
let
@ -42,6 +44,10 @@
inherit system;
config.allowUnfree = true;
};
pkgs-ollama = import nixpkgs-ollama {
inherit system;
config.allowUnfree = true;
};
in
{
homeConfigurations = {
@ -54,6 +60,7 @@
pkgs-go
pkgs-vscode
pkgs-zed
pkgs-ollama
;
isServer = false;
};
@ -63,7 +70,7 @@
inherit pkgs;
modules = [ ./home.nix ];
extraSpecialArgs = {
inherit pkgs pkgs-go;
inherit pkgs pkgs-go pkgs-ollama;
isServer = true;
};
};
@ -77,6 +84,7 @@
pkgs-go
pkgs-vscode
pkgs-zed
pkgs-ollama
;
isServer = false;
};
@ -86,7 +94,7 @@
inherit pkgs;
modules = [ ./home.nix ];
extraSpecialArgs = {
inherit pkgs pkgs-go;
inherit pkgs pkgs-go pkgs-ollama;
isServer = true;
};
};

8
config/home-manager/packages/common/bash.nix
View File

@ -1,8 +1,16 @@
{ config, pkgs, ... }:
{
home.file.".bashrc.extra".source = "${config.home.homeDirectory}/dotfiles/.bashrc";
programs.bash = {
enable = true;
enableCompletion = true;
initExtra = ''
if [ -f ~/.bashrc.extra ]; then
source ~/.bashrc.extra
fi
'';
};
programs.fzf = {

3
config/home-manager/packages/common/packages.nix
View File

@ -1,4 +1,4 @@
{ pkgs, ... }:
{ pkgs, pkgs-ollama, ... }:
{
home.packages = with pkgs; [
# General packages
@ -8,6 +8,7 @@
nixfmt-rfc-style
wget
fastfetch
pkgs-ollama.ollama
# Package management
pipx

6
config/home-manager/workstation/keyboard-shortcuts.nix
View File

@ -13,6 +13,7 @@
"/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/1password-quick-access/"
"/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/missioncenter/"
"/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/terminal/"
"/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/emotes/"
];
};
"org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/1password-quick-access" = {
@ -30,5 +31,10 @@
command = "kgx";
name = "terminal";
};
"org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/emotes" = {
binding = "<Super>e";
command = "flatpak run com.tomjwatson.Emote";
name = "emotes";
};
};
}