From 9ef699df79c41cbc0b7ce30702e4f5e0a062878a Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Wed, 13 Dec 2023 19:32:02 +0100 Subject: [PATCH] move more and more stuff to home manager --- nixos/homes/palo/default.nix | 2 +- nixos/homes/palo/git.nix | 17 ++++++++- nixos/homes/palo/vim.nix | 6 ++++ nixos/{machines/cream => legacy}/scanner.nix | 0 .../programs => legacy}/shell-bash.nix | 0 .../programs => legacy}/shell-tools.nix | 0 .../programs => legacy}/shell-zsh.nix | 0 nixos/{modules/programs => legacy}/vim.nix | 0 nixos/machines/cream/configuration.nix | 9 ----- nixos/machines/cream/cups.nix | 2 -- nixos/machines/cream/qemu.nix | 1 - nixos/machines/cream/rethinkdb.nix | 1 - nixos/machines/cream/trilium.nix | 19 ---------- nixos/machines/sternchen/configuration.nix | 6 ---- nixos/machines/sterni/configuration.nix | 5 --- nixos/modules/default.nix | 6 +--- nixos/modules/programs/git.nix | 36 ------------------- nixos/system/desktop/default.nix | 8 +---- nixos/system/desktop/size.nix | 32 ++++++++--------- nixos/system/server/default.nix | 3 -- 20 files changed, 41 insertions(+), 112 deletions(-) create mode 100644 nixos/homes/palo/vim.nix rename nixos/{machines/cream => legacy}/scanner.nix (100%) rename nixos/{modules/programs => legacy}/shell-bash.nix (100%) rename nixos/{modules/programs => legacy}/shell-tools.nix (100%) rename nixos/{modules/programs => legacy}/shell-zsh.nix (100%) rename nixos/{modules/programs => legacy}/vim.nix (100%) delete mode 100644 nixos/machines/cream/rethinkdb.nix delete mode 100644 nixos/machines/cream/trilium.nix delete mode 100644 nixos/modules/programs/git.nix diff --git a/nixos/homes/palo/default.nix b/nixos/homes/palo/default.nix index 3cc352d..bfccb15 100644 --- a/nixos/homes/palo/default.nix +++ b/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 = { diff --git a/nixos/homes/palo/git.nix b/nixos/homes/palo/git.nix index ff075b8..c2be9fc 100644 --- a/nixos/homes/palo/git.nix +++ b/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 ]; } diff --git a/nixos/homes/palo/vim.nix b/nixos/homes/palo/vim.nix new file mode 100644 index 0000000..f4b2e9f --- /dev/null +++ b/nixos/homes/palo/vim.nix @@ -0,0 +1,6 @@ +{ + programs.vim = { + enable = true; + defaultEditor = true; + }; +} diff --git a/nixos/machines/cream/scanner.nix b/nixos/legacy/scanner.nix similarity index 100% rename from nixos/machines/cream/scanner.nix rename to nixos/legacy/scanner.nix diff --git a/nixos/modules/programs/shell-bash.nix b/nixos/legacy/shell-bash.nix similarity index 100% rename from nixos/modules/programs/shell-bash.nix rename to nixos/legacy/shell-bash.nix diff --git a/nixos/modules/programs/shell-tools.nix b/nixos/legacy/shell-tools.nix similarity index 100% rename from nixos/modules/programs/shell-tools.nix rename to nixos/legacy/shell-tools.nix diff --git a/nixos/modules/programs/shell-zsh.nix b/nixos/legacy/shell-zsh.nix similarity index 100% rename from nixos/modules/programs/shell-zsh.nix rename to nixos/legacy/shell-zsh.nix diff --git a/nixos/modules/programs/vim.nix b/nixos/legacy/vim.nix similarity index 100% rename from nixos/modules/programs/vim.nix rename to nixos/legacy/vim.nix diff --git a/nixos/machines/cream/configuration.nix b/nixos/machines/cream/configuration.nix index ba86463..d5828b4 100644 --- a/nixos/machines/cream/configuration.nix +++ b/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; diff --git a/nixos/machines/cream/cups.nix b/nixos/machines/cream/cups.nix index 2a1100f..2c2e41d 100644 --- a/nixos/machines/cream/cups.nix +++ b/nixos/machines/cream/cups.nix @@ -11,8 +11,6 @@ media = "na_letter_8.5x11in"; sides = "one-sided"; }; - } - ]; } diff --git a/nixos/machines/cream/qemu.nix b/nixos/machines/cream/qemu.nix index 687e30c..f390118 100644 --- a/nixos/machines/cream/qemu.nix +++ b/nixos/machines/cream/qemu.nix @@ -1,5 +1,4 @@ { config, lib, pkgs, ... }: - { virtualisation.libvirtd.enable = true; diff --git a/nixos/machines/cream/rethinkdb.nix b/nixos/machines/cream/rethinkdb.nix deleted file mode 100644 index 8b13789..0000000 --- a/nixos/machines/cream/rethinkdb.nix +++ /dev/null @@ -1 +0,0 @@ - diff --git a/nixos/machines/cream/trilium.nix b/nixos/machines/cream/trilium.nix deleted file mode 100644 index db99e2d..0000000 --- a/nixos/machines/cream/trilium.nix +++ /dev/null @@ -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; - ''; - -} diff --git a/nixos/machines/sternchen/configuration.nix b/nixos/machines/sternchen/configuration.nix index ca1e9bc..1bea30b 100644 --- a/nixos/machines/sternchen/configuration.nix +++ b/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; diff --git a/nixos/machines/sterni/configuration.nix b/nixos/machines/sterni/configuration.nix index aee98d3..3e86b63 100644 --- a/nixos/machines/sterni/configuration.nix +++ b/nixos/machines/sterni/configuration.nix @@ -68,11 +68,6 @@ }; }; - configuration.desktop = { - width = 1366; - height = 768; - }; - services.xserver.desktopManager.gnome.enable = true; custom.samba-share = { diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix index 38e6f66..ffff35b 100644 --- a/nixos/modules/default.nix +++ b/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 diff --git a/nixos/modules/programs/git.nix b/nixos/modules/programs/git.nix deleted file mode 100644 index 6c725f3..0000000 --- a/nixos/modules/programs/git.nix +++ /dev/null @@ -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 - ]; - }; -} - diff --git a/nixos/system/desktop/default.nix b/nixos/system/desktop/default.nix index 5f3202b..3fd7d7f 100644 --- a/nixos/system/desktop/default.nix +++ b/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; }; diff --git a/nixos/system/desktop/size.nix b/nixos/system/desktop/size.nix index 52455b2..7edbce1 100644 --- a/nixos/system/desktop/size.nix +++ b/nixos/system/desktop/size.nix @@ -9,21 +9,21 @@ let in { - options.configuration.desktop = { - height = mkOption { - default = 900; - type = with types; int; - description = '' - height of the dektop monitor - ''; - }; - width = mkOption { - default = 1600; - type = with types; int; - description = '' - width of the desktop monitor - ''; - }; - }; + #options.configuration.desktop = { + # height = mkOption { + # default = 900; + # type = with types; int; + # description = '' + # height of the dektop monitor + # ''; + # }; + # width = mkOption { + # default = 1600; + # type = with types; int; + # description = '' + # width of the desktop monitor + # ''; + # }; + #}; } diff --git a/nixos/system/server/default.nix b/nixos/system/server/default.nix index 6bcf08e..75bfdfc 100644 --- a/nixos/system/server/default.nix +++ b/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;