diff --git a/flake.nix b/flake.nix index 78b7e5d..98e9360 100644 --- a/flake.nix +++ b/flake.nix @@ -1,16 +1,22 @@ { - description = "Fahim's nixos configuration"; + description = "FrostPhoenix's nixos configuration"; + inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nur.url = "github:nix-community/NUR"; + hypr-contrib.url = "github:hyprwm/contrib"; hyprpicker.url = "github:hyprwm/hyprpicker"; + alejandra.url = "github:kamadorueda/alejandra/3.0.0"; + nix-gaming.url = "github:fufexan/nix-gaming"; + hyprland = { url = "github:hyprwm/Hyprland"; inputs.nixpkgs.follows = "nixpkgs"; }; + home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -18,10 +24,7 @@ }; outputs = - { nixpkgs - , self - , ... - } @ inputs: + { nixpkgs, self, ...} @ inputs: let selfPkgs = import ./pkgs; in diff --git a/install.sh b/install.sh index 79f4ff0..e6f066e 100755 --- a/install.sh +++ b/install.sh @@ -2,6 +2,6 @@ cp /etc/nixos/hardware-configuration.nix hosts/nixos/hardware-configuration.nix sleep 1 mkdir -p ~/Pictures/wallpapers sleep 1 -cp ./wallpaper/wallpaper.png ~/Pictures/wallpapers/ +cp ./wallpapers/* ~/Pictures/wallpapers/ sleep 1 sudo nixos-rebuild switch --flake .#nixos \ No newline at end of file diff --git a/modules/core/bootloader.nix b/modules/core/bootloader.nix index 204d6c5..7965c4c 100644 --- a/modules/core/bootloader.nix +++ b/modules/core/bootloader.nix @@ -1,5 +1,4 @@ { pkgs, ... }: - { boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; diff --git a/modules/core/cloudflare-warp.nix b/modules/core/cloudflare-warp.nix index 8ae2e50..ad644b1 100644 --- a/modules/core/cloudflare-warp.nix +++ b/modules/core/cloudflare-warp.nix @@ -1,4 +1,5 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ systemd.packages = with pkgs; [ (cloudflare-warp.overrideAttrs (old: { src = pkgs.fetchurl { diff --git a/modules/core/default.nix b/modules/core/default.nix index 6505a33..3e159e0 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -1,8 +1,4 @@ -{ inputs -, nixpkgs -, self -, ... -}: +{ inputs, nixpkgs, self, ...}: let system = "x86_64-linux"; pkgs = import nixpkgs { diff --git a/modules/core/hardware.nix b/modules/core/hardware.nix index 4f62c79..801abb1 100755 --- a/modules/core/hardware.nix +++ b/modules/core/hardware.nix @@ -1,5 +1,5 @@ -{ pkgs, ... }: { - +{ pkgs, ... }: +{ hardware.opengl.enable = true; hardware.opengl.driSupport = true; hardware.opengl.driSupport32Bit = true; diff --git a/modules/core/network.nix b/modules/core/network.nix index 9264aec..0120169 100755 --- a/modules/core/network.nix +++ b/modules/core/network.nix @@ -1,4 +1,5 @@ -{ ... }: { +{ ... }: +{ networking = { hostName = "nixos"; networkmanager.enable = true; diff --git a/modules/core/pipewire.nix b/modules/core/pipewire.nix index 3810f91..723fa4b 100755 --- a/modules/core/pipewire.nix +++ b/modules/core/pipewire.nix @@ -1,4 +1,5 @@ -{ ... }: { +{ ... }: +{ sound.enable = true; hardware.pulseaudio.enable = false; services.pipewire = { diff --git a/modules/core/program.nix b/modules/core/program.nix index f3f54d5..4219319 100755 --- a/modules/core/program.nix +++ b/modules/core/program.nix @@ -1,4 +1,5 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ programs.dconf.enable = true; programs.zsh.enable = true; programs.gnupg.agent = { diff --git a/modules/core/security.nix b/modules/core/security.nix index 92e6ff4..f5fcfa1 100644 --- a/modules/core/security.nix +++ b/modules/core/security.nix @@ -1,4 +1,5 @@ -{ ... }: { +{ ... }: +{ security.rtkit.enable = true; security.sudo.enable = true; security.pam.services.swaylock = { }; diff --git a/modules/core/services.nix b/modules/core/services.nix index 3d0259f..6f6eab7 100755 --- a/modules/core/services.nix +++ b/modules/core/services.nix @@ -1,4 +1,5 @@ -{...}: { +{ ... }: +{ services = { gvfs.enable = true; gnome.gnome-keyring.enable = true; diff --git a/modules/core/steam.nix b/modules/core/steam.nix index 0aecd08..0308ffd 100644 --- a/modules/core/steam.nix +++ b/modules/core/steam.nix @@ -1,4 +1,5 @@ -{ pkgs, lib, ... }: { +{ pkgs, lib, ... }: +{ programs.steam = { enable = true; remotePlay.openFirewall = true; diff --git a/modules/core/system.nix b/modules/core/system.nix index 762fd55..3018ba0 100644 --- a/modules/core/system.nix +++ b/modules/core/system.nix @@ -1,9 +1,5 @@ -{ self -, pkgs -, lib -, inputs -, ... -}: { +{ self, pkgs, lib, inputs, ...}: +{ imports = [ inputs.nix-gaming.nixosModules.default ]; nix = { settings = { diff --git a/modules/core/user.nix b/modules/core/user.nix index 8f4cad1..cba653b 100644 --- a/modules/core/user.nix +++ b/modules/core/user.nix @@ -1,7 +1,4 @@ -{ pkgs -, inputs -, ... -}: +{ pkgs, inputs, ...}: let name = "FrostPhoenix"; username = "frostphoenix"; diff --git a/modules/core/virtualization.nix b/modules/core/virtualization.nix index 2fdf6b7..e1ee07d 100644 --- a/modules/core/virtualization.nix +++ b/modules/core/virtualization.nix @@ -1,5 +1,4 @@ { config, pkgs, ... }: - { # Add user to libvirtd group users.users.frostphoenix.extraGroups = [ "libvirtd" ]; diff --git a/modules/core/xserver.nix b/modules/core/xserver.nix index b3cf76e..f82f65c 100644 --- a/modules/core/xserver.nix +++ b/modules/core/xserver.nix @@ -1,4 +1,5 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ services.xserver = { enable = true; layout = "us"; diff --git a/modules/home/chromium/default.nix b/modules/home/chromium/default.nix index 9c4a59c..1529a03 100644 --- a/modules/home/chromium/default.nix +++ b/modules/home/chromium/default.nix @@ -1,4 +1,5 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ programs.chromium = { enable = true; }; diff --git a/modules/home/default.nix b/modules/home/default.nix index ec1251d..17289c0 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -1,7 +1,8 @@ -{ inputs, ... }: { +{ inputs, ... }: +{ imports = - [ (import ./waybar) ] - ++ [ (import ./firefox) ] + [ (import ./waybar) ] + ++ [ (import ./firefox) ] # ++ [ (import ./vscode) ] ++ [ (import ./chromium) ] ++ [ (import ./hyprland) ] diff --git a/modules/home/firefox/default.nix b/modules/home/firefox/default.nix index 2198f04..9124059 100755 --- a/modules/home/firefox/default.nix +++ b/modules/home/firefox/default.nix @@ -1,5 +1,4 @@ { config, pkgs, theme, inputs, ... }: - { programs.firefox = let diff --git a/modules/home/foot/default.nix b/modules/home/foot/default.nix index e63ab16..0a52dd1 100644 --- a/modules/home/foot/default.nix +++ b/modules/home/foot/default.nix @@ -1,4 +1,5 @@ -{...}: { +{...}: +{ programs.foot = { enable = true; }; diff --git a/modules/home/gaming/default.nix b/modules/home/gaming/default.nix index 654210b..a1f6504 100644 --- a/modules/home/gaming/default.nix +++ b/modules/home/gaming/default.nix @@ -1,4 +1,5 @@ -{ pkgs, config, inputs, ... }: { +{ pkgs, config, inputs, ... }: +{ home.packages = with pkgs;[ gamemode gamescope diff --git a/modules/home/git/default.nix b/modules/home/git/default.nix index 1ac7ac3..1dd5b8f 100644 --- a/modules/home/git/default.nix +++ b/modules/home/git/default.nix @@ -1,5 +1,5 @@ -{ pkgs, ... }: { - +{ pkgs, ... }: +{ programs.git = { enable = true; diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix index 6bdbd21..c8e98f1 100755 --- a/modules/home/hyprland/default.nix +++ b/modules/home/hyprland/default.nix @@ -1,4 +1,5 @@ -{ inputs, ... }: { +{ inputs, ... }: +{ imports = [ (import ./hyprland.nix) ] ++ [ (import ./config.nix) ] ++ [ (import ./variables.nix) ] diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index 24cd30f..df9b888 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -1,7 +1,5 @@ -{ inputs -, pkgs -, ... -}: { +{ inputs, pkgs, ...}: +{ home.packages = with pkgs; [ swww inputs.hypr-contrib.packages.${pkgs.system}.grimblast diff --git a/modules/home/hyprland/variables.nix b/modules/home/hyprland/variables.nix index 41d1dbd..784a86a 100755 --- a/modules/home/hyprland/variables.nix +++ b/modules/home/hyprland/variables.nix @@ -1,5 +1,4 @@ { ... }: - { home.sessionVariables = { NIXOS_OZONE_WL = "1"; diff --git a/modules/home/mako/default.nix b/modules/home/mako/default.nix index 5fa2788..b2d1693 100755 --- a/modules/home/mako/default.nix +++ b/modules/home/mako/default.nix @@ -1,8 +1,5 @@ +{ config, pkgs, ... }: { - config, - pkgs, - ... -}: { services = { mako = { enable = true; diff --git a/modules/home/neofetch/default.nix b/modules/home/neofetch/default.nix index 19928b7..a106548 100644 --- a/modules/home/neofetch/default.nix +++ b/modules/home/neofetch/default.nix @@ -1,9 +1,5 @@ +{ config, lib, pkgs, ... }: { - config, - lib, - pkgs, - ... -}: { home.packages = [pkgs.neofetch]; # xdg.configFile."neofetch".source = ./config; } diff --git a/modules/home/package/default.nix b/modules/home/package/default.nix index 7026758..e2721aa 100755 --- a/modules/home/package/default.nix +++ b/modules/home/package/default.nix @@ -1,7 +1,5 @@ -{ inputs -, pkgs -, ... -}: { +{ inputs, pkgs, ... }: +{ home.packages = let php = pkgs.php.buildEnv { extraConfig = "memory_limit = 2G"; }; diff --git a/modules/home/package/python.nix b/modules/home/package/python.nix index 566e8dd..a9fa5c1 100644 --- a/modules/home/package/python.nix +++ b/modules/home/package/python.nix @@ -5,7 +5,8 @@ requests ]; -in { +in +{ environment.systemPackages = [ (pkgs.python3.withPackages my-python-packages) ]; diff --git a/modules/home/starship/default.nix b/modules/home/starship/default.nix index 09d5492..1a432e9 100755 --- a/modules/home/starship/default.nix +++ b/modules/home/starship/default.nix @@ -1,4 +1,5 @@ -{lib, ...}: { +{ lib, ... }: +{ programs.starship = { enable = true; settings = { diff --git a/modules/home/swaylock/default.nix b/modules/home/swaylock/default.nix index fe415e1..fe77ca8 100644 --- a/modules/home/swaylock/default.nix +++ b/modules/home/swaylock/default.nix @@ -1,12 +1,5 @@ +{ pkgs, lib, config, inputs, ... }: { - pkgs, - lib, - config, - inputs, - ... -}: { - # home.packages = with pkgs; [swaylock-effects]; - programs.swaylock = { enable = true; package = pkgs.swaylock-effects; diff --git a/modules/home/vscode/default.nix b/modules/home/vscode/default.nix index cb357c3..12f8421 100644 --- a/modules/home/vscode/default.nix +++ b/modules/home/vscode/default.nix @@ -1,4 +1,5 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ programs.vscode = { enable = true; package = pkgs.vscodium; diff --git a/modules/home/waybar/default.nix b/modules/home/waybar/default.nix index 1114331..9b8b240 100755 --- a/modules/home/waybar/default.nix +++ b/modules/home/waybar/default.nix @@ -1,5 +1,6 @@ -{ ... }: { - imports = [ (import ./waybar.nix) ] - ++ [ (import ./settings.nix) ] - ++ [ (import ./style.nix) ]; +{ ... }: +{ + imports = [ (import ./waybar.nix) ] + ++ [ (import ./settings.nix) ] + ++ [ (import ./style.nix) ]; } diff --git a/modules/home/waybar/settings.nix b/modules/home/waybar/settings.nix index 14ab13e..bcd9f71 100644 --- a/modules/home/waybar/settings.nix +++ b/modules/home/waybar/settings.nix @@ -1,6 +1,5 @@ { ... }: { - programs.waybar.settings = [ { "layer" = "top"; diff --git a/modules/home/waybar/style.nix b/modules/home/waybar/style.nix index 1d8672d..dfcf0ba 100644 --- a/modules/home/waybar/style.nix +++ b/modules/home/waybar/style.nix @@ -1,4 +1,5 @@ -{ ... }: { +{ ... }: +{ programs.waybar.style = '' * { font-family: JetBrainsMono Nerd Font; diff --git a/modules/home/waybar/waybar.nix b/modules/home/waybar/waybar.nix index 1283e73..a207a98 100644 --- a/modules/home/waybar/waybar.nix +++ b/modules/home/waybar/waybar.nix @@ -1,4 +1,5 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +{ programs.waybar = { enable = true; systemd = { diff --git a/modules/home/wlogout/default.nix b/modules/home/wlogout/default.nix index 1429943..921d30f 100644 --- a/modules/home/wlogout/default.nix +++ b/modules/home/wlogout/default.nix @@ -1,3 +1,4 @@ -{...}: { +{...}: +{ xdg.configFile."wlogout".source = ./config; } diff --git a/modules/home/wofi/default.nix b/modules/home/wofi/default.nix index f34e966..a83495e 100644 --- a/modules/home/wofi/default.nix +++ b/modules/home/wofi/default.nix @@ -1,3 +1,4 @@ -{...} :{ +{ ... }: +{ xdg.configFile."wofi".source = ./config; } \ No newline at end of file diff --git a/modules/home/zsh/default.nix b/modules/home/zsh/default.nix index 8ad511d..dec77bf 100755 --- a/modules/home/zsh/default.nix +++ b/modules/home/zsh/default.nix @@ -1,8 +1,5 @@ -{ hostname -, config -, pkgs -, ... -}: { +{ hostname, config, pkgs, ...}: +{ programs.zsh = { enable = true; enableCompletion = true; diff --git a/wallpaper/wallpaper.png b/wallpapers/wallpaper.png similarity index 100% rename from wallpaper/wallpaper.png rename to wallpapers/wallpaper.png