youwen5/liminalOS
1
0
Fork 0
mirror of https://github.com/youwen5/nixos.git synced 2024-11-24 17:53:51 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: run nixfmt

Browse source
This commit is contained in:
Youwen Wu 2024-07-21 19:02:10 -07:00
parent c72ff260db
commit 420d932dec
Signed by: youwen5
GPG key ID: 865658ED1FE61EC3
4 changed files with 149 additions and 172 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
configuration.nix
View file

@ -5,8 +5,7 @@
{ config, inputs, pkgs, ... }:
{
imports =
[ # Include the results of the hardware scan.
imports = [ # Include the results of the hardware scan.
./hardware-configuration.nix
];
@ -51,9 +50,7 @@
LC_TIME = "en_US.UTF-8";
};
systemd.services = {
NetworkManager-wait-online.enable = false;
};
systemd.services = { NetworkManager-wait-online.enable = false; };
# Enable the X11 windowing system.
# You can disable this if you're only using the Wayland session.
@ -66,7 +63,8 @@
programs.hyprland = {
enable = true;
package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
package =
inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
};
# Enable the KDE Plasma Desktop Environment.
@ -118,7 +116,8 @@
trusted-users = [ "root" "youwen" ];
experimental-features = [ "nix-command" "flakes" ];
substituters = [ "https://hyprland.cachix.org" ];
trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
trusted-public-keys =
[ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ];
};
# Allow unfree packages
@ -171,7 +170,8 @@
nixpkgs.config.packageOverrides = pkgs: {
steam = pkgs.steam.override {
extraPkgs = pkgs: with pkgs; [
extraPkgs = pkgs:
with pkgs; [
xorg.libXcursor
xorg.libXi
xorg.libXinerama
@ -186,7 +186,6 @@
};
};
# List services that you want to enable:
# Enable the OpenSSH daemon.
@ -206,9 +205,7 @@
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "24.05"; # Did you read the comment?
hardware.opengl = {
enable = true;
};
hardware.opengl = { enable = true; };
hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable;

9
flake.nix
View file

@ -18,7 +18,9 @@
};
};
outputs = { self, nixpkgs, home-manager, catppuccin, zimfw, lanzaboote, ... }@inputs: {
outputs = { self, nixpkgs, home-manager, catppuccin, zimfw, lanzaboote, ...
}@inputs: {
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt;
nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs; };
system = "x86_64-linux";
@ -53,10 +55,7 @@
home-manager.backupFileExtension = "backup";
home-manager.sharedModules = [ zimfw.homeManagerModules.zimfw ];
home-manager.users.youwen = {
imports = [
./home.nix
catppuccin.homeManagerModules.catppuccin
];
imports = [ ./home.nix catppuccin.homeManagerModules.catppuccin ];
};
}
];

18
hardware-configuration.nix
View file

@ -4,22 +4,21 @@
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.availableKernelModules =
[ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/2616d86c-aac2-4780-9527-7b11192e783f";
fileSystems."/" = {
device = "/dev/disk/by-uuid/2616d86c-aac2-4780-9527-7b11192e783f";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/B826-E14B";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/B826-E14B";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
};
@ -35,5 +34,6 @@
# networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.cpu.intel.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
}

63
home.nix
View file

