diff --git a/etc/nixos/configuration.nix b/etc/nixos/configuration.nix index f6e8b2d..c471b5c 100644 --- a/etc/nixos/configuration.nix +++ b/etc/nixos/configuration.nix @@ -22,9 +22,12 @@ in ./modules/virtualization.nix ./modules/nvidia.nix ./modules/desktop.nix + ./modules/ld-fix.nix ]; + + #░█▀▄░█▀█░█▀█░▀█▀░█░░░█▀█░█▀█░█▀▄░█▀▀░█▀▄ #░█▀▄░█░█░█░█░░█░░█░░░█░█░█▀█░█░█░█▀▀░█▀▄ #░▀▀░░▀▀▀░▀▀▀░░▀░░▀▀▀░▀▀▀░▀░▀░▀▀░░▀▀▀░▀░▀ @@ -34,6 +37,9 @@ in services.blueman.enable = true; boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; + services.udev.extraRules = '' + KERNEL=="i2c-[0-9]*", GROUP="i2c", MODE="0660" + ''; boot = { plymouth = { @@ -43,6 +49,7 @@ in # Enable "Silent Boot" consoleLogLevel = 0; initrd.verbose = false; + kernelModules = ["i2c-dev"]; kernelParams = [ "quiet" "splash" @@ -56,7 +63,7 @@ in kernelPackages = pkgs.linuxPackages_latest; loader.timeout = 0; - loader.systemd-boot.consoleMode = "max"; + loader.systemd-boot.consoleMode = "auto"; }; @@ -73,6 +80,7 @@ in nssmdns4 = true; openFirewall = true; }; + networking.firewall = { enable = false; }; #░█░░░█▀█░█▀▀░█▀█░█░░░█▀▀ @@ -111,11 +119,12 @@ in users.users.nicole = { isNormalUser = true; description = "Nicole"; - extraGroups = [ "networkmanager" "wheel" "libvrtd" "kvm" "qemu-libvirtd" ]; + extraGroups = [ "networkmanager" "wheel" "libvrtd" "kvm" "qemu-libvirtd" "i2c"]; packages = with pkgs; []; }; - + stylix.enable = true; + stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"; #░█░█░█▀█░█▀▀░█▀▄░█▀▀░█▀▀ @@ -131,35 +140,14 @@ in #░█░░░█░█░░░█▀▀░░█░░▄▀▄ #░▀▀▀░▀▀░░░░▀░░░▀▀▀░▀░▀ - programs.nix-ld.enable = true; - programs.nix-ld.libraries = with pkgs ; [ - gcc-unwrapped - ]; - - - -#░█▀▄░█▀▀░█▀▀░█░█░▀█▀░█▀█░█▀█ -#░█░█░█▀▀░▀▀█░█▀▄░░█░░█░█░█▀▀ -#░▀▀░░▀▀▀░▀▀▀░▀░▀░░▀░░▀▀▀░▀░░ - - # Enable SDDM & Hyprland -# services.xserver.displayManager.gdm.enable = true; -# services.gnome.gnome-keyring.enable = true; -# services.desktopManager.cosmic.xwayland.enable = true; - -# programs.hyprland = { -# enable = true; -# withUWSM = true; -# xwayland.enable = true; -# }; - -# environment.sessionVariables = { -# WLR_NO_HARDWARE_CURSOR = "1"; -# NIXOS_OZONE_WL = "1"; -# CUDA_HOME = "${pkgs.cudaPackages.cudatoolkit}"; -# CUDA_MODULE_LOADING = "LAZY"; -# }; - + #programs.nix-ld.enable = true; + #programs.nix-ld.libraries = with pkgs ; [ + # gcc-unwrapped + # stdenv.cc.cc.lib + # libz + # cairo + # pango + #]; #░█░█░█▀▄░█▀▀ @@ -180,10 +168,12 @@ in security.rtkit.enable = true; services.pipewire = { enable = true; + audio.enable = true; + wireplumber.enable = true; + pulse.enable = true; alsa.enable = true; alsa.support32Bit = true; - pulse.enable = true; - jack.enable = true; + #jack.enable = true; }; @@ -203,6 +193,7 @@ in htop cowsay starship + cava # FILES # nemo-with-extensions @@ -245,6 +236,7 @@ in ffmpeg mpv jellyfin-media-player + resonance # INTERNET # floorp @@ -260,13 +252,13 @@ in vscode-fhs nixd nil - python312 - python312Packages.pip + #python312 + #python312Packages.pip zed-editor gnumake cmake ninja - python3 + #python3 libgcc gcc @@ -283,10 +275,12 @@ in playerctl adw-gtk3 remmina + deskreen # UTILS # monitorets xdg-user-dirs + brightnessctl # CUDA # cudaPackages.cudatoolkit @@ -295,6 +289,9 @@ in # AUDIO # helvum + + + ]; diff --git a/etc/nixos/flake.nix b/etc/nixos/flake.nix index 94ff1da..a7d424b 100644 --- a/etc/nixos/flake.nix +++ b/etc/nixos/flake.nix @@ -5,9 +5,15 @@ nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; hyprpanel.url = "github:Jas-SinghFSU/HyprPanel"; + stylix.url = "github:danth/stylix"; + #catppuccin.url = "github:catppuccin/nix"; + #home-manager = { + # url = "github:nix-community/home-manager"; + # inputs.nixpkgs.follows = "nixpkgs"; + #}; }; - outputs = { self, nixpkgs, nixpkgs-unstable, ... } @inputs: + outputs = { self, nixpkgs, nixpkgs-unstable, stylix, ... } @inputs: let system = "x86_64-linux"; # change to whatever your system should be. @@ -33,10 +39,24 @@ inherit pkgs-unstable; }; modules = [ + #catppuccin.nixosModules.catppuccin + + #home-manager.nixosModules.home-manager + #{ + # if you use home-manager + # home-manager.users.nicole = { + # imports = [ + # ./home.nix + # catppuccin.homeManagerModules.catppuccin + # ]; + # }; + #} ./configuration.nix {nixpkgs.overlays = [inputs.hyprpanel.overlay];} + stylix.nixosModules.stylix ]; }; + packages.x86_64-linux.hello = nixpkgs.legacyPackages.x86_64-linux.hello; packages.x86_64-linux.default = self.packages.x86_64-linux.hello; diff --git a/etc/nixos/modules/desktop.nix b/etc/nixos/modules/desktop.nix index 775ad43..301b589 100644 --- a/etc/nixos/modules/desktop.nix +++ b/etc/nixos/modules/desktop.nix @@ -26,59 +26,4 @@ CUDA_MODULE_LOADING = "LAZY"; }; - # GNOME # - services.xserver.desktopManager.gnome.enable = true; - - # Exclude GNOME packages - environment.gnome.excludePackages = with pkgs; [ - orca - evince - # file-roller - geary - gnome-disk-utility - seahorse - sushi - sysprof - # - # gnome-shell-extensions - # - adwaita-icon-theme - # nixos-background-info - gnome-backgrounds - # gnome-bluetooth - # gnome-color-manager - # gnome-control-center - # gnome-shell-extensions - gnome-tour # GNOME Shell detects the .desktop file on first log-in. - gnome-user-docs - # glib # for gsettings program - # gnome-menus - # gtk3.out # for gtk-launch program - # xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ - # xdg-user-dirs-gtk # Used to create the default bookmarks - # - baobab - epiphany - gnome-text-editor - gnome-calculator - gnome-calendar - gnome-characters - # gnome-clocks - gnome-console - gnome-contacts - gnome-font-viewer - gnome-logs - gnome-maps - gnome-music - # gnome-system-monitor - gnome-weather - # loupe - # nautilus - gnome-connections - simple-scan - snapshot - totem - yelp - gnome-software - ]; } diff --git a/etc/nixos/modules/nvidia.nix b/etc/nixos/modules/nvidia.nix index 700e90e..c020535 100644 --- a/etc/nixos/modules/nvidia.nix +++ b/etc/nixos/modules/nvidia.nix @@ -16,19 +16,13 @@ hardware = { nvidia = { - open = false; + open = true; gsp.enable = config.hardware.nvidia.open; - powerManagement.enable = true; - nvidiaSettings = false; + powerManagement.enable = true; + powerManagement.finegrained = false; + nvidiaSettings = true; package = config.boot.kernelPackages.nvidiaPackages.latest; -# package = config.boot.kernelPackages.nvidiaPackages.mkDriver { -# version = "575.51.02"; -# sha256_64bit = "sha256-XZ0N8ISmoAC8p28DrGHk/YN1rJsInJ2dZNL8O+Tuaa0="; -# openSha256 = "sha256-NQg+QDm9Gt+5bapbUO96UFsPnz1hG1dtEwT/g/vKHkw="; -# useSettings = false; -# usePersistenced = false; -# }; videoAcceleration = true; }; };