ktiu/omniflake
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

continuous improvement

Browse source
This commit is contained in:
Till 2023-10-20 01:04:29 +02:00
parent 2fc06ae9df
commit 5a227bfc45
9 changed files with 131 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

12
flake.lock generated
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1695738267, "lastModified": 1697410455,
"narHash": "sha256-LTNAbTQ96xSj17xBfsFrFS9i56U2BMLpD0BduhrsVkU=", "narHash": "sha256-jCs/ffIP3tUPN7HWWuae4BB8+haAw2NI02z5BQvWMGM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0f4e5b4999fd6a42ece5da8a3a2439a50e48e486", "rev": "78125bc681d12364cb65524eaa887354134053d0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -22,11 +22,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1695644571, "lastModified": 1697059129,
"narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=", "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6500b4580c2a1f3d0f980d32d285739d8e156d92", "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593",
"type": "github" "type": "github"
}, },
"original": { "original": {

15
home/R.nix
View file

@ -20,7 +20,7 @@
src = builtins.fetchGit { src = builtins.fetchGit {
url = "ssh://git@ktiu.net/home/git/publishR/"; url = "ssh://git@ktiu.net/home/git/publishR/";
ref = "main"; ref = "main";
rev = "77a3f6d45df1b2d1dbcfd2475a2c67d9fb7cc3dd"; rev = "bbf9b785c2a71996afa8ddbb96d00cf76ce18f07";
}; };
propagatedBuildInputs = []; propagatedBuildInputs = [];
nativeBuildInputs = []; nativeBuildInputs = [];
@ -30,11 +30,22 @@
src = builtins.fetchGit { src = builtins.fetchGit {
url = "ssh://git@ktiu.net/home/git/goethR/"; url = "ssh://git@ktiu.net/home/git/goethR/";
ref = "main"; ref = "main";
rev = "d7e9c54a3a193979ea4195ac36938aa55cd5360f"; rev = "e21aa96dfd410105822ead33b26d9d92bdd0053c";
}; };
propagatedBuildInputs = []; propagatedBuildInputs = [];
nativeBuildInputs = []; nativeBuildInputs = [];
}; };
readODS = pkgs.rPackages.buildRPackage {
name = "readODS";
src = pkgs.fetchFromGitHub {
owner = "ropensci";
repo = "readODS";
rev = "011a89f57169d6f7c8796954e2365f0bd9b5765f";
sha256 = "1hg8w46l5ifbaifmkmxxdvbamlj7bkadq956fab5063a5yrxfzwm";
};
propagatedBuildInputs = [xml2 cellranger readr stringi purrr zip];
nativeBuildInputs = [];
};
# readODS = pkgs.rPackages.buildRPackage { # readODS = pkgs.rPackages.buildRPackage {
# name = "readODS"; # name = "readODS";
# src = builtins.fetchGit { # src = builtins.fetchGit {

12
home/default.nix
View file

