fix general oxo configuration

6 files changed, 9 insertions, 11 deletions

diff --git a/config/bash.nix b/config/bash.nix
index df936b9..bdd89c4 100644
--- a/config/bash.nix
+++ b/config/bash.nix
@@ -2,7 +2,7 @@
   programs.bash = {
     enable = true;
     initExtra= ''
-      export PS1='\[\[\e[38;5;254m\]\w \[\033[0m\]> '
+      export PS1='\h \[\[\e[38;5;254m\]\w \[\033[0m\]> '
 
       bind "set completion-ignore-case on"
 
diff --git a/machines/oxo/configuration.nix b/machines/oxo/configuration.nix
index ef7a84b..5dfc9e7 100644
--- a/machines/oxo/configuration.nix
+++ b/machines/oxo/configuration.nix
@@ -27,7 +27,7 @@
     useUserPackages = true;
     users = {
       git = import ./git-home.nix;
-      compromyse = import ./home.nix
+      compromyse = import ./home.nix;
     };
   };
 }
diff --git a/machines/oxo/git-home.nix b/machines/oxo/git-home.nix
index ce20f9e..c2bff08 100644
--- a/machines/oxo/git-home.nix
+++ b/machines/oxo/git-home.nix
@@ -1,9 +1,9 @@
-{ inputs, pkgs, ... }:
+{ inputs, pkgs, lib, ... }:
 
 {
   home = {
     username = "git";
-    homeDirectory = "/home/git";
+    homeDirectory = lib.mkForce "/home/git";
   };
 
   home.packages = with pkgs; [
diff --git a/modules/compromyse.nix b/modules/compromyse.nix
index 0c4b2a0..abcc4ff 100644
--- a/modules/compromyse.nix
+++ b/modules/compromyse.nix
@@ -5,7 +5,6 @@
     hashedPassword = "$y$j9T$sLByWUVQIl0D6AzHKpVat/$VAsX7YK1NCy2H4XxhVTKdkhWXHuzdMMHq6tC4liH879";
     isNormalUser = true;
     openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDljZ44cNtYqvpeGuUsMRekkjiyaCLraX7GHp2BJGyhvUnCpVz7I5K6SGQ92vnEdkbQpUEs29Cw5RTYTKDXcn1zyl7fi/jLWVLgV3Apc7dbJvhQOTfxB24D5EuOR+3nZFtR1C89VNiB55ahqoBAxGMxr9GkOaKplruT1u+UOAW7wRwCGWoC7ySuVRnEoquWsv3ZHZhxTgmM6b8wnOk9K/to0JY51fbZ56OXcUKRUNkq4QzVMWEhWEpOuSFeufOewCjUIcMQkWzjG3XiqF7gBGnNqbvPlWOB3iLbAdOGBfkAxFlzTBGzwNEGWV39AMWHA1dRBKeETo5sHACsorpIQ3IHR3uHz3YccqhzOBqERqU419ioLdHSQt7uXS54AvZ7ZAMm/RZBeFdupT2dhfOdmvY/2ZHHEuP55A3GExlthaFR+SPKc1q/MhtX/+hBhtkPH+RMP/WPgPbXBCLVdL/ul/vGk8CGCFeKAVrexmz5q+5xax/gDIKfS3ynoMCrWxoto2U= raghus2247@gmail.com" ];
-    # openssh.authorizedKeys.keys = [];
     extraGroups = [ "wheel" "video" "storage" "input" "plugdev" "libvirtd" "docker" "kvm" "lp" ];
   };
   security.sudo.wheelNeedsPassword = false;
diff --git a/modules/git/cgit.nix b/modules/git/cgit.nix
index 56a9b76..123260b 100644
--- a/modules/git/cgit.nix
+++ b/modules/git/cgit.nix
@@ -1,7 +1,7 @@
 { config, pkgs, lib, ... }:
 
 let
-  repositoryPath = "/home/compromyse";
+  repositoryPath = "/home/git";
   cgit = (pkgs.callPackage ../../packages/cgit.nix {
     dist = ./cgit-dist;
     theme = "monokai";
@@ -43,10 +43,6 @@ in {
     };
   };
 
-  services.fcgiwrap.instances."cgit-git.compromyse.xyz".process.user = "root";
-  services.fcgiwrap.instances."cgit-git.compromyse.xyz".socket.user = lib.mkForce "root";
-  services.fcgiwrap.instances."cgit-git.compromyse.xyz".socket.group = lib.mkForce "root";
-
   services.nginx.virtualHosts."git.compromyse.xyz" = {
     forceSSL = true;
     enableACME = true;
diff --git a/modules/git/user.nix b/modules/git/user.nix
index 797b452..db2fa0e 100644
--- a/modules/git/user.nix
+++ b/modules/git/user.nix
@@ -1,8 +1,11 @@
-{ config, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   users.users.git = {
     isNormalUser = true;
+    isSystemUser = lib.mkForce false;
+    uid = 1001;
     openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDljZ44cNtYqvpeGuUsMRekkjiyaCLraX7GHp2BJGyhvUnCpVz7I5K6SGQ92vnEdkbQpUEs29Cw5RTYTKDXcn1zyl7fi/jLWVLgV3Apc7dbJvhQOTfxB24D5EuOR+3nZFtR1C89VNiB55ahqoBAxGMxr9GkOaKplruT1u+UOAW7wRwCGWoC7ySuVRnEoquWsv3ZHZhxTgmM6b8wnOk9K/to0JY51fbZ56OXcUKRUNkq4QzVMWEhWEpOuSFeufOewCjUIcMQkWzjG3XiqF7gBGnNqbvPlWOB3iLbAdOGBfkAxFlzTBGzwNEGWV39AMWHA1dRBKeETo5sHACsorpIQ3IHR3uHz3YccqhzOBqERqU419ioLdHSQt7uXS54AvZ7ZAMm/RZBeFdupT2dhfOdmvY/2ZHHEuP55A3GExlthaFR+SPKc1q/MhtX/+hBhtkPH+RMP/WPgPbXBCLVdL/ul/vGk8CGCFeKAVrexmz5q+5xax/gDIKfS3ynoMCrWxoto2U= raghus2247@gmail.com" ];
+    shell = "${pkgs.git}/bin/git-shell";
   };
 }