Renamed specialisations. Started configuring hyprpaper and hyprlock

configuration.nix

@@ -10,7 +10,7 @@
 
 #Nix flake file limit: ulimit -n 500000
 
-{ config, pkgs, lib, username, ... }:
+{ config, pkgs, lib, username, version, ... }:
 {
 #  stylix.enable = true;
 #  stylix.image = /etc/nixos/other/wallpaper.png;
@@ -27,17 +27,25 @@
     ];
 
   specialisation = {
-    gaming = {
+    "plasma" = {
       configuration = {
         imports = [
-          ./plasma/kde-plasma.nix
+          ./plasma/plasma.nix
         ];
 
         programs.gamemode.enable = true;
       };
     };
 
-    minimal = {
+    "hyprland" = {
+      configuration = {
+        imports = [
+          ./hyprland/hyprland.nix
+        ];
+      };
+    };
+
+    "minimal" = {
       inheritParentConfig = false;
       configuration = {
         imports = [
@@ -140,33 +148,6 @@
     #Enable CUPS to print documents.
     printing.enable = true;
     
-    xserver = {
-      enable = true;
-      videoDrivers = [ "amdgpu" ];
-
-      xkb = {
-	      layout = "de";
-	      variant = "";
-      };
-
-      desktopManager = {
-        #gnome.enable = true;
-        xterm.enable = false;
-      };
-
-      excludePackages = [ pkgs.xterm ];
-    ## Enable sound with pipewire.
-    #services.pulseaudio.enable = false;
-    };
-
-    displayManager = {
-      sddm = {
-        enable = false;
-        theme = "breeze";
-        wayland.enable = true;
-      };
-    };
-
     # Enable the OpenSSH daemon.
     openssh.enable = true;
   };
@@ -294,5 +275,5 @@
   # 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 = "25.05"; # Did you read the comment?
+  system.stateVersion = version; # Did you read the comment?
 }

flake.nix

@@ -38,7 +38,7 @@
     system = "x86_64-linux";
     pkgs = import nixpkgs { inherit system; };
 
-    hyprlandEnabled = true;
+    hyprlandEnabled = false;
     plasmaEnabled = false;
 
     framework13 = true; 

home.nix

@@ -9,7 +9,7 @@
     inputs.zen-browser.homeModules.beta
     # or inputs.zen-browser.homeModules.twilight
     # or inputs.zen-browser.homeModules.twilight-official
-    ./neovim-home.nix    
+    #./neovim-home.nix    
     ./desktop-entries.nix
   ];
 

hyprland/hyprland-home.nix

@@ -9,19 +9,39 @@
     enable = true;
     xwayland.enable = true;
 
-    #settings = {
+    settings = {
-    #  bind = [
+#      bind = [
-    #  	"SUPER, Space, pkill rofi || rofi -show drun -modi drun,filebrowser,run,window"
+#      	"SUPER, Space, pkill rofi || rofi -show drun -modi drun,filebrowser,run,window"
-    #  ];
+#      ];
-    #};
+      #So hyprland doesnt break after a rebuild...
+      #exec = [ "systemctl --user restart hyprland-session.target" ];
+    };
 
     extraConfig = builtins.readFile ./hyprland.conf;
- };
+
+  };
+
+  services = {
+    hyprpaper = {
+      enable = true;
+      
+      settings = {
+        preload = [
+          "/etc/nixos/other/wallpaper2.png"
+        ];
+
+        wallpaper = [
+          "eDP-1,/etc/nixos/other/wallpaper2.png"
+        ];
+      };
+    };
+  };
 
   programs = {
     noctalia-shell = {
-      #enable = true;
+      enable = false;
-      systemd.enable = true;
+      systemd.enable = false;
     };
+     hyprlock.enable = true;
   };
 }

hyprland/hyprland.conf

@@ -39,6 +39,7 @@ $menu = wofi --show drun
 
 #USE autostart.nix INSTEAD OF THIS!!!
 
+#exec = [ "systemctl --user restart hyprland-session.target" ];
 # exec-once = $terminal
 # exec-once = nm-applet &
 # exec-once = waybar & hyprpaper & firefox
@@ -176,8 +177,8 @@ master {
 
 # https://wiki.hyprland.org/Configuring/Variables/#misc
 misc {
-    force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers
+    force_default_wallpaper = 0 # Set to 0 or 1 to disable the anime mascot wallpapers
-    disable_hyprland_logo = false # If true disables the random hyprland logo / anime girl background. :(
+    disable_hyprland_logo = true # If true disables the random hyprland logo / anime girl background. :(
 }
 
 
@@ -226,14 +227,15 @@ $mainMod = SUPER # Sets "Windows" key as main modifier
 bind = $mainMod, Space, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run,window
 
 # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
-bind = $mainMod, Q, exec, $terminal
+bind = $mainMod, Enter, exec, $terminal
 bind = $mainMod, C, killactive,
-bind = $mainMod, M, exit,
+bind = $mainMod, L, exec, hyprlock
-bind = $mainMod, E, exec, $fileManager
+#bind = $mainMod, M, exit,
-bind = $mainMod, V, togglefloating,
+#bind = $mainMod, E, exec, $fileManager
-bind = $mainMod, R, exec, $menu
+#bind = $mainMod, V, togglefloating,
-bind = $mainMod, P, pseudo, # dwindle
+#bind = $mainMod, R, exec, $menu
-bind = $mainMod, J, togglesplit, # dwindle
+#bind = $mainMod, P, pseudo, # dwindle
+#bind = $mainMod, J, togglesplit, # dwindle
 
 # Move focus with mainMod + arrow keys
 bind = $mainMod, left, movefocus, l

hyprland/hyprland.nix

@@ -10,19 +10,20 @@
   
   environment.systemPackages = with pkgs;
   [
-  	(waybar.overrideAttrs (oldAttrs: {
+    (waybar.overrideAttrs (oldAttrs: {
-  		mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
+      mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
-  	  })
+      })
-  	)
+    )
+    hyprland
     dunst
     libnotify
     hyprpaper
     sway	#Sway Wayland compositor
-    inputs.noctalia.packages.${system}.default
+    inputs.noctalia.packages.${system}.default	
-    #inputs.noctalia.nixosModules.default
-	
     #kitty	#Terminal (Already Included by default)
-  	rofi-wayland	#Search bar (Meta + Space)
+    rofi-wayland	#Search bar (Meta + Space)
+    yazi
+    hyprlock
   ];
 
   programs = {
@@ -32,7 +33,11 @@
       withUWSM = false;
     };
 
-    waybar.enable = true;
+    hyprlock = {
+      enable = true;
+    };
+
+    #waybar.enable = true;
     #rofi.enable = true;
   };
 

