diff --git a/flake.lock b/flake.lock index 9d32656..2a79d9b 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1695738267, - "narHash": "sha256-LTNAbTQ96xSj17xBfsFrFS9i56U2BMLpD0BduhrsVkU=", + "lastModified": 1697410455, + "narHash": "sha256-jCs/ffIP3tUPN7HWWuae4BB8+haAw2NI02z5BQvWMGM=", "owner": "nix-community", "repo": "home-manager", - "rev": "0f4e5b4999fd6a42ece5da8a3a2439a50e48e486", + "rev": "78125bc681d12364cb65524eaa887354134053d0", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1695644571, - "narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=", + "lastModified": 1697059129, + "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6500b4580c2a1f3d0f980d32d285739d8e156d92", + "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593", "type": "github" }, "original": { diff --git a/home/R.nix b/home/R.nix index 2f74690..5ed5b14 100644 --- a/home/R.nix +++ b/home/R.nix @@ -20,7 +20,7 @@ src = builtins.fetchGit { url = "ssh://git@ktiu.net/home/git/publishR/"; ref = "main"; - rev = "77a3f6d45df1b2d1dbcfd2475a2c67d9fb7cc3dd"; + rev = "bbf9b785c2a71996afa8ddbb96d00cf76ce18f07"; }; propagatedBuildInputs = []; nativeBuildInputs = []; @@ -30,11 +30,22 @@ src = builtins.fetchGit { url = "ssh://git@ktiu.net/home/git/goethR/"; ref = "main"; - rev = "d7e9c54a3a193979ea4195ac36938aa55cd5360f"; + rev = "e21aa96dfd410105822ead33b26d9d92bdd0053c"; }; propagatedBuildInputs = []; 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 { # name = "readODS"; # src = builtins.fetchGit { diff --git a/home/default.nix b/home/default.nix index aadb704..47826a8 100644 --- a/home/default.nix +++ b/home/default.nix @@ -74,6 +74,7 @@ okular xournalpp evolution + freemind # publishing hunspell @@ -91,6 +92,7 @@ gimp godot_4 scrcpy + drawing # web qutebrowser @@ -99,6 +101,7 @@ mullvad-vpn # media + bookworm vlc rhythmbox freetube @@ -131,9 +134,12 @@ ]; home.shellAliases = { - ls = "exa"; - tree = "exa --tree"; - v = "nvim"; + 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 = { diff --git a/home/desktop/default.nix b/home/desktop/default.nix index d55f960..3c48b8a 100644 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -8,13 +8,9 @@ }; dconf.settings = { - "org/gnome/desktop/background" = { - picture-uri = "file://" + ./fjord.jpg; - }; "org/gnome-shell" = { enabled-extensions = [ "run-or-raise@edvard.cz" - "places-menu@gnome-shell-extensions.gcampax.github.com" ]; }; }; diff --git a/home/fish.nix b/home/fish.nix index 9e91b64..9850ad5 100644 --- a/home/fish.nix +++ b/home/fish.nix @@ -5,13 +5,8 @@ enable = true; interactiveShellInit = "fish_add_path ${config.xdg.dataHome}/npm/packages/bin"; shellAliases = { - r = "R --no-save --no-restore"; - R = "R --no-save --no-restore"; linkbox = "ln -s (pwd) ~/box/"; - cdg = "cd \$(git rev-parse --show-toplevel)"; 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/"; ktiubox = "rsync -vaL --delete ~/box/ root@ktiu.net:/var/www/html/box/"; ymd = "date +'%Y-%m-%d'"; diff --git a/home/mail/bindings.neomuttrc b/home/mail/bindings.neomuttrc index ee4a294..860e0c1 100644 --- a/home/mail/bindings.neomuttrc +++ b/home/mail/bindings.neomuttrc @@ -54,9 +54,9 @@ macro index,pager gj "$my_junk" "Go to ju macro index,pager gu "~/.local/share/mail/gu/Inbox" "Go to GU" # macro index,pager gp "+systemli/IMAP/Inbox" "Go to Systemli" # macro index,pager gm "+gmail/IMAP/Inbox" "Go to Gmail" -# macro index,pager gk "+ks/IMAP/Inbox" "Go to KS" +macro index,pager gk "~/.local/share/mail/ks/Inbox" "Go to KS" macro index,pager gi "~/.local/share/mail/ktiu/Inbox" "Go to ktiu" -macro index,pager gf "~/.local/share/mail/dkg/Inbox" "Go to DKG" +# macro index,pager gf "~/.local/share/mail/dkg/Inbox" "Go to DKG" macro index,pager L "all\n" "Show all messages (undo limit)" @@ -80,5 +80,5 @@ macro index,pager gb \ "extract URLs out of a message" macro index,pager gO \ - "mbsync -ac ~/.config/mbsync/mbsyncrc && notmuch new" \ + "mbsync -a && notmuch new" \ "run mbsync to sync all mail" diff --git a/home/mail/default.nix b/home/mail/default.nix index 90da329..2e4f3d7 100644 --- a/home/mail/default.nix +++ b/home/mail/default.nix @@ -116,7 +116,7 @@ "signature.txt" config.accounts.email.accounts.ktiu.signature.text } - color status yellow default + color status green default ''; }; mbsync.enable = true; @@ -126,49 +126,91 @@ }; passwordCommand = "secret-tool lookup server shorbut.ktiu.net account till"; }; - dkg = { - address = "kontakt@dkg2023.de"; - realName = "DKG Orga-Team"; - imap.host = "mail.privateemail.com"; - smtp.host = "mail.privateemail.com"; + ks = { + address = "kein_schlussstrich_hessen@gmx.de"; + realName = "Kein Schlussstrich Hessen"; + imap.host = "imap.gmx.net"; + smtp.host = "mail.gmx.net"; smtp.tls.useStartTls = true; notmuch.enable = true; - userName = "helpdesk@dkg2023.de"; + userName = "kein_schlussstrich_hessen@gmx.de"; signature.text = '' - DKG '23 - https://dkg2023.de + Kein Schlussstrich Hessen ''; signature.showSignature = "append"; neomutt = { enable = true; sendMailCommand = "/home/till/.nix-profile/bin/msmtp"; extraConfig = '' - set my_mbsync_acct='dkg' - - set mbox='+Archive' + set my_mbsync_acct='ks' + set mbox='+Archives' set my_junk='+Junk' - + set postponed='+Entw&APw-rfe' + set record='+Gesendet' + set trash='+Gel&APY-scht' 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 + config.accounts.email.accounts.ks.signature.text } - color status yellow default + color status cyan default ''; }; mbsync.enable = true; msmtp = { 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"; + # }; }; }; } diff --git a/home/nvim/config.vim b/home/nvim/config.vim index dd018f5..182fc09 100644 --- a/home/nvim/config.vim +++ b/home/nvim/config.vim @@ -54,3 +54,10 @@ xnoremap al $o0 onoremap al :normal val xnoremap i% GoggV onoremap i% :normal vi% + +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\yaml_note\" +endfunction diff --git a/system/hardware-nova.nix b/system/hardware-nova.nix index 3948edf..3557244 100644 --- a/system/hardware-nova.nix +++ b/system/hardware-nova.nix @@ -10,42 +10,45 @@ boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/6a0d25d4-0253-4467-85cc-ab3e0ef71f54"; - fsType = "btrfs"; - options = [ "subvol=root" "compress=zstd" ]; - }; + boot.initrd.luks.devices."cryptroot" = { + device = "/dev/disk/by-uuid/eaad533f-8586-4002-9c53-5aecf8e7abd8"; + allowDiscards = true; + }; - 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" = - { device = "/dev/disk/by-uuid/6a0d25d4-0253-4467-85cc-ab3e0ef71f54"; - fsType = "btrfs"; - options = [ "subvol=home" "compress=zstd" ]; - }; + fileSystems."/home" = { + device = "/dev/disk/by-uuid/6a0d25d4-0253-4467-85cc-ab3e0ef71f54"; + fsType = "btrfs"; + options = [ "subvol=home" "compress=zstd" "discard=async" ]; + }; - fileSystems."/home/till/.local/share/Steam" = - { device = "/dev/disk/by-uuid/6a0d25d4-0253-4467-85cc-ab3e0ef71f54"; - fsType = "btrfs"; - options = [ "subvol=home/till/.local/share/Steam" "compress=zstd" ]; - }; + fileSystems."/home/till/.local/share/Steam" = { + device = "/dev/disk/by-uuid/6a0d25d4-0253-4467-85cc-ab3e0ef71f54"; + fsType = "btrfs"; + options = [ "subvol=home/till/.local/share/Steam" "compress=zstd" "discard=async" ]; + }; - fileSystems."/home/till/.cache" = - { device = "/dev/disk/by-uuid/6a0d25d4-0253-4467-85cc-ab3e0ef71f54"; - fsType = "btrfs"; - options = [ "subvol=home/till/.cache" ]; - }; + fileSystems."/home/till/.cache" = { + device = "/dev/disk/by-uuid/6a0d25d4-0253-4467-85cc-ab3e0ef71f54"; + fsType = "btrfs"; + options = [ "subvol=home/till/.cache" "compress=zstd" "discard=async" ]; + }; - fileSystems."/nix" = - { device = "/dev/disk/by-uuid/6a0d25d4-0253-4467-85cc-ab3e0ef71f54"; - fsType = "btrfs"; - options = [ "subvol=nix" "compress=zstd" "noatime"]; - }; + fileSystems."/nix" = { + device = "/dev/disk/by-uuid/6a0d25d4-0253-4467-85cc-ab3e0ef71f54"; + fsType = "btrfs"; + options = [ "subvol=nix" "compress=zstd" "noatime" "discard=async" ]; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/7362-C4C4"; - fsType = "vfat"; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/7362-C4C4"; + fsType = "vfat"; + }; swapDevices = [{ device = "/swapfile";