This commit is contained in:
Till 2023-12-14 18:09:34 +01:00
parent 6a475a7430
commit b5d14a8b64
9 changed files with 173 additions and 34 deletions

58
alt/default.nix Normal file
View file

@ -0,0 +1,58 @@
{ config, pkgs, inputs, lib, ... }:
{
home.username = "alt";
home.homeDirectory = "/home/alt";
home.stateVersion = "22.11";
nixpkgs = {
config = {
allowUnfree = true;
allowUnfreePredicate = (_: true);
};
};
programs.home-manager.enable = true;
xdg.userDirs = {
enable = true;
createDirectories = true;
download = "${config.home.homeDirectory}/tmp";
music = "${config.home.homeDirectory}/media/music";
pictures = "${config.home.homeDirectory}/media/img";
videos = "${config.home.homeDirectory}/media/vid";
documents = "${config.home.homeDirectory}/misc";
templates = "${config.xdg.dataHome}/templates";
};
home.file.".npmrc".text = ''
prefix = ${config.xdg.dataHome}/npm/packages
'';
home.packages = with pkgs; [
# commandline
fzf
nnn
jq
progress
silver-searcher
tmux
wl-clipboard
firefox
qbittorrent
vlc
];
imports = [
./desktop
];
programs.nix-index = {
enable = true;
enableFishIntegration = true;
};
}

18
alt/desktop/default.nix Normal file
View file

@ -0,0 +1,18 @@
{ config, pkgs, ... }:
{
home.pointerCursor = {
name = "Adwaita";
package = pkgs.gnome.adwaita-icon-theme;
size = 32;
};
dconf.settings = {
"org/gnome-shell" = {
enabled-extensions = [
"run-or-raise@edvard.cz"
];
};
};
xdg.configFile."run-or-raise/shortcuts.conf".source = ./run-or-raise.conf;
}

View file

@ -0,0 +1,42 @@
# Here you list all the shortcuts.
#
# The shortcuts may be defined in two ways:
#
# 1. Run-or-raise form: shortcut,launch-command,[wm_class],[title]
# * wm_class and title are optional and case sensitive
# * if none is set, lowercased launch-command is compared with lowercased windows wm_classes and titles
#
# 2. Run only form: shortcut,calculate
#
# =================
# Run or raise form
# =================
#
# This line cycles any open gnome-terminal (matched by wm_class = Gnome-terminal on Ubuntu 17.10) OR if not found, launches new one.
# If you're using Arch, you may want to match by wm_class = gnome-terminal-server , just check yourself by Alt+F2/lg/Windows
<Super>t,gnome-terminal,gnome-terminal-server,
<Super>n,nautilus,,
<Super>f,firefox,,
<Super>return,foot,,
<Super>x,keepassxc,,,
<Super>q,qutebrowser,,
# You may use regular expression in title or wm_class.
# Just put the regular expression between slashes.
# E.g. to jump to pidgin conversation window you may use this line
# (that means any windows of wm_class Pidgin, not containing the title Buddy List)"
# <Super>KP_1,pidgin,Pidgin,/^((?!Buddy List).)*$/
# Have the mail always at numpad-click.
# <Super>KP_2,chromium-browser --app=https://mail.google.com/mail/u/0/#inbox
# =============
# Run only form
# =============
#
# This line will launch notify-send command.
# <Super>h,notify-send Hello world
# Blank lines are allowed. Line starting with "#" means a comment.
# Now delete these shortcuts and put here yours.
# How to know wm_class? Alt+f2, lg, "windows" tab (at least on Ubuntu 17.10)

View file

@ -22,6 +22,14 @@
./system/btrbk.nix ./system/btrbk.nix
./system/hardware-nova.nix ./system/hardware-nova.nix
]; ];
users.users.alt = {
isNormalUser = true;
description = "Alt";
extraGroups = [
"networkmanager"
];
shell = pkgs.fish;
};
}; };
romulus = nixpkgs.lib.nixosSystem { romulus = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
@ -48,6 +56,13 @@
./home ./home
]; ];
}; };
alt = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux.extend inputs.nur.overlay;
extraSpecialArgs = { inherit inputs; };
modules = [
./alt
];
};
}; };
}; };
} }

33
home/alias.nix Normal file
View file

@ -0,0 +1,33 @@
{ config, pkgs, ... }:
{
home.shellAliases = {
htop = "btm -b";
linkbox = "ln -s (pwd) ~/box/";
rloft = "tmux source-file ~/.config/tmux/rloft.conf";
liftbox = "rsync -vaL --delete ~/box/ tstraube@login.server.uni-frankfurt.de:box/";
ktiubox = "rsync -vaL --delete ~/box/ root@ktiu.net:/var/www/html/box/";
ymd = "date +'%Y-%m-%d'";
pulluni = "ssh tstraube@login.server.uni-frankfurt.de \"cd uni-tstraube && git pull\"";
pullstat = "ssh tstraube@login.server.uni-frankfurt.de \"cd statistik && git pull\"";
pullds = "ssh tstraube@login.server.uni-frankfurt.de \"cd ds23 && git pull\"";
pullmla = "ssh tstraube@login.server.uni-frankfurt.de \"cd malta23 && git pull\"";
pulldkg = "ssh till@geocom.uni-frankfurt.de \"cd /var/www/dkg_lp && git pull\"";
pullgrid = "ssh till@geocom.uni-frankfurt.de \"cd /var/www/grid && git pull\"";
pullsneak = "ssh till@geocom.uni-frankfurt.de \"cd /var/www/dkg_lp_prev && git pull\"";
pullkhole = "ssh root@ktiu.net \"cd /var/www/karaoke && git pull\"";
buildfk = "curl -X POST -d '{}' https://api.netlify.com/build_hooks/61669ddfeaa3cccc44e752ea";
showbox = "chromium-browser -app=https://user.uni-frankfurt.de/~tstraube/box";
showc = "chromium-browser -app=https://user.uni-frankfurt.de/~tstraube/c/";
castget = "castget -prvC ~/.config/castget/castget.conf";
castsync = "mv -v ~/.local/share/podcasts/* /run/media/till/CLIP\\ JAM/Podcasts/";
cb = "cd $(sed 's|^file://||' /home/till/.config/gtk-3.0/bookmarks | fzf --height 10% --reverse)";
univpn = "secret-tool lookup server uni-frankfurt.de account tstraube | sudo openconnect --config=/home/till/.config/openconnect/config --passwd-on-stdin";
v = "nvim";
r = "R --no-save --no-restore";
R = "R --no-save --no-restore";
cdg = "cd \$(git rev-parse --show-toplevel)";
map = "telnet mapscii.me";
weather = "curl wttr.in/frankfurt";
};
}

