Flake: Add disko

flake.nix

@@ -16,6 +16,10 @@
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
+    # Disk partitioning
+    disko.url = "github:nix-community/disko/latest";
+    disko.inputs.nixpkgs.follows = "nixpkgs";
+
     # Manage secrets with agenix
     # agenix.url = "github:ryantm/agenix";
     # agenix.inputs.nixpkgs.follows = "nixpkgs";
@@ -155,6 +159,7 @@
     commonModules = [
       # inputs.agenix.nixosModules.default
       inputs.sops-nix.nixosModules.sops
+      inputs.disko.nixosModules.disko
     ];
   in {
     # Local shell for NixFlake directory

home/christoph/default.nix

@@ -86,9 +86,9 @@
 
         bindings = {
           "$mainMod, t" = ["exec, kitty"];
-          "$mainMod, e" = ["exec, kitty"];
+          "$mainMod, e" = ["exec, kitty --title=Yazi yazi"];
           "$mainMod, n" = ["exec, neovide"];
-          "$mainMod, r" = ["exec, kitty --title=Rmpc rmpc"];
+          # "$mainMod, r" = ["exec, kitty --title=Rmpc rmpc"];
           "$mainMod CTRL, n" = ["exec, kitty --title=Navi navi"];
           "$mainMod SHIFT, n" = ["exec, neovide ${config.paths.dotfiles}/navi/christoph.cheat"];
           "$mainMod SHIFT, f" = ["exec, neovide ${config.paths.dotfiles}/flake.nix"];
@@ -128,7 +128,7 @@
           "ferdium" = "x";
           "msty" = "z";
           "btop" = "b";
-          "rmcp" = "r";
+          "rmpc" = "r";
         };
       };
 
@@ -146,7 +146,7 @@
           "ferdium" = ["ferdium"];
           "msty" = ["msty"];
           "btop" = ["kitty --title=Btop btop"];
-          "rmcp" = ["kitty --title=Rmcp rmcp"];
+          "rmpc" = ["kitty --title=Rmpc rmpc"];
         };
 
         delayed = [];
@@ -737,15 +737,13 @@
         (lib.mkIf (!headless) [
           "com.github.tchx84.Flatseal"
 
-          "com.spotify.Client" # Don't need this when spicetify is enabled
+          # "com.spotify.Client" # Don't need this when spicetify is enabled
 
-          # NOTE: Also change discord-ipc-0 below
           "com.discordapp.Discord"
           # "com.discordapp.DiscordCanary"
-          # "dev.vencord.Vesktop"
 
           # "com.google.Chrome"
-          # "md.obsidian.Obsidian" # NOTE: Installed via package
+          # "md.obsidian.Obsidian"
           # "io.anytype.anytype"
         ])
       ];

home/modules/neovim/default.nix

@@ -1904,12 +1904,12 @@ in {
             '';
           };
 
-          wakatime = {
+          # wakatime = {
-            name = "wakatime";
+          #   name = "wakatime";
-            pkg = pkgs.vimPlugins.vim-wakatime;
+          #   pkg = pkgs.vimPlugins.vim-wakatime;
-            lazy = true;
+          #   lazy = true;
-            event = ["BufReadPost" "BufNewFile"];
+          #   event = ["BufReadPost" "BufNewFile"];
-          };
+          # };
 
           web-devicons = rec {
             name = "nvim-web-devicons";
@@ -2083,7 +2083,7 @@ in {
           typescript-tools # Typescript tsserver LSP
           ufo # Code folding
           vimtex # LaTeX support
-          wakatime # Time tracking
+          # wakatime # Time tracking
           web-devicons # Icons for many plugins
           which-key # Live keybinding help
           window-picker # Jump to window without multiple <leader-hjkl>

home/modules/neovim/extraConfigLua.lua

@@ -58,11 +58,11 @@ end, {
 	desc = "Toggle autolint-on-save",
 })
 
--- Toggle Rcmp
+-- Toggle Rmpc
 local Terminal = require("toggleterm.terminal").Terminal
-local rmcp =
+local rmpc =
 	Terminal:new({ cmd = "rmpc", hidden = true, close_on_exit = true, auto_scroll = false, direction = "float" })
 
-vim.g.toggle_rcmp = function()
+vim.g.toggle_rmpc = function()
-	rmcp:toggle()
+	rmpc:toggle()
 end

home/modules/neovim/mappings.nix

@@ -332,8 +332,8 @@ _: let
     {
       mode = "n";
       key = "<leader>r";
-      action = "<cmd>lua vim.g.toggle_rcmp()<cr>"; # Defined in extraConfigLua.lua
+      action = "<cmd>lua vim.g.toggle_rmpc()<cr>"; # Defined in extraConfigLua.lua
-      options.desc = "Show Rcmp";
+      options.desc = "Show Rmpc";
     }
     {
       mode = "n";