minimal.nix

@@ -4,11 +4,14 @@
 # or if no password (open wifi)
 #nmcli device wifi connect <ssid>
 
-{ config, pkgs, lib, username, ... }:
+{ config, pkgs, lib, username, version, ... }:
 {
   imports =
     [
       ./hardware-configuration.nix
+      ./zsh.nix
+      #./neovim.nix
+      ./packages.nix
     ];
 
   #networking.hostName = "nixos";
@@ -74,4 +77,5 @@
     TERMINAL = "kitty";
   };
 
+  system.stateVersion = version;
 }

neovim.nix

@@ -1,14 +1,19 @@
-{ config, lib, pkgs, ... }:
+{ inputs, config, lib, pkgs, ... }:
 {
   environment.systemPackages = with pkgs;
   [
   	neovim
   	vimPlugins.LazyVim
-	vimPlugins.lazygit-nvim
+  	vimPlugins.lazygit-nvim
-	wl-clipboard
+	  wl-clipboard
-	xclip
+	  xclip
   ];
 
+  home-manager.sharedModules = [
+    ./neovim-home.nix
+  ];
+
+
 #  programs.neovim = {
 #   enable = true;
 #};

other/aliases

@@ -47,7 +47,7 @@ alias kde-theme-apply="source /etc/nixos/plasma/konsave.sh"
 #-----
 alias exit-hyprland="hyprctl dispatch exit"
 alias hyprland-exit="hyprctl dispatch exit"
-alias hypr-edit="sudoedit /etc/nixos/other/hyprland.conf"
+alias hypr-edit="sudoedit /etc/nixos/hyprland/hyprland.conf"
 
 #LaTeX Commands
 alias makepdf="makeglossaries main && pdflatex main.tex"

packages.nix

@@ -48,6 +48,7 @@
     nodejs_22
 
     #Desktop Applications
+    ryubing
     vlc
     #steam
     #heroic
@@ -71,11 +72,13 @@
     eddie		#AirVPN desktop client
     chromium  #For Youtube app to work
     kdePackages.bluez-qt
-    #latte-dock
     moonlight-qt
     kitty
     tdrop
     wmctrl  #To Force windows into fullscreen
+    kdePackages.dolphin
+    persepolis    #Download Manager
+    libreoffice-still
     
     #CLI tools
     pdftk
@@ -96,21 +99,21 @@
     "dotnet-runtime-6.0.36"
   ];
 
-  services.flatpak = {
+#  services.flatpak = {
-    enable = true;
+#   enable = false;
-
+#
-    remotes = [
+#    remotes = [
-      {
+#      {
-        name = "flathub";
+#        name = "flathub";
-        location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
+#        location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
-      }
+#      }
-    ];
+#    ];
-    packages = [
+#    packages = [
-      {
+#      {
-        appId = "org.vinegarhq.Sober";
+#        appId = "org.vinegarhq.Sober";
-        origin = "flathub";
+#        origin = "flathub";
-        #commit = "e28fd81675b0871614ccdc8fc66c6da6761dd11333a65900a0451edf07ef0ea6";
+#        #commit = "e28fd81675b0871614ccdc8fc66c6da6761dd11333a65900a0451edf07ef0ea6";
-      }
+#      }
-    ];
+#    ];
-  };
+#  };
 }

plasma/plasma.nix

@@ -15,13 +15,44 @@ in
 {
   imports =
   [
-    #Example:
-    #./hardware-configuration.nix
     ./autostart.nix
-    #Moved Back to flake until plasma theme configuration is done!
-    #./zsh.nix
   ];
 
+  home-manager.sharedModules = [
+    ./plasma-home.nix
+  ];
+  
+  services = {
+    xserver = {
+      enable = true;
+      videoDrivers = [ "amdgpu" ];
+
+      xkb = {
+        layout = "de";
+        variant = "";
+      };
+
+      desktopManager = {
+        #gnome.enable = true;
+        xterm.enable = false;
+      };
+
+      excludePackages = [ pkgs.xterm ];
+      ## Enable sound with pipewire.
+      #services.pulseaudio.enable = false;
+    };
+
+    displayManager = {
+      sddm = {
+        enable = true;
+        theme = "breeze";
+      wayland.enable = true;
+      };
+    };
+  };
+
+
+
   # Enable the X11 windowing system.
   # You can disable this if you're only using the Wayland session.
   #services.xserver.enable = true;
@@ -33,9 +64,8 @@ in
   #};
 
   system.activationScripts.script.text = ''
-		source /etc/nixos/other/colors.sh
+    source /etc/nixos/other/colors.sh
     source /etc/nixos/other/pfp.sh
-
     '';
 
   #services.displayManager.sddm = {