@ -74,6 +74,7 @@
okular okular
xournalpp xournalpp
evolution evolution
freemind
# publishing # publishing
hunspell hunspell
@ -91,6 +92,7 @@
gimp gimp
godot_4 godot_4
scrcpy scrcpy
drawing
# web # web
qutebrowser qutebrowser
@ -99,6 +101,7 @@
mullvad-vpn mullvad-vpn
# media # media
bookworm
vlc vlc
rhythmbox rhythmbox
freetube freetube
@ -131,9 +134,12 @@
]; ];
home.shellAliases = { home.shellAliases = {
ls = "exa"; v = "nvim";
tree = "exa --tree"; r = "R --no-save --no-restore";
v = "nvim"; 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 = {

4
home/desktop/default.nix
View file

@ -8,13 +8,9 @@
}; };
dconf.settings = { dconf.settings = {
"org/gnome/desktop/background" = {
picture-uri = "file://" + ./fjord.jpg;
};
"org/gnome-shell" = { "org/gnome-shell" = {
enabled-extensions = [ enabled-extensions = [
"run-or-raise@edvard.cz" "run-or-raise@edvard.cz"
"places-menu@gnome-shell-extensions.gcampax.github.com"
]; ];
}; };
}; };

5
home/fish.nix
View file

@ -5,13 +5,8 @@
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 = { shellAliases = {
r = "R --no-save --no-restore";
R = "R --no-save --no-restore";
linkbox = "ln -s (pwd) ~/box/"; linkbox = "ln -s (pwd) ~/box/";
cdg = "cd \$(git rev-parse --show-toplevel)";
rloft = "tmux source-file ~/.config/tmux/rloft.conf"; rloft = "tmux source-file ~/.config/tmux/rloft.conf";
map = "telnet mapscii.me";
weather = "curl wttr.in/frankfurt";
liftbox = "rsync -vaL --delete ~/box/ tstraube@login.server.uni-frankfurt.de:box/"; liftbox = "rsync -vaL --delete ~/box/ tstraube@login.server.uni-frankfurt.de:box/";
ktiubox = "rsync -vaL --delete ~/box/ root@ktiu.net:/var/www/html/box/"; ktiubox = "rsync -vaL --delete ~/box/ root@ktiu.net:/var/www/html/box/";
ymd = "date +'%Y-%m-%d'"; ymd = "date +'%Y-%m-%d'";

6
home/mail/bindings.neomuttrc
View file

@ -54,9 +54,9 @@ macro index,pager gj "<change-folder>$my_junk<enter><refresh>" "Go to ju
macro index,pager gu "<change-folder>~/.local/share/mail/gu/Inbox<enter><refresh>" "Go to GU" macro index,pager gu "<change-folder>~/.local/share/mail/gu/Inbox<enter><refresh>" "Go to GU"
# macro index,pager gp "<change-folder>+systemli/IMAP/Inbox<enter><refresh>" "Go to Systemli" # macro index,pager gp "<change-folder>+systemli/IMAP/Inbox<enter><refresh>" "Go to Systemli"
# macro index,pager gm "<change-folder>+gmail/IMAP/Inbox<enter><refresh>" "Go to Gmail" # macro index,pager gm "<change-folder>+gmail/IMAP/Inbox<enter><refresh>" "Go to Gmail"
# macro index,pager gk "<change-folder>+ks/IMAP/Inbox<enter><refresh>" "Go to KS" macro index,pager gk "<change-folder>~/.local/share/mail/ks/Inbox<enter><refresh>" "Go to KS"
macro index,pager gi "<change-folder>~/.local/share/mail/ktiu/Inbox<enter><refresh>" "Go to ktiu" macro index,pager gi "<change-folder>~/.local/share/mail/ktiu/Inbox<enter><refresh>" "Go to ktiu"
macro index,pager gf "<change-folder>~/.local/share/mail/dkg/Inbox<enter><refresh>" "Go to DKG" # macro index,pager gf "<change-folder>~/.local/share/mail/dkg/Inbox<enter><refresh>" "Go to DKG"
macro index,pager L "<limit>all\n" "Show all messages (undo limit)" macro index,pager L "<limit>all\n" "Show all messages (undo limit)"
@ -80,5 +80,5 @@ macro index,pager gb \
"extract URLs out of a message" "extract URLs out of a message"
macro index,pager gO \ macro index,pager gO \
"<shell-escape>mbsync -ac ~/.config/mbsync/mbsyncrc && notmuch new<enter>" \ "<shell-escape>mbsync -a && notmuch new<enter>" \
"run mbsync to sync all mail" "run mbsync to sync all mail"

78
home/mail/default.nix
View file

@ -116,7 +116,7 @@
"signature.txt" "signature.txt"
config.accounts.email.accounts.ktiu.signature.text config.accounts.email.accounts.ktiu.signature.text
} }
color status yellow default color status green default
''; '';
}; };
mbsync.enable = true; mbsync.enable = true;
@ -126,49 +126,91 @@
}; };
passwordCommand = "secret-tool lookup server shorbut.ktiu.net account till"; passwordCommand = "secret-tool lookup server shorbut.ktiu.net account till";
}; };
dkg = { ks = {
address = "kontakt@dkg2023.de"; address = "kein_schlussstrich_hessen@gmx.de";
realName = "DKG Orga-Team"; realName = "Kein Schlussstrich Hessen";
imap.host = "mail.privateemail.com"; imap.host = "imap.gmx.net";
smtp.host = "mail.privateemail.com"; smtp.host = "mail.gmx.net";
smtp.tls.useStartTls = true; smtp.tls.useStartTls = true;
notmuch.enable = true; notmuch.enable = true;
userName = "helpdesk@dkg2023.de"; userName = "kein_schlussstrich_hessen@gmx.de";
signature.text = '' signature.text = ''
DKG '23 Kein Schlussstrich Hessen
https://dkg2023.de
''; '';
signature.showSignature = "append"; signature.showSignature = "append";
neomutt = { neomutt = {
enable = true; enable = true;
sendMailCommand = "/home/till/.nix-profile/bin/msmtp"; sendMailCommand = "/home/till/.nix-profile/bin/msmtp";
extraConfig = '' extraConfig = ''
set my_mbsync_acct='dkg' set my_mbsync_acct='ks'
set mbox='+Archives'
set mbox='+Archive'
set my_junk='+Junk' set my_junk='+Junk'
set postponed='+Entw&APw-rfe'
set record='+Gesendet'
set trash='+Gel&APY-scht'
set crypt_auto_pgp set crypt_auto_pgp
unset crypt_auto_smime unset crypt_auto_smime
unalternates * unalternates *
alternates @dkg2023.de$
set reverse_name set reverse_name
set my_signature = ${ set my_signature = ${
pkgs.writeText pkgs.writeText
"signature.txt" "signature.txt"
config.accounts.email.accounts.dkg.signature.text config.accounts.email.accounts.ks.signature.text
} }
color status yellow default color status cyan default
''; '';
}; };
mbsync.enable = true; mbsync.enable = true;
msmtp = { msmtp = {
enable = true; enable = true;
extraConfig.from = "*@dkg2023.de"; extraConfig.from = "kein_schlussstrich_hessen@gmx.de";
}; };
passwordCommand = "secret-tool lookup server mail.privateemail.com account helpdesk@dkg2023.de"; passwordCommand = "secret-tool lookup server mail.gmx.de account kein_schlussstrich_hessen";
}; };
# dkg = {
# address = "kontakt@dkg2023.de";
# realName = "DKG Orga-Team";
# imap.host = "mail.privateemail.com";
# smtp.host = "mail.privateemail.com";
# smtp.tls.useStartTls = true;
# notmuch.enable = true;
# userName = "helpdesk@dkg2023.de";
# signature.text = ''
# DKG '23
# https://dkg2023.de
# '';
# signature.showSignature = "append";
# neomutt = {
# enable = true;
# sendMailCommand = "/home/till/.nix-profile/bin/msmtp";
# extraConfig = ''
# set my_mbsync_acct='dkg'
# set mbox='+Archive'
# set my_junk='+Junk'
# set crypt_auto_pgp
# unset crypt_auto_smime
# unalternates *
# alternates @dkg2023.de$
# set reverse_name
# set my_signature = ${
# pkgs.writeText
# "signature.txt"
# config.accounts.email.accounts.dkg.signature.text
# }
# color status yellow default
# '';
# };
# mbsync.enable = true;
# msmtp = {
# enable = true;
# extraConfig.from = "*@dkg2023.de";
# };
# passwordCommand = "secret-tool lookup server mail.privateemail.com account helpdesk@dkg2023.de";
# };
}; };
}; };
} }

