zalupa

modules/home-manager/mpv/mpv.nix

@@ -1,11 +1,11 @@
-{ config, ... }: {
+{
   programs.mpv.enable = true;
 
   home.file = {
-    ".config/mpv/mpv.conf".source = config.lib.file.mkOutOfStoreSymlink ./mpv.conf;
+    ".config/mpv/mpv.conf".source = ./mpv.conf;
-    ".config/mpv/input.conf".source = config.lib.file.mkOutOfStoreSymlink ./input.conf;
+    ".config/mpv/input.conf".source = ./input.conf;
-    ".config/mpv/scripts".source = config.lib.file.mkOutOfStoreSymlink ./scripts;
+    ".config/mpv/scripts".source = ./scripts;
-    ".config/mpv/script-opts".source = config.lib.file.mkOutOfStoreSymlink ./script-opts;
+    ".config/mpv/script-opts".source = ./script-opts;
-    ".config/mpv/fonts".source = config.lib.file.mkOutOfStoreSymlink ./fonts;
+    ".config/mpv/fonts".source = ./fonts;
   };
 }

modules/home-manager/symlinks.nix

@@ -21,30 +21,16 @@ in {
     ".password-store".source = config.lib.file.mkOutOfStoreSymlink "${dir}/Backups/.password-store"; # Для утилиты pass
     ".ssh".source = config.lib.file.mkOutOfStoreSymlink "${dir}/Backups/.ssh";
 
-    # Games
-    # ".local/share/osu-wine/osu!/Replays".source = config.lib.file.mkOutOfStoreSymlink "${dir}/games/osu!/Replays";
-    # ".local/share/osu-wine/osu!/Skins".source = config.lib.file.mkOutOfStoreSymlink "${dir}/games/osu!/Skins";
-    # ".local/share/osu-wine/osu!/Songs".source = config.lib.file.mkOutOfStoreSymlink "${dir}/games/osu!/Songs";
-    # ".local/share/osu-wine/osu!/collection.db".source = config.lib.file.mkOutOfStoreSymlink "${dir}/games/osu!/collection.db";
-    # ".local/share/osu-wine/osu!/osu!.buliway.cfg".source = config.lib.file.mkOutOfStoreSymlink "${dir}/games/osu!/osu!.buliway.cfg";
-
     # Browsers. Мб сделать .force, чтоб удалить сток. А мб руками удалить сток перед этим
     ".mozilla".source = config.lib.file.mkOutOfStoreSymlink "${dir}/Backups/Apps/.mozilla";
     ".librewolf".source = config.lib.file.mkOutOfStoreSymlink "${dir}/Backups/Apps/.librewolf";
 
     "Downloads/Telegram Desktop".source = config.lib.file.mkOutOfStoreSymlink "${dir}/Telegram Desktop";
-
-    # Не знаю на счёт obs, chatbox, planify, calibre, discord, nekobox
   };
 
   xdg.configFile = { # Это для каталога .config
     "qobuz-dl".source = config.lib.file.mkOutOfStoreSymlink "${dir}/Media/Music/Qobuz/.config/qobuz-dl"; # Конфиг для бекапа Qobuz музыки
     # "chromium".source = config.lib.file.mkOutOfStoreSymlink "${dir}/Backups/Apps/chromium";
     # "vesktop/themes/my-vesktop_theme.css".source = config.lib.file.mkOutOfStoreSymlink "${dir}/Backups/Apps/my-vesktop_theme.css"
-
-    # Ебаный qt, как я тебя ненавижу
-    # "Kvantum".source = ../shit/Kvantum;
-    # "qt5ct".source = ../shit/qt5ct
-    # "qt6ct".source = ../shit/qt6ct
   };
 }

modules/home-manager/terminal/zsh.nix

@@ -62,6 +62,7 @@
     # Extra commands that should be added to .zshrc
     initExtra = ''
       source ${pkgs.zsh-you-should-use}/share/zsh/plugins/you-should-use/you-should-use.plugin.zsh
+      unset -f d
     '';
 
     historySubstringSearch = {
@@ -100,8 +101,6 @@
         "universalarchive" # Run "ua <format> <files>"" to compress <files> into an archive file using <format>
         # "vi-mode" # https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/vi-mode
         # "watson" # Completion for https://github.com/TailorDev/Watson (CLI to track your time)
-        # "z" # Tracks your most visited directories and allows you to access them with very few keystrokes
-        "zoxide" # Как "z", но быстрее и с более сложным и точным алгоритмом для ранжирования директорий
       ];
     };
   };

