stuff

flake.nix

@@ -25,6 +25,7 @@
           ./system/gnome.nix
           ./system/btrbk.nix
           ./system/hardware-nova.nix
+          #firewall
         ];
       };
       romulus = nixpkgs.lib.nixosSystem {

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 = [];

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

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;
 }
 

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";

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

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;
       }
       {

home/nvim/lsp.vim

@@ -1,22 +1,22 @@
 lua <<EOF
-  local cmp = require'cmp'
+  local cmp = require('cmp')
   cmp.setup({
     snippet = {
       expand = function(args)
-        vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users.
+        vim.fn["UltiSnips#Anon"](args.body)
       end,
     },
     window = {
-      -- completion = cmp.config.window.bordered(),
-      -- documentation = cmp.config.window.bordered(),
+      documentation = cmp.config.window.bordered(),
+      completion = cmp.config.window.bordered(),
+    },
+    mapping = {
+      ['<C-p>'] = cmp.mapping.select_prev_item(),
+      ['<C-n>'] = cmp.mapping.select_next_item(),
+      ['<C-g>'] = cmp.mapping.abort(),
+      ['<Tab>'] = cmp.mapping.confirm({ select = true }),
+      ['<Cr>'] = cmp.mapping.confirm({ select = false }),
     },
-    mapping = cmp.mapping.preset.insert({
-      ['<C-b>'] = cmp.mapping.scroll_docs(-4),
-      ['<C-f>'] = cmp.mapping.scroll_docs(4),
-      ['<C-Space>'] = cmp.mapping.complete(),
-      ['<C-e>'] = cmp.mapping.abort(),
-      ['<CR>'] = 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 <<EOF
     }
   })
 
-  -- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
   cmp.setup.cmdline(':', {
     mapping = cmp.mapping.preset.cmdline(),
     sources = cmp.config.sources({
@@ -51,14 +50,17 @@ lua <<EOF
     })
   })
 
---  -- Set up lspconfig.
---  local capabilities = require('cmp_nvim_lsp').default_capabilities()
---  -- Replace <YOUR_LSP_SERVER> with each lsp server you've enabled.
---  require('lspconfig')['typescript'].setup {
---    capabilities = capabilities
---  }
+  local on_attach = function(_, _)
+    vim.keymap.set('n', '<leader>rn', vim.lsp.buf.rename, {})
+    vim.keymap.set('n', '<leader>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 {

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";
       };
     };
   };

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
   ];
 

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