7
home/nvim/config.vim
View file

@ -54,3 +54,10 @@ xnoremap al $o0
onoremap <silent> al :normal val<return> onoremap <silent> al :normal val<return>
xnoremap i% GoggV xnoremap i% GoggV
onoremap <silent> i% :normal vi%<return> onoremap <silent> i% :normal vi%<return>
function CreateNote(title)
execute "file ~/notes/" . strftime("%Y-%m-%d") . "_" . join(split(tolower(a:title)), "_") . ".md"
execute "set ft=markdown"
execute "normal! i" . a:title
execute "normal V\<tab>yaml_note\<tab>"
endfunction

63
system/hardware-nova.nix
View file

@ -10,42 +10,45 @@
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = boot.initrd.luks.devices."cryptroot" = {
{ device = "/dev/disk/by-uuid/6a0d25d4-0253-4467-85cc-ab3e0ef71f54"; device = "/dev/disk/by-uuid/eaad533f-8586-4002-9c53-5aecf8e7abd8";
fsType = "btrfs"; allowDiscards = true;
options = [ "subvol=root" "compress=zstd" ]; };
};
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/eaad533f-8586-4002-9c53-5aecf8e7abd8"; fileSystems."/" = {
device = "/dev/disk/by-uuid/6a0d25d4-0253-4467-85cc-ab3e0ef71f54";
fsType = "btrfs";
options = [ "subvol=root" "compress=zstd" "discard=async" ];
};
fileSystems."/home" = fileSystems."/home" = {
{ device = "/dev/disk/by-uuid/6a0d25d4-0253-4467-85cc-ab3e0ef71f54"; device = "/dev/disk/by-uuid/6a0d25d4-0253-4467-85cc-ab3e0ef71f54";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=home" "compress=zstd" ]; options = [ "subvol=home" "compress=zstd" "discard=async" ];
}; };
fileSystems."/home/till/.local/share/Steam" = fileSystems."/home/till/.local/share/Steam" = {
{ device = "/dev/disk/by-uuid/6a0d25d4-0253-4467-85cc-ab3e0ef71f54"; device = "/dev/disk/by-uuid/6a0d25d4-0253-4467-85cc-ab3e0ef71f54";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=home/till/.local/share/Steam" "compress=zstd" ]; options = [ "subvol=home/till/.local/share/Steam" "compress=zstd" "discard=async" ];
}; };
fileSystems."/home/till/.cache" = fileSystems."/home/till/.cache" = {
{ device = "/dev/disk/by-uuid/6a0d25d4-0253-4467-85cc-ab3e0ef71f54"; device = "/dev/disk/by-uuid/6a0d25d4-0253-4467-85cc-ab3e0ef71f54";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=home/till/.cache" ]; options = [ "subvol=home/till/.cache" "compress=zstd" "discard=async" ];
}; };
fileSystems."/nix" = fileSystems."/nix" = {
{ device = "/dev/disk/by-uuid/6a0d25d4-0253-4467-85cc-ab3e0ef71f54"; device = "/dev/disk/by-uuid/6a0d25d4-0253-4467-85cc-ab3e0ef71f54";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=nix" "compress=zstd" "noatime"]; options = [ "subvol=nix" "compress=zstd" "noatime" "discard=async" ];
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/7362-C4C4"; device = "/dev/disk/by-uuid/7362-C4C4";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = [{ swapDevices = [{
device = "/swapfile"; device = "/swapfile";