modules/nixos/filesystems.nix

@@ -3,12 +3,10 @@
     "/mnt/backups" = {
       device = "/dev/disk/by-uuid/55287544-ce9f-4c93-a2f6-a63b69623fe1";
       fsType = "ext4";
-      options = [ "defaults" "noatime" ]; #"uid=1000" "gid=1000" "dmask=007" "fmask=117" ];
+      options = [ "nofail" "noatime" "x-systemd.device-timeout=1s" ];
-    };
-    "/mnt/shit" = {
-      device = "/dev/disk/by-uuid/234dc4ed-ade3-447f-af5a-4d254835cc66";
-      fsType = "ext4";
-      options = [ "defaults" "noatime" ]; #"uid=1000" "gid=1000" "dmask=007" "fmask=117" ];
     };
   };
 }
+# Ещё можно добавить такие параметры:
+# x-systemd.automount - диск не монтируется при загрузке, только при первом обращении, для юзбов норм
+# x-systemd.device-timeout=1s - иногда systemd долго ждёт устройство, даже с nofail

modules/nixos/xserver.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ pkgs, spkgs, ... }: {
 
   services.displayManager = {
     defaultSession = "none+bspwm"; # only effective for GDM, LightDM and SDDM
@@ -8,6 +8,7 @@
       # Тоесть именно username, без .png в конце
       enable = true;
       # package = pkgs.kdePackages.sddm; # qt6 sddm
+      package = spkgs.libsForQt5.sddm; # qt5 sddm
       theme = "chili";
     };
   };

nixos/home.nix

@@ -25,7 +25,7 @@
       BROWSER = "librewolf";
       TERMINAL = "alacritty";
       TERM = "alacritty";
-      QT_QPA_PLATFORMTHEME = "qt6ct";
+      # QT_QPA_PLATFORMTHEME = "qt6ct";
       # QT_STYLE_OVERRIDE = "kvantum";
       PATH = "$PATH:${config.home.homeDirectory}/go/bin";
     };

nixos/packages.nix

@@ -43,8 +43,6 @@
     # unclutter.enable = true; # Hide your mouse cursor when inactive
     # fwupd.enable = true; # DBus service that allows applications to update firmware
     # greenclip.enable = true; # https://github.com/erebe/greenclip (использую clipmenu вместо этого)
