current

configuration.nix

@@ -20,12 +20,15 @@
   boot.loader.grub.useOSProber = true;
   boot.initrd.kernelModules = [ "amdgpu" ];
   boot.kernelPackages = pkgs.linuxPackages_latest;
-
+#  boot.supportedFilesystems = [ "zfs" ];
+#  boot.zfs.forceImportRoot = false;
+#  networking.hostId = "a44f5fde";
   networking.hostName = "hypr-nix"; # Define your hostname.
 #  networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
   # Enable networking
   networking.networkmanager.enable = true;
+  nixpkgs.config.allowBroken = true;
 
   # Set your time zone.
   time.timeZone = "Europe/London";
@@ -46,16 +49,17 @@
   };
 
   # Enable the X11 windowing system.
-  services.xserver.enable = true;
+  # services.xserver.enable = true;
-
+	 services.xserver = {
+	   enable = true;
+	   layout = "gb";
+	   xkbVariant = "";
+	 };
   # Enable the GNOME Desktop Environment.
   services.xserver.displayManager.gdm.enable = true;
   services.xserver.desktopManager.gnome.enable = true;
   # Configure keymap in X11
-  services.xserver = {
+ 
-    layout = "gb";
-    xkbVariant = "";
-  };
 
   # Configure console keymap
   console.keyMap = "uk";
@@ -91,14 +95,10 @@
     isNormalUser = true;
     description = "micqdf";
     extraGroups = [ "networkmanager" "wheel" "docker"];
-    packages = with pkgs; [
-    #  thunderbird
-    ];
   };
 
   # Install programs config
   programs.java.enable = true; 
-  programs.firefox.enable = true;
   programs.sway.enable = true;
    
 
@@ -121,6 +121,11 @@
     enable = true;
     driSupport = true;
     driSupport32Bit = true;
+    extraPackages = with pkgs; [
+      vulkan-loader
+      vulkan-validation-layers
+      vulkan-extension-layer
+    ];
   };
 
   services.xserver.videoDrivers = ["amdgpu"];
@@ -129,12 +134,13 @@
 
   programs.gamemode.enable = true;
 
-  # List services that you want to enable:
+#  # List services that you want to enable:
-  environment.sessionVariables = {
+#  environment.sessionVariables = {
-  	STEAM_EXTRA_COMPAT_TOOLS_PATHS = "/home/mciqdf/.steam/root/compatibilitytools.d";
+#  	STEAM_EXTRA_COMPAT_TOOLS_PATHS = "/home/micqdf/.steam/root/compatibilitytools.d";
-  	hyprshot = "/home/micqdf/flakes/hyprshot/Hyprshot";
+#  	hyprshot = "/home/micqdf/flakes/hyprshot/Hyprshot";
-  };
+#  };
-
+#
+  security.polkit.enable = true;
   # Enable the OpenSSH daemon.
   services.openssh.enable = true;
   services.tumbler.enable = true;
@@ -152,7 +158,7 @@
   # 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 = "23.11"; # Did you read the comment?
+  system.stateVersion = "24.05"; # Did you read the comment?
   system.autoUpgrade.enable = true;
   system.autoUpgrade.allowReboot = true;
 

hardware-configuration.nix

@@ -25,8 +25,8 @@
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
+ networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp9s0.useDHCP = lib.mkDefault true;
+ networking.interfaces.wlp9s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

hyprland.nix

@@ -5,4 +5,47 @@
 		# package = inputs.hyprland.packages.${pkgs.system}.hyprland;
 		xwayland.enable = true;
 	};
+
+  environment.systemPackages = with pkgs; [
+		waypaper
+    wl-clipboard
+    blueman
+    rofi-wayland
+    waybar
+    wttrbar
+    hackgen-nf-font
+    playerctl
+    swaybg
+    swww
+    nwg-look
+    dunst
+    udiskie
+    hyprshot
+    hyprland-protocols
+    xfce.thunar-volman
+    xfce.thunar-dropbox-plugin
+    xfce.thunar-archive-plugin
+    xfce.tumbler
+    pavucontrol
+    wlr-randr
+    grim
+    discocss
+    themechanger
+    catppuccin-kvantum
+    dolphin
+    nwg-drawer
+	];
+
+  programs.thunar.enable = true;
+  programs.thunar.plugins = with pkgs.xfce; [
+  	thunar-archive-plugin
+  	thunar-volman
+  ];
+  # xdg.portal = {
+	# 	enable = true;
+	# 	wlr.enable = true;
+	# 	extraPortals = with pkgs; [
+	# 		xdg-desktop-portal-gtk
+	# 	];
+	# };
 }

