This commit is contained in:
DACHXY 2024-12-12 10:57:27 +08:00
parent 3728ac496d
commit 53395d3971
81 changed files with 723 additions and 1543 deletions

View file

@ -1,18 +1,17 @@
let configDir = ../config;
in
{
in {
home.file = {
".config/nvim".source = "${configDir}/nvim";
".config/wallpapers".source = "${configDir}/wallpapers";
".config/kitty".source = "${configDir}/kitty";
".config/neofetch".source = "${configDir}/neofetch";
".config/hypr".source = "${configDir}/hypr";
".config/swayidle".source = "${configDir}/swayidle";
".config/swaylock".source = "${configDir}/swaylock";
".config/wlogout".source = "${configDir}/wlogout";
".config/waybar".source = "${configDir}/waybar";
".config/btop".source = "${configDir}/btop";
".config/wofi".source = "${configDir}/wofi";
".config/mako".source = "${configDir}/mako";
".config/nvim".source = "${configDir}/nvim";
".config/wallpapers".source = "${configDir}/wallpapers";
".config/kitty".source = "${configDir}/kitty";
".config/neofetch".source = "${configDir}/neofetch";
".config/hypr".source = "${configDir}/hypr";
".config/swayidle".source = "${configDir}/swayidle";
".config/swaylock".source = "${configDir}/swaylock";
".config/wlogout".source = "${configDir}/wlogout";
".config/waybar".source = "${configDir}/waybar";
".config/btop".source = "${configDir}/btop";
".config/wofi".source = "${configDir}/wofi";
".config/mako".source = "${configDir}/mako";
};
}

View file

@ -1,13 +1,13 @@
{
imports = [
./git.nix
./gtk.nix
./shell.nix
./config.nix
./packages.nix
./programs.nix
./environment.nix
];
imports = [
./git.nix
./gtk.nix
./shell.nix
./config.nix
./packages.nix
./programs.nix
./environment.nix
];
nixpkgs = {
config = {

View file

@ -1,32 +1,31 @@
{
home.sessionVariables = {
BROWSER = "firefox";
EDITOR = "nvim";
TERMINAL = "kitty";
NIXOS_OZONE_WL = "1";
QT_QPA_PLATFORMTHEME = "gtk3";
QT_SCALE_FACTOR = "1";
MOZ_ENABLE_WAYLAND = "1";
SDL_VIDEODRIVER = "wayland";
QT_QPA_PLATFORM = "wayland-egl";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
QT_AUTO_SCREEN_SCALE_FACTOR = "1";
GTK_CSD = "0";
WLR_DRM_DEVICES = "/dev/dri/card0";
WLR_NO_HARDWARE_CURSORS = "1";
CLUTTER_BACKEND = "wayland";
WLR_RENDERER = "vulkan";
XCURSOR_SIZE = "32";
GTK_THEME="Catppuccin-Macchiato-Compact-Blue-Dark";
XDG_CURRENT_DESKTOP = "Hyprland";
XDG_SESSION_DESKTOP = "Hyprland";
XDG_SESSION_TYPE = "wayland";
GTK_USE_PORTAL = "1";
NIXOS_XDG_OPEN_USE_PORTAL = "1";
XDG_CACHE_HOME = "\${HOME}/.cache";
XDG_CONFIG_HOME = "\${HOME}/.config";
#XDG_BIN_HOME = "\${HOME}/.local/bin";
XDG_DATA_HOME = "\${HOME}/.local/share";
BROWSER = "firefox";
EDITOR = "nvim";
TERMINAL = "kitty";
NIXOS_OZONE_WL = "1";
QT_QPA_PLATFORMTHEME = "gtk3";
QT_SCALE_FACTOR = "1";
MOZ_ENABLE_WAYLAND = "1";
SDL_VIDEODRIVER = "wayland";
QT_QPA_PLATFORM = "wayland-egl";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
QT_AUTO_SCREEN_SCALE_FACTOR = "1";
GTK_CSD = "0";
WLR_DRM_DEVICES = "/dev/dri/card0";
WLR_NO_HARDWARE_CURSORS = "1";
CLUTTER_BACKEND = "wayland";
WLR_RENDERER = "vulkan";
XCURSOR_SIZE = "32";
GTK_THEME = "Catppuccin-Macchiato-Compact-Blue-Dark";
XDG_CURRENT_DESKTOP = "Hyprland";
XDG_SESSION_DESKTOP = "Hyprland";
XDG_SESSION_TYPE = "wayland";
GTK_USE_PORTAL = "1";
NIXOS_XDG_OPEN_USE_PORTAL = "1";
XDG_CACHE_HOME = "\${HOME}/.cache";
XDG_CONFIG_HOME = "\${HOME}/.config";
#XDG_BIN_HOME = "\${HOME}/.local/bin";
XDG_DATA_HOME = "\${HOME}/.local/share";
};
}

View file

@ -1,11 +1,10 @@
let
userName = "gpskwlkr";
email = "giorgi.anakidze@outlook.com";
in
{
programs.git = {
enable = true;
userName = userName;
userEmail = email;
};
userName = "danny";
email = "Danny10132024@gmail.com";
in {
programs.git = {
enable = true;
userName = userName;
userEmail = email;
};
}

View file

@ -1,18 +1,17 @@
{ pkgs, ... }:
{
{ pkgs, ... }: {
gtk = {
enable = true;
cursorTheme = {
name = "Catppuccin-Macchiato-Blue";
package = pkgs.catppuccin-cursors.macchiatoBlue;
name = "Catppuccin-Macchiato-Blue";
package = pkgs.catppuccin-cursors.macchiatoBlue;
};
theme = {
name = "Catppuccin-Macchiato-Compact-Blue-dark";
package = pkgs.catppuccin-gtk.override {
size = "compact";
accents = ["blue"];
accents = [ "blue" ];
variant = "macchiato";
};
};
@ -23,15 +22,15 @@
};
gtk3.extraConfig = {
Settings = ''
gtk-application-prefer-dark-theme = 1;
'';
Settings = ''
gtk-application-prefer-dark-theme = 1;
'';
};
gtk4.extraConfig = {
Settings = ''
gtk-application-prefer-dark-theme = 1;
'';
Settings = ''
gtk-application-prefer-dark-theme = 1;
'';
};
};

View file

@ -1,55 +1,32 @@
{ pkgs, pkgs-unstable, ... }:
{
home.packages = [
# Dev stuff
pkgs.jetbrains.rider
pkgs.dotnet-sdk_8
pkgs.dotnetPackages.Nuget
pkgs.gcc
pkgs.go
pkgs.lua
pkgs.nodejs_21
pkgs.nodePackages.pnpm
(pkgs.python3.withPackages (python-pkgs: [
python-pkgs.pip
python-pkgs.requests
]))
(pkgs.python3.withPackages
(python-pkgs: [ python-pkgs.pip python-pkgs.requests ]))
pkgs.rustup
pkgs.pkgsCross.mingwW64.stdenv.cc
pkgs.pkgsCross.mingwW64.stdenv.cc
pkgs.pkgsCross.mingwW64.windows.pthreads
pkgs.zig
# Work stuff
pkgs.obsidian
pkgs.teams-for-linux
pkgs.thunderbird
pkgs.zoom-us
pkgs.libreoffice-qt
pkgs.hunspell
# Bluetooth
pkgs.blueberry
# Social
pkgs.telegram-desktop
pkgs-unstable.vesktop
# Gaming
pkgs.steam
pkgs.steam-run
pkgs.yuzu-mainline
(pkgs.lutris.override {
extraPkgs = pkgs: [
pkgs.wineWowPackages.stable
pkgs.winetricks
];
})
# pkgs.steam
# pkgs.steam-run
# (pkgs.lutris.override {
# extraPkgs = pkgs: [ pkgs.wineWowPackages.stable pkgs.winetricks ];
# })
# Downloads
pkgs.qbittorrent
@ -59,6 +36,6 @@
pkgs-unstable.hyprshot
pkgs.catppuccin-cursors.macchiatoBlue
pkgs.catppuccin-gtk
pkgs.papirus-folders
# pkgs.papirus-folders
];
}

View file

@ -1,20 +1,15 @@
{ inputs, ... }:
{
{ inputs, ... }: {
programs.firefox = {
enable = true;
profiles.gpskwlkr = {
extensions = with inputs.firefox-addons.packages."x86_64-linux"; [
bypass-paywalls-clean
darkreader
facebook-container
i-dont-care-about-cookies
proton-pass
to-google-translate
view-image
ublock-origin
youtube-shorts-block
];
profiles.danny = {
extensions = with inputs.firefox-addons.packages."x86_64-linux"; [
darkreader
proton-pass
to-google-translate
view-image
# ublock-origin
];
};
};

View file

@ -1,45 +1,40 @@
{ config, pkgs, ... }:
let
let
myAliases = {
docker-compose = "podman-compose";
cat = "bat";
ls = "eza --icons=always";
fullClean = ''
nix-collect-garbage --delete-old
fullClean = ''
nix-collect-garbage --delete-old
sudo nix-collect-garbage -d
sudo nix-collect-garbage -d
sudo /run/current-system/bin/switch-to-configuration boot
sudo /run/current-system/bin/switch-to-configuration boot
'';
rebuild = "sudo nixos-rebuild switch --flake ~/.dotfiles/";
fullRebuild = "sudo nixos-rebuild switch --flake ~/.dotfiles/ && home-manager switch --flake ~/.dotfiles/ -b backup";
fullRebuild =
"sudo nixos-rebuild switch --flake ~/.dotfiles/ && home-manager switch --flake ~/.dotfiles/ -b backup";
homeRebuild = "home-manager switch --flake ~/.dotfiles/ -b backup";
};
in
{
};
in {
programs = {
zsh = {
enable = true;
enableAutosuggestions = true;
syntaxHighlighting.enable = true;
initExtra = ''
source ~/.p10k.zsh &&
eval "$(zoxide init --cmd cd zsh)" &&
zsh = {
enable = true;
enableAutosuggestions = true;
syntaxHighlighting.enable = true;
initExtra = ''
source ~/.p10k.zsh &&
eval "$(zoxide init --cmd cd zsh)" &&
export PATH="$PATH:/home/gpskwlkr/.dotnet/tools"
'';
shellAliases = myAliases;
oh-my-zsh = {
enable = true;
custom = "$HOME/.oh-my-custom";
theme = "powerlevel10k/powerlevel10k";
plugins = [
"git"
"history"
"wd"
];
};
};
export PATH="$PATH:/home/gpskwlkr/.dotnet/tools"
'';
shellAliases = myAliases;
oh-my-zsh = {
enable = true;
custom = "$HOME/.oh-my-custom";
theme = "powerlevel10k/powerlevel10k";
plugins = [ "git" "history" "wd" ];
};
};
};
}