chromium, kemaps, cli commands

home/common/core/default.nix

@@ -18,13 +18,15 @@
       ripgrep
       fzf
       eza
+      bat
+      killall
       pciutils
       tree
       jq
       coreutils
       btop
       htop
-      postgresql
+      postgresql_16
       libqalculate
       tmux
       ;

home/common/core/zsh.nix

@@ -9,6 +9,9 @@
     shellAliases = {
       ll = "ls -l";
       src = "cd ~/.local/share/src";
+      no = "cd /etc/nixos";
+      cat = "bat --decorations=never";
+      ls = "eza";
     };
     history.size = 10000;
     history.path = "${config.xdg.dataHome}/zsh/history";

home/common/optional/desktop/common/default.nix

@@ -22,5 +22,6 @@
     pkgs.texlive.combined.scheme-small
     pkgs.libreoffice
     pkgs.set_wm_class
+    pkgs.xorg.xkill
   ];
 }

home/common/optional/desktop/common/x11/default.nix

@@ -9,6 +9,7 @@
     pkgs.st
     pkgs.xclip
     pkgs.feh
+    pkgs.ungoogled-chromium
   ];
 
 }

hosts/citadel/default.nix

@@ -76,6 +76,13 @@ in {
       xkb.options = "caps:swapescape";
       dpi = 196;
       upscaleDefaultCursor = true;
+      displayManager.sessionCommands = pkgs.writeShellScriptBin "key-remaps" ''
+      ${pkgs.xorg.xmodmap}/bin/xmodmap -e "keycode 64 = Mode_switch"
+      ${pkgs.xorg.xmodmap}/bin/xmodmap -e "keycode 43 = h H Left H"
+      ${pkgs.xorg.xmodmap}/bin/xmodmap -e "keycode 44 = j J Down J"
+      ${pkgs.xorg.xmodmap}/bin/xmodmap -e "keycode 45 = k K Up K"
+      ${pkgs.xorg.xmodmap}/bin/xmodmap -e "keycode 46 = l L Right L"
+  '';
     };
   };
 

hosts/common/users/sam/default.nix

@@ -12,7 +12,6 @@
   secretsDirectory = builtins.toString inputs.nix-secrets;
   secretsFile = "${secretsDirectory}/secrets.yaml";
   baseddataPostgresIp = configVars.networking.addresses.postgres.ip;
-  baseddataPostgresPort = configVars.networking.addresses.postgres.port;
   username = "sam";
 in {
   users.users.${username} = {
@@ -30,7 +29,7 @@ in {
       "podman"
     ];
   };
-
+  services.tailscale.enable = true;
   sops.secrets = {
     "passwords/${username}" = {
       sopsFile = "${secretsFile}";

pkgs/st/default.nix

@@ -12,8 +12,8 @@ pkgs.stdenv.mkDerivation {
     domain = "git.bitlab21.com";
     owner = "sam";
     repo = "st";
-    rev = "31e0ba8cb2086fb12741afc5fc3dfd938ca1f59b";
-    sha256 = "sha256-dbkXFbNr/lJveMeR7qXo7jGgF5+79S9vqKsLM7XM250=";
+    rev = "0e926487c85227aad9eed6667b91e149018014b8";
+    sha256 = "sha256-aUquoUotLKJDxOISIcx0RUybNvBrytc7+EF7PE1MRJU=";
   };
 
   nativeBuildInputs = [