From bf58ac712c115aeaff777aea741c3334942df86e Mon Sep 17 00:00:00 2001 From: Quentin Boyer Date: Sun, 14 Aug 2022 14:52:54 +0200 Subject: [PATCH] Formatting --- graphical.nix | 8 +++++--- nixos/anbox.nix | 12 ++++++------ nixos/configuration.nix | 10 +++++----- nixos/localcfg.nix | 34 +++++++++++++++++----------------- nixos/pkg.nix | 12 ++++++------ rustdev.nix | 8 ++++---- wm/terminal/kitty.nix | 2 +- 7 files changed, 44 insertions(+), 42 deletions(-) diff --git a/graphical.nix b/graphical.nix index a9fb93a..ef76214 100644 --- a/graphical.nix +++ b/graphical.nix @@ -40,12 +40,14 @@ feh ]; - /* environment.pathsToLink = [ "/share/hunspell" "/share/myspell" "/share/hyphen" ]; - environment.variables.DICPATH = "/run/current-system/sw/share/hunspell:/run/current-system/sw/share/hyphen"; */ + /* + environment.pathsToLink = [ "/share/hunspell" "/share/myspell" "/share/hyphen" ]; + environment.variables.DICPATH = "/run/current-system/sw/share/hunspell:/run/current-system/sw/share/hyphen"; + */ home.sessionVariables = { BROWSER = "firefox"; - GTK_USE_PORTAL = 1; + GTK_USE_PORTAL = 1; }; programs = { diff --git a/nixos/anbox.nix b/nixos/anbox.nix index c415a23..c6c1603 100644 --- a/nixos/anbox.nix +++ b/nixos/anbox.nix @@ -34,12 +34,12 @@ in ''; /* - makeFlags = [ - "KERNELRELEASE=${kernel.modDirVersion}" - "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - "INSTALL_MOD_PATH=$(out)" - ]; - */ + makeFlags = [ + "KERNELRELEASE=${kernel.modDirVersion}" + "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "INSTALL_MOD_PATH=$(out)" + ]; + */ meta = with lib; { description = "Kernel module for anbox - ${name}"; diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 34e6690..8669595 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -25,8 +25,8 @@ font = "Lat2-Terminus16"; keyMap = "dvorak-programmer"; }; - - environment.pathsToLink = [ "/share/zsh" ]; + + environment.pathsToLink = ["/share/zsh"]; security.rtkit.enable = true; services = { flatpak.enable = true; @@ -37,7 +37,7 @@ pulse.enable = true; }; localtimed.enable = true; - geoclue2.enable = true; + geoclue2.enable = true; fwupd.enable = true; postgresql = { enable = true; @@ -64,8 +64,8 @@ boot.kernelPackages = pkgs.linuxPackages; /* - nixpkgs.config.allowBroken = true; - */ + nixpkgs.config.allowBroken = true; + */ virtualisation.waydroid.enable = true; virtualisation = { diff --git a/nixos/localcfg.nix b/nixos/localcfg.nix index 073b022..a6f1d45 100644 --- a/nixos/localcfg.nix +++ b/nixos/localcfg.nix @@ -35,23 +35,23 @@ }; /* - services.xserver = { - enable = true; - videoDrivers = [ "nvidia" ]; - layout = "us"; - xkbVariant = "dvp"; - libinput.enable = true; - desktopManager.session = [ - { - name = "home-manager"; - start = '' - ${pkgs.runtimeShell} $HOME/.hm-xsession-dbg& - waitPID=$! - ''; - } - ]; - }; - */ + services.xserver = { + enable = true; + videoDrivers = [ "nvidia" ]; + layout = "us"; + xkbVariant = "dvp"; + libinput.enable = true; + desktopManager.session = [ + { + name = "home-manager"; + start = '' + ${pkgs.runtimeShell} $HOME/.hm-xsession-dbg& + waitPID=$! + ''; + } + ]; + }; + */ users = { users = { diff --git a/nixos/pkg.nix b/nixos/pkg.nix index 8454818..0fd7bd9 100644 --- a/nixos/pkg.nix +++ b/nixos/pkg.nix @@ -32,12 +32,12 @@ in { }; /* - nixpkgs.config.packageOverrides = pkgs: { - steam = pkgs.steam.override { - nativeOnly = true; - }; - }; - */ + nixpkgs.config.packageOverrides = pkgs: { + steam = pkgs.steam.override { + nativeOnly = true; + }; + }; + */ programs.steam.enable = true; } diff --git a/rustdev.nix b/rustdev.nix index e102e76..bbaf173 100644 --- a/rustdev.nix +++ b/rustdev.nix @@ -14,9 +14,9 @@ ]; home.file = { - ".zfunc/_cargo".text = '' - #compdef cargo - source $(rustc --print sysroot)/share/zsh/site-functions/_cargo - ''; + ".zfunc/_cargo".text = '' + #compdef cargo + source $(rustc --print sysroot)/share/zsh/site-functions/_cargo + ''; }; } diff --git a/wm/terminal/kitty.nix b/wm/terminal/kitty.nix index 5dffcbd..29076ea 100644 --- a/wm/terminal/kitty.nix +++ b/wm/terminal/kitty.nix @@ -25,7 +25,7 @@ in { then "#${color.bright}" else colorCfgNormal color; in { - confirm_os_window_close = 0; + confirm_os_window_close = 0; background = colorCfg cCfg.background; foreground = colorCfg cCfg.foreground;