diff --git a/flake.lock b/flake.lock index 9307174..59fb03e 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750877742, - "narHash": "sha256-OrCy70x59VaBHxPZnm6A1wvQSdJvTz4i8Ngx40UeApI=", + "lastModified": 1751274312, + "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f25c1bd2a6b33a4b1aa7aff56a94e0daab3773f0", + "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1751011381, - "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { @@ -68,11 +68,11 @@ ] }, "locked": { - "lastModified": 1751127508, - "narHash": "sha256-fU2FQKNxO5gkADRFMS2S54M/LKsTewMpGRm+KJRLdFo=", + "lastModified": 1751383329, + "narHash": "sha256-52dUY8jEkuXEIZINYb+AVsrmw6FxMhBAG3K9J/2qiSo=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "5962b5db7babbb1607dcd2d1d6db9ab540cc108d", + "rev": "f29a4fece3b76c3e4579d67e2cf0cb8037f6a351", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d2a577a..31217db 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; - nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable"; zen-browser = { url = "github:0xc000022070/zen-browser-flake"; diff --git a/hosts/hypr-nix/configuration.nix b/hosts/hypr-nix/configuration.nix index 56925ed..196ac0b 100644 --- a/hosts/hypr-nix/configuration.nix +++ b/hosts/hypr-nix/configuration.nix @@ -101,23 +101,9 @@ }; }; - # XDG Portals Configuration for Wayland - xdg.portal = { - enable = true; - extraPortals = with pkgs; [ - xdg-desktop-portal-hyprland - ]; - config.common.default = ["hyprland"]; - }; - # Disable GNOME desktop services that might conflict - services.gnome.gnome-keyring.enable = false; - services.gnome.gnome-online-accounts.enable = false; - #xdg.portal = { - # enable = true; - # hyprland.enable = true; - # extraPortals = [ "gtk" ]; # Optional, for GTK apps support - #}; + services.gnome.gnome-keyring.enable = lib.mkForce false; + services.gnome.gnome-online-accounts.enable = lib.mkForce false; # Configure console keymap console.keyMap = "uk"; @@ -152,30 +138,18 @@ description = "micqdf"; extraGroups = [ "networkmanager" "wheel" "docker" ]; }; - # environment.systemPackages = [ - # pkgs.home-manager - # ]; # Install programs config programs.java.enable = true; programs.sway.enable = true; - programs.fish.enable = true; - users.defaultUserShell = pkgs.fish; - # Allow unfree packages nixpkgs.config.allowUnfree = true; nixpkgs.config.permittedInsecurePackages = [ "electron-33.4.11" ]; - # List packages installed in system profile. To search, run: - # $ nix search wget - #nixpkgs.overlays = [ - # (import ./godot4-overlay.nix) - #]; - #hardware.opengl.driSupport = true; # This is already enabled by default hardware.bluetooth.enable = true; # enables support for Bluetooth hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot @@ -184,23 +158,8 @@ Enable = "Source,Sink,Media,Socket"; }; }; - #cosmic - #hardware.system76.enableAll = true; - #services.desktopManager.cosmic.enable = true; - #services.displayManager.cosmic-greeter.enable = true; - - programs.steam.enable = true; - programs.steam.gamescopeSession.enable = true; - - programs.gamemode.enable = true; programs.ssh.askPassword = lib.mkForce "/nix/store/qjl45ra2yaqn88h6s9f7b79zpja9dy8b-seahorse-43.0/libexec/seahorse/ssh-askpass"; - # # List services that you want to enable: - # environment.sessionVariables = { - # STEAM_EXTRA_COMPAT_TOOLS_PATHS = "/home/micqdf/.steam/root/compatibilitytools.d"; - # hyprshot = "/home/micqdf/flakes/hyprshot/Hyprshot"; - # }; - # security.polkit.enable = true; # Enable the OpenSSH daemon. services.openssh.enable = true; @@ -212,12 +171,6 @@ # Or disable the firewall altogether. # networking.firewall.enable = false; nix.settings.experimental-features = [ "nix-command" "flakes" ]; - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). system.stateVersion = "24.11"; # Did you read the comment? system.autoUpgrade.enable = true; system.autoUpgrade.allowReboot = false; diff --git a/hosts/hypr-nix/gpu.nix b/hosts/hypr-nix/gpu.nix index 1f357bb..0c051d0 100644 --- a/hosts/hypr-nix/gpu.nix +++ b/hosts/hypr-nix/gpu.nix @@ -2,7 +2,16 @@ { environment.systemPackages = [ pkgs.rocmPackages.rpp - ]; + ]; + hardware.opengl = { + enable = true; + driSupport = true; + driSupport32Bit = true; + extraPackages = with pkgs; [ + mesa.drivers + ]; + }; + hardware.graphics = { enable = true; #driSupport = true; diff --git a/hosts/hypr-nix/hardware-configuration.nix b/hosts/hypr-nix/hardware-configuration.nix index 78b1efc..7387414 100644 --- a/hosts/hypr-nix/hardware-configuration.nix +++ b/hosts/hypr-nix/hardware-configuration.nix @@ -5,7 +5,8 @@ { imports = - [ (modulesPath + "/installer/scan/not-detected.nix") + [ + (modulesPath + "/installer/scan/not-detected.nix") ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" ]; @@ -14,7 +15,8 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/2ccf7538-1328-4793-a455-d62e09c1f057"; + { + device = "/dev/disk/by-uuid/2ccf7538-1328-4793-a455-d62e09c1f057"; fsType = "ext4"; }; diff --git a/hosts/hypr-nix/hyprland.nix b/hosts/hypr-nix/hyprland.nix index 182cb02..c74ebd0 100644 --- a/hosts/hypr-nix/hyprland.nix +++ b/hosts/hypr-nix/hyprland.nix @@ -1,13 +1,13 @@ { pkgs, ... }: { programs.hyprland = { - enable = true; - # package = inputs.hyprland.packages.${pkgs.system}.hyprland; - xwayland.enable = true; - }; + enable = true; + # package = inputs.hyprland.packages.${pkgs.system}.hyprland; + xwayland.enable = true; + }; environment.systemPackages = with pkgs; [ - waypaper + waypaper wl-clipboard blueman rofi-wayland @@ -37,11 +37,11 @@ catppuccin-kvantum nwg-drawer hyprpaper - ]; + ]; programs.thunar.enable = true; programs.thunar.plugins = with pkgs.xfce; [ - thunar-archive-plugin - thunar-volman + thunar-archive-plugin + thunar-volman ]; } diff --git a/hosts/hypr-nix/i3.nix b/hosts/hypr-nix/i3.nix index 6e10a70..0c67159 100644 --- a/hosts/hypr-nix/i3.nix +++ b/hosts/hypr-nix/i3.nix @@ -1,7 +1,7 @@ #this might be redundent -{config, pkgs, callPackage, ... }: +{ config, pkgs, callPackage, ... }: { - services.xserver = { + services.xserver = { enable = true; desktopManager = { @@ -16,7 +16,7 @@ i3lock #default i3 screen locker i3blocks #if you are planning on using i3blocks over i3status picom - ]; + ]; }; }; -} \ No newline at end of file +} diff --git a/hosts/hypr-nix/mnt.nix b/hosts/hypr-nix/mnt.nix index 39644ed..e105470 100644 --- a/hosts/hypr-nix/mnt.nix +++ b/hosts/hypr-nix/mnt.nix @@ -1,4 +1,4 @@ -{... }: +{ ... }: { services.rpcbind.enable = true; # needed for NFS diff --git a/hosts/hypr-nix/packages.nix b/hosts/hypr-nix/packages.nix index 0e77710..51897cd 100644 --- a/hosts/hypr-nix/packages.nix +++ b/hosts/hypr-nix/packages.nix @@ -8,206 +8,109 @@ in environment.systemPackages = with pkgs; [ #flakes zen-browser.packages."${system}".twilight - # Text Editors - sublime - vscode - - # Development Tools + # Core Languages & Runtimes (that need to be global) openjdk - clang-tools - gcc - cmake - glew - glfw - libGL - sdl3 - vulkan-loader - vulkan-tools - vulkan-headers - wayland-protocols - python3 - php - php83Packages.composer - exercism - betterdiscord-installer - bun - air - tailwindcss - google-cloud-sdk-gce - kubo - hashcat - - # Version Control - git - git-lfs - nix-prefetch-git - - # Terminals - kitty - alacritty - - # Shell Utilities - home-manager + + # Nix & Nix tools + nixpkgs-fmt + nixpkgs-review + nurl + + # Core CLI & Networking Tools curl wget tree fd - fzf bat - thefuck - tmux - zellij - lolcat lsd tldr - - # File Management - ranger - _7zz - unrar - zip - unzip - gzip - gvfs + + # File systems, Mounts, Partitions btrfs-progs nfs-utils ntfs3g - - # System Utilities - htop - vault - btop - amdgpu_top + gvfs parted gparted - xorg.xprop - xorg.xkill - calc - maim - xclip - xdotool - networkmanager_dmenu - virt-manager - networkmanagerapplet - polybarFull - picom - arandr - nitrogen - pywal + gptfdisk ldmtool smartmontools - gptfdisk - - # Window Managers - i3 - eww - vesktop - hyprsunset - - # Web Browsers - brave - google-chrome - firefox - tor-browser - - # Communication - discord - webcord - slack - #telegram-desktop - - # Media - vlc - simplescreenrecorder - davinci-resolve-studio - audacity - haruna - - # Gaming - mangohud - protonup - protontricks - lutris - bottles - wine - wine64 - - # Fonts - noto-fonts - noto-fonts-color-emoji - twemoji-color-font - catppuccin-kvantum - themechanger - - # Backup and Recovery - pika-backup - megasync - - # Networking - ngrok - ipmitool + + # Network & VPN tailscale - remmina - ddev - - # Containers and Virtualization + ipmitool + + # Containers & Virtualization docker docker-compose kubectl - terraform minikube - - # Security + terraform + helm + pulumi + pulumiPackages.pulumi-go + pulumiPackages.pulumi-aws-native + awscli2 + sqlite + postgresql + virt-manager + + # System monitoring + htop + btop + amdgpu_top + + # Xorg/WM system utils + xorg.xprop + xorg.xkill + + # Login/session management + networkmanagerapplet + networkmanager_dmenu + + # System Security + vault onlyoffice-bin rcon rconc monero-gui - - # Graphics + + # Spice/QEMU/VM graphics spice spice-gtk spice-vdagent - - # Themes and Customization - #kdePackages.qt6ct - catppuccin-kvantum - - # Multimedia Tools - svt-av1 - rav1e - libaom - sunshine - - # Miscellaneous - fastfetch - betterdiscord-installer - ghostty - guacamole-client + + # KDE core system apps (for Plasma systems) + kdePackages.dolphin + kdePackages.filelight + + # ddev (if used for multiple users/projects) + ddev + + # Misc System + calc rpi-imager light - #games - flightgear -# unstable.luanti - openttd - endless-sky - cataclysm-dda - xonotic - superTux - superTuxKart - airshipper - mindustry-wayland - speed_dreams - simutrans_binaries - #modrinth-app - minecraft - nsnake + # Games & GPU/driver helpers (if system-wide needed) + mangohud + + # Google Cloud tools (system use) + google-cloud-sdk-gce + kubo + + # Backup/recovery (system-wide, headless or cron use) + megasync + + # Misc/other core system-wide apps + betterdiscord-installer # if you want it everywhere + air # if needed globally + + # Themes and customization (for display manager, greeter, or global theming) + catppuccin-kvantum + themechanger + - #kdePackages - kdePackages.dolphin - kdePackages.filelight - kdePackages.kate - kdePackages.falkon ]; } diff --git a/hosts/hypr-nix/sunshine.nix b/hosts/hypr-nix/sunshine.nix index a3f1b5f..0931351 100644 --- a/hosts/hypr-nix/sunshine.nix +++ b/hosts/hypr-nix/sunshine.nix @@ -7,11 +7,11 @@ openFirewall = true; }; -#security.wrappers.sunshine = { -# owner = "root"; -# group = "root"; -# capabilities = "cap_sys_admin+p"; -# source = "${pkgs.sunshine}/bin/sunshine"; -# }; + #security.wrappers.sunshine = { + # owner = "root"; + # group = "root"; + # capabilities = "cap_sys_admin+p"; + # source = "${pkgs.sunshine}/bin/sunshine"; + # }; }