Merge branch 'nixos' into nixos-work

modules/config/terminal.nix

@@ -6,6 +6,7 @@ with lib;
 {
   options.my.terminal = {
     package = mkOption {
+      description = "Terminal emulator package to use. Gets converted to path of bin automatically.";
       type = types.package;
       apply = lib.getExe;
     };

modules/profiles/base.nix

@@ -311,10 +311,4 @@ in
     };
     xdg.userDirs.enable = true;
   };
-
-  system.activationScripts.diff = ''
-    if [ -e /run/current-system ]; then
-      ${pkgs.nvd}/bin/nvd --nix-bin-dir ${pkgs.nix}/bin diff /run/current-system/ "$systemConfig"
-    fi
-  '';
 }

modules/programs/nvim/new_plugins/comment.nix

@@ -0,0 +1,10 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.comment.enable = true;
+  };
+}

modules/programs/nvim/new_plugins/conform.nix

@@ -66,7 +66,7 @@ in
       "conform.nvim"
     ];
     keymaps = [
-      { key = "<leader>cf"; action.__raw = ''function() require("conform").format() end''; options.desc = "Format current file"; }
+      { key = "="; action.__raw = ''function() require("conform").format() end''; options.desc = "Format current file"; }
     ];
   };
 

modules/programs/nvim/new_plugins/crates-nvim.nix

@@ -0,0 +1,10 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.crates-nvim.enable = true;
+  };
+}

modules/programs/nvim/new_plugins/direnv.nix

@@ -0,0 +1,10 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.direnv.enable = true;
+  };
+}

modules/programs/nvim/new_plugins/friendly-snippets.nix

@@ -0,0 +1,10 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.friendly-snippets.enable = true;
+  };
+}

modules/programs/nvim/new_plugins/fugitive.nix

@@ -0,0 +1,10 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.fugitive.enable = true;
+  };
+}

modules/programs/nvim/new_plugins/gitsigns.nix

@@ -0,0 +1,10 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.gitsigns.enable = true;
+  };
+}

modules/programs/nvim/new_plugins/helpview.nix

@@ -0,0 +1,11 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.helpview.enable = true;
+    performance.combinePlugins.standalonePlugins = [ "helpview.nvim" ];
+  };
+}

modules/programs/nvim/new_plugins/hmts.nix

@@ -0,0 +1,11 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.hmts.enable = true;
+    performance.combinePlugins.standalonePlugins = [ "hmts.nvim" ];
+  };
+}

modules/programs/nvim/new_plugins/keymaps.nix

@@ -0,0 +1,15 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    keymaps = [
+      { key = "<esc>"; action = "<cmd>noh<cr><esc>"; options.desc = "Escape and clear hlsearch"; mode = [ "i" "n" ]; }
+      { key = "<"; action = "<gv"; options.desc = "Shift left"; mode = [ "v" ]; }
+      { key = ">"; action = ">gv"; options.desc = "Shift right"; mode = [ "v" ]; }
+      { key = "y"; action = "ygv<esc>"; options.desc = "Yank"; mode = [ "v" ]; }
+    ];
+  };
+}

modules/programs/nvim/new_plugins/lastplace.nix

@@ -0,0 +1,10 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.lastplace.enable = true;
+  };
+}

modules/programs/nvim/new_plugins/lspsaga.nix

@@ -16,9 +16,9 @@ in
     keymapsOnEvents = {
       LspAttach = [
         {
-          key = "<leader>cc";
+          key = "<leader>q";
           action = "<cmd>Lspsaga code_action<cr>";
-          options.desc = "Code Action";
+          options.desc = "Quickfix";
           options.buffer = true;
         }
         {
@@ -28,7 +28,7 @@ in
           options.buffer = true;
         }
         {
-          key = "<leader>cr";
+          key = "<leader>r";
           action = "<cmd>Lspsaga rename<cr>";
           options.desc = "Rename";
           options.buffer = true;

modules/programs/nvim/new_plugins/markdown-preview.nix

@@ -0,0 +1,10 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.markdown-preview.enable = true;
+  };
+}

modules/programs/nvim/new_plugins/marks.nix

@@ -0,0 +1,13 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.marks = {
+      enable = true;
+      defaultMappings = false;
+    };
+  };
+}

modules/programs/nvim/new_plugins/mini.nix

@@ -0,0 +1,16 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.mini = {
+      enable = true;
+      modules = {
+        align = { };
+      };
+    };
+    performance.combinePlugins.standalonePlugins = [ "mini.nvim" ];
+  };
+}