hyprshot.nix

@@ -1,31 +0,0 @@
-{ pkgs ? import <nixpkgs> {} }:
-
-pkgs.stdenv.mkDerivation {
-  pname = "hyprshot";
-
-  src = pkgs.fetchFromGitHub {
-    owner = "Gustash";
-    repo = "hyprshot";
-    rev = "main"; # Specify the commit hash or branch name
-    sha256 = "nix-prefetch-git https://github.com/Gustash/hyprshot
-"; # Fill with the actual sha256 hash
-  };
-
-  buildPhase = ''
-    # Add build instructions if required, e.g., make
-    echo "Building hyprshot"
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    ln -s $src/hyprshot $out/bin/hyprshot
-    chmod +x $src/hyprshot
-  '';
-
-  meta = {
-    description = "A brief description of hyprshot";
-    homepage = "https://github.com/Gustash/hyprshot.git";
-    license = pkgs.lib.licenses.mit;
-  };
-}
-

mnt.nix

@@ -1,13 +1,18 @@
 { pkgs, ... }:
 
 {
-  fileSystems."/mnt/BigNAS" = {
+  #fileSystems."/mnt/BigNAS" = {
-    device = "10.27.27.239:/BigNAS";
+  #  device = "10.27.27.239:/BigNAS";
-    fsType = "nfs";
+  #  fsType = "nfs";
-  };
+  #};
 
-  fileSystems."/mnt/NV1" = {
+  #fileSystems."/mnt/MainPool" = {
-    device = "/dev/nvme1n1p2";
+  #  device = "10.27.27.12:/MainPool";
-    fsType = "btrfs";
+  #  fsType = "nfs";
-  };
+  #};
+
+  #fileSystems."/mnt/NV1" = {
+  #  device = "/dev/nvme1n1p2";
+  #  fsType = "btrfs";
+  #};
 }

packages.nix

@@ -1,4 +1,9 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
+let
+  unstable = import 
+    (builtins.fetchTarball "channel:nixos-unstable")
+    { config = config.nixpkgs.config; };
+in
 {
   environment.systemPackages = with pkgs; [
   # Applications you want to install with Nix.
@@ -22,29 +27,17 @@
   tmux
   lsd
   nfs-utils
-  waybar
-  wttrbar
-  rofi-wayland
-  hackgen-nf-font
   tldr
-  blueman
-  wl-clipboard
-  waypaper
   btrfs-progs
   golangci-lint
   golangci-lint-langserver
-  playerctl
-  swaybg
-  swww
   google-chrome
-  gvfs
+  # gvfs
   git
+  ipmitool
   go
   zig
   slack
-  nwg-look
-  dunst
-  udiskie
   networkmanagerapplet
   spotify
   xorg.xkill
@@ -55,17 +48,11 @@
   docker
   docker-compose
   pamixer
-  xfce.thunar-volman
-  xfce.thunar-dropbox-plugin
-  xfce.thunar-archive-plugin
-  xfce.tumbler
-  hyprland-protocols
   onlyoffice-bin
   svt-av1
   rav1e
   libaom
   slurp
-  pavucontrol
   nix-prefetch-git
   ddev
   libsForQt5.kate
@@ -87,14 +74,34 @@
   mangohud
   protonup
   lutris
-  wlr-randr
   bottles
-  ];
+  wine
-
+  #peazip
-  programs.thunar.enable = true;
+  _7zz
-  programs.thunar.plugins = with pkgs.xfce; [
+  unrar
-  	thunar-archive-plugin
+  spice
-  	thunar-volman
+  spice-gtk
+  spice-vdagent
+  haruna
+  air
+  tailwindcss
+  betterdiscord-installer
+  vesktop
+  vencord
+  fastfetch
+  davinci-resolve-studio
+  obs-studio
+  lunarvim
+  qbittorrent
+  godot_4
+  vlc
+  python3
+  gparted
+  parted
+  amdgpu_top
+  unstable.zed-editor
+  unstable.hyprshot
+  guacamole-client
   ];
 
 }