Skip to content

Commit

Permalink
changes
Browse files Browse the repository at this point in the history
  • Loading branch information
rasmus-kirk committed Oct 20, 2024
1 parent 37c061a commit d1867aa
Show file tree
Hide file tree
Showing 16 changed files with 281 additions and 1,131 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ for personal use, it's possible for others to reuse them:
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
kirk-modules.url = "github:rasmus-kirk/nix-configuration";
kirk-modules.url = "github:rasmus-kirk/nix-config";
kirk-modules.inputs.nixpkgs.follows = "nixpkgs";
home-manager.url = "github:nix-community/home-manager/release-23.11";
Expand Down
1 change: 0 additions & 1 deletion configurations/home-manager/pi/home.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
in {
kirk = {
terminalTools.enable = true;
fzf.enable = true;
git = {
enable = true;
userEmail = "[email protected]";
Expand Down
98 changes: 3 additions & 95 deletions configurations/home-manager/work/home.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ in {
kirk = {
terminalTools.enable = true;
foot.enable = true;
fzf.enable = true;
mpv.enable = true;
mvi.enable = true;
xdgMime.enable = true;
git = {
enable = true;
userEmail = "[email protected]";
Expand All @@ -30,8 +32,6 @@ in {
enable = true;
configDir = configDir;
};
joshuto.enableZshIntegration = false;
kakoune.enable = true;
ssh = {
enable = true;
identityPath = "${secretDir}/id_ed25519";
Expand Down Expand Up @@ -81,98 +81,6 @@ in {
initExtra = "exec zsh";
};

programs.emacs = {
enable = true;
extraConfig = ''
(use-package kakoune)
'';
extraPackages = epkgs: [epkgs.kakoune];
};

# TODO: Add to kirk-module
programs.mpv = {
enable = true;
bindings = {
UP = "add chapter 1";
DOWN = "add chapter -1";
ESC = "quit";
ENTER = "cycle pause";
f = "cycle fullscreen";
h = "seek -5";
j = "add chapter -1";
k = "add chapter 1";
l = "seek 5";

"Shift+LEFT" = "cycle sub down";
"Shift+RIGHT" = "cycle sub";
"Shift+UP" = "cycle audio";
"Shift+DOWN" = "cycle audio down";

y = "add audio-delay 0.010";
o = "add audio-delay -0.010";

i = ''cycle-values vf "sub,lavfi=negate" ""'';
S = "playlist-shuffle";

a = "ab-loop";

"Alt+r" = "playlist-shuffle";
};
scripts = with pkgs.mpvScripts; [
# Load all files in directory to playlist, playing next alphabetically ordered file on playback end.
autoload
# Better UI
uosc
# Allows media playback buttons to work in mpv
mpris
# Thumbnail support, needs uosc to work
thumbfast
# Prevents screen sleep on gnome
inhibit-gnome
];
config = {
# TODO: wtf is the reason for this? It should not be necessary. WHY DOES IT WORK!?
vo = "x11";

alang = ["jpn" "eng"];
slang = ["eng"];
#extension.gif = {
# cache = "no";
# no-pause = "";
# loop-file = "yes";
#};
#extension.webm = {
# no-pause = "";
# loop-file = "yes";
#};
};
};

xdg.desktopEntries = with pkgs.lib; {
zathura = {
name = "Zathura";
exec = "${getExe pkgs.zathura} %U";
#mimeType = [ "application/pdf" ];
};
yazi = {
name = "Yazi";
exec = "${getExe pkgs.foot} ${getExe pkgs.yazi} %u";
mimeType = [ "inode/directory" ];
};
};

xdg.mimeApps = {
enable = true;
defaultApplications = {
"application/pdf" = [ "zathura.desktop" ];
"inode/directory" = [ "yazi.desktop" ];
"x-scheme-handler/about" = [ "librewolf.desktop" ];
"x-scheme-handler/http" = [ "librewolf.desktop" ];
"x-scheme-handler/https" = [ "librewolf.desktop" ];
"x-scheme-handler/unknown" = [ "librewolf.desktop" ];
};
};

programs.zsh.profileExtra = ''
export PATH=$PATH:~/.cargo/bin:~/.local/bin
Expand Down
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ for personal use, it's possible for others to reuse them:
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
kirk-modules.url = "github:rasmus-kirk/nix-configuration";
kirk-modules.url = "github:rasmus-kirk/nix-config";
kirk-modules.inputs.nixpkgs.follows = "nixpkgs";
home-manager.url = "github:nix-community/home-manager/release-23.11";
Expand Down
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
description = "My Nixos configuration";
description = "My Nix configuration";

inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
Expand Down
10 changes: 5 additions & 5 deletions modules/home-manager/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
imports = [
./fonts
./foot
./fzf
./scripts
./git
./gruvboxTheme
./helix
./homeManagerScripts
./jiten
./joshuto
./kakoune
./mpv
./mvi
./scripts
./ssh
./yazi
./terminalTools
./userDirs
./xdgMime
./yazi
./zathura
./zsh
];
Expand Down
46 changes: 0 additions & 46 deletions modules/home-manager/fzf/default.nix

This file was deleted.

Loading

0 comments on commit d1867aa

Please sign in to comment.