From 6f5976364240bb8cf90cfb953955937ba50514b9 Mon Sep 17 00:00:00 2001 From: Simon Cornet Date: Wed, 3 Apr 2024 23:26:46 +0200 Subject: [PATCH] [generic] prettified code --- nix/home/alacritty/alacritty.nix | 2 +- nix/home/git/git.nix | 6 +++--- nix/home/ssh/ssh.nix | 2 +- nix/home/theme/gtk.nix | 6 +++--- nix/home/virt-manager/virt-manager.nix | 2 +- nix/home/xdg/xdg.nix | 4 ++++ nix/systems/bootloader.nix | 4 ++-- nix/systems/desktop.nix | 4 ++-- nix/systems/itclt75/hardware-configuration.nix | 3 +-- nix/systems/phaedra/hardware-configuration.nix | 4 +--- nix/systems/sound.nix | 4 ++-- nix/systems/talathiel/hardware-configuration.nix | 4 +--- 12 files changed, 22 insertions(+), 23 deletions(-) diff --git a/nix/home/alacritty/alacritty.nix b/nix/home/alacritty/alacritty.nix index 00ff1d2..5133911 100644 --- a/nix/home/alacritty/alacritty.nix +++ b/nix/home/alacritty/alacritty.nix @@ -95,7 +95,7 @@ # window window = { opacity = 0.75; - class = { + class = { general = "Alacritty"; instance = "Alacritty"; }; diff --git a/nix/home/git/git.nix b/nix/home/git/git.nix index 6acde8e..2d12536 100644 --- a/nix/home/git/git.nix +++ b/nix/home/git/git.nix @@ -3,10 +3,10 @@ # git programs.git = { - enable = true; - userName = "Simon Cornet"; + enable = true; + userName = "Simon Cornet"; userEmail = "simon@simoncor.net"; - aliases = { + aliases = { # commit + message cam = "commit -am"; diff --git a/nix/home/ssh/ssh.nix b/nix/home/ssh/ssh.nix index 7425635..03cad27 100644 --- a/nix/home/ssh/ssh.nix +++ b/nix/home/ssh/ssh.nix @@ -3,7 +3,7 @@ # ssh programs.ssh = { - enable = true; + enable = true; matchBlocks = { # general diff --git a/nix/home/theme/gtk.nix b/nix/home/theme/gtk.nix index 6669abc..eb92ed6 100644 --- a/nix/home/theme/gtk.nix +++ b/nix/home/theme/gtk.nix @@ -23,7 +23,7 @@ # theme theme = { - name = "Catppuccin-Macchiato-Standard-Sky-Dark"; + name = "Catppuccin-Macchiato-Standard-Sky-Dark"; package = pkgs.catppuccin-gtk.override { accents = [ "sky" ]; size = "standard"; @@ -41,8 +41,8 @@ # xdg settings xdg.configFile = { - "gtk-4.0/assets".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/assets"; - "gtk-4.0/gtk.css".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/gtk.css"; + "gtk-4.0/assets".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/assets"; + "gtk-4.0/gtk.css".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/gtk.css"; "gtk-4.0/gtk-dark.css".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/gtk-dark.css"; }; } diff --git a/nix/home/virt-manager/virt-manager.nix b/nix/home/virt-manager/virt-manager.nix index d112785..2773b33 100644 --- a/nix/home/virt-manager/virt-manager.nix +++ b/nix/home/virt-manager/virt-manager.nix @@ -5,7 +5,7 @@ dconf.settings = { "org/virt-manager/virt-manager/connections" = { autoconnect = ["qemu:///system"]; - uris = ["qemu:///system"]; + uris = ["qemu:///system"]; }; }; } diff --git a/nix/home/xdg/xdg.nix b/nix/home/xdg/xdg.nix index fba0f24..881eb02 100644 --- a/nix/home/xdg/xdg.nix +++ b/nix/home/xdg/xdg.nix @@ -9,6 +9,10 @@ enable = true; defaultApplications = { + # documents + "application/pdf" = ["org.gnome.Evince.desktop"]; + "application/x-pdf" = ["org.gnome.Evince.desktop"]; + # images "image/bmp" = [ "org.gnome.Loupe.desktop" ]; "image/gif" = [ "org.gnome.Loupe.desktop" ]; diff --git a/nix/systems/bootloader.nix b/nix/systems/bootloader.nix index d024e27..94fdf50 100644 --- a/nix/systems/bootloader.nix +++ b/nix/systems/bootloader.nix @@ -16,8 +16,8 @@ }; # make boot pretty - boot.plymouth.enable = true; - boot.kernelParams = [ "quiet" ]; + boot.plymouth.enable = true; + boot.kernelParams = [ "quiet" ]; boot.initrd.systemd.enable = true; # make console pretty diff --git a/nix/systems/desktop.nix b/nix/systems/desktop.nix index 2e58215..110cf2f 100644 --- a/nix/systems/desktop.nix +++ b/nix/systems/desktop.nix @@ -8,7 +8,7 @@ }; # xdg portals - xdg.portal.enable = true; + xdg.portal.enable = true; xdg.portal.extraPortals = with pkgs; [ xdg-desktop-portal-wlr ]; @@ -24,7 +24,7 @@ }; # gnome - services.xserver.displayManager.gdm.enable = true; + services.xserver.displayManager.gdm.enable = true; services.xserver.desktopManager.gnome.enable = true; # hyprland diff --git a/nix/systems/itclt75/hardware-configuration.nix b/nix/systems/itclt75/hardware-configuration.nix index dcd533c..c91ec31 100644 --- a/nix/systems/itclt75/hardware-configuration.nix +++ b/nix/systems/itclt75/hardware-configuration.nix @@ -5,8 +5,7 @@ imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; # bootloader - boot.extraModulePackages = [ ]; - boot.initrd.kernelModules = [ "kvm-intel" ]; + boot.initrd.kernelModules = [ "kvm-intel" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot.initrd.luks = { devices = { diff --git a/nix/systems/phaedra/hardware-configuration.nix b/nix/systems/phaedra/hardware-configuration.nix index 40a77de..b171b1a 100644 --- a/nix/systems/phaedra/hardware-configuration.nix +++ b/nix/systems/phaedra/hardware-configuration.nix @@ -5,9 +5,7 @@ imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; # bootloader - boot.extraModulePackages = [ ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" "amdgpu" ]; + boot.kernelModules = [ "kvm-amd" "amdgpu" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; # filesystems - boot diff --git a/nix/systems/sound.nix b/nix/systems/sound.nix index 173d12d..97f35ae 100644 --- a/nix/systems/sound.nix +++ b/nix/systems/sound.nix @@ -14,11 +14,11 @@ # enable pipewire services.pipewire = { + enable = true; + pulse.enable = true; alsa = { enable = true; support32Bit = true; }; - enable = true; - pulse.enable = true; }; } diff --git a/nix/systems/talathiel/hardware-configuration.nix b/nix/systems/talathiel/hardware-configuration.nix index 2c1a0b8..aab69a4 100644 --- a/nix/systems/talathiel/hardware-configuration.nix +++ b/nix/systems/talathiel/hardware-configuration.nix @@ -5,9 +5,7 @@ imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; # bootloader - boot.extraModulePackages = [ ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; + boot.initrd.kernelModules = [ "kvm-intel" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; # filesystems - boot