@ -130,37 +130,30 @@
};
};
services.easyeffects = {
enable = true;
};
services.easyeffects = { enable = true; };
programs.fzf = {
enable = true;
catppuccin.enable = true;
};
programs.wlogout = {
enable = true;
};
programs.wlogout = { enable = true; };
wayland.windowManager.hyprland.enable = true;
wayland.windowManager.hyprland.settings = {
exec-once =
[
"waybar"
"waypaper --restore"
];
exec-once = [ "waybar" "waypaper --restore" ];
"$mod" = "SUPER";
"$Left" = "Y";
"$Right" = "O";
"$Up" = "I";
"$Down" = "U";
env = [
"HYPRCURSOR_THEME,Bibata-Modern-Ice" "HYPRCURSOR_SIZE,26"
"XCURSOR_THEME,Bibata-Modern-Ice" "XCURSOR_SIZE,26"
"HYPRCURSOR_THEME,Bibata-Modern-Ice"
"HYPRCURSOR_SIZE,26"
"XCURSOR_THEME,Bibata-Modern-Ice"
"XCURSOR_SIZE,26"
];
bind =
[
bind = [
# Application Keybinds
"$mod, F, exec, librewolf"
"$mod, T, exec, kitty"
@ -209,7 +202,7 @@
# Utilities
"$mod, Space, exec, pkill -x rofi || rofi -show drun" # Run rofi
"$mod, P, exec, grim -g \"$(slurp)\" - | swappy -f -" # Screenshot
''$mod, P, exec, grim -g "$(slurp)" - | swappy -f -'' # Screenshot
"$mod, Backspace, exec, wlogout" # Screenshot
];
@ -298,10 +291,8 @@
"ignorezero,swaync-control-center"
"blur,logout_dialog"
];
monitor = [
"DP-1,2560x1440@165,1920x0,auto"
"HDMI-A-1,1920x1080@60,0x0,1"
];
monitor =
[ "DP-1,2560x1440@165,1920x0,auto" "HDMI-A-1,1920x1080@60,0x0,1" ];
dwindle = {
pseudotile = "yes";
preserve_split = "yes";
@ -394,9 +385,7 @@
name = "Bibata-Modern-Ice";
size = 26;
};
iconTheme = {
name = "Papirus-Dark";
};
iconTheme = { name = "Papirus-Dark"; };
};
qt = {
@ -411,7 +400,8 @@
theme=GraphiteNordDark
'';
"Kvantum/GraphiteNord".source = "${pkgs.graphite-kde-theme}/share/Kvantum/GraphiteNord";
"Kvantum/GraphiteNord".source =
"${pkgs.graphite-kde-theme}/share/Kvantum/GraphiteNord";
};
programs.waybar = {
@ -450,7 +440,7 @@
};
"custom/weather" = {
orientation = "horizontal";
exec = "curl wttr.in/?format=\"%l:%20%t\"";
exec = ''curl wttr.in/?format="%l:%20%t"'';
interval = 10;
};
cpu = {
@ -466,12 +456,8 @@
# format-paused = " 󰏤 {title} ";
# format-stopped = "Nothing Playing";
# };
tray = {
spacing = 10;
};
clock = {
format = "{:%a %b %d, %I:%M %p} ";
};
tray = { spacing = 10; };
clock = { format = "{:%a %b %d, %I:%M %p} "; };
backlight = {
device = "intel_backlight";
format = "{percent}% {icon}";
@ -486,9 +472,7 @@
format = "{capacity}% {icon}";
format-icons = [ "󰁻" "󰁽" "󰁿" "󰂀" "󰁹" ];
};
"hyprland/window" = {
format = "{class}";
};
"hyprland/window" = { format = "{class}"; };
network = {
format-wifi = "{essid} ";
format-linked = "{ifname} (No IP) ";
@ -502,9 +486,7 @@
format-muted = " {format_source}";
format-source = "{volume}% ";
format-source-muted = "";
format-icons = {
default = [ "" "" "" ];
};
format-icons = { default = [ "" "" "" ]; };
};
};
};
@ -525,7 +507,8 @@
enable = true;
enableZshIntegration = true;
enableBashIntegration = true;
settings = with builtins; fromJSON (unsafeDiscardStringContext (readFile ./prompt.omp.json));
settings = with builtins;
fromJSON (unsafeDiscardStringContext (readFile ./prompt.omp.json));
};
programs.zsh = {
@ -557,9 +540,7 @@
};
};
programs.bash = {
enable = true;
};
programs.bash = { enable = true; };
programs.librewolf = {
enable = true;