Modularize hardware config and remove specific nix folder

programs/individual_configs/default.nix

@@ -0,0 +1,13 @@
+{
+  imports = [
+    ./kitty.nix
+    ./yazi.nix
+    ./fish.nix
+    ./ssh.nix
+    ./direnv.nix
+    ./git.nix
+    ./firefox.nix
+    ./keepass.nix
+    ./neovide.nix
+  ];
+}

programs/individual_configs/direnv.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }: {
+  xdg.configFile."direnv/direnv.toml".source = (pkgs.formats.toml { }).generate "direnv" {
+    global = {
+      warn_timeout = "-1s";
+    };
+  };
+}

programs/individual_configs/firefox.nix

@@ -0,0 +1,29 @@
+{ pkgs, config, ... }: {
+  programs.firefox = {
+    enable = true;
+
+    policies = {
+      EnableTrackingProtection = {
+        Value = true;
+        Locked = true;
+        Cryptomining = true;
+        Fingerprinting = true;
+      };
+      DisablePocket = true;
+      DisplayBookmarksToolbar = "never";
+      DisplayMenuBar = "default-off";
+    };
+    profiles.${config.conf.username} = {
+      extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+        ublock-origin
+        darkreader
+        privacy-badger
+        vimium
+        keepassxc-browser
+        i-dont-care-about-cookies
+        tokyo-night-v2
+
+      ];
+    };
+  };
+}

programs/individual_configs/fish.nix

