From a0397085ed8b178b76b2ab321d9bfb4a1523c5a9 Mon Sep 17 00:00:00 2001 From: RGBCube Date: Wed, 24 May 2023 21:16:19 +0300 Subject: [PATCH] Better formatting --- machines/asus/bat/default.nix | 8 ++++---- machines/asus/fonts.nix | 10 +++------- machines/asus/git/default.nix | 29 +++++++++++++++-------------- machines/asus/hardware.nix | 4 ++-- machines/asus/helix/default.nix | 17 +++++++---------- machines/asus/localisation.nix | 26 ++++++++++++++------------ machines/asus/nushell/default.nix | 4 ++-- machines/asus/pipewire/default.nix | 2 +- machines/asus/xserver/default.nix | 2 +- 9 files changed, 49 insertions(+), 53 deletions(-) diff --git a/machines/asus/bat/default.nix b/machines/asus/bat/default.nix index d84c6a5..3b579fb 100644 --- a/machines/asus/bat/default.nix +++ b/machines/asus/bat/default.nix @@ -6,7 +6,7 @@ (homeConfiguration "nixos" { programs.nushell.environmentVariables = { - PAGER = "\"bat --plain\""; + PAGER = "\"bat --plain\""; MANPAGER = "\"sh -c 'col --spaces --no-backspaces | bat --plain --language man'\""; }; @@ -14,9 +14,9 @@ config.theme = "catppuccin"; themes.catppuccin = builtins.readFile (pkgs.fetchFromGitHub { - owner = "catppuccin"; - repo = "bat"; - rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1"; + owner = "catppuccin"; + repo = "bat"; + rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1"; sha256 = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw="; } + "/Catppuccin-mocha.tmTheme"); }; diff --git a/machines/asus/fonts.nix b/machines/asus/fonts.nix index 9298879..dd08564 100644 --- a/machines/asus/fonts.nix +++ b/machines/asus/fonts.nix @@ -3,17 +3,13 @@ (systemConfiguration { console = { earlySetup = true; - font = "Lat2-Terminus16"; - packages = with pkgs; [ - terminus-nerdfont - ]; + font = "Lat2-Terminus16"; + packages = with pkgs; [ terminus-nerdfont ]; }; }) (with pkgs; systemFonts [ (nerdfonts.override { - fonts = [ - "JetBrainsMono" - ]; + fonts = [ "JetBrainsMono" ]; }) ]) diff --git a/machines/asus/git/default.nix b/machines/asus/git/default.nix index f469eca..7d8ae7f 100644 --- a/machines/asus/git/default.nix +++ b/machines/asus/git/default.nix @@ -2,30 +2,31 @@ homeConfiguration "nixos" { programs.nushell.shellAliases = { - g = "git"; - ga = "git add ./"; - grb = "git rebase --interactive"; + g = "git"; + ga = "git add ./"; + grb = "git rebase --interactive"; grba = "git rebase --abort"; - gc = "git commit --message"; - gca = "git commit --amend"; - gcl = "git clone"; - gd = "git diff"; - gds = "git diff --staged"; - gp = "git push"; - gs = "git stash"; - gss = "git status"; + gc = "git commit --message"; + gca = "git commit --amend"; + gcl = "git clone"; + gd = "git diff"; + gds = "git diff --staged"; + gp = "git push"; + gs = "git stash"; + gst = "git status"; }; programs.git = enabled { - userName = "RGBCube"; + userName = "RGBCube"; userEmail = "RGBCube@users.noreply.github.com"; extraConfig = { init.defaultBranch = "master"; - gpg.format = "ssh"; + gpg.format = "ssh"; user.signingKey = "~/.ssh/id_rsa"; - commit.gpgSign = true; + commit.gpgSign = true; + url."ssh://git@github.com/".insteadOf = "https://github.com/"; }; }; diff --git a/machines/asus/hardware.nix b/machines/asus/hardware.nix index 219ba53..14aa5e9 100644 --- a/machines/asus/hardware.nix +++ b/machines/asus/hardware.nix @@ -17,9 +17,9 @@ systemConfiguration { ]; boot.loader = { - systemd-boot = enabled {}; + systemd-boot = enabled {}; efi.canTouchEfiVariables = true; - efi.efiSysMountPoint = "/boot/efi"; + efi.efiSysMountPoint = "/boot/efi"; }; fileSystems."/" = { diff --git a/machines/asus/helix/default.nix b/machines/asus/helix/default.nix index f7987fb..ec6b3cb 100644 --- a/machines/asus/helix/default.nix +++ b/machines/asus/helix/default.nix @@ -13,16 +13,13 @@ settings.theme = "catppuccin_mocha"; settings.editor = { - color-modes = true; + color-modes = true; cursor-shape.insert = "bar"; - cursorline = true; - file-picker.hidden = false; - line-number = "relative"; - shell = [ - "nu" - "-c" - ]; - text-width = 100; + cursorline = true; + file-picker.hidden = false; + line-number = "relative"; + shell = [ "nu" "-c" ]; + text-width = 100; }; settings.editor.auto-pairs = { @@ -42,7 +39,7 @@ }; settings.editor.whitespace = { - render.tab = "all"; + render.tab = "all"; characters.tab = "→"; }; }; diff --git a/machines/asus/localisation.nix b/machines/asus/localisation.nix index 804012d..c3096d2 100644 --- a/machines/asus/localisation.nix +++ b/machines/asus/localisation.nix @@ -2,20 +2,22 @@ systemConfiguration { services.xserver.layout = "tr"; - console.keyMap = "trq"; + console.keyMap = "trq"; time.timeZone = "Europe/Istanbul"; - i18n.defaultLocale = "en_US.UTF-8"; - i18n.extraLocaleSettings = { - LC_ADDRESS = "tr_TR.UTF-8"; - LC_IDENTIFICATION = "tr_TR.UTF-8"; - LC_MEASUREMENT = "tr_TR.UTF-8"; - LC_MONETARY = "tr_TR.UTF-8"; - LC_NAME = "tr_TR.UTF-8"; - LC_NUMERIC = "tr_TR.UTF-8"; - LC_PAPER = "tr_TR.UTF-8"; - LC_TELEPHONE = "tr_TR.UTF-8"; - LC_TIME = "tr_TR.UTF-8"; + i18n.defaultLocale = "en_US.UTF-8"; + i18n.extraLocaleSettings = let + locale = "tr_TR.UTF-8"; + in { + LC_ADDRESS = locale; + LC_IDENTIFICATION = locale; + LC_MEASUREMENT = locale; + LC_MONETARY = locale; + LC_NAME = locale; + LC_NUMERIC = locale; + LC_PAPER = locale; + LC_TELEPHONE = locale; + LC_TIME = locale; }; } diff --git a/machines/asus/nushell/default.nix b/machines/asus/nushell/default.nix index 79238fd..2ba5a9e 100644 --- a/machines/asus/nushell/default.nix +++ b/machines/asus/nushell/default.nix @@ -8,13 +8,13 @@ programs.starship = enabled { settings.character = { success_symbol = ""; - error_symbol = ""; + error_symbol = ""; }; }; programs.nushell = enabled { configFile.source = ./configuration.nu; - envFile.source = ./environment.nu; + envFile.source = ./environment.nu; shellAliases = { la = "ls --all"; diff --git a/machines/asus/pipewire/default.nix b/machines/asus/pipewire/default.nix index 1305bc7..53b42ed 100644 --- a/machines/asus/pipewire/default.nix +++ b/machines/asus/pipewire/default.nix @@ -2,7 +2,7 @@ systemConfiguration { security.rtkit = enabled {}; - sound = enabled {}; + sound = enabled {}; services.pipewire = enabled { pulse = enabled {}; diff --git a/machines/asus/xserver/default.nix b/machines/asus/xserver/default.nix index f9966c3..742e423 100644 --- a/machines/asus/xserver/default.nix +++ b/machines/asus/xserver/default.nix @@ -2,7 +2,7 @@ systemConfiguration { services.xserver = enabled { - displayManager.sddm = enabled {}; + displayManager.sddm = enabled {}; desktopManager.plasma5 = enabled {}; }; }