Updated

flake.lock

@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1746557022,
-        "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=",
+        "lastModified": 1751274312,
+        "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860",
+        "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674",
         "type": "github"
       },
       "original": {
@@ -37,9 +37,26 @@
         "type": "github"
       }
     },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1751271578,
+        "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "nixpkgs": "nixpkgs",
+        "nixpkgs-unstable": "nixpkgs-unstable",
         "zen-browser": "zen-browser"
       }
     },
@@ -47,15 +64,15 @@
       "inputs": {
         "home-manager": "home-manager",
         "nixpkgs": [
-          "nixpkgs"
+          "nixpkgs-unstable"
         ]
       },
       "locked": {
-        "lastModified": 1746915423,
-        "narHash": "sha256-6SH9pS5q6Q0oWIfD3UJcfGbQBUMdBbRGbhUJ1skYnTI=",
+        "lastModified": 1751383329,
+        "narHash": "sha256-52dUY8jEkuXEIZINYb+AVsrmw6FxMhBAG3K9J/2qiSo=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "2f982bed9845cccffebd0cf267c7e1d3dd98117e",
+        "rev": "f29a4fece3b76c3e4579d67e2cf0cb8037f6a351",
         "type": "github"
       },
       "original": {

flake.nix

@@ -3,10 +3,11 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
+    nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable";
 
     zen-browser = {
       url = "github:0xc000022070/zen-browser-flake";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
   };
 

home/micqdf.nix

@@ -1,21 +0,0 @@
-{ pkgs, ... }: {
-  home.username = "micqdf";
-  home.homeDirectory = "/home/micqdf";
-  home.stateVersion = "24.11";
-
-  programs.fish.enable = true;
-
-  programs.git = {
-    enable = true;
-    userName = "MichaelFisher1997";
-  };
-
-  home.packages = with pkgs; [
-#    neovim
-#    firefox
-#    ripgrep
-    #zen-browser.packages.${pkgs.system}.twilight
-    #zen-browser.packages."${system}".twilight
-  ];
-}
-

hosts/hypr-nix/configuration.nix

@@ -6,7 +6,8 @@
 
 {
   imports =
-    [ # Include the results of the hardware scan.
+    [
+      # Include the results of the hardware scan.
       ./hardware-configuration.nix
       ./packages.nix
       ./mnt.nix
@@ -38,10 +39,10 @@
   services.zfs.autoScrub.enable = true;
   services.zfs.trim.enable = true;
 
-#  boot.supportedFilesystems = [ "zfs" ];
-#  boot.zfs.forceImportRoot = false;
-#  networking.hostId = "a44f5fde";
-#  networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+  #  boot.supportedFilesystems = [ "zfs" ];
+  #  boot.zfs.forceImportRoot = false;
+  #  networking.hostId = "a44f5fde";
+  #  networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
   # Enable networking
   networking.networkmanager.enable = true;
@@ -74,7 +75,7 @@
       enable = true;
       xkb.layout = "gb";
       xkb.variant = "";
-      videoDrivers = ["amdgpu"];
+      videoDrivers = [ "amdgpu" ];
 
       # Enable GDM as the display manager
       displayManager.gdm.enable = true;
@@ -100,13 +101,9 @@
     };
   };
 
-  # XDG Portals Configuration for Wayland
-  xdg.portal = {
-    enable = true;
-    extraPortals = [
-      pkgs.xdg-desktop-portal-hyprland
-    ];
-  };
+  # Disable GNOME desktop services that might conflict
+  services.gnome.gnome-keyring.enable = lib.mkForce false;
+  services.gnome.gnome-online-accounts.enable = lib.mkForce false;
 
   # Configure console keymap
   console.keyMap = "uk";
@@ -139,28 +136,19 @@
   users.users.micqdf = {
     isNormalUser = true;
     description = "micqdf";
-    extraGroups = [ "networkmanager" "wheel" "docker"];
+    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;
-
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-    #nixpkgs.overlays = [
-    #  (import ./godot4-overlay.nix)
-    #];
+  nixpkgs.config.permittedInsecurePackages = [
+    "electron-33.4.11"
+  ];
 
   #hardware.opengl.driSupport = true; # This is already enabled by default
   hardware.bluetooth.enable = true; # enables support for Bluetooth
@@ -170,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;
@@ -198,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;

hosts/hypr-nix/docker.nix

@@ -17,7 +17,7 @@
 
   # Override the Docker service to disable autostart
   systemd.services.docker = {
-    enable = false;
+    enable = true;
     wants = [ "docker.socket" ];
     after = [ "docker.socket" ];
     serviceConfig = {

hosts/hypr-nix/gpu.nix

@@ -3,6 +3,13 @@
   environment.systemPackages = [
     pkgs.rocmPackages.rpp
   ];
+  hardware.opengl = {
+    enable = true;
+    extraPackages = with pkgs; [
+      mesa.drivers
+    ];
+  };
+
   hardware.graphics = {
     enable = true;
     #driSupport = true;

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";
     };
 

hosts/hypr-nix/i3.nix

@@ -1,5 +1,5 @@
 #this might be redundent 
-{config, pkgs, callPackage, ... }:
+{ config, pkgs, callPackage, ... }:
 {
   services.xserver = {
     enable = true;

hosts/hypr-nix/mnt.nix

@@ -1,4 +1,4 @@
-{... }:
+{ ... }:
 
 {
   services.rpcbind.enable = true; # needed for NFS

hosts/hypr-nix/packages.nix

@@ -8,212 +8,106 @@ in
   environment.systemPackages = with pkgs; [
     #flakes
     zen-browser.packages."${system}".twilight
-    # Text Editors
-    vim
-    sublime
-    lunarvim
-    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
-    golangci-lint
-    golangci-lint-langserver
-    python3
-    php
-    php83Packages.composer
-    exercism
-    betterdiscord-installer
-    go
-    bun
-    air
-    tailwindcss
-    google-cloud-sdk-gce
-    kubo
-    hashcat
 
-    # Version Control
-    git
-    git-lfs
-    nix-prefetch-git
+    # Nix & Nix tools
+    nixpkgs-fmt
+    nixpkgs-review
+    nurl
 
-    # Terminals
-    kitty
-    alacritty
-    
-    # Shell Utilities
-    fish
-    zsh
+    # 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
-    obs-studio
-    davinci-resolve-studio
-    audacity
-    haruna
-    
-    # Gaming
-    mangohud
-    protonup
-    protontricks
-    lutris
-    bottles
-    wine
-    wine64
-    
-    # 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
+    ipmitool
 
-    # Containers and Virtualization
+    # Containers & Virtualization
     docker
     docker-compose
     kubectl
-    terraform
     minikube
+    terraform
+    helm
+    awscli2
+    sqlite
+    postgresql
+    virt-manager
 
-    # Security
+    # 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
+    # KDE core system apps (for Plasma systems)
+    kdePackages.dolphin
+    kdePackages.filelight
 
-    # Multimedia Tools
-    svt-av1
-    rav1e
-    libaom
-    sunshine
+    # ddev (if used for multiple users/projects)
+    ddev
 
-    # Miscellaneous
-    fastfetch
-    betterdiscord-installer
-    ghostty
-    guacamole-client
+    # Misc System
+    calc
     rpi-imager
     light
 
-    #games
-    flightgear
-    minetest
-    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
   ];
 
 }

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";
+  # };
 }