diff --git a/flake.nix b/flake.nix index 0ce6673..ccc57a7 100644 --- a/flake.nix +++ b/flake.nix @@ -25,6 +25,7 @@ ./system/gnome.nix ./system/btrbk.nix ./system/hardware-nova.nix + #firewall ]; }; romulus = nixpkgs.lib.nixosSystem { diff --git a/home/R.nix b/home/R.nix index 5ed5b14..b9d1195 100644 --- a/home/R.nix +++ b/home/R.nix @@ -30,7 +30,7 @@ src = builtins.fetchGit { url = "ssh://git@ktiu.net/home/git/goethR/"; ref = "main"; - rev = "e21aa96dfd410105822ead33b26d9d92bdd0053c"; + rev = "e953fdb9814c02858017e623519c0a4c59ff583d"; }; propagatedBuildInputs = []; nativeBuildInputs = []; diff --git a/home/castget/castget.conf b/home/castget/castget.conf index ab5af8a..747c104 100644 --- a/home/castget/castget.conf +++ b/home/castget/castget.conf @@ -18,6 +18,9 @@ url=https://tribuenengespraech.podigee.io/feed/mp3 url=https://www.wett-broetchen.de/feed/mp3 id3album=Wettbrötchen +[efpodcast] +url=https://www.eintracht-podcast.de/feed/mp3 + [*] id3contenttype=Podcast spool=/home/till/.local/share/podcasts diff --git a/home/default.nix b/home/default.nix index 47826a8..2730cd6 100644 --- a/home/default.nix +++ b/home/default.nix @@ -76,7 +76,7 @@ evolution freemind - # publishing + # text publishing hunspell hunspellDicts.de_DE hunspellDicts.th_TH @@ -88,25 +88,26 @@ zathura # graphics - inkscape + drawing gimp godot_4 + inkscape scrcpy - drawing # web - qutebrowser - nyxt chromium mullvad-vpn + nyxt + qutebrowser # media bookworm - vlc - rhythmbox - freetube - yt-dlp castget + freetube + qbittorrent + rhythmbox + vlc + yt-dlp # development bundler @@ -161,6 +162,16 @@ }; }; +programs.vscode = { + enable = true; + package = pkgs.vscodium; + extensions = with pkgs.vscode-extensions; [ + # dracula-theme.theme-dracula + # vscodevim.vim + # yzhang.markdown-all-in-one + ]; +}; + programs.taskwarrior = { enable = true; dataLocation = "${config.xdg.dataHome}/taskwarrior/tasks"; @@ -174,5 +185,7 @@ verbose=affected,context,edit,label,header,new-id,project,special,sync,recur "; }; + + programs.obs-studio.enable = true; } diff --git a/home/fish.nix b/home/fish.nix index 9850ad5..fe77143 100644 --- a/home/fish.nix +++ b/home/fish.nix @@ -15,6 +15,7 @@ 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"; @@ -22,6 +23,7 @@ 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 = { openconnect = "openconnect --config=/home/till/.config/openconnect/config"; diff --git a/home/nvim/config.vim b/home/nvim/config.vim index 182fc09..8247765 100644 --- a/home/nvim/config.vim +++ b/home/nvim/config.vim @@ -4,7 +4,7 @@ let maplocalleader="\\" set colorcolumn=+1 set expandtab set ignorecase -set iskeyword+=ä,Ä,ö,Ö,ü,Ü,ß +set iskeyword+=-,ä,Ä,ö,Ö,ü,Ü,ß set linebreak set list listchars=tab:»\ ,trail:·,nbsp:~ set number diff --git a/home/nvim/default.nix b/home/nvim/default.nix index f570122..232f7a9 100644 --- a/home/nvim/default.nix +++ b/home/nvim/default.nix @@ -16,7 +16,6 @@ }; }; in [ - # todo: SNIPPETS pandoc, completion, lsp { plugin = woof; config = '' @@ -33,7 +32,7 @@ cmp-nvim-ultisnips nvim-cmp { - plugin = nvim-lspconfig; + plugin = nvim-lspconfig; config = builtins.readFile ./lsp.vim; } { diff --git a/home/nvim/lsp.vim b/home/nvim/lsp.vim index 5d299fc..4cf28bd 100644 --- a/home/nvim/lsp.vim +++ b/home/nvim/lsp.vim @@ -1,22 +1,22 @@ lua <'] = cmp.mapping.select_prev_item(), + [''] = cmp.mapping.select_next_item(), + [''] = cmp.mapping.abort(), + [''] = cmp.mapping.confirm({ select = true }), + [''] = cmp.mapping.confirm({ select = false }), }, - mapping = cmp.mapping.preset.insert({ - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - [''] = cmp.mapping.complete(), - [''] = cmp.mapping.abort(), - [''] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items. - }), sources = cmp.config.sources({ { name = 'nvim_lsp' }, { name = 'ultisnips' }, @@ -41,7 +41,6 @@ lua < with each lsp server you've enabled. --- require('lspconfig')['typescript'].setup { --- capabilities = capabilities --- } + local on_attach = function(_, _) + vim.keymap.set('n', 'rn', vim.lsp.buf.rename, {}) + vim.keymap.set('n', 'ca', vim.lsp.buf.code_action, {}) + vim.keymap.set('n', 'gd', vim.lsp.buf.definition, {}) + vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, {}) + vim.keymap.set('n', 'gr', vim.lsp.buf.references, {}) + vim.keymap.set('n', 'K', vim.lsp.buf.hover, {}) + end local nvim_lsp = require('lspconfig') + local capabilities = require('cmp_nvim_lsp').default_capabilities() local servers = { "r_language_server", "tsserver" } for _, lsp in ipairs(servers) do nvim_lsp[lsp].setup { diff --git a/home/nvim/test.md b/home/nvim/test.md new file mode 100644 index 0000000..e69de29 diff --git a/system/btrbk.nix b/system/btrbk.nix index c8e7277..5c35ac5 100644 --- a/system/btrbk.nix +++ b/system/btrbk.nix @@ -11,8 +11,8 @@ snapshot_preserve_min = "4d"; snapshot_dir = "/btrbk_snapshots"; target = "/run/media/till/backup/${config.networking.hostName}"; - target_preserve_min = "2h"; - target_preserve = "40d 52w *m"; + target_preserve_min = "latest"; + target_preserve = "10d 10w *m"; }; }; }; diff --git a/system/default.nix b/system/default.nix index abc4b40..42f9331 100644 --- a/system/default.nix +++ b/system/default.nix @@ -20,6 +20,11 @@ }; time.timeZone = "Europe/Berlin"; + i18n.extraLocaleSettings = { + LC_TIME = "de_DE.UTF-8"; + LC_CTYPE = "de_DE.UTF-8"; + LC_PAPER = "de_DE.UTF-8"; + }; users.users.till = { isNormalUser = true; @@ -63,6 +68,7 @@ foot htop killall + pciutils virt-manager ]; diff --git a/system/gnome.nix b/system/gnome.nix index 030f8b5..6a76fe2 100644 --- a/system/gnome.nix +++ b/system/gnome.nix @@ -6,10 +6,8 @@ services.xserver.desktopManager.gnome.enable = true; services.gnome.gnome-browser-connector.enable = true; environment.gnome.excludePackages = (with pkgs; [ - # gnome-photos gnome-tour ]) ++ (with pkgs.gnome; [ - epiphany geary yelp gnome-contacts