code style refactor

This commit is contained in:
Frost-Phoenix 2023-11-05 17:56:55 +01:00
parent 5631025ec1
commit 40bb2bfaaa
40 changed files with 73 additions and 86 deletions

View file

@ -1,16 +1,22 @@
{ {
description = "Fahim's nixos configuration"; description = "FrostPhoenix's nixos configuration";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
hypr-contrib.url = "github:hyprwm/contrib"; hypr-contrib.url = "github:hyprwm/contrib";
hyprpicker.url = "github:hyprwm/hyprpicker"; hyprpicker.url = "github:hyprwm/hyprpicker";
alejandra.url = "github:kamadorueda/alejandra/3.0.0"; alejandra.url = "github:kamadorueda/alejandra/3.0.0";
nix-gaming.url = "github:fufexan/nix-gaming"; nix-gaming.url = "github:fufexan/nix-gaming";
hyprland = { hyprland = {
url = "github:hyprwm/Hyprland"; url = "github:hyprwm/Hyprland";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -18,10 +24,7 @@
}; };
outputs = outputs =
{ nixpkgs { nixpkgs, self, ...} @ inputs:
, self
, ...
} @ inputs:
let let
selfPkgs = import ./pkgs; selfPkgs = import ./pkgs;
in in

View file

@ -2,6 +2,6 @@ cp /etc/nixos/hardware-configuration.nix hosts/nixos/hardware-configuration.nix
sleep 1 sleep 1
mkdir -p ~/Pictures/wallpapers mkdir -p ~/Pictures/wallpapers
sleep 1 sleep 1
cp ./wallpaper/wallpaper.png ~/Pictures/wallpapers/ cp ./wallpapers/* ~/Pictures/wallpapers/
sleep 1 sleep 1
sudo nixos-rebuild switch --flake .#nixos sudo nixos-rebuild switch --flake .#nixos

View file

@ -1,5 +1,4 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;

View file

@ -1,4 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }:
{
systemd.packages = with pkgs; [ systemd.packages = with pkgs; [
(cloudflare-warp.overrideAttrs (old: { (cloudflare-warp.overrideAttrs (old: {
src = pkgs.fetchurl { src = pkgs.fetchurl {

View file

@ -1,8 +1,4 @@
{ inputs { inputs, nixpkgs, self, ...}:
, nixpkgs
, self
, ...
}:
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs { pkgs = import nixpkgs {

View file

@ -1,5 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }:
{
hardware.opengl.enable = true; hardware.opengl.enable = true;
hardware.opengl.driSupport = true; hardware.opengl.driSupport = true;
hardware.opengl.driSupport32Bit = true; hardware.opengl.driSupport32Bit = true;

View file

@ -1,4 +1,5 @@
{ ... }: { { ... }:
{
networking = { networking = {
hostName = "nixos"; hostName = "nixos";
networkmanager.enable = true; networkmanager.enable = true;

View file

@ -1,4 +1,5 @@
{ ... }: { { ... }:
{
sound.enable = true; sound.enable = true;
hardware.pulseaudio.enable = false; hardware.pulseaudio.enable = false;
services.pipewire = { services.pipewire = {

View file

@ -1,4 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }:
{
programs.dconf.enable = true; programs.dconf.enable = true;
programs.zsh.enable = true; programs.zsh.enable = true;
programs.gnupg.agent = { programs.gnupg.agent = {

View file

@ -1,4 +1,5 @@
{ ... }: { { ... }:
{
security.rtkit.enable = true; security.rtkit.enable = true;
security.sudo.enable = true; security.sudo.enable = true;
security.pam.services.swaylock = { }; security.pam.services.swaylock = { };

View file

@ -1,4 +1,5 @@
{...}: { { ... }:
{
services = { services = {
gvfs.enable = true; gvfs.enable = true;
gnome.gnome-keyring.enable = true; gnome.gnome-keyring.enable = true;

View file

@ -1,4 +1,5 @@
{ pkgs, lib, ... }: { { pkgs, lib, ... }:
{
programs.steam = { programs.steam = {
enable = true; enable = true;
remotePlay.openFirewall = true; remotePlay.openFirewall = true;

View file

@ -1,9 +1,5 @@
{ self { self, pkgs, lib, inputs, ...}:
, pkgs {
, lib
, inputs
, ...
}: {
imports = [ inputs.nix-gaming.nixosModules.default ]; imports = [ inputs.nix-gaming.nixosModules.default ];
nix = { nix = {
settings = { settings = {

View file

@ -1,7 +1,4 @@
{ pkgs { pkgs, inputs, ...}:
, inputs
, ...
}:
let let
name = "FrostPhoenix"; name = "FrostPhoenix";
username = "frostphoenix"; username = "frostphoenix";

View file

@ -1,5 +1,4 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
# Add user to libvirtd group # Add user to libvirtd group
users.users.frostphoenix.extraGroups = [ "libvirtd" ]; users.users.frostphoenix.extraGroups = [ "libvirtd" ];

View file

@ -1,4 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }:
{
services.xserver = { services.xserver = {
enable = true; enable = true;
layout = "us"; layout = "us";

View file

@ -1,4 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }:
{
programs.chromium = { programs.chromium = {
enable = true; enable = true;
}; };

View file

@ -1,7 +1,8 @@
{ inputs, ... }: { { inputs, ... }:
{
imports = imports =
[ (import ./waybar) ] [ (import ./waybar) ]
++ [ (import ./firefox) ] ++ [ (import ./firefox) ]
# ++ [ (import ./vscode) ] # ++ [ (import ./vscode) ]
++ [ (import ./chromium) ] ++ [ (import ./chromium) ]
++ [ (import ./hyprland) ] ++ [ (import ./hyprland) ]

View file

@ -1,5 +1,4 @@
{ config, pkgs, theme, inputs, ... }: { config, pkgs, theme, inputs, ... }:
{ {
programs.firefox = programs.firefox =
let let

View file

@ -1,4 +1,5 @@
{...}: { {...}:
{
programs.foot = { programs.foot = {
enable = true; enable = true;
}; };

View file

@ -1,4 +1,5 @@
{ pkgs, config, inputs, ... }: { { pkgs, config, inputs, ... }:
{
home.packages = with pkgs;[ home.packages = with pkgs;[
gamemode gamemode
gamescope gamescope

View file

@ -1,5 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }:
{
programs.git = { programs.git = {
enable = true; enable = true;

View file

@ -1,4 +1,5 @@
{ inputs, ... }: { { inputs, ... }:
{
imports = [ (import ./hyprland.nix) ] imports = [ (import ./hyprland.nix) ]
++ [ (import ./config.nix) ] ++ [ (import ./config.nix) ]
++ [ (import ./variables.nix) ] ++ [ (import ./variables.nix) ]

View file

@ -1,7 +1,5 @@
{ inputs { inputs, pkgs, ...}:
, pkgs {
, ...
}: {
home.packages = with pkgs; [ home.packages = with pkgs; [
swww swww
inputs.hypr-contrib.packages.${pkgs.system}.grimblast inputs.hypr-contrib.packages.${pkgs.system}.grimblast

View file

@ -1,5 +1,4 @@
{ ... }: { ... }:
{ {
home.sessionVariables = { home.sessionVariables = {
NIXOS_OZONE_WL = "1"; NIXOS_OZONE_WL = "1";

View file

@ -1,8 +1,5 @@
{ config, pkgs, ... }:
{ {
config,
pkgs,
...
}: {
services = { services = {
mako = { mako = {
enable = true; enable = true;

View file

@ -1,9 +1,5 @@
{ config, lib, pkgs, ... }:
{ {
config,
lib,
pkgs,
...
}: {
home.packages = [pkgs.neofetch]; home.packages = [pkgs.neofetch];
# xdg.configFile."neofetch".source = ./config; # xdg.configFile."neofetch".source = ./config;
} }

View file

@ -1,7 +1,5 @@
{ inputs { inputs, pkgs, ... }:
, pkgs {
, ...
}: {
home.packages = home.packages =
let let
php = pkgs.php.buildEnv { extraConfig = "memory_limit = 2G"; }; php = pkgs.php.buildEnv { extraConfig = "memory_limit = 2G"; };

View file

@ -5,7 +5,8 @@
requests requests
]; ];
in { in
{
environment.systemPackages = [ environment.systemPackages = [
(pkgs.python3.withPackages my-python-packages) (pkgs.python3.withPackages my-python-packages)
]; ];

View file

@ -1,4 +1,5 @@
{lib, ...}: { { lib, ... }:
{
programs.starship = { programs.starship = {
enable = true; enable = true;
settings = { settings = {

View file

@ -1,12 +1,5 @@
{ pkgs, lib, config, inputs, ... }:
{ {
pkgs,
lib,
config,
inputs,
...
}: {
# home.packages = with pkgs; [swaylock-effects];
programs.swaylock = { programs.swaylock = {
enable = true; enable = true;
package = pkgs.swaylock-effects; package = pkgs.swaylock-effects;

View file

@ -1,4 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }:
{
programs.vscode = { programs.vscode = {
enable = true; enable = true;
package = pkgs.vscodium; package = pkgs.vscodium;

View file

@ -1,5 +1,6 @@
{ ... }: { { ... }:
imports = [ (import ./waybar.nix) ] {
++ [ (import ./settings.nix) ] imports = [ (import ./waybar.nix) ]
++ [ (import ./style.nix) ]; ++ [ (import ./settings.nix) ]
++ [ (import ./style.nix) ];
} }

View file

@ -1,6 +1,5 @@
{ ... }: { ... }:
{ {
programs.waybar.settings = [ programs.waybar.settings = [
{ {
"layer" = "top"; "layer" = "top";

View file

@ -1,4 +1,5 @@
{ ... }: { { ... }:
{
programs.waybar.style = '' programs.waybar.style = ''
* { * {
font-family: JetBrainsMono Nerd Font; font-family: JetBrainsMono Nerd Font;

View file

@ -1,4 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }:
{
programs.waybar = { programs.waybar = {
enable = true; enable = true;
systemd = { systemd = {

View file

@ -1,3 +1,4 @@
{...}: { {...}:
{
xdg.configFile."wlogout".source = ./config; xdg.configFile."wlogout".source = ./config;
} }

View file

@ -1,3 +1,4 @@
{...} :{ { ... }:
{
xdg.configFile."wofi".source = ./config; xdg.configFile."wofi".source = ./config;
} }

View file

@ -1,8 +1,5 @@
{ hostname { hostname, config, pkgs, ...}:
, config {
, pkgs
, ...
}: {
programs.zsh = { programs.zsh = {
enable = true; enable = true;
enableCompletion = true; enableCompletion = true;

View file

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 1.3 MiB