-    # fstrim.enable = true; # Чистит ssd для норм производительности. Пока не пользуюсь
-    # archisteamfarm = {}; # Фарм карточек стима афк. Просто раскомментить мало, надо настроить
     flatpak = {
       # flatpak install flathub com.github.tchx84.Flatseal
       # https://flathub.org/en/apps/org.vinegarhq.Vinegar
@@ -301,7 +299,6 @@
     timer # A "sleep" with progress. Таймер на пельмени "timer 5m"
     libqalculate # Advanced calculator library
     fastfetch # Пишешь в теримнал и кидаешь всем со словами I use nixos btw
-    zoxide # Замена cd для частых каталогов
     fzf # Нечёткий поиск
     killall # Убить процессы. Мем, что в стоке не стоит
     libnotify # Вызов оповещений через "notify-send"

nvim/lua/kickstart/plugins/themes.lua

@@ -47,49 +47,6 @@ return {
             -- vim.cmd.colorscheme 'rose-pine-main'
         end,
     },
-    {
-        'loctvl842/monokai-pro.nvim',
-        priority = 1000,
-        config = function()
-            -- 'monokai-pro', 'monokai-pro-classic', 'monokai-pro-default', 'monokai-pro-machine',
-            -- 'monokai-pro-octagon', 'monokai-pro-spectrum', 'monokai-pro-ristretto'
-            -- vim.cmd.colorscheme 'monokai-pro'
-        end,
-    },
-    {
-        'catppuccin/nvim',
-        name = 'catppuccin',
-        priority = 1000,
-        config = function()
-            -- 'catppuccin', 'catppuccin-latte', 'catppuccin-frappe',
-            -- 'catppuccin-macchiato', 'catppuccin-mocha'
-            -- vim.cmd.colorscheme 'catppuccin'
-        end,
-    },
-    {
-        'rebelot/kanagawa.nvim',
-        priority = 1000,
-        config = function()
-            -- 'kanagawa-wave', 'kanagawa-dragon', 'kanagawa-lotus',
-            -- vim.cmd.colorscheme 'kanagawa-dragon'
-        end,
-    },
-    {
-        'EdenEast/nightfox.nvim',
-        priority = 1000,
-        config = function()
-            -- 'nightfox', 'dayfox', 'dawnfox', 'duskfox'
-            -- 'nordfox', 'terafox', 'carbonfox'
-            -- vim.cmd.colorscheme 'carbonfox'
-        end,
-    },
-    {
-        'AlexvZyl/nordic.nvim',
-        priority = 1000,
-        config = function()
-            -- vim.cmd.colorscheme 'nordic'
-        end,
-    },
 
     ----------------------------------------------------------
     -- Гандоны не дают выбрать тему нормально               --
@@ -149,59 +106,4 @@ return {
             vim.cmd.colorscheme 'gruvbox'
         end,
     },
-    {
-        'sainnhe/gruvbox-material',
-        priority = 1000,
-        init = function()
-            -- 'hard', 'medium', 'soft'
-            vim.g.gruvbox_material_background = 'medium'
-            -- 'material', 'mix', 'original'
-            vim.g.gruvbox_material_foreground = 'mix'
-            -- 'grey', 'colored', 'highlighted'
-            vim.g.gruvbox_material_diagnostic_virtual_text = 'colored'
-            vim.g.gruvbox_material_diagnostic_line_highlight = 1
-            vim.g.gruvbox_material_diagnostic_text_highlight = 1
-
-            -- vim.g.gruvbox_material_inlay_hints_background = 'dimmed'
-            -- vim.g.gruvbox_material_better_performance = 1
-            -- vim.g.gruvbox_material_spell_foreground = 'colored'
-            -- vim.g.gruvbox_material_enable_bold = 1
-            -- vim.g.gruvbox_material_enable_italic = true
-            -- vim.cmd.colorscheme 'gruvbox-material'
-        end,
-    },
-    {
-        'sainnhe/everforest',
-        priority = 1000,
-        init = function()
-            -- 'hard', 'medium', 'soft'
-            vim.g.everforest_background = 'hard'
-            vim.g.everforest_better_performance = 1
-            -- vim.g.everforest_enable_italic = true
-            -- vim.cmd.colorscheme 'everforest'
-        end,
-    },
-    {
-        'sainnhe/sonokai',
-        priority = 1000,
-        init = function()
-            -- Очень разные темы
-            -- 'default', 'atlantis', 'andromeda', 'shusia', 'maia', 'espresso'
-            vim.g.sonokai_style = 'shusia'
-            vim.g.sonokai_better_performance = 1
-            -- vim.g.sonokai_enable_italic = true
-            -- vim.cmd.colorscheme 'sonokai'
-        end,
-    },
-    {
-        'sainnhe/edge',
-        priority = 1000,
-        init = function()
-            -- 'default', 'aura', 'neon'
-            vim.g.edge_style = 'default'
-            vim.g.edge_better_performance = 1
-            -- vim.g.edge_enable_italic = true
-            -- vim.cmd.colorscheme 'edge'
-        end,
-    },
 }

shit/install.sh

@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 
-mkdir -p $HOME/.config/xfce4/
+mkdir -p "$HOME/.config/xfce4/"
-cp $HOME/nixos-private-dots/shit/helpers.rc $HOME/.config/xfce4/helpers.rc
+cp "$HOME/nixos-private-dots/shit/helpers.rc" "$HOME/.config/xfce4/helpers.rc"
-cp $HOME/nixos-private-dots/shit/mimeapps.list $HOME/.config/mimeapps.list
+cp "$HOME/nixos-private-dots/shit/mimeapps.list" "$HOME/.config/mimeapps.list"
 
-cp -r $HOME/nixos-private-dots/shit/Kvantum $HOME/.config/Kvantum
+cp -r "$HOME/nixos-private-dots/shit/Kvantum" "$HOME/.config/Kvantum"
-cp -r $HOME/nixos-private-dots/shit/qt5ct $HOME/.config/qt5ct
+cp -r "$HOME/nixos-private-dots/shit/qt5ct" "$HOME/.config/qt5ct"
-cp -r $HOME/nixos-private-dots/shit/qt6ct $HOME/.config/qt6ct
+cp -r "$HOME/nixos-private-dots/shit/qt6ct" "$HOME/.config/qt6ct"