diff --git a/etc/nixos/configuration.nix b/etc/nixos/configuration.nix index 99bdc89..2e88bc7 100644 --- a/etc/nixos/configuration.nix +++ b/etc/nixos/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-unstable, lib, ... }: +{ config, pkgs, pkgs-unstable, lib, inputs, ... }: #░█░█░█▀▀░█▀▀░█▀▄░░░█░█░█▀█░█▀▄░▀█▀░█▀█░█▀▄░█░░░█▀▀░█▀▀ @@ -55,7 +55,7 @@ in "udev.log_priority=3" ]; - kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_zen; loader.timeout = 0; loader.systemd-boot.consoleMode = "auto"; @@ -118,9 +118,6 @@ in packages = with pkgs; []; }; - stylix.enable = true; - stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"; - #░█░█░█▀█░█▀▀░█▀▄░█▀▀░█▀▀ #░█░█░█░█░█▀▀░█▀▄░█▀▀░█▀▀ @@ -182,6 +179,7 @@ in nautilus-python sushi fsearch + filezilla # SCREENSHOTS AND RECORDING # grim @@ -192,12 +190,14 @@ in # HYPRLAND RELATED # hyprpaper + swaybg pkgs-unstable.hyprlock swaylock hypridle hyprpanel hyprpolkitagent waybar + hyprpanel wlogout rofi-wayland libnotify @@ -211,6 +211,8 @@ in xournalpp gnome-text-editor gnome-calculator + simple-scan + anydesk # MEDIA # ffmpeg @@ -220,6 +222,8 @@ in # INTERNET # floorp + brave + grayjay telegram-desktop element-desktop (discord.override { @@ -329,6 +333,18 @@ in # Fonts with emojis uwu # fonts.packages = with pkgs; [ nerd-fonts.jetbrains-mono ]; - system.stateVersion = "24.11"; + system.stateVersion = "25.11"; + + system.autoUpgrade = { + enable = true; + flake = inputs.self.outPath; + flags = [ + "--update-input" + "nixpkgs" + "-L" # print build logs + ]; + dates = "02:00"; + randomizedDelaySec = "45min"; + }; } diff --git a/etc/nixos/flake.nix b/etc/nixos/flake.nix index a7d424b..e8b218c 100644 --- a/etc/nixos/flake.nix +++ b/etc/nixos/flake.nix @@ -4,24 +4,19 @@ inputs = { 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"; - #}; + #hyprpanel.url = "github:Jas-SinghFSU/HyprPanel"; + #stylix.url = "github:danth/stylix"; }; - outputs = { self, nixpkgs, nixpkgs-unstable, stylix, ... } @inputs: + outputs = { self, nixpkgs, nixpkgs-unstable, ... } @inputs: let - system = "x86_64-linux"; # change to whatever your system should be. + system = "x86_64-linux"; pkgs-unstable = import nixpkgs-unstable { system = "x86_64-linux"; config.allowUnfree = true; }; pkgs = import nixpkgs { inherit system; overlays = [ - inputs.hyprpanel.overlay + #inputs.hyprpanel.overlay (final: prev: { unstable = nixpkgs-unstable.legacyPackages.${prev.system}; }) @@ -39,21 +34,9 @@ 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 + #{nixpkgs.overlays = [inputs.hyprpanel.overlay];} + #stylix.nixosModules.stylix ]; }; diff --git a/etc/nixos/modules/desktop.nix b/etc/nixos/modules/desktop.nix index 301b589..3d2291c 100644 --- a/etc/nixos/modules/desktop.nix +++ b/etc/nixos/modules/desktop.nix @@ -3,11 +3,14 @@ #░▀▀░░▀▀▀░▀▀▀░▀░▀░░▀░░▀▀▀░▀░░ {config, pkgs, pkgs-unstable, lib, ... }: - { # Enable GDM - services.xserver.displayManager.gdm.enable = true; + #services.displayManager.gdm.enable = true; + + # Enable SDDM + services.displayManager.sddm.enable = true; + services.displayManager.sddm.wayland.enable = true; # Gnome Keyring (for window managers) services.gnome.gnome-keyring.enable = true; @@ -18,6 +21,15 @@ withUWSM = true; xwayland.enable = true; }; + + # SWAY + #programs.sway = { + # enable = true; + # wrapperFeatures.gtk = true; + #}; + + # GNOME + #services.desktopManager.gnome.enable = true; environment.sessionVariables = { WLR_NO_HARDWARE_CURSOR = "1"; diff --git a/etc/nixos/modules/nvidia.nix b/etc/nixos/modules/nvidia.nix index c020535..b136418 100644 --- a/etc/nixos/modules/nvidia.nix +++ b/etc/nixos/modules/nvidia.nix @@ -16,9 +16,10 @@ hardware = { nvidia = { + modesetting.enable = true; open = true; gsp.enable = config.hardware.nvidia.open; - powerManagement.enable = true; + powerManagement.enable = false; powerManagement.finegrained = false; nvidiaSettings = true; diff --git a/etc/nixos/modules/virtualization.nix b/etc/nixos/modules/virtualization.nix index 6cc4b46..e13c2e2 100644 --- a/etc/nixos/modules/virtualization.nix +++ b/etc/nixos/modules/virtualization.nix @@ -36,7 +36,7 @@ in # Add the GPU video and audio to VFIO binding extraModprobeConfig = ''options vfio-pci ids=${builtins.concatStringsSep "," vfioIds} - options kvmfr static_size_mb=64 + options kvmfr static_size_mb=128 ''; # Enable the KVMFR kernel package