From 5a7501eec0a9632f2cb8aab633275a1d39208eb1 Mon Sep 17 00:00:00 2001 From: elwrcl Date: Fri, 29 May 2026 18:33:58 +0300 Subject: [PATCH] big great refactor --- README.md | 0 auto/hardconf.sh | 120 ------------- darwin/default.nix | 45 ----- flake.lock | 5 +- flake.nix | 26 +-- home/darwin.nix | 19 -- home/dots/copetch/cop.txt | 20 --- home/dots/zsh/.zshrc | 101 ----------- home/linux.nix | 125 ------------- home/shared.nix | 114 ------------ main/darwin/machine.nix | 26 +++ main/darwin/packages.nix | 9 + hardware.nix => main/nixos/hardware.nix | 0 machine.nix => main/nixos/machine.nix | 6 +- main/nixos/packages.nix | 169 ++++++++++++++++++ modules/darwin/default.nix | 10 ++ modules/darwin/homebrew/default.nix | 14 ++ modules/darwin/system/default.nix | 71 ++++++++ modules/darwin/user/default.nix | 17 ++ modules/home/.DS_Store | Bin 0 -> 6148 bytes modules/home/git.nix | 28 +++ modules/home/home.nix | 139 ++++++++++++++ {home => modules/home}/hypr/default.nix | 0 {home => modules/home}/hypr/hyprland/env.nix | 0 .../home}/hypr/hyprland/execs.nix | 0 .../home}/hypr/hyprland/general.nix | 0 .../home}/hypr/hyprland/keybinds.nix | 0 .../home}/hypr/hyprland/rules.nix | 0 {home => modules/home}/hyprland.nix | 0 modules/nixos/.DS_Store | Bin 0 -> 6148 bytes {nixos => modules/nixos}/boot/default.nix | 1 + {nixos => modules/nixos}/default.nix | 1 + .../nixos}/desktop/audio/default.nix | 0 .../nixos}/desktop/audio/pipewire.nix | 0 {nixos => modules/nixos}/desktop/default.nix | 2 +- .../nixos}/desktop/display/default.nix | 5 +- .../desktop/window-managers/default.nix | 0 .../desktop/window-managers/hyprland.nix | 12 +- {nixos => modules/nixos}/gaming/default.nix | 0 .../nixos}/gaming/steam/default.nix | 0 .../nixos}/hardware/bluetooth/default.nix | 0 {nixos => modules/nixos}/hardware/default.nix | 0 .../nixos}/hardware/graphics/amd.nix | 0 .../nixos}/hardware/graphics/default.nix | 0 .../nixos}/hardware/graphics/intel.nix | 0 .../nixos}/hardware/graphics/nvidia.nix | 0 modules/nixos/hardware/graphics/prime.nix | 9 + .../nixos}/hardware/udev/default.nix | 1 + .../nixos}/networking/default.nix | 0 .../networking/network-manager/default.nix | 0 .../nixos}/networking/vpn/default.nix | 0 .../nixos}/services/appimage/default.nix | 0 {nixos => modules/nixos}/services/default.nix | 0 .../nixos}/services/flatpak/default.nix | 0 .../nixos}/services/fwupd/default.nix | 0 .../nixos}/services/kde_connect/default.nix | 0 .../nixos}/services/ollama/default.nix | 1 - .../nixos}/services/performance/default.nix | 2 +- .../nixos}/services/printing/default.nix | 0 modules/nixos/services/security/default.nix | 23 +++ .../nixos}/services/ssh/default.nix | 0 {nixos => modules/nixos}/system/default.nix | 0 .../nixos}/system/fonts/default.nix | 0 .../nixos}/system/kmscon/default.nix | 2 +- .../nixos}/system/locale/default.nix | 0 .../nixos}/system/nix/default.nix | 2 +- {nixos => modules/nixos}/users/default.nix | 0 .../nixos}/virtualization/default.nix | 0 .../nixos}/virtualization/docker/default.nix | 0 .../virtualization/virt-manager/default.nix | 0 nixos/hardware/graphics/prime.nix | 9 - nixos/services/security/default.nix | 9 - packages.nix | 38 ---- 73 files changed, 537 insertions(+), 644 deletions(-) mode change 100644 => 100755 README.md delete mode 100755 auto/hardconf.sh delete mode 100644 darwin/default.nix mode change 100644 => 100755 flake.lock mode change 100644 => 100755 flake.nix delete mode 100644 home/darwin.nix delete mode 100644 home/dots/copetch/cop.txt delete mode 100644 home/dots/zsh/.zshrc delete mode 100644 home/linux.nix delete mode 100644 home/shared.nix create mode 100755 main/darwin/machine.nix create mode 100755 main/darwin/packages.nix rename hardware.nix => main/nixos/hardware.nix (100%) mode change 100644 => 100755 rename machine.nix => main/nixos/machine.nix (76%) mode change 100644 => 100755 create mode 100755 main/nixos/packages.nix create mode 100755 modules/darwin/default.nix create mode 100755 modules/darwin/homebrew/default.nix create mode 100755 modules/darwin/system/default.nix create mode 100755 modules/darwin/user/default.nix create mode 100755 modules/home/.DS_Store create mode 100755 modules/home/git.nix create mode 100755 modules/home/home.nix rename {home => modules/home}/hypr/default.nix (100%) mode change 100644 => 100755 rename {home => modules/home}/hypr/hyprland/env.nix (100%) mode change 100644 => 100755 rename {home => modules/home}/hypr/hyprland/execs.nix (100%) mode change 100644 => 100755 rename {home => modules/home}/hypr/hyprland/general.nix (100%) mode change 100644 => 100755 rename {home => modules/home}/hypr/hyprland/keybinds.nix (100%) mode change 100644 => 100755 rename {home => modules/home}/hypr/hyprland/rules.nix (100%) mode change 100644 => 100755 rename {home => modules/home}/hyprland.nix (100%) mode change 100644 => 100755 create mode 100755 modules/nixos/.DS_Store rename {nixos => modules/nixos}/boot/default.nix (99%) mode change 100644 => 100755 rename {nixos => modules/nixos}/default.nix (89%) mode change 100644 => 100755 rename {nixos => modules/nixos}/desktop/audio/default.nix (100%) mode change 100644 => 100755 rename {nixos => modules/nixos}/desktop/audio/pipewire.nix (100%) mode change 100644 => 100755 rename {nixos => modules/nixos}/desktop/default.nix (98%) mode change 100644 => 100755 rename {nixos => modules/nixos}/desktop/display/default.nix (99%) mode change 100644 => 100755 rename {nixos => modules/nixos}/desktop/window-managers/default.nix (100%) mode change 100644 => 100755 rename {nixos => modules/nixos}/desktop/window-managers/hyprland.nix (70%) mode change 100644 => 100755 rename {nixos => modules/nixos}/gaming/default.nix (100%) mode change 100644 => 100755 rename {nixos => modules/nixos}/gaming/steam/default.nix (100%) mode change 100644 => 100755 rename {nixos => modules/nixos}/hardware/bluetooth/default.nix (100%) mode change 100644 => 100755 rename {nixos => modules/nixos}/hardware/default.nix (100%) mode change 100644 => 100755 rename {nixos => modules/nixos}/hardware/graphics/amd.nix (100%) mode change 100644 => 100755 rename {nixos => modules/nixos}/hardware/graphics/default.nix (100%) mode change 100644 => 100755 rename {nixos => modules/nixos}/hardware/graphics/intel.nix (100%) mode change 100644 => 100755 rename {nixos => modules/nixos}/hardware/graphics/nvidia.nix (100%) mode change 100644 => 100755 create mode 100755 modules/nixos/hardware/graphics/prime.nix rename {nixos => modules/nixos}/hardware/udev/default.nix (99%) mode change 100644 => 100755 rename {nixos => modules/nixos}/networking/default.nix (100%) mode change 100644 => 100755 rename {nixos => modules/nixos}/networking/network-manager/default.nix (100%) mode change 100644 => 100755 rename {nixos => modules/nixos}/networking/vpn/default.nix (100%) mode change 100644 => 100755 rename {nixos => modules/nixos}/services/appimage/default.nix (100%) mode change 100644 => 100755 rename {nixos => modules/nixos}/services/default.nix (100%) mode change 100644 => 100755 rename {nixos => modules/nixos}/services/flatpak/default.nix (100%) mode change 100644 => 100755 rename {nixos => modules/nixos}/services/fwupd/default.nix (100%) mode change 100644 => 100755 rename {nixos => modules/nixos}/services/kde_connect/default.nix (100%) mode change 100644 => 100755 rename {nixos => modules/nixos}/services/ollama/default.nix (97%) mode change 100644 => 100755 rename {nixos => modules/nixos}/services/performance/default.nix (90%) mode change 100644 => 100755 rename {nixos => modules/nixos}/services/printing/default.nix (100%) mode change 100644 => 100755 create mode 100755 modules/nixos/services/security/default.nix rename {nixos => modules/nixos}/services/ssh/default.nix (100%) mode change 100644 => 100755 rename {nixos => modules/nixos}/system/default.nix (100%) mode change 100644 => 100755 rename {nixos => modules/nixos}/system/fonts/default.nix (100%) mode change 100644 => 100755 rename {nixos => modules/nixos}/system/kmscon/default.nix (92%) mode change 100644 => 100755 rename {nixos => modules/nixos}/system/locale/default.nix (100%) mode change 100644 => 100755 rename {nixos => modules/nixos}/system/nix/default.nix (97%) mode change 100644 => 100755 rename {nixos => modules/nixos}/users/default.nix (100%) mode change 100644 => 100755 rename {nixos => modules/nixos}/virtualization/default.nix (100%) mode change 100644 => 100755 rename {nixos => modules/nixos}/virtualization/docker/default.nix (100%) mode change 100644 => 100755 rename {nixos => modules/nixos}/virtualization/virt-manager/default.nix (100%) mode change 100644 => 100755 delete mode 100644 nixos/hardware/graphics/prime.nix delete mode 100644 nixos/services/security/default.nix delete mode 100644 packages.nix diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/auto/hardconf.sh b/auto/hardconf.sh deleted file mode 100755 index a7d97c6..0000000 --- a/auto/hardconf.sh +++ /dev/null @@ -1,120 +0,0 @@ -#!/usr/bin/env bash -set -e - -[[ $EUID -ne 0 ]] && echo "Run with sudo" && exit 1 - -# ── CPU ────────────────────────────────────────────────────────────────────── -VENDOR=$(grep -m1 'vendor_id' /proc/cpuinfo | awk '{print $3}') -if [[ "$VENDOR" == "AuthenticAMD" ]]; then - CPU_MICROCODE="hardware.cpu.amd.updateMicrocode" - CPU_KVM="kvm-amd" -else - CPU_MICROCODE="hardware.cpu.intel.updateMicrocode" - CPU_KVM="kvm-intel" -fi - -# ── GPU ────────────────────────────────────────────────────────────────────── -HAS_AMD=false -HAS_NVIDIA=false -lspci | grep -qi 'amd\|radeon' && HAS_AMD=true -lspci | grep -qi 'nvidia' && HAS_NVIDIA=true - -if $HAS_AMD && $HAS_NVIDIA; then - GPU_DRIVER="hybrid-amd-nvidia" -elif $HAS_AMD; then - GPU_DRIVER="amd" -elif $HAS_NVIDIA; then - GPU_DRIVER="nvidia" -else - GPU_DRIVER="intel" -fi - -echo "CPU: $VENDOR → $CPU_KVM" -echo "GPU: $GPU_DRIVER" -echo "" - -INITRD_MODULES="" -if [[ "$GPU_DRIVER" == "hybrid-amd-nvidia" ]]; then - INITRD_MODULES="\"amdgpu\" \"nvidia\" \"nvidia_modeset\" \"nvidia_uvm\" \"nvidia_drm\"" -elif [[ "$GPU_DRIVER" == "intel" ]]; then - INITRD_MODULES="\"i915\"" -elif [[ "$GPU_DRIVER" == "amd" ]]; then - INITRD_MODULES="\"amdgpu\"" -elif [[ "$GPU_DRIVER" == "nvidia" ]]; then - INITRD_MODULES="\"nvidia\" \"nvidia_modeset\" \"nvidia_uvm\" \"nvidia_drm\"" -fi - -# ── Disks ──────────────────────────────────────────────────────────────────── -lsblk -o NAME,SIZE,FSTYPE,UUID,MOUNTPOINT -echo "" - -read -rp "Root partition (e.g. /dev/sda2): " ROOT_PART -[[ ! -b "$ROOT_PART" ]] && echo "Invalid partition" && exit 1 -ROOT_UUID=$(blkid -s UUID -o value "$ROOT_PART") -ROOT_FSTYPE=$(blkid -s TYPE -o value "$ROOT_PART") -echo "Root → $ROOT_UUID ($ROOT_FSTYPE)" - -read -rp "Boot/EFI partition (e.g. /dev/sda1): " BOOT_PART -[[ ! -b "$BOOT_PART" ]] && echo "Invalid partition" && exit 1 -BOOT_UUID=$(blkid -s UUID -o value "$BOOT_PART") -echo "Boot → $BOOT_UUID" - -EXTRA_BLOCK="" -read -rp "Extra partition? (leave empty to skip): " EXTRA_PART -if [[ -n "$EXTRA_PART" ]]; then - EXTRA_UUID=$(blkid -s UUID -o value "$EXTRA_PART") - EXTRA_FSTYPE=$(blkid -s TYPE -o value "$EXTRA_PART") - read -rp "Mount point (e.g. /mnt/hdd): " EXTRA_MOUNT - EXTRA_BLOCK=" - fileSystems.\"$EXTRA_MOUNT\" = { - device = \"/dev/disk/by-uuid/$EXTRA_UUID\"; - fsType = \"$EXTRA_FSTYPE\"; - options = [ \"defaults\" \"nofail\" ]; - }; -" -fi - -# ── Write hardware.nix ─────────────────────────────────────────────────────── -cat > ./hardware.nix <*wwvrc#ef>RI^4vYcGCbyF@50!H3kK<{s&DrkQ uRMfB54uyS7#Y9WR9OylAX-2o_+NZrpSUc(}I&a~`_z^HdLInfAz`!TZ1W`W# literal 0 HcmV?d00001 diff --git a/modules/home/git.nix b/modules/home/git.nix new file mode 100755 index 0000000..8fc7fd9 --- /dev/null +++ b/modules/home/git.nix @@ -0,0 +1,28 @@ +{ + pkgs, + lib, + ... +}: + +let + base = '' + [user] + name = elwrcl + email = elwerici@proton.me + signingkey = AAC15D93AFCAB283 + [commit] + gpgsign = true + [tag] + gpgsign = true + ''; + + darwinExtra = '' + [credential] + helper = osxkeychain + ''; + + gitconfig = pkgs.writeText "gitconfig" (base + lib.optionalString pkgs.stdenv.isDarwin darwinExtra); +in +{ + environment.variables.GIT_CONFIG_SYSTEM = "${gitconfig}"; +} diff --git a/modules/home/home.nix b/modules/home/home.nix new file mode 100755 index 0000000..5b3d88d --- /dev/null +++ b/modules/home/home.nix @@ -0,0 +1,139 @@ +{ + pkgs, + ... +}: + +{ + imports = [ ./hyprland.nix ]; + + home.username = "elars"; + home.homeDirectory = "/home/elars"; + home.stateVersion = "25.05"; + + programs.home-manager.enable = true; + fonts.fontconfig.enable = true; + + home.sessionVariables = { + BROWSER = "zen-beta.desktop"; + }; + + programs.zsh = { + enable = true; + enableCompletion = true; + autosuggestion.enable = true; + syntaxHighlighting.enable = true; + initContent = '' + export FZF_DEFAULT_OPTS='--height 40% --layout=reverse --border' + export FZF_DEFAULT_COMMAND='fd --type f --hidden --follow --exclude .git' + + alias ls='eza --icons --group-directories-first' + alias ll='eza -lah --icons --group-directories-first' + alias la='eza -a --icons --group-directories-first' + alias lt='eza --tree --level=2 --icons' + + alias cd='z' + alias cat='bat' + alias grep='grep --color=auto' + alias df='df -h' + alias du='du -h' + alias free='free -h' + + alias cp='cp -i' + alias mv='mv -i' + alias rm='trash-put' + + alias sysinfo='fastfetch' + alias monitor='sudo btop' + alias ports='sudo ss -tulpn' + alias myip='curl ifconfig.me' + + alias ..='cd ..' + alias ...='cd ../..' + alias ....='cd ../../..' + alias ~='cd ~' + alias -- -='cd -' + + alias gs='git status' + alias ga='git add' + alias gc='git commit -m' + alias gp='git push' + alias gl='git log --oneline --graph --decorate' + + alias rebuild='git -C ~/copland add -A && git -C ~/copland commit -m "update" && nh os switch' + alias rebuild-dry='nh os switch --dry' + alias rebuild-cop='nix flake update --flake ~/copland && git -C ~/copland add -A && git -C ~/copland commit -m "flake update $(date +%Y-%m-%d)" && nh os switch' + + extract() { + if [ -f "$1" ]; then + case "$1" in + *.tar.bz2) tar xjf "$1" ;; *.tar.gz) tar xzf "$1" ;; + *.bz2) bunzip2 "$1" ;; *.rar) unrar e "$1" ;; + *.gz) gunzip "$1" ;; *.tar) tar xf "$1" ;; + *.zip) unzip "$1" ;; *.7z) 7z x "$1" ;; + *) echo "'$1' can't be extracted" ;; + esac + fi + } + + HISTSIZE=10000 + SAVEHIST=10000 + HISTFILE=~/.zsh_history + setopt HIST_IGNORE_DUPS HIST_IGNORE_SPACE SHARE_HISTORY AUTO_CD + zstyle ':completion:*' menu select + zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}' + + export MESA_GL_VERSION_OVERRIDE=4.6 + export MESA_GLSL_VERSION_OVERRIDE=460 + export MESA_SHADER_CACHE_MAX_SIZE=2G + export MESA_SHADER_CACHE_DIR=/tmp/mesa_shader_cache + export PATH="$HOME/.local/bin:$PATH" + + copetch --ascii + ''; + }; + + programs.starship.enable = true; + programs.fzf.enable = true; + programs.zoxide.enable = true; + + gtk = { + enable = true; + theme.name = "Adwaita-dark"; + theme.package = pkgs.gnome-themes-extra; + gtk4.theme.name = "Adwaita-dark"; + gtk4.theme.package = pkgs.gnome-themes-extra; + }; + + qt = { + enable = true; + platformTheme.name = "gtk3"; + style.name = "adwaita-dark"; + style.package = pkgs.adwaita-qt; + }; + + home.pointerCursor = { + name = "Bibata-Modern-Classic"; + package = pkgs.bibata-cursors; + size = 24; + gtk.enable = true; + x11.enable = true; + }; + + dconf.settings."org/gnome/desktop/interface" = { + color-scheme = "prefer-dark"; + gtk-application-prefer-dark-theme = true; + gtk-theme = "Adwaita-dark"; + }; + + xdg.mimeApps = { + enable = true; + defaultApplications = { + "inode/directory" = [ "thunar.desktop" ]; + "x-scheme-handler/http" = [ "zen-beta.desktop" ]; + "x-scheme-handler/https" = [ "zen-beta.desktop" ]; + "x-scheme-handler/about" = [ "zen-beta.desktop" ]; + "x-scheme-handler/unknown" = [ "zen-beta.desktop" ]; + }; + }; + services.easyeffects.enable = true; +} diff --git a/home/hypr/default.nix b/modules/home/hypr/default.nix old mode 100644 new mode 100755 similarity index 100% rename from home/hypr/default.nix rename to modules/home/hypr/default.nix diff --git a/home/hypr/hyprland/env.nix b/modules/home/hypr/hyprland/env.nix old mode 100644 new mode 100755 similarity index 100% rename from home/hypr/hyprland/env.nix rename to modules/home/hypr/hyprland/env.nix diff --git a/home/hypr/hyprland/execs.nix b/modules/home/hypr/hyprland/execs.nix old mode 100644 new mode 100755 similarity index 100% rename from home/hypr/hyprland/execs.nix rename to modules/home/hypr/hyprland/execs.nix diff --git a/home/hypr/hyprland/general.nix b/modules/home/hypr/hyprland/general.nix old mode 100644 new mode 100755 similarity index 100% rename from home/hypr/hyprland/general.nix rename to modules/home/hypr/hyprland/general.nix diff --git a/home/hypr/hyprland/keybinds.nix b/modules/home/hypr/hyprland/keybinds.nix old mode 100644 new mode 100755 similarity index 100% rename from home/hypr/hyprland/keybinds.nix rename to modules/home/hypr/hyprland/keybinds.nix diff --git a/home/hypr/hyprland/rules.nix b/modules/home/hypr/hyprland/rules.nix old mode 100644 new mode 100755 similarity index 100% rename from home/hypr/hyprland/rules.nix rename to modules/home/hypr/hyprland/rules.nix diff --git a/home/hyprland.nix b/modules/home/hyprland.nix old mode 100644 new mode 100755 similarity index 100% rename from home/hyprland.nix rename to modules/home/hyprland.nix diff --git a/modules/nixos/.DS_Store b/modules/nixos/.DS_Store new file mode 100755 index 0000000000000000000000000000000000000000..9e0cc92c519d48d75c293217515964443abb3ca9 GIT binary patch literal 6148 zcmeHK%TB{E5FD3MLW@w3T#)hwNc=&l%7HT%j?f1Mkv1qzDR9c2U*I43K29)eTUG6r zD?(_uT94z*uDz2gjsck7Vsr|00VH(6#y*=ZCilfRtl>x6L?bya@?tp1ivh1Cq1xY9 zK%QL_0~GvK(eu0Fz4tF`wvY}+7~>Woi^#ggkNxt=X^;EaFegSDCy%o$VSiR>YJ z^KcHZ+JN68|Ak(WI}N!~Yrx&5jxKwY)v(fld1&V^nRUTRbFSr;SP=`%qFGpV5K9r% zQ~^~$6^Inzo-LMi9BQiyr~<0MN&$I4q;$c|W9`tsI@s7F0I|toYwX)ke_|>F#LQ#u zkRvqXLWwTa_#=k#CkNxgc|Y^~+Mx@Fu`@G|pV{~mitz^zlUh1V=1^NzKotlT*m0L# z+5gXfKL3Y7dZh}e0{=<@)9hdNdo0QCtsBM3UYpXd>0-jG9j-#yv0E{@vK1fEt#Le+ W4l(msJLCvWKLo4{+Nc7*s=zl-*ORdT literal 0 HcmV?d00001 diff --git a/nixos/boot/default.nix b/modules/nixos/boot/default.nix old mode 100644 new mode 100755 similarity index 99% rename from nixos/boot/default.nix rename to modules/nixos/boot/default.nix index 4cddc7c..f7605d5 --- a/nixos/boot/default.nix +++ b/modules/nixos/boot/default.nix @@ -24,6 +24,7 @@ canTouchEfiVariables = false; efiSysMountPoint = "/boot"; }; + systemd-boot = { enable = true; configurationLimit = 5; diff --git a/nixos/default.nix b/modules/nixos/default.nix old mode 100644 new mode 100755 similarity index 89% rename from nixos/default.nix rename to modules/nixos/default.nix index f5e9c7b..5a3a53f --- a/nixos/default.nix +++ b/modules/nixos/default.nix @@ -2,6 +2,7 @@ { imports = [ + ../home/git.nix ./boot ./desktop ./gaming diff --git a/nixos/desktop/audio/default.nix b/modules/nixos/desktop/audio/default.nix old mode 100644 new mode 100755 similarity index 100% rename from nixos/desktop/audio/default.nix rename to modules/nixos/desktop/audio/default.nix diff --git a/nixos/desktop/audio/pipewire.nix b/modules/nixos/desktop/audio/pipewire.nix old mode 100644 new mode 100755 similarity index 100% rename from nixos/desktop/audio/pipewire.nix rename to modules/nixos/desktop/audio/pipewire.nix diff --git a/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix old mode 100644 new mode 100755 similarity index 98% rename from nixos/desktop/default.nix rename to modules/nixos/desktop/default.nix index 0cedf92..f40caf3 --- a/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -10,7 +10,7 @@ xdg.mime = { enable = true; defaultApplications = { - # gui/web + # gui "text/html" = "zen-beta.desktop"; "x-scheme-handler/http" = "zen-beta.desktop"; "x-scheme-handler/https" = "zen-beta.desktop"; diff --git a/nixos/desktop/display/default.nix b/modules/nixos/desktop/display/default.nix old mode 100644 new mode 100755 similarity index 99% rename from nixos/desktop/display/default.nix rename to modules/nixos/desktop/display/default.nix index 61e7708..43058c8 --- a/nixos/desktop/display/default.nix +++ b/modules/nixos/desktop/display/default.nix @@ -1,4 +1,5 @@ { ... }: + { services.xserver.enable = true; services.displayManager.ly = { @@ -8,21 +9,19 @@ colormix_col1 = "0x00FFFFFF"; colormix_col2 = "0x000000EE"; colormix_col3 = "0x00777799"; - bigclock = "en"; bigclock_12hr = false; - fg = "0x00FFFFFF"; bg = "0x00000000"; border_fg = "0x00FFFFFF"; error_fg = "0x01FF0000"; blank_box = true; hide_borders = false; - margin_box_h = 2; margin_box_v = 1; }; }; + services.xserver.xkb = { layout = "tr"; variant = ""; diff --git a/nixos/desktop/window-managers/default.nix b/modules/nixos/desktop/window-managers/default.nix old mode 100644 new mode 100755 similarity index 100% rename from nixos/desktop/window-managers/default.nix rename to modules/nixos/desktop/window-managers/default.nix diff --git a/nixos/desktop/window-managers/hyprland.nix b/modules/nixos/desktop/window-managers/hyprland.nix old mode 100644 new mode 100755 similarity index 70% rename from nixos/desktop/window-managers/hyprland.nix rename to modules/nixos/desktop/window-managers/hyprland.nix index 9350f15..a1ddf5a --- a/nixos/desktop/window-managers/hyprland.nix +++ b/modules/nixos/desktop/window-managers/hyprland.nix @@ -17,7 +17,7 @@ xdg.portal = { enable = true; extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; - config.common.default = [ + config.hyprland.default = [ "hyprland" "gtk" ]; @@ -35,14 +35,4 @@ xdg-utils xdg-user-dirs ]; - - security.wrappers = { - gsr-kms-server = { - source = "${pkgs.gpu-screen-recorder}/bin/gsr-kms-server"; - capabilities = "cap_sys_admin+ep"; - owner = "root"; - group = "root"; - permissions = "u+rx,g+rx,o+rx"; - }; - }; } diff --git a/nixos/gaming/default.nix b/modules/nixos/gaming/default.nix old mode 100644 new mode 100755 similarity index 100% rename from nixos/gaming/default.nix rename to modules/nixos/gaming/default.nix diff --git a/nixos/gaming/steam/default.nix b/modules/nixos/gaming/steam/default.nix old mode 100644 new mode 100755 similarity index 100% rename from nixos/gaming/steam/default.nix rename to modules/nixos/gaming/steam/default.nix diff --git a/nixos/hardware/bluetooth/default.nix b/modules/nixos/hardware/bluetooth/default.nix old mode 100644 new mode 100755 similarity index 100% rename from nixos/hardware/bluetooth/default.nix rename to modules/nixos/hardware/bluetooth/default.nix diff --git a/nixos/hardware/default.nix b/modules/nixos/hardware/default.nix old mode 100644 new mode 100755 similarity index 100% rename from nixos/hardware/default.nix rename to modules/nixos/hardware/default.nix diff --git a/nixos/hardware/graphics/amd.nix b/modules/nixos/hardware/graphics/amd.nix old mode 100644 new mode 100755 similarity index 100% rename from nixos/hardware/graphics/amd.nix rename to modules/nixos/hardware/graphics/amd.nix diff --git a/nixos/hardware/graphics/default.nix b/modules/nixos/hardware/graphics/default.nix old mode 100644 new mode 100755 similarity index 100% rename from nixos/hardware/graphics/default.nix rename to modules/nixos/hardware/graphics/default.nix diff --git a/nixos/hardware/graphics/intel.nix b/modules/nixos/hardware/graphics/intel.nix old mode 100644 new mode 100755 similarity index 100% rename from nixos/hardware/graphics/intel.nix rename to modules/nixos/hardware/graphics/intel.nix diff --git a/nixos/hardware/graphics/nvidia.nix b/modules/nixos/hardware/graphics/nvidia.nix old mode 100644 new mode 100755 similarity index 100% rename from nixos/hardware/graphics/nvidia.nix rename to modules/nixos/hardware/graphics/nvidia.nix diff --git a/modules/nixos/hardware/graphics/prime.nix b/modules/nixos/hardware/graphics/prime.nix new file mode 100755 index 0000000..3146a46 --- /dev/null +++ b/modules/nixos/hardware/graphics/prime.nix @@ -0,0 +1,9 @@ +{ ... }: + +{ + hardware.nvidia.prime = { + offload.enable = true; + amdgpuBusId = "PCI:X:X:X"; + nvidiaBusId = "PCI:X:X:X"; + }; +} diff --git a/nixos/hardware/udev/default.nix b/modules/nixos/hardware/udev/default.nix old mode 100644 new mode 100755 similarity index 99% rename from nixos/hardware/udev/default.nix rename to modules/nixos/hardware/udev/default.nix index 656a995..e2cdb81 --- a/nixos/hardware/udev/default.nix +++ b/modules/nixos/hardware/udev/default.nix @@ -1,4 +1,5 @@ { ... }: + { services.udev.extraRules = '' KERNEL=="ttyACM[0-9]*", MODE="0666" diff --git a/nixos/networking/default.nix b/modules/nixos/networking/default.nix old mode 100644 new mode 100755 similarity index 100% rename from nixos/networking/default.nix rename to modules/nixos/networking/default.nix diff --git a/nixos/networking/network-manager/default.nix b/modules/nixos/networking/network-manager/default.nix old mode 100644 new mode 100755 similarity index 100% rename from nixos/networking/network-manager/default.nix rename to modules/nixos/networking/network-manager/default.nix diff --git a/nixos/networking/vpn/default.nix b/modules/nixos/networking/vpn/default.nix old mode 100644 new mode 100755 similarity index 100% rename from nixos/networking/vpn/default.nix rename to modules/nixos/networking/vpn/default.nix diff --git a/nixos/services/appimage/default.nix b/modules/nixos/services/appimage/default.nix old mode 100644 new mode 100755 similarity index 100% rename from nixos/services/appimage/default.nix rename to modules/nixos/services/appimage/default.nix diff --git a/nixos/services/default.nix b/modules/nixos/services/default.nix old mode 100644 new mode 100755 similarity index 100% rename from nixos/services/default.nix rename to modules/nixos/services/default.nix diff --git a/nixos/services/flatpak/default.nix b/modules/nixos/services/flatpak/default.nix old mode 100644 new mode 100755 similarity index 100% rename from nixos/services/flatpak/default.nix rename to modules/nixos/services/flatpak/default.nix diff --git a/nixos/services/fwupd/default.nix b/modules/nixos/services/fwupd/default.nix old mode 100644 new mode 100755 similarity index 100% rename from nixos/services/fwupd/default.nix rename to modules/nixos/services/fwupd/default.nix diff --git a/nixos/services/kde_connect/default.nix b/modules/nixos/services/kde_connect/default.nix old mode 100644 new mode 100755 similarity index 100% rename from nixos/services/kde_connect/default.nix rename to modules/nixos/services/kde_connect/default.nix diff --git a/nixos/services/ollama/default.nix b/modules/nixos/services/ollama/default.nix old mode 100644 new mode 100755 similarity index 97% rename from nixos/services/ollama/default.nix rename to modules/nixos/services/ollama/default.nix index c0f45b1..fb915fd --- a/nixos/services/ollama/default.nix +++ b/modules/nixos/services/ollama/default.nix @@ -1,6 +1,5 @@ { ... }: { - services.ollama.enable = true; } diff --git a/nixos/services/performance/default.nix b/modules/nixos/services/performance/default.nix old mode 100644 new mode 100755 similarity index 90% rename from nixos/services/performance/default.nix rename to modules/nixos/services/performance/default.nix index 9fa55d1..4656440 --- a/nixos/services/performance/default.nix +++ b/modules/nixos/services/performance/default.nix @@ -2,7 +2,7 @@ { services.scx = { - enable = true; + enable = false; scheduler = "scx_rustland"; }; services.irqbalance.enable = true; diff --git a/nixos/services/printing/default.nix b/modules/nixos/services/printing/default.nix old mode 100644 new mode 100755 similarity index 100% rename from nixos/services/printing/default.nix rename to modules/nixos/services/printing/default.nix diff --git a/modules/nixos/services/security/default.nix b/modules/nixos/services/security/default.nix new file mode 100755 index 0000000..0a9180b --- /dev/null +++ b/modules/nixos/services/security/default.nix @@ -0,0 +1,23 @@ +{ + pkgs, + ... +}: + +{ + programs.gnupg.agent = { + enable = true; + enableSSHSupport = false; + }; + + security.wrappers = { + gsr-kms-server = { + source = "${pkgs.gpu-screen-recorder}/bin/gsr-kms-server"; + capabilities = "cap_sys_admin+ep"; + owner = "root"; + group = "root"; + permissions = "u+rx,g+rx,o+rx"; + }; + }; + + services.gnome.gnome-keyring.enable = true; +} diff --git a/nixos/services/ssh/default.nix b/modules/nixos/services/ssh/default.nix old mode 100644 new mode 100755 similarity index 100% rename from nixos/services/ssh/default.nix rename to modules/nixos/services/ssh/default.nix diff --git a/nixos/system/default.nix b/modules/nixos/system/default.nix old mode 100644 new mode 100755 similarity index 100% rename from nixos/system/default.nix rename to modules/nixos/system/default.nix diff --git a/nixos/system/fonts/default.nix b/modules/nixos/system/fonts/default.nix old mode 100644 new mode 100755 similarity index 100% rename from nixos/system/fonts/default.nix rename to modules/nixos/system/fonts/default.nix diff --git a/nixos/system/kmscon/default.nix b/modules/nixos/system/kmscon/default.nix old mode 100644 new mode 100755 similarity index 92% rename from nixos/system/kmscon/default.nix rename to modules/nixos/system/kmscon/default.nix index a50279e..6e8350c --- a/nixos/system/kmscon/default.nix +++ b/modules/nixos/system/kmscon/default.nix @@ -14,7 +14,7 @@ } ]; extraConfig = '' - font-size=10 + font-size=18 ''; }; } diff --git a/nixos/system/locale/default.nix b/modules/nixos/system/locale/default.nix old mode 100644 new mode 100755 similarity index 100% rename from nixos/system/locale/default.nix rename to modules/nixos/system/locale/default.nix diff --git a/nixos/system/nix/default.nix b/modules/nixos/system/nix/default.nix old mode 100644 new mode 100755 similarity index 97% rename from nixos/system/nix/default.nix rename to modules/nixos/system/nix/default.nix index 6c18b7f..0d1fb8f --- a/nixos/system/nix/default.nix +++ b/modules/nixos/system/nix/default.nix @@ -7,7 +7,7 @@ "flakes" ]; - max-jobs = "auto"; + max-jobs = 1; cores = 0; substituters = [ diff --git a/nixos/users/default.nix b/modules/nixos/users/default.nix old mode 100644 new mode 100755 similarity index 100% rename from nixos/users/default.nix rename to modules/nixos/users/default.nix diff --git a/nixos/virtualization/default.nix b/modules/nixos/virtualization/default.nix old mode 100644 new mode 100755 similarity index 100% rename from nixos/virtualization/default.nix rename to modules/nixos/virtualization/default.nix diff --git a/nixos/virtualization/docker/default.nix b/modules/nixos/virtualization/docker/default.nix old mode 100644 new mode 100755 similarity index 100% rename from nixos/virtualization/docker/default.nix rename to modules/nixos/virtualization/docker/default.nix diff --git a/nixos/virtualization/virt-manager/default.nix b/modules/nixos/virtualization/virt-manager/default.nix old mode 100644 new mode 100755 similarity index 100% rename from nixos/virtualization/virt-manager/default.nix rename to modules/nixos/virtualization/virt-manager/default.nix diff --git a/nixos/hardware/graphics/prime.nix b/nixos/hardware/graphics/prime.nix deleted file mode 100644 index 811211d..0000000 --- a/nixos/hardware/graphics/prime.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ ... }: - -{ - hardware.nvidia.prime = { - offload.enable = true; - amdgpuBusId = "PCI:X:X:X"; # change to your AMD GPU's bus ID, e.g. "PCI:1:0:0" - nvidiaBusId = "PCI:X:X:X"; # change to your NVIDIA GPU's bus ID, e.g. "PCI:2:0:0" - }; -} diff --git a/nixos/services/security/default.nix b/nixos/services/security/default.nix deleted file mode 100644 index 9cd6a83..0000000 --- a/nixos/services/security/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ ... }: - -{ - programs.gnupg.agent = { - enable = true; - enableSSHSupport = false; - }; - services.gnome.gnome-keyring.enable = true; -} diff --git a/packages.nix b/packages.nix deleted file mode 100644 index 03f54e5..0000000 --- a/packages.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ pkgs }: -let - uxplay-fixed = pkgs.uxplay.override { - avahi = pkgs.avahi.override { withLibdnssdCompat = true; }; - }; -in -with pkgs; -{ - system = [ - # phone - libmtp - jmtpfs - android-tools - scrcpy - libimobiledevice - ifuse - kdePackages.krdp - usbmuxd - uxplay-fixed - - # hardware - ddcutil - libsecret - brightnessctl - lm_sensors - smartmontools - gsmartcontrol - exfatprogs - hfsprogs - gptfdisk - usbutils - p7zip - dmg2img - tree - xar - parted - ]; -}