config/shell/zsh/.zprofile

@@ -1,3 +0,0 @@
-__HOME_ZPROFILE_SOURCED=1
-[[ -f "/etc/profile" ]] && emulate sh -c "source /etc/profile"
-[[ -f "~/.profile" ]] && emulate sh -c "source ~/.profile" 

config/shell/zsh/zshenv

@@ -1,5 +1 @@
-#TODO: Set ZDOTDIR based on MKK_CONFIG_PATH
+__MATERUS_HM_ZSH=1
-
-__HOME_ZSHENV_SOURCED=1
-ZDOTDIR=${XDG_CONFIG_HOME:-"$HOME/.config"}/zsh/cfg
-setopt no_global_rcs

config/shell/zsh/zshrc

@@ -1,5 +1,3 @@
-__HOME_ZSHRC_SOURCED=1
-
 if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
   source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
 fi
@@ -9,8 +7,8 @@ if [ -n "$EAT_SHELL_INTEGRATION_DIR" ]; then
     source "$EAT_SHELL_INTEGRATION_DIR/zsh";
 fi
 
-ZSH_DATA_DIR="${XDG_CONFIG_HOME:-"$HOME/.config"}/zsh/data"
+export ZSH_DATA_DIR="${XDG_CONFIG_HOME:-"$HOME/.config"}/zsh/data"
-ZSH_CONFIG_DIR="${XDG_CONFIG_HOME:-"$HOME/.config"}/zsh/cfg"
+export ZSH_CONFIG_DIR="${XDG_CONFIG_HOME:-"$HOME/.config"}/zsh/cfg"
 
 #Check if terminal is fullcolor
 if zmodload zsh/terminfo && (( "$terminfo[colors]" >= "256" )); then 
@@ -21,7 +19,7 @@ fi
 #MSYS
 if [[ "$(uname -s)" =~ ^MSYS_NT.* ]]; then
     #Use windows symlink instead copy
-    MSYS=winsymlinks:nativestrict   
+    export MSYS=winsymlinks:nativestrict   
 fi
 
 
@@ -127,15 +125,6 @@ if [[ $(whence -p "nvim") ]]; then
     alias vi="nvim"
     alias vimdiff="nvim -d"
 fi
-if [[ $(whence -p "eza") ]]; then
-    alias l="eza -lahg --color=auto --hyperlink"
-    alias ll="eza -alF --color=auto --hyperlink"
-    alias ls="eza --color=auto"
-else
-    alias l="ls -lah --color=auto --hyperlink"
-    alias ll="ls -alF --color=auto --hyperlink"
-    alias ls="ls --color=auto"
-fi
 
 #endregion
 

config/terminal/wezterm/wezterm.lua

@@ -1,7 +0,0 @@
-local wezterm = require 'wezterm'
-local config = wezterm.config_builder()
-
-
-
-
-return config

config/tmux/tmux.conf

@@ -1,10 +0,0 @@
-set -g history-limit 50000
-set -g display-time 4000
-set -g status-interval 5
-set -g default-terminal "screen-256color"
-set -g status-keys emacs
-set -g focus-events on
-setw -g aggressive-resize on
-setw -g mouse on
-setw -g clock-mode-style 24
-

nix-config/home/materus/default.nix

@@ -14,13 +14,11 @@
 
 
   home.file = {
+    ".zshrc".source = "${config.xdg.configFile."zsh/cfg".source}/zshrc";
     ".zshenv".source = "${config.xdg.configFile."zsh/cfg".source}/zshenv";
-    ".tmux.conf".source = "${config.mkk.dir}/config/tmux/tmux.conf";
   };
 
   xdg.enable = true;
-  xdg.configFile."wezterm".source = "${config.mkk.dir}/config/terminal/wezterm";
-  
   xdg.configFile."zsh/cfg".source =
     "${config.mkk.dir}/config/shell/zsh";
   xdg.configFile."zsh/data/plugins/powerlevel10k".source =

nix-config/host/materusPC/configuration.nix

@@ -279,7 +279,7 @@ in
     enable = true;
     enableGlobalCompInit = false;
     interactiveShellInit = ''
-      if [[ ''${__HOME_ZSHRC_SOURCED:-0} == 0 ]]; then
+      if [[ ''${__MATERUS_HM_ZSH:-0} == 0 ]]; then
         source ${pkgs.grml-zsh-config}/etc/zsh/zshrc
       fi
     '';