modules/programs/nvim/new_plugins/nvim-autopairs.nix

@@ -0,0 +1,10 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.nvim-autopairs.enable = true;
+  };
+}

modules/programs/nvim/new_plugins/obsidian.nix

@@ -0,0 +1,36 @@
+_:
+
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.obsidian = {
+      enable = true;
+      settings = {
+        ui.enable = false;
+        dir = "~/Documents/Nextcloud/Notes/zettelkasten/";
+        note_id_func.__raw = ''
+          function(title)
+            if title ~= nil then
+              return title
+            else
+              suffix = ""
+              for _ = 1, 4 do
+                suffix = suffix .. string.char(math.random(65, 90))
+              end
+              return tostring(os.date("%Y-%m-%d")) .. "-" .. suffix
+            end
+          end
+        '';
+        mappings = {
+          "<localleader>n" = { action.__raw = ''function() return vim.cmd("ObsidianNew") end''; opts.desc = "New Note"; opts.buffer = true; };
+          "<localleader>q" = { action.__raw = ''function() return vim.cmd("ObsidianQuickSwitch") end''; opts.desc = "Quick Switch"; opts.buffer = true; };
+          "<localleader>b" = { action.__raw = ''function() return vim.cmd("ObsidianBacklinks") end''; opts.desc = "Backlinks"; opts.buffer = true; };
+          "<localleader>l" = { action.__raw = ''function() return vim.cmd("ObsidianLink") end''; opts.desc = "Link"; opts.buffer = true; };
+          "<localleader>e" = { action.__raw = ''function() return vim.cmd("ObsidianExtractNote") end''; opts.desc = "Extract Note"; opts.buffer = true; };
+          "<localleader>r" = { action.__raw = ''function() return vim.cmd("ObsidianRename") end''; opts.desc = "Rename"; opts.buffer = true; };
+          "<cr>" = { action.__raw = ''function() return require("obsidian").util.smart_action() end''; opts.buffer = true; opts.expr = true; };
+          "gf" = { action.__raw = ''function() return require("obsidian").util.gf_passthrough() end''; opts = { noremap = false; expr = true; buffer = true; }; };
+        };
+      };
+    };
+  };
+}

modules/programs/nvim/new_plugins/oil.nix

@@ -0,0 +1,10 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.oil.enable = true;
+  };
+}

modules/programs/nvim/new_plugins/other.nix

@@ -1,91 +0,0 @@
-{ config, lib, pkgs, inputs, ... }:
-
-let
-  inherit (lib) mkEnableOption mkIf readFile;
-in
-{
-  home-manager.users.moritz = {
-    programs.nixvim = lib.mkMerge [
-      { plugins.which-key.enable = true; }
-      { plugins.lastplace.enable = true; }
-      { plugins.comment.enable = true; }
-      { plugins.ts-context-commentstring.enable = true; }
-      {
-        plugins.vimtex = {
-          enable = true;
-          settings.view_method = "zathura";
-        };
-      }
-      {
-        plugins.todo-comments = {
-          enable = true;
-          keymaps.todoTelescope.key = "<leader>fc";
-        };
-      }
-
-      {
-        keymaps = [
-          { key = "<esc>"; action = "<cmd>noh<cr><esc>"; options.desc = "Escape and clear hlsearch"; mode = [ "i" "n" ]; }
-          { key = "<"; action = "<gv"; options.desc = "Shift left"; mode = [ "v" ]; }
-          { key = ">"; action = ">gv"; options.desc = "Shift right"; mode = [ "v" ]; }
-          { key = "y"; action = "ygv<esc>"; options.desc = "Yank"; mode = [ "v" ]; }
-        ];
-      }
-      { plugins.oil.enable = true; }
-      { plugins.nvim-autopairs.enable = true; }
-      { plugins.vim-surround.enable = true; }
-
-      # TODO: add linters
-      # {
-      #   plugins.lint.enable = true;
-      #   plugins.lint.lintersByFt = { };
-      # }
-
-      {
-        plugins.marks.enable = true;
-        plugins.marks.defaultMappings = false;
-      }
-      {
-        plugins.hmts.enable = true;
-        performance.combinePlugins.standalonePlugins = [ "hmts.nvim" ];
-      }
-      { plugins.gitsigns.enable = true; }
-      { plugins.fugitive.enable = true; }
-      { plugins.friendly-snippets.enable = true; }
-      { plugins.direnv.enable = true; }
-      { plugins.crates-nvim.enable = true; }
-      {
-        plugins.helpview.enable = true;
-        performance.combinePlugins.standalonePlugins = [ "helpview.nvim" ];
-      }
-      {
-        plugins.obsidian.enable = true;
-        plugins.obsidian.settings = {
-          dir = "~/Documents/Nextcloud/Notes/zettelkasten/";
-          note_id_func.__raw = ''
-            function(title)
-              if title ~= nil then
-                return title
-              else
-                suffix = ""
-                for _ = 1, 4 do
-                  suffix = suffix .. string.char(math.random(65, 90))
-                end
-                return tostring(os.date("%Y-%m-%d")) .. "-" .. suffix
-              end
-            end
-          '';
-        };
-      }
-      {
-        plugins.mini = {
-          enable = true;
-          modules = {
-            align = { };
-          };
-        };
-        performance.combinePlugins.standalonePlugins = [ "mini.nvim" ];
-      }
-    ];
-  };
-}

