From a5b0e5c6bfd9fd997c471422abe333fca748e519 Mon Sep 17 00:00:00 2001 From: able Date: Tue, 13 Jun 2023 04:19:23 -0500 Subject: [PATCH] vscode update --- configuration.nix | 187 +++++++++++++++++++++------------------------- 1 file changed, 84 insertions(+), 103 deletions(-) diff --git a/configuration.nix b/configuration.nix index 392d530..d04a7e1 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,7 +1,3 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - { config, pkgs, ... }: { imports = [ # Include the results of the hardware scan. @@ -12,20 +8,6 @@ boot = { # Bootloader. loader = { - #systemd-boot = { - # enable = true; - # set this to false, as it allows gaining root access by passing init=/bin/sh as a kernel parameter. - # However, it is enabled by default for backwards compatibility. - # editor = false; - # Prevent boot partition from running out of space - # configurationLimit = 12; - #}; - #efi={ - # canTouchEfiVariables = true; - # efiSysMountPoint = "/boot/efi"; - #}; - - grub = { enable = true; device = "/dev/sda"; @@ -120,7 +102,6 @@ sound.enable = true; - # Define a user account. Don't forget to set a password with ‘passwd’. users.users.able = { openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE8hxhhfB2zomqQLw/o3MaFxHIhE9cfmuW55npfwVtOJ able@nixos" @@ -138,60 +119,44 @@ home.stateVersion = "22.11"; home.packages = with pkgs; [ - # armcord # Smaller discord client - btop cinnamon.nemo + + dconf2nix + discord + flameshot + firefox + gimp + grapejuice gzdoom enyo-launcher - obs-studio - discord - dconf2nix - # hexdino - - # okteta - soundux - firefox - steam - grapejuice - - # adoptopenjdk-hotspot-bin-8 - # adoptopenjdk-hotspot-bin-16 - - spotify nixfmt - openrgb + prismlauncher - rustup - qemu_full + llvmPackages_16.clangUseLLVM + obs-studio + openrgb OVMFFull + + qemu_full + rustup + steam + soundux + spotify ]; - # programs.gnupg.agent = { - # enable = true; - # enableSSHSupport = true; - # }; - # environment.usr."share/ovmf/x64/OVMF_CODE.fd" = "${pkgs.OVMF}/ovmf/x64/OVMF_CODE.fd"; - - # programs.steam = { - # enable = true; - # remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play - # dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server - # }; - - programs.bash = { enable = true; shellAliases = { cinnaback = "dconf dump / | dconf2nix > dconf.nix"; - + rebuild = "sudo nixos-rebuild switch"; # Git commands gcl = "git clone"; @@ -261,53 +226,69 @@ mhutchie.git-graph ]; userSettings = { - "rust-analyzer.check.command" = "clippy"; - "files.autoSave" = "off"; - "[nix]"."editor.tabSize" = 2; - "editor.formatOnSave" = true; - "window.zoomLevel" = 2; - "workbench.colorTheme" = "One Dark"; - "editor.multiCursorModifier" = "ctrlCmd"; - "editor.formatOnPaste" = true; - "git.autofetch" = true; - "editor.tokenColorCustomizations" = { - "textMateRules" = [ - { - "name" = "One Dark italic"; - "scope" = [ - "comment" - "entity.other.attribute-name" - "keyword" - "markup.underline.link" - "storage.modifier" - "storage.type" - "string.url" - "variable.language.super" - "variable.language.this" - ]; - "settings" = { - "fontStyle" = "italic"; - }; - } - { - "name" = "One Dark italic reset"; - "scope" = [ - "keyword.operator" - "keyword.other.type" - "storage.modifier.import" - "storage.modifier.package" - "storage.type.built-in" - "storage.type.function.arrow" - "storage.type.generic" - "storage.type.java" - "storage.type.primitive" - ]; - "settings" = { - "fontStyle" = ""; - }; - } - ]; + rust-analyzer.check.command = "clippy"; + files = { + autoSave = "off"; + associations = { + "*.hbasm" = "asm-intel-x86-generic"; + }; }; + + + "[nix]".editor.tabSize = 2; + + git.autofetch = true; + gitlens.showWelcomeOnInstall = false; + + explorer.confirmDelete = false; + + editor = { + multiCursorModifier = "ctrlCmd"; + formatOnSave = true; + formatOnPaste = true; + find.addExtraSpaceOnTop = false; + tokenColorCustomizations = { + textMateRules = [ + { + name = "One Dark italic"; + scope = [ + "comment" + "entity.other.attribute-name" + "keyword" + "markup.underline.link" + "storage.modifier" + "storage.type" + "string.url" + "variable.language.super" + "variable.language.this" + ]; + settings = { + fontStyle = "italic"; + }; + } + { + name = "One Dark italic reset"; + scope = [ + "keyword.operator" + "keyword.other.type" + "storage.modifier.import" + "storage.modifier.package" + "storage.type.built-in" + "storage.type.function.arrow" + "storage.type.generic" + "storage.type.java" + "storage.type.primitive" + ]; + settings = { + fontStyle = ""; + }; + } + ]; + }; + }; + window.zoomLevel = 2; + workbench.colorTheme = "One Dark"; + }; }; @@ -316,10 +297,10 @@ enable = true; userName = "able"; userEmail = "abl3theabove@gmail.com"; - # signing = { - # key = ""; - # signByDefault = false; - # }; + signing = { + key = ""; + signByDefault = false; + }; }; };