move more and more stuff to home manager

nixos/homes/palo/default.nix

@@ -8,11 +8,11 @@
     ./packages
     ./ssh.nix
     ./stylix.nix
+    ./vim.nix
   ];
 
   home.stateVersion = "22.11";
 
-
   programs.gpg = {
     enable = true;
     settings = {

nixos/homes/palo/git.nix

@@ -1,4 +1,5 @@
 { pkgs, ... }:
+with pkgs;
 {
 
   programs.git = {
@@ -18,7 +19,21 @@
 
 
   home.packages = [
-    pkgs.pre-commit
+    pre-commit
+    gita
+    tig
+    lazygit
+    git-crypt
+    gitAndTools.gitflow
+    gitAndTools.gitSVN
+    gitAndTools.git2cl
+
+    # merge tools
+    meld
+
+    # activate using :
+    # git config --global core.pager "diff-so-fancy | less --tabs=4 -RFX"
+    gitAndTools.diff-so-fancy
   ];
 
 }

nixos/homes/palo/vim.nix

@@ -0,0 +1,6 @@
+{
+  programs.vim = {
+    enable = true;
+    defaultEditor = true;
+  };
+}

nixos/machines/cream/configuration.nix

@@ -14,14 +14,10 @@
     ./tinc.nix
     ./tinc_retiolum.nix
 
-    #./wifi-access-point.nix
-    #./wireshark.nix
-    #./scanner.nix
     ./qemu.nix
     ./wireguard.nix
 
     ./borg.nix
-    ./trilium.nix
 
   ];
 
@@ -128,11 +124,6 @@
     };
   };
 
-  configuration.desktop = {
-    width = 2256;
-    height = 1504;
-  };
-
   #services.xserver.desktopManager.gnome.enable = true;
   #services.xserver.displayManager.lightdm.enable = false;
   #services.xserver.displayManager.sddm.enable = true;

nixos/machines/cream/cups.nix

@@ -11,8 +11,6 @@
         media = "na_letter_8.5x11in";
         sides = "one-sided";
       };
-
     }
-
   ];
 }

nixos/machines/cream/qemu.nix

@@ -1,5 +1,4 @@
 { config, lib, pkgs, ... }:
-
 {
 
   virtualisation.libvirtd.enable = true;

nixos/machines/cream/rethinkdb.nix

@@ -1 +0,0 @@
-

nixos/machines/cream/trilium.nix

@@ -1,19 +0,0 @@
-{ config, pkgs, ... }:
-{
-
-  services.trilium-server = {
-    enable = true;
-    instanceName = config.networking.hostName;
-    host = "10.23.42.27";
-    nginx = {
-      enable = true;
-      hostName = "trilium.${config.networking.hostName}.private";
-    };
-  };
-
-  services.nginx.virtualHosts."${config.services.trilium-server.nginx.hostName}".extraConfig = ''
-    allow ${config.tinc.private.subnet};
-    deny all;
-  '';
-
-}

nixos/machines/sternchen/configuration.nix

@@ -60,12 +60,6 @@
   programs.custom.xterm.fontSize = 12;
   # system.custom.fonts.dpi = 100;
 
-  # x11
-  # ---
-  configuration.desktop = {
-    width = 1366;
-    height = 768;
-  };
   # for congress and streaming
   hardware.opengl = {
     enable = true;

nixos/machines/sterni/configuration.nix

@@ -68,11 +68,6 @@
     };
   };
 
-  configuration.desktop = {
-    width = 1366;
-    height = 768;
-  };
-
   services.xserver.desktopManager.gnome.enable = true;
 
   custom.samba-share = {

nixos/modules/default.nix

@@ -20,16 +20,12 @@
     #./programs/elm.nix
     #./programs/espeak.nix
     #./programs/ffmpeg.nix
-    #./programs/git.nix
-    #./programs/shell-bash.nix
-    #./programs/shell-tools.nix
-    #./programs/shell-zsh.nix
     #./programs/slack.nix
     ./programs/steam.nix
     #./programs/taskwarrior.nix
     ./programs/urxvt.nix
     #./programs/video.nix
-    ./programs/vim.nix
+    #./programs/vim.nix
     ./programs/xterm.nix
 
     #./system/audio.nix

nixos/modules/programs/git.nix

@@ -1,36 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
-
-  cfg = config.programs.custom.git;
-
-in
-{
-
-  options.programs.custom.git.enable =
-    mkEnableOption "install git and all its tools";
-
-  config = mkIf cfg.enable {
-
-    environment.systemPackages = with pkgs; [
-      git
-      gita
-      tig
-      lazygit
-      git-crypt
-      gitAndTools.gitflow
-      gitAndTools.gitSVN
-      gitAndTools.git2cl
-
-      # merge tools
-      meld
-
-      # activate using :
-      # git config --global core.pager "diff-so-fancy | less --tabs=4 -RFX"
-      gitAndTools.diff-so-fancy
-    ];
-  };
-}
-

nixos/system/desktop/default.nix

@@ -3,17 +3,12 @@
   imports = [
 
     ../all
-
-    #./icecast.nix
-    #./audio.nix
-    #./mail-stuff.nix
     ./packages.nix
     ./size.nix
-    #./user.nix
     ./yubikey.nix
   ];
 
-  components.network.sshd.onlyTincAccess = lib.mkDefault true;
+  #components.network.sshd.onlyTincAccess = lib.mkDefault true;
 
   backup.dirs = [
     "${config.users.users.mainUser.home}/.config/noti"
@@ -35,7 +30,6 @@
 
     curlScripts.enable = true;
     citate.enable = true;
-    vim.enable = true;
 
   };
 

nixos/system/desktop/size.nix

@@ -9,21 +9,21 @@ let
 in
 {
 
-  options.configuration.desktop = {
+  #options.configuration.desktop = {
-    height = mkOption {
+  #  height = mkOption {
-      default = 900;
+  #    default = 900;
-      type = with types; int;
+  #    type = with types; int;
-      description = ''
+  #    description = ''
-        height of the dektop monitor
+  #      height of the dektop monitor
-      '';
+  #    '';
-    };
+  #  };
-    width = mkOption {
+  #  width = mkOption {
-      default = 1600;
+  #    default = 1600;
-      type = with types; int;
+  #    type = with types; int;
-      description = ''
+  #    description = ''
-        width of the desktop monitor
+  #      width of the desktop monitor
-      '';
+  #    '';
-    };
+  #  };
-  };
+  #};
 
 }

nixos/system/server/default.nix

@@ -14,9 +14,6 @@
   powerManagement.enable = false;
   #powerManagement.scsiLinkPolicy = "min_power";
 
-  # config vim
-  programs.custom.vim.enable = true;
-
   services.locate.enable = true;
   services.locate.locate = pkgs.mlocate;
   services.locate.localuser = null;