modules/programs/nvim/new_plugins/render-markdown.nix

@@ -0,0 +1,13 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.render-markdown = {
+      enable = true;
+      settings.latex.enable = false;
+    };
+  };
+}

modules/programs/nvim/new_plugins/telescope.nix

@@ -31,6 +31,10 @@ _:
             action = "oldfiles";
             options.desc = "Recent files";
           };
+          "<leader>fc" = {
+            action = "commands";
+            options.desc = "Commands";
+          };
         };
       };
       web-devicons.enable = true;

modules/programs/nvim/new_plugins/todo-comments.nix

@@ -0,0 +1,13 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.todo-comments = {
+      enable = true;
+      keymaps.todoTelescope.key = "<leader>ft";
+    };
+  };
+}

modules/programs/nvim/new_plugins/ts-context-commentstring.nix

@@ -0,0 +1,10 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.ts-context-commentstring.enable = true;
+  };
+}

modules/programs/nvim/new_plugins/vim-surround.nix

@@ -0,0 +1,10 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.vim-surround.enable = true;
+  };
+}

modules/programs/nvim/new_plugins/vimtex.nix

@@ -0,0 +1,13 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.vimtex = {
+      enable = true;
+      settings.view_method = "zathura";
+    };
+  };
+}

modules/programs/nvim/new_plugins/which-key.nix

@@ -0,0 +1,10 @@
+{ config, lib, pkgs, inputs, ... }:
+
+let
+  inherit (lib) mkEnableOption mkIf readFile;
+in
+{
+  home-manager.users.moritz.programs.nixvim = {
+    plugins.which-key.enable = true;
+  };
+}

modules/programs/python.nix

@@ -10,7 +10,7 @@ let
 
   cfg = config.my.programs.python;
 
-  pythonVersions = map (version: "3${toString version}") (range 8 13);
+  pythonVersions = map (version: "3${toString version}") (range 9 13);
   enabledVersions = filterAttrs (_: value: value.enable) cfg.versions;
 
   pythonPackages = version: attrNames pkgs."python${version}Packages";

modules/programs/river/default.nix

@@ -15,10 +15,10 @@ in
     enable = mkEnableOption "river";
     keyboardLayouts = mkOption {
       type = types.listOf types.str;
-      description = "list of keyboard layouts";
+      description = "List of keyboard layouts.";
       default = [ "us" "de" ];
     };
-    nvidiaSupport = mkEnableOption "nvidiaSupport";
+    nvidiaSupport = mkEnableOption "nvidia gpu support";
   };
 
   config = mkIf cfg.enable {
@@ -66,6 +66,9 @@ in
             open = "spawn 'wlr-randr --output eDP-1 --on'";
           };
           map = {
+            passthrough = {
+              "Super F11" = "enter-mode normal";
+            };
             normal = {
               "Super Q" = "close";
               "Super Return" = "spawn '${config.my.terminal.package}'";
@@ -103,6 +106,8 @@ in
               "None XF86AudioNext" = "spawn 'playerctl -p spotifyd,firefox next'";
               "None XF86AudioPlay" = "spawn 'playerctl -p spotifyd,firefox play-pause'";
               "None XF86AudioPrev" = "spawn 'playerctl -p spotifyd,firefox previous'";
+
+              "Super F11" = "enter-mode passthrough";
             } //
             # tags
             (
@@ -257,7 +262,6 @@ in
       pipewire = {
         enable = true;
         alsa.enable = true;
-        alsa.support32Bit = true;
         pulse.enable = true;
       };
       displayManager = {