diff --git a/.emacs.d/init.el b/.emacs.d/init.el index abe6f7e..26cf99d 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -42,7 +42,7 @@ '(global-hl-line-mode t) '(package-selected-packages (quote - (phps-mode projectile webfeeder znc pinboard yaml-mode which-key web-mode virtualenvwrapper use-package twittering-mode try smex racer powershell poetry pipenv ox-reveal outline-magic org-pdfview org-bullets ob-restclient multiple-cursors magit lua-mode lsp-ui iedit helm flycheck-rust exec-path-from-shell eglot edit-indirect company-lsp ansible ace-window)))) + (fira-code-mode yasnippet org-pdftools phps-mode projectile webfeeder znc pinboard yaml-mode which-key web-mode virtualenvwrapper use-package twittering-mode try smex racer powershell poetry pipenv ox-reveal outline-magic org-pdfview org-bullets ob-restclient multiple-cursors magit lua-mode lsp-ui iedit helm flycheck-rust exec-path-from-shell eglot edit-indirect company-lsp ansible ace-window)))) '(znc-servers `(("bouncer.awful.club" 5000 t ((freenode "blindidiotgod/freenode" ,znc-password) diff --git a/.emacs.d/jlj-generic.el b/.emacs.d/jlj-generic.el index f6a89f8..15b526b 100644 --- a/.emacs.d/jlj-generic.el +++ b/.emacs.d/jlj-generic.el @@ -8,7 +8,7 @@ (setq case-fold-search t) ; ignore case when searching (fset 'yes-or-no-p 'y-or-n-p) ; make it easier to answer qs. -(set-frame-font "Consolas 12") ; set default font +(set-frame-font "fira code 12") ; set default font (transient-mark-mode 1) ; Enable transient mark mode (highlights) (load-theme 'manoj-dark) ; loads my favorite default theme (global-hl-line-mode t) ; highlights the line you're on @@ -19,6 +19,17 @@ (find-file "~/Sync/Documents/org/personal.org") ;open primary org file on launch (electric-pair-mode 1) ; create paired brackets. + + +(use-package yasnippet + :ensure t + :config + (yas-minor-mode-on)) + +(use-package fira-code-mode + :custom (fira-code-mode-disabled-ligatures '("[]" "#{" "#(" "#_" "#_(" "x")) ;; List of ligatures to turn off + :config (global-fira-code-mode)) ;; Enables fira-code-mode globally + ;; lets you find all instance of string @ point with C-; (use-package iedit :ensure t) @@ -128,9 +139,6 @@ :config (pdf-tools-install)) -(use-package org-pdfview - :ensure t) - (use-package magit :ensure t) diff --git a/.emacs.d/snippets/org-mode/org-include-file b/.emacs.d/snippets/org-mode/org-include-file new file mode 100644 index 0000000..549e52e --- /dev/null +++ b/.emacs.d/snippets/org-mode/org-include-file @@ -0,0 +1,6 @@ +# -*- mode: snippet -*- +# name: org include file +# key: oif +# -- + +#+INCLUDE: "" src \ No newline at end of file diff --git a/.xinitrc b/.xinitrc old mode 100755 new mode 100644 index 69b8996..86088ac --- a/.xinitrc +++ b/.xinitrc @@ -1 +1 @@ -exec awesome +awesome diff --git a/configuration.nix b/nixos-config/configuration.nix similarity index 82% rename from configuration.nix rename to nixos-config/configuration.nix index 13dd267..705875e 100644 --- a/configuration.nix +++ b/nixos-config/configuration.nix @@ -15,14 +15,15 @@ # boot.loader.efi.canTouchEfiVariables = true; boot.loader.grub.useOSProber = true; - networking.hostName = "nix-hive"; # Define your hostname. + networking.hostName = "nix-ling"; # Define your hostname. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # The global useDHCP flag is deprecated, therefore explicitly set to false here. # Per-interface useDHCP will be mandatory in the future, so this generated config # replicates the default behaviour. networking.useDHCP = false; - networking.interfaces.enp34s0.useDHCP = true; + networking.interfaces.enp2s0f1.useDHCP = true; + networking.interfaces.wlp3s0.useDHCP = true; # Configure network proxy if necessary # networking.proxy.default = "http://user:password@proxy:port/"; @@ -31,7 +32,7 @@ # Select internationalisation properties. i18n.defaultLocale = "en_US.UTF-8"; console = { - font = "Lat2-Terminus16"; + font = "fira-code"; keyMap = "us"; }; @@ -49,10 +50,13 @@ vim konsole firefox + chromium + next emacs git rofi # jlj utils + ansible python38Packages.syncthing-gtk bitwarden keychain @@ -60,6 +64,10 @@ os-prober breeze-grub grub2_efi + lsof + gnupg + # jlj sound + pavucontrol # jlj comms riot-desktop slack @@ -78,14 +86,27 @@ vulkan-tools ]; + fonts.fonts = with pkgs; [ + noto-fonts + noto-fonts-cjk + noto-fonts-emoji + liberation_ttf + fira-code + fira-code-symbols + mplus-outline-fonts + dina-font + proggyfonts + ]; + + # Some programs need SUID wrappers, can be configured further or are # started in user sessions. # programs.mtr.enable = true; - # programs.gnupg.agent = { - # enable = true; - # enableSSHSupport = true; - # pinentryFlavor = "gnome3"; - # }; + programs.gnupg.agent = { + enable = true; + enableSSHSupport = true; + pinentryFlavor = "qt"; + }; # List services that you want to enable: @@ -104,6 +125,7 @@ # Enable sound. sound.enable = true; hardware.pulseaudio.enable = true; + hardware.pulseaudio.support32Bit = true; ## If compatibility with 32-bit applications is desired. games need this. # Enable the X11 windowing system. services.xserver.enable = true; @@ -113,7 +135,6 @@ # Enable vulkan support hardware.opengl.driSupport32Bit = true; hardware.opengl.enable = true; - hardware.pulseaudio.support32Bit = true; # services.xserver.xkbOptions = "eurosign:e"; # Enable touchpad support. @@ -127,7 +148,7 @@ # Define a user account. Don't forget to set a password with ‘passwd’. users.users.josiah = { isNormalUser = true; - extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. + extraGroups = [ "wheel" "audio" "sound" "video"]; # Enable ‘sudo’ for the user. }; # This value determines the NixOS release from which the default diff --git a/nixos-config/hardware-configuration.nix b/nixos-config/hardware-configuration.nix new file mode 100644 index 0000000..fe6f778 --- /dev/null +++ b/nixos-config/hardware-configuration.nix @@ -0,0 +1,32 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, ... }: + +{ + imports = + [ + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/4d876a76-08c8-4894-92cc-d27bb3d6eb66"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/BD51-BD35"; + fsType = "vfat"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/887f86eb-17ba-4b2c-a3f4-6f0a8356bf0f"; } + ]; + + nix.maxJobs = lib.mkDefault 8; + powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; +}