nix-config/host/oldie/configuration.nix

@@ -24,8 +24,6 @@
   boot.loader.grub = {
     enable = true;
     efiSupport = true;
-    gfxmodeEfi = "1920x1080";
-    gfxmodeBios = "1920x1080";
     device = "nodev";
     useOSProber = true;
     memtest86.enable = true;
@@ -33,7 +31,6 @@
   services.xserver.videoDrivers = [ "nvidia" ];
   hardware.nvidia = {
     modesetting.enable = true;
-    powerManagement.enable = true;
     open = true;
     nvidiaSettings = true;
     package = config.boot.kernelPackages.nvidiaPackages.stable;
@@ -41,14 +38,6 @@
   hardware.graphics = {
     enable = true;
     extraPackages = with pkgs; [
-      libva-vdpau-driver
-      nvidia-vaapi-driver
-      libvdpau-va-gl
-    ];
-    extraPackages32 = with pkgs; [
-      libva-vdpau-driver
-      nvidia-vaapi-driver
-      libvdpau-va-gl
     ];
   };
   # Use latest kernel.
@@ -70,14 +59,6 @@
   networking.networkmanager.enable = true;
   programs.firefox.enable = true;
   programs.java.enable = true;
-  services.flatpak.enable = true;
-  hardware.bluetooth.enable = true;
-  services.gvfs.enable = true;
-  programs.kdeconnect.enable = true;
-  services.fstrim = {
-    enable = true;
-    interval = "weekly";
-  };
   programs.steam = {
     enable = true;
     remotePlay.openFirewall = true;
@@ -252,15 +233,6 @@
   };
   services.desktopManager.plasma6.enable = true;
   services.desktopManager.plasma6.enableQt5Integration = true;
-  xdg.portal.enable = true;
-  xdg.portal.wlr.enable = true;
-  xdg.portal.xdgOpenUsePortal = true;
-  xdg.portal.extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde ];
-  environment.plasma6.excludePackages = with pkgs.kdePackages; [
-    kwallet
-    kwalletmanager
-    kwallet-pam
-  ];
 
   programs.ssh.startAgent = true;
 
@@ -280,7 +252,6 @@
   # Enable sound.
   # services.pulseaudio.enable = true;
   # OR
-  security.rtkit.enable = true;
   services.pipewire = {
     enable = true;
     audio.enable = true;
@@ -290,51 +261,6 @@
     systemWide = true;
     jack.enable = true;
   };
-  virtualisation.podman = {
-    enable = true;
-    dockerCompat = true;
-    dockerSocket.enable = true;
-  };
-  virtualisation.libvirtd = {
-    enable = true;
-    onBoot = "ignore";
-    onShutdown = "shutdown";
-    qemu.runAsRoot = true;
-    qemu.swtpm.enable = true;
-    qemu.package = pkgs.qemu_full;
-  };
-  environment.sessionVariables = rec {
-    XDG_CACHE_HOME = "\${HOME}/.cache";
-    XDG_CONFIG_HOME = "\${HOME}/.config";
-    XDG_BIN_HOME = "\${HOME}/.local/bin";
-    XDG_DATA_HOME = "\${HOME}/.local/share";
-
-    #SSH_ASKPASS_REQUIRE = "prefer";
-
-    STEAM_EXTRA_COMPAT_TOOLS_PATHS = "\${HOME}/.steam/root/compatibilitytools.d";
-
-    MOZ_USE_XINPUT2 = "1";
-    PATH = [ "\${XDG_BIN_HOME}" ];
-  };
-
-  environment.shellInit = ''
-    if ! [ -z "$DISPLAY" ]; then ${pkgs.xhost}/bin/xhost +si:localuser:root &> /dev/null; fi;
-    if ! [ -z "$DISPLAY" ]; then ${pkgs.xhost}/bin/xhost +si:localuser:$USER &> /dev/null; fi;
-  '';
-  security.sudo = {
-    enable = true;
-    extraConfig = ''
-      Defaults pwfeedback
-    '';
-  };
-  i18n.inputMethod.enable = true;
-  i18n.inputMethod.type = "fcitx5";
-  i18n.inputMethod.fcitx5.addons = [
-    pkgs.qt6Packages.fcitx5-configtool
-    pkgs.fcitx5-lua
-    pkgs.fcitx5-mozc
-    pkgs.kdePackages.fcitx5-qt
-  ];
 
   # Enable touchpad support (enabled default in most desktopManager).
   services.libinput.enable = true;
@@ -366,6 +292,7 @@
   # };
 
   # List services that you want to enable:
+
   # Enable the OpenSSH daemon.
   # services.openssh.enable = true;
 
@@ -374,27 +301,6 @@
   # networking.firewall.allowedUDPPorts = [ ... ];
   # Or disable the firewall altogether.
   networking.firewall.enable = true;
-  networking.firewall.allowedTCPPorts = [
-    24800
-    5900
-    5357
-    4656
-    #region Syncthing
-    22000
-    config.services.syncthing.relay.statusPort
-    config.services.syncthing.relay.port
-    #endregion
-  ];
-  networking.firewall.allowedUDPPorts = [
-    24800
-    5900
-    3702
-    4656
-    #region Syncthing
-    22000
-    21027
-    #endregion
-  ];
 
   # Copy the NixOS configuration file and link it from the resulting system
   # (/run/current-system/configuration.nix). This is useful in case you
@@ -420,6 +326,7 @@
   hardware.uinput.enable = true;
   hardware.steam-hardware.enable = true;
 
+
   sops.templates."networkmanager.env".content = ''
     WIREGUARD_PRIVATEKEY="${config.sops.placeholder.wg-key}"
   '';
@@ -455,6 +362,7 @@
     };
   };
 