View file

@ -21,6 +21,10 @@ id3album=Wettbrötchen
[efpodcast] [efpodcast]
url=https://www.eintracht-podcast.de/feed/mp3 url=https://www.eintracht-podcast.de/feed/mp3
[edeltalk]
url=https://cdn.julephosting.de/podcasts/573-edeltalk-mit-dominik-kevin/feed.rss
id3album=Edeltalk
[*] [*]
id3contenttype=Podcast id3contenttype=Podcast
spool=/home/till/.local/share/podcasts spool=/home/till/.local/share/podcasts

View file

@ -118,6 +118,7 @@
imports = [ imports = [
./desktop ./desktop
./alias.nix
./nvim ./nvim
./foot.nix ./foot.nix
./fish.nix ./fish.nix
@ -129,15 +130,6 @@
./R.nix ./R.nix
]; ];
home.shellAliases = {
v = "nvim";
r = "R --no-save --no-restore";
R = "R --no-save --no-restore";
cdg = "cd \$(git rev-parse --show-toplevel)";
map = "telnet mapscii.me";
weather = "curl wttr.in/frankfurt";
};
programs.nix-index = { programs.nix-index = {
enable = true; enable = true;
enableFishIntegration = true; enableFishIntegration = true;

View file

@ -3,28 +3,6 @@
programs.fish = { programs.fish = {
enable = true; enable = true;
interactiveShellInit = "fish_add_path ${config.xdg.dataHome}/npm/packages/bin"; interactiveShellInit = "fish_add_path ${config.xdg.dataHome}/npm/packages/bin";
shellAliases = {
htop = "btm -b";
linkbox = "ln -s (pwd) ~/box/";
rloft = "tmux source-file ~/.config/tmux/rloft.conf";
liftbox = "rsync -vaL --delete ~/box/ tstraube@login.server.uni-frankfurt.de:box/";
ktiubox = "rsync -vaL --delete ~/box/ root@ktiu.net:/var/www/html/box/";
ymd = "date +'%Y-%m-%d'";
pulluni = "ssh tstraube@login.server.uni-frankfurt.de \"cd uni-tstraube && git pull\"";
pullstat = "ssh tstraube@login.server.uni-frankfurt.de \"cd statistik && git pull\"";
pullds = "ssh tstraube@login.server.uni-frankfurt.de \"cd ds23 && git pull\"";
pullmla = "ssh tstraube@login.server.uni-frankfurt.de \"cd malta23 && git pull\"";
pulldkg = "ssh till@geocom.uni-frankfurt.de \"cd /var/www/dkg_lp && git pull\"";
pullgrid = "ssh till@geocom.uni-frankfurt.de \"cd /var/www/grid && git pull\"";
pullsneak = "ssh till@geocom.uni-frankfurt.de \"cd /var/www/dkg_lp_prev && git pull\"";
pullkhole = "ssh root@ktiu.net \"cd /var/www/karaoke && git pull\"";
buildfk = "curl -X POST -d '{}' https://api.netlify.com/build_hooks/61669ddfeaa3cccc44e752ea";
showbox = "chromium-browser -app=https://user.uni-frankfurt.de/~tstraube/box";
showc = "chromium-browser -app=https://user.uni-frankfurt.de/~tstraube/c/";
castget = "castget -pvC ~/.config/castget/castget.conf";
castsync = "mv -v ~/.local/share/podcasts/* /run/media/till/CLIP\\ JAM/Podcasts/";
univpn = "secret-tool lookup server uni-frankfurt.de account tstraube | sudo openconnect --config=/home/till/.config/openconnect/config --passwd-on-stdin";
};
shellAbbrs = { shellAbbrs = {
openconnect = "openconnect --config=/home/till/.config/openconnect/config"; openconnect = "openconnect --config=/home/till/.config/openconnect/config";
}; };

View file

@ -6,11 +6,10 @@
settings = { settings = {
main = { main = {
shell = "/home/till/.nix-profile/bin/fish -c 'tmux attach || tmux'"; shell = "/home/till/.nix-profile/bin/fish -c 'tmux attach || tmux'";
pad = "20x20"; pad = "22x22";
font = "JetBrains Mono:size=15"; font = "JetBrains Mono:size=14";
initial-window-mode = "maximized"; initial-window-mode = "maximized";
line-height = "19"; line-height = "19";
# dpi-aware = "yes";
}; };
mouse.hide-when-typing = "yes"; mouse.hide-when-typing = "yes";
cursor = { cursor = {