@@ -0,0 +1,140 @@
+{ config, ... }: {
+  xdg.configFile."fish/config.fish" = {
+    text =
+      ''
+        if status is-interactive
+            # Commands to run in interactive sessions can go here
+        end
+
+        # =============================================================================
+        #
+        # Utility functions for zoxide.
+        #
+
+        export NIX_PATH="$NIX_PATH:$HOME/gits/dotFiles/."
+
+        set EDITOR "neovide --no-fork"
+
+        alias rebuild='sudo nixos-rebuild switch --flake /home/${config.conf.username}/gits/dotFiles/.'
+        abbr --add ls 'lsd'
+        abbr --add :q 'exit'
+        abbr --add gh 'git push origin'
+        abbr --add gl 'git pull origin'
+        abbr --add gm 'git commit -m'
+        abbr --add ga "git add -A"
+        abbr --add g+ 'bear -- g++ -Wextra -Werror -std=c++20'
+        abbr --add s "kitty +kitten ssh"
+        abbr --add zl 'z "" '
+        abbr --add nv 'neovide'
+        abbr --add cr 'cargo run'
+        abbr --add grep 'rg'
+        abbr --add cat 'bat'
+        abbr --add find 'fd'
+        abbr --add rm 'rip'
+
+        set fish_greeting
+        # pwd based on the value of _ZO_RESOLVE_SYMLINKS.
+        function __zoxide_pwd
+            builtin pwd -L
+        end
+
+        # A copy of fish's internal cd function. This makes it possible to use
+        # `alias cd=z` without causing an infinite loop.
+        if ! builtin functions --query __zoxide_cd_internal
+            if builtin functions --query cd
+                builtin functions --copy cd __zoxide_cd_internal
+            else
+                alias __zoxide_cd_internal='builtin cd'
+            end
+        end
+
+        # cd + custom logic based on the value of _ZO_ECHO.
+        function __zoxide_cd
+            __zoxide_cd_internal $argv
+        end
+
+        # =============================================================================
+        #
+        # Hook configuration for zoxide.
+        #
+
+        # Initialize hook to add new entries to the database.
+        function __zoxide_hook --on-variable PWD
+            test -z "$fish_private_mode"
+            and command zoxide add -- (__zoxide_pwd)
+        end
+
+        # =============================================================================
+        #
+        # When using zoxide with --no-cmd, alias these internal functions as desired.
+        #
+
+        if test -z $__zoxide_z_prefix
+            set __zoxide_z_prefix 'z!'
+        end
+        set __zoxide_z_prefix_regex ^(string escape --style=regex $__zoxide_z_prefix)
+
+        # Jump to a directory using only keywords.
+        function __zoxide_z
+            set -l argc (count $argv)
+            if test $argc -eq 0
+                __zoxide_cd $HOME
+            else if test "$argv" = -
+                __zoxide_cd -
+            else if test $argc -eq 1 -a -d $argv[1]
+                __zoxide_cd $argv[1]
+            else if set -l result (string replace --regex $__zoxide_z_prefix_regex \'\' $argv[-1]); and test -n $result
+                __zoxide_cd $result
+            else
+                set -l result (command zoxide query --exclude (__zoxide_pwd) -- $argv)
+                and __zoxide_cd $result
+            end
+        end
+
+        # Completions.
+        function __zoxide_z_complete
+            set -l tokens (commandline --current-process --tokenize)
+            set -l curr_tokens (commandline --cut-at-cursor --current-process --tokenize)
+
+            if test (count $tokens) -le 2 -a (count $curr_tokens) -eq 1
+                # If there are < 2 arguments, use `cd` completions.
+                complete --do-complete "\'\' "(commandline --cut-at-cursor --current-token) | string match --regex '.*/$'
+            else if test (count $tokens) -eq (count $curr_tokens); and ! string match --quiet --regex $__zoxide_z_prefix_regex. $tokens[-1]
+                # If the last argument is empty and the one before doesn't start with
+                # $__zoxide_z_prefix, use interactive selection.
+                set -l query $tokens[2..-1]
+                set -l result (zoxide query --exclude (__zoxide_pwd) --interactive -- $query)
+                and echo $__zoxide_z_prefix$result
+                commandline --function repaint
+            end
+        end
+        complete --command __zoxide_z --no-files --arguments '(__zoxide_z_complete)'
+
+        # Jump to a directory using interactive search.
+        function __zoxide_zi
+            set -l result (command zoxide query --interactive -- $argv)
+            and __zoxide_cd $result
+        end
+
+        # =============================================================================
+        #
+        # Commands for zoxide. Disable these using --no-cmd.
+        #
+
+        abbr --erase z &>/dev/null
+        alias z=__zoxide_z
+
+        abbr --erase zi &>/dev/null
+        alias zi=__zoxide_zi
+
+        # =============================================================================
+        #
+        # To initialize zoxide, add this to your configuration (usually
+        # ~/.config/fish/config.fish):
+        #
+        #   zoxide init fish | source
+
+        direnv hook fish | source
+      '';
+  };
+}

programs/individual_configs/git.nix

@@ -0,0 +1,16 @@
+{
+  programs.git = {
+    enable = true;
+    userName = "DashieTM";
+    userEmail = "fabio.lenherr@gmail.com";
+    extraConfig = {
+      merge = {
+        tool = "nvimdiff";
+      };
+      diff = {
+        tool = "nvimdiff";
+      };
+    };
+  };
+
+}

programs/individual_configs/keepass.nix

@@ -0,0 +1,26 @@
+{
+  xdg.configFile."keepassxc/keepassxc.ini" = {
+    text =
+      ''
+        [General]
+        ConfigVersion=2
+
+        [Browser]
+        CustomProxyLocation=
+        Enabled=true
+
+        [GUI]
+        ApplicationTheme=classic
+        HidePasswords=true
+        TrayIconAppearance=monochrome-light
+
+        [PasswordGenerator]
+        AdditionalChars=
+        ExcludedChars=
+        Length=18
+
+        [Security]
+        EnableCopyOnDoubleClick=true
+      '';
+  };
+}

programs/individual_configs/kitty.nix

@@ -0,0 +1,83 @@
+{ lib, config, inputs, pkgs, ... }:
+let
+  base16 = pkgs.callPackage inputs.base16.lib { };
+  scheme = (base16.mkSchemeAttrs config.stylix.base16Scheme);
+  hexTable = {
+    "0" = "1";
+    "1" = "0";
+    "2" = "1";
+    "3" = "2";
+    "4" = "3";
+    "5" = "4";
+    "6" = "5";
+    "7" = "6";
+    "8" = "7";
+    "9" = "8";
+    "a" = "9";
+    "b" = "a";
+    "c" = "b";
+    "d" = "c";
+    "e" = "d";
+    "f" = "e";
+  };
+  base = "#" + lib.strings.concatStrings ((lib.lists.take 5 (lib.strings.stringToCharacters scheme.base00)) ++ [ hexTable."${(lib.lists.last (lib.strings.stringToCharacters scheme.base00))}" ]);
+in
+{
+
+  stylix.targets.kitty = {
+    enable = false;
+  };
+  programs.kitty = {
+    enable = true;
+
+    settings = {
+      enable_audio_bell = "no";
+      window_alert_on_bell = "no";
+      cursor_blink_interval = "0";
+      window_padding_width = "1";
+      shell_integration = "yes";
+      sync_with_monitor = "no";
+      background_opacity = "0.8";
+
+      font_family = "JetBrainsMono Nerd Font Mono";
+      bold_font = "JetBrainsMono Nerd Font Mono Extra Bold";
+      italic_font = "JetBrainsMono Nerd Font Mono Extra Italic";
+      bold_italic_font = "JetBrainsMono Nerd Font Mono Extra Bold Italic";
+
+      background = base;
+      foreground = "#" + scheme.base05;
+      selection_foreground = "#" + scheme.base05;
+      selection_background = base;
+      url_color = "#" + scheme.base04;
+      cursor = "#" + scheme.base05;
+      active_border_color = "#" + scheme.base03;
+      inactive_border_color = "#" + scheme.base01;
+      active_tab_background = base;
+      active_tab_foreground = "#" + scheme.base05;
+      inactive_tab_background = "#" + scheme.base01;
+      inactive_tab_foreground = "#" + scheme.base04;
+      tab_bar_background = "#" + scheme.base01;
+
+      color0 = base;
+      color1 = "#" + scheme.base08;
+      color2 = "#" + scheme.base0B;
+      color3 = "#" + scheme.base0A;
+      color4 = "#" + scheme.base0D;
+      color5 = "#" + scheme.base0E;
+      color6 = "#" + scheme.base0C;
+      color7 = "#" + scheme.base05;
+
+      color8 = "#" + scheme.base03;
+      color9 = "#" + scheme.base08;
+      color10 = "#" + scheme.base0B;
+      color11 = "#" + scheme.base0A;
+      color12 = "#" + scheme.base0D;
+      color13 = "#" + scheme.base0E;
+      color14 = "#" + scheme.base0C;
+      color15 = "#" + scheme.base07;
+
+      shell = "fish";
+    };
+
+  };
+}

programs/individual_configs/ncspot.nix

@@ -0,0 +1,38 @@
+{ pkgs, ... }: {
+  xdg.configFile."ncspot/config.toml".source = (pkgs.formats.toml { }).generate "ncspot" {
+    notify = true;
+    shuffle = true;
+    cover_max_scale = 2;
+    initial_screen = "library";
+    library_tabs = [ "playlists" ];
+    theme = {
+      background = "#1a1b26";
+      primary = "#9aa5ce";
+      secondary = "#414868";
+      title = "#9ece6a";
+      playing = "#7aa2f7";
+      playing_selected = "#bb9af7";
+      playing_bg = "#24283b";
+      highlight = "#c0caf5";
+      highlight_bg = "#24283b";
+      error = "#414868";
+      error_bg = "#f7768e";
+      statusbar = "#ff9e64";
+      statusbar_progress = "#7aa2f7";
+      statusbar_bg = "#1a1b26";
+      cmdline = "#c0caf5";
+      cmdline_bg = "#24283b";
+      search_match = "#f7768e";
+    };
+    keybindings = {
+      "j" = "move left 1";
+      "k" = "move down 1";
+      "l" = "move up 1";
+      ";" = "move right 1";
+    };
+    notification_format = {
+      title = "%artists";
+      body = "%title";
+    };
+  };
+}

programs/individual_configs/neovide.nix

@@ -0,0 +1,3 @@
+{ pkgs, ... }: {
+  xdg.configFile."neovide/config.toml".source = (pkgs.formats.toml { }).generate "neovide" { };
+}

programs/individual_configs/ssh.nix

@@ -0,0 +1,10 @@
+{ config, ... }: {
+  home.file.".ssh/config".text = ''
+    Host github.com
+      IdentityFile ${config.sops.secrets.hub.path}
+    Host gitlab.com
+      IdentityFile ${config.sops.secrets.lab.path}
+    Host dashie.org
+      IdentityFile ${config.sops.secrets.dashie.path}
+  '';
+}