diff --git a/flake.nix b/flake.nix index e991028..469d8f6 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "Pwnix: NixOS Dotfiles focused on Hacking and Productivity."; + description = "Nixos: Home-Manager and System configuration"; inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; @@ -16,13 +16,10 @@ pkgs = nixpkgs.legacyPackages.${system}; lib = nixpkgs.lib; - # ---CUSTOM SETTINGS--- user = "spagnologasper"; hostName = "yoga"; - # ---CUSTOM SETTINGS--- - mkSystem = pkgs: system: hostname: pkgs.lib.nixosSystem { system = system; diff --git a/hosts/yoga/default.nix b/hosts/yoga/default.nix index 24e7fbe..60fad88 100644 --- a/hosts/yoga/default.nix +++ b/hosts/yoga/default.nix @@ -2,6 +2,6 @@ { imports = [ - ../../modules/nvidia-optimus/default.nix + ../../modules/nvidia/default.nix ]; } diff --git a/modules/hyprland/default.nix b/modules/hyprland/default.nix index 7bdeddb..16d5888 100644 --- a/modules/hyprland/default.nix +++ b/modules/hyprland/default.nix @@ -12,7 +12,7 @@ in { home.file.".config/hypr/hyprland.conf".source = ./hyprland.conf; home.file.".config/hypr/hyprpaper.conf".source = ./hyprpaper.conf; - home.file.".config/hypr/wallpaper.png".source = ../../pics/wallpaper.png; - home.file.".config/hypr/PwNixOS-Wallpaper.png".source = ../../pics/PwNixOS-Wallpaper.png; + home.file.".config/hypr/wallpaper.png".source = ../../pictures/wallpaper.png; + home.file.".config/hypr/lock-wallpaper.png".source = ../../pictures/lock-wallpaper.png; }; } diff --git a/modules/hyprland/hyprland.conf b/modules/hyprland/hyprland.conf index 33989cf..47f3ee0 100644 --- a/modules/hyprland/hyprland.conf +++ b/modules/hyprland/hyprland.conf @@ -11,7 +11,7 @@ exec-once=waybar exec-once=hyprpaper exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP GTK_THEME exec-once=systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP GTK_THEME -exec-once=swayidle -w timeout 600 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep 'gtklock -i -d -b ~/.config/hypr/PwNixOS-Wallpaper.png' +exec-once=swayidle -w timeout 600 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep 'gtklock -i -d -b ~/.config/hypr/lock-wallpaper.png' misc { disable_hyprland_logo=true diff --git a/modules/nvidia-optimus/default.nix b/modules/nvidia/default.nix similarity index 100% rename from modules/nvidia-optimus/default.nix rename to modules/nvidia/default.nix diff --git a/pics/PwNixOS.png b/pics/PwNixOS.png deleted file mode 100644 index 23468f7..0000000 Binary files a/pics/PwNixOS.png and /dev/null differ diff --git a/pics/readme/floating.png b/pics/readme/floating.png deleted file mode 100644 index 5f0231b..0000000 Binary files a/pics/readme/floating.png and /dev/null differ diff --git a/pics/readme/terminal.png b/pics/readme/terminal.png deleted file mode 100644 index ec7b347..0000000 Binary files a/pics/readme/terminal.png and /dev/null differ diff --git a/pics/readme/vim_and_gtk.png b/pics/readme/vim_and_gtk.png deleted file mode 100644 index 0974284..0000000 Binary files a/pics/readme/vim_and_gtk.png and /dev/null differ diff --git a/pics/PwNixOS-Wallpaper.png b/pictures/lock-wallpaper.png similarity index 100% rename from pics/PwNixOS-Wallpaper.png rename to pictures/lock-wallpaper.png diff --git a/pics/wallpaper.png b/pictures/wallpaper.png similarity index 100% rename from pics/wallpaper.png rename to pictures/wallpaper.png