flake.lock

@@ -307,11 +307,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711625603,
+        "lastModified": 1711133180,
-        "narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=",
+        "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2",
+        "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb",
         "type": "github"
       },
       "original": {
@@ -328,11 +328,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711604890,
+        "lastModified": 1711133180,
-        "narHash": "sha256-vbI/gxRTq/gHW1Q8z6D/7JG/qGNl3JTimUDX+MwnC3A=",
+        "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3142bdcc470e1e291e1fbe942fd69e06bd00c5df",
+        "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb",
         "type": "github"
       },
       "original": {
@@ -349,11 +349,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711591334,
+        "lastModified": 1710717205,
-        "narHash": "sha256-9d5ilxxq4CXw44eFw8VFrRneAKex7D8xjn95mwZjgf4=",
+        "narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "f0dd0838c3558b59dc3b726d8ab89f5b5e35c297",
+        "rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3",
         "type": "github"
       },
       "original": {
@@ -412,11 +412,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1711703276,
+        "lastModified": 1711163522,
-        "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
+        "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
+        "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
         "type": "github"
       },
       "original": {
@@ -455,11 +455,11 @@
         "pre-commit-hooks": "pre-commit-hooks_2"
       },
       "locked": {
-        "lastModified": 1711745924,
+        "lastModified": 1711284540,
-        "narHash": "sha256-ZYVrOg12pWNbY1hx1lOu3cwER6xalEHUUIXnfbkCtUY=",
+        "narHash": "sha256-DTzi4ujZoxM3ZXStCwD6Lph3FdGtkBlvfYsDCRITjfA=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "4f83bcf2906c1c933316396221024f3482a7b086",
+        "rev": "e7a3461fefd983ae3443e9aa849e9d1566ab47e4",
         "type": "github"
       },
       "original": {
@@ -505,11 +505,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711519547,
+        "lastModified": 1710923068,
-        "narHash": "sha256-Q7YmSCUJmDl71fJv/zD9lrOCJ1/SE/okZ2DsrmRjzhY=",
+        "narHash": "sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI+JMJuLo45aG3cKc=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "7d47a32e5cd1ea481fab33c516356ce27c8cef4a",
+        "rev": "e611897ddfdde3ed3eaac4758635d7177ff78673",
         "type": "github"
       },
       "original": {
@@ -527,11 +527,11 @@
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1711760932,
+        "lastModified": 1710923068,
-        "narHash": "sha256-DqUTQ2iAAqSDwMhKBqvi24v0Oc7pD3LCK/0FCG//TdA=",
+        "narHash": "sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI+JMJuLo45aG3cKc=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "c11e43aed6f17336c25cd120eac886b96c455731",
+        "rev": "e611897ddfdde3ed3eaac4758635d7177ff78673",
         "type": "github"
       },
       "original": {

home-manager/home.nix

@@ -77,7 +77,6 @@
         mupen64plus
         melonds
         fceumm
-        beetle-saturn
       ];
     }) # Retroarch with cores
     dolphin-emu # Gamecube/wii emulator

home-manager/modules/nvim.nix

@@ -83,7 +83,7 @@
       prettierd
     ];
     plugins = {
-      comment.enable = true;
+      comment-nvim.enable = true;
 
       ts-context-commentstring.enable = true;
 
@@ -96,7 +96,7 @@
 
       indent-blankline = {
         enable = true;
-        settings.scope.enabled = false;
+        scope.enabled = false;
       };
 
       cmp = {
@@ -176,37 +176,35 @@
 
       oil = {
         enable = true;
-        settings = {
+        defaultFileExplorer = true;
-          show_hidden = true;
+        extraOptions = { show_hidden = true; };
-          default_file_explorer = true;
-        };
       };
 
       treesitter.enable = true;
 
       gitsigns = {
         enable = true;
-        settings.signs = {
+        signs = {
           add.text = "▎";
           change.text = "▎";
           changedelete.text = "▎";
           delete.text = "▎";
           topdelete.text = "▎";
           untracked.text = "▎";
-          on_attach = ''
-            function(buffer)
-              local gs = package.loaded.gitsigns
-              
-              local function map(mode, l, r, desc)
-              	vim.keymap.set(mode, l, r, { buffer = buffer, desc = desc })
-              end
-              
-              -- stylua: ignore start
-              map("n", "]g", gs.next_hunk, "Next git hunk")
-              map("n", "[g", gs.prev_hunk, "Previous git hunk")
-            end
-          '';
         };
+        onAttach.function = ''
+          function(buffer)
+            local gs = package.loaded.gitsigns
+            
+            local function map(mode, l, r, desc)
+            	vim.keymap.set(mode, l, r, { buffer = buffer, desc = desc })
+            end
+            
+            -- stylua: ignore start
+            map("n", "]g", gs.next_hunk, "Next git hunk")
+            map("n", "[g", gs.prev_hunk, "Previous git hunk")
+          end
+        '';
       };
 
       mini = {

home-manager/modules/plasma.nix

@@ -1,5 +1,6 @@
 { pkgs, ... }: {
   home.packages = [
+    pkgs.catppuccin-cursors.frappeRosewater
     pkgs.catppuccin-gtk
     (pkgs.catppuccin-papirus-folders.override {
       flavor = "frappe";

nixos/configuration.nix

@@ -76,11 +76,7 @@
     wayland.enable = true;
     theme = "catppuccin-frappe";
     # Fix keyboard showing up unnecesarilly
-    settings = {
+    settings = { General = { InputMethod = ""; }; };
-      General = { InputMethod = ""; };
-      # Setup nicer cursor theme
-      Theme = { CursorTheme = "Catppuccin-Frappe-Rosewater-Cursors"; };
-    };
   };
 
   # Setup plasma with excluding a couple unnecesarry packages
@@ -166,7 +162,7 @@
     cryptsetup
     xfsprogs
     (catppuccin-kde.override { winDecStyles = [ "classic" "modern" ]; })
-    catppuccin-cursors.frappeRosewater
+    catppuccin-sddm-corners
     (callPackage ./modules/catppuccin-sddm.nix { inherit pkgs; })
   ];
 

nixos/modules/catppuccin-sddm.nix

@@ -11,8 +11,6 @@ pkgs.stdenv.mkDerivation {
     hash = "sha256-ddz++Xzh3tiEdEnYvIhKcN8Y3FRSvaN0wtmCMb7DEVc=";
   };
 
-  propagatedUserEnvPkgs = with pkgs.libsForQt5; [ qtquickcontrols2 qtsvg ];
-
   dontBuild = true;
 
   installPhase = ''