update

7 files changed, 48 insertions, 12 deletions

diff --git a/config/bash.nix b/config/bash.nix
index 563a60f..bf53bbd 100644
--- a/config/bash.nix
+++ b/config/bash.nix
@@ -39,6 +39,8 @@
       bind '"\C-f": "sessionizer -cd\n"'
 
       alias c="ssh root@cacer.local"
+      alias ub1="ssh ubuntu@ub1.local"
+      alias ub2="ssh ubuntu@ub2.local"
     '';
   };
 }
diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index f7adc24..a906307 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -30,6 +30,9 @@ require('packer').startup(function(use)
   use 'windwp/nvim-autopairs'
   use 'numToStr/Comment.nvim'
 
+  use 'romgrk/barbar.nvim'
+  use 'nvim-tree/nvim-web-devicons'
+
   use 'kvrohit/rasmus.nvim'
 
 	use 'hrsh7th/cmp-nvim-lsp'
@@ -201,4 +204,18 @@ vim.keymap.set('n', '<A-a>', '<cmd>lua oil.toggle_float()<cr>', { noremap = true
 vim.api.nvim_set_keymap('n', '<A-\\>', ':vsplit<CR>', { noremap = true })
 vim.api.nvim_set_keymap('n', '<A-->', ':split<CR>', { noremap = true })
 
+require('barbar').setup {}
+
 vim.cmd.colorscheme('rasmus')
+
+local map = vim.api.nvim_set_keymap
+local opts = { noremap = true, silent = true }
+
+-- Move to previous/next
+map('n', '<A-,>', '<Cmd>BufferPrevious<CR>', opts)
+map('n', '<A-.>', '<Cmd>BufferNext<CR>', opts)
+-- Re-order to previous/next
+map('n', '<A-<>', '<Cmd>BufferMovePrevious<CR>', opts)
+map('n', '<A->>', '<Cmd>BufferMoveNext<CR>', opts)
+-- Close buffer
+map('n', '<A-c>', '<Cmd>BufferClose<CR>', opts)
diff --git a/flake.lock b/flake.lock
index 32df989..57989c7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713566308,
-        "narHash": "sha256-7Y91t8pheIzjJveUMAPyeh5NOq5F49Nq4Hl2532QpJs=",
+        "lastModified": 1713789879,
+        "narHash": "sha256-4Wt3Bg6uOnvwZcECBZaFEdzlWRlGLgd8DqLL4ugLdxg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "057117a401a34259c9615ce62218aea7afdee4d3",
+        "rev": "46833c3115e8858370880d892748f0927d8193c3",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1713537308,
-        "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=",
+        "lastModified": 1713714899,
+        "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f",
+        "rev": "6143fc5eeb9c4f00163267708e26191d1e918932",
         "type": "github"
       },
       "original": {
diff --git a/machines/x/configuration.nix b/machines/x/configuration.nix
index 459bfce..5612c2f 100644
--- a/machines/x/configuration.nix
+++ b/machines/x/configuration.nix
@@ -31,10 +31,20 @@
 
   home-manager.users.compromyse = import ./home.nix;
   services.desktopManager.plasma6.enable = true;
+  environment.plasma6.excludePackages = with pkgs.kdePackages; [
+    konsole
+    oxygen
+    ark
+    elisa
+    gwenview
+    kate
+  ];
 
   networking.extraHosts =
   ''
     127.0.0.1 download.labsmartlis.local
-    192.168.1.186 cacer.local
+    192.168.1.186 cacer.local c
+    192.168.1.16  ub1.local
+    192.168.1.17  ub2.local
   '';
 }
diff --git a/modules/amd.nix b/modules/amd.nix
index e16e3e9..351318c 100644
--- a/modules/amd.nix
+++ b/modules/amd.nix
@@ -3,6 +3,6 @@ let
   kver = config.boot.kernelPackages.kernel.version;
 in
 {
-  boot.kernelParams = [ "amd_pstate=active" "amd_iommu=on" ];
+  boot.kernelParams = [ "amd_pstate=active" "amd_iommu=on" "amdgpu.sg_display=0" ];
   hardware.cpu.amd.updateMicrocode = config.hardware.enableRedistributableFirmware;
 }
diff --git a/modules/login.nix b/modules/login.nix
index 3d9fb31..a9beb4c 100644
--- a/modules/login.nix
+++ b/modules/login.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 
 {
-  environment.systemPackages = with pkgs; [
+  /* environment.systemPackages = with pkgs; [
     greetd.tuigreet
     greetd.greetd
   ];
@@ -14,13 +14,20 @@
         user = "greeter";
       };
     };
+  }; */
+  services.displayManager.sddm = {
+    enable = true;
+    wayland = {
+      enable = true;
+      compositor = "kwin";
+    };
   };
 
   services.logind.extraConfig = ''
     HandlePowerKey=ignore
   '';
 
-  systemd.services.greetd.serviceConfig = {
+  /* systemd.services.greetd.serviceConfig = {
     Type = "idle";
     StandardInput = "tty";
     StandardOutput = "tty";
@@ -28,7 +35,7 @@
     TTYReset = true;
     TTYVHangup = true;
     TTYVTDisallocate = true;
-  };
+  }; */
 
   security.polkit.enable = true;
 
diff --git a/modules/nvidia.nix b/modules/nvidia.nix
index 5f49c8f..1913459 100644
--- a/modules/nvidia.nix
+++ b/modules/nvidia.nix
@@ -9,7 +9,7 @@
     powerManagement.finegrained = true;
     open = false;
     nvidiaSettings = true;
-    package = config.boot.kernelPackages.nvidiaPackages.stable;
+    package = config.boot.kernelPackages.nvidiaPackages.vulkan_beta;
 
     prime = {
       offload = {