+
   # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
   system.stateVersion = "26.05"; # Did you read the comment?
 

nix-config/host/oldie/hardware-configuration.nix

@@ -25,7 +25,6 @@
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
-  boot.supportedFilesystems = [ "ntfs" ];
 
   boot.initrd.systemd.enable = true;
   boot.initrd.luks.devices."DECRYPTED_ROOT".device =
@@ -91,11 +90,6 @@
   swapDevices = [
     { device = "/dev/disk/by-uuid/9a5795a9-8ddb-4be0-b8f7-e59270ba8db9"; }
   ];
-  zramSwap = {
-    enable = true;
-    memoryPercent = 50;
-    priority = 10;
-  };
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

nix-config/host/oldie/home-manager/materus.nix

@@ -1,14 +1,12 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 {
   home.stateVersion = "26.05";
-  mkk.dir = config.lib.file.mkOutOfStoreSymlink "/mkk/config";
-
   mkk.neovim.enable = true;
+
   home.packages = with pkgs; [
     neovide
     obsidian
     git-crypt
-    tmux
 
     telegram-desktop
     discord
@@ -18,9 +16,6 @@
     mesa-demos
     vulkan-tools
     nixfmt
-    nixd
-
-    eza
 
     curl
     wget
@@ -28,29 +23,14 @@
 
     packwiz
     ani-cli
-
+    mpv
     kitty
     keepassxc
     moonlight-qt
     wezterm
 
-    (vivaldi.override { proprietaryCodecs = true; })
+    (vivaldi.override {proprietaryCodecs = true;})
   ];
-  programs.mpv = {
-    enable = true;
-    config = {
-      ytdl-format = "bestvideo+bestaudio";
-      slang = "pl,pol,Polish,Polski,en,eng,English";
-      alang = "ja,jp,jpn,Japanese,pl,pol,Polski,en,eng,English";
-      demuxer-max-bytes = "500MiB";
-      demuxer-max-back-bytes = "150MiB";
-      cache = "yes";
-      cache-pause-wait = "10";
-      cache-pause-initial = "yes";
-      keep-open = "yes";
-    };
-  };
-
   programs.vscode = {
     enable = true;
     mutableExtensionsDir = true;
@@ -63,16 +43,9 @@
       user.name = "materus";
       commit.gpgsign = true;
       gpg.format = "ssh";
-
     };
 
     signing.signByDefault = true;
     signing.key = "/mkk/config/extra-files/ssh/materus.pub";
   };
-  programs.delta = {
-    enable = true;
-    enableGitIntegration = true;
-  };
-  programs.gitui.enable = true;
-  programs.yt-dlp.enable = true;
 }