flake.nix

@@ -126,7 +126,7 @@
       inherit (nixpkgs) lib;
 
 
-      meta = { nixpackages ? nixpkgs }: rec {
+      meta = {nixpackages ? nixpkgs}: rec {
         system = "x86_64-linux";
         pkgs = import nixpackages {
           inherit system;

nixos/homes/palo/default.nix

@@ -11,7 +11,6 @@
     ./stylix.nix
     ./vim.nix
     ./yubikey.nix
-    ./zellij.nix
   ];
 
   home.stateVersion = "22.11";

nixos/homes/palo/git.nix

@@ -15,8 +15,7 @@ with pkgs;
       init.defaultBranch = "main";
       pull.ff = "only";
     };
-    #diff-so-fancy.enable = true;
-    difftastic.enable = true;
+    diff-so-fancy.enable = true;
   };
 
 

nixos/homes/palo/i3.nix

@@ -35,12 +35,12 @@ in
       in
       [
         fixXhost
+        pkgs.kitty
         pkgs.autorandr
         pkgs.polygon-art.polygon-art
       ];
 
 
-
     programs.i3status-rust = {
       enable = true;
       bars = {
@@ -115,10 +115,6 @@ in
       };
     };
 
-    programs.kitty = {
-      enable = true;
-    };
-
     programs.alacritty = {
       enable = true;
       settings = {

nixos/homes/palo/zellij.nix

@@ -1,13 +0,0 @@
-{ pkgs, ... }:
-with pkgs;
-{
-  programs.zellij = {
-    enable = true;
-    # zsh will automatically start in zelllij
-    #enableZshIntegration = true;
-    settings = {
-      on_force_close = "quit";
-    };
-  };
-
-}

nixos/machines/chungus/gitea.nix

@@ -20,7 +20,6 @@
   services.gitea = {
     enable = true;
     appName = "git.chungus.private";
-    package = pkgs.forgejo;
     stateDir = "/srv/gitea";
     settings = {
       server.ROOT_URL = "http://git.chungus.private/";

nixos/machines/robi/gitea.nix

@@ -15,12 +15,9 @@
     };
   };
 
-
-  # todo move to forgejo
   services.gitea = {
     enable = true;
     appName = "git.ingolf-wagner.de";
-    package = pkgs.forgejo;
     #cookieSecure = true;
     #disableRegistration = true;
     settings = {

nixos/system/all/nginx-landingpage.nix

@@ -1,5 +1,5 @@
 { config, lib, pkgs, ... }: {
-  # deprecated
+# deprecated
   services.nginx.virtualHosts."${config.networking.hostName}.private" = {
     default = true;
     locations."/" = {