From 81c0c423013c29b962bc8607b1dd2ebdfaae71af Mon Sep 17 00:00:00 2001 From: Nguyễn Gia Phong Date: Fri, 27 Dec 2019 22:29:40 +0700 Subject: Update 2019-09-27 --- .gitignore | 4 +- configuration.nix | 118 ------------------------------------------------ emacs/.emacs.d/init.el | 2 +- nix/configuration.nix | 120 +++++++++++++++++++++++++++++++++++++++++++++++++ vim/.vim/vimrc | 2 +- 5 files changed, 124 insertions(+), 122 deletions(-) delete mode 100644 configuration.nix create mode 100644 nix/configuration.nix diff --git a/.gitignore b/.gitignore index 39c54dc..dc40f43 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ vim/.cache/vim/viminfo vim/.vim/__pycache__ vim/.vim/plugged -meta/.fonts/.uuid -meta/.config/gtk-3.0/bookmarks awesome/.config/awesome/vicious/ +nix/.config/gtk-3.0/settings.ini +nix/.gtkrc-2.0 .uuid diff --git a/configuration.nix b/configuration.nix deleted file mode 100644 index 84043a6..0000000 --- a/configuration.nix +++ /dev/null @@ -1,118 +0,0 @@ -# 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. - ./hardware-configuration.nix - ]; - - # Use the systemd-boot EFI boot loader. - boot.loader.systemd-boot.enable = true; - - networking.hostName = "nix"; # 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.enp1s0.useDHCP = true; - networking.interfaces.wlp2s0.useDHCP = true; - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Enable NetworkManager - networking.networkmanager.enable = true; - - # Select internationalisation properties. - i18n = { - consoleFont = "Lat2-Terminus16"; - consoleKeyMap = "us"; - defaultLocale = "en_US.UTF-8"; - inputMethod = { - enabled = "ibus"; - ibus.engines = with pkgs.ibus-engines; [ table table-others ]; - }; - }; - - # Set your time zone. - time.timeZone = "Asia/Ho_Chi_Minh"; - - # List packages installed in system profile. To search, run: - # $ nix search wget - environment.systemPackages = with pkgs; with kdeApplications; [ - ack htop mc stow - alacritty emacs git - aria2 curl firefox ipfs thunderbird w3m wget - ark ktorrent okular spectacle - audaciousQt5 ffmpeg-full mpv - blender frei0r glfw gmic-qt-krita kdenlive krita simplescreenrecorder - dict dictdDBs.eng2fra dictdDBs.fra2eng dictdDBs.wiktionary dictdDBs.wordnet - efibootmgr refind - gcc gdb man-pages posix_man_pages - go guile jdk12 lua octave sbcl - lmodern texlive.combined.scheme-full - python38Packages.pip python38 python38Packages.setuptools python38Packages.wheel python38Packages.twine - ]; - - # 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; }; - - # List services that you want to enable: - services.dictd.enable = true; - services.dictd.DBs = with pkgs.dictdDBs; [ eng2fra fra2eng - wiktionary wordnet ]; - - # Emacs daemon - services.emacs.enable = false; - services.emacs.install = true; - services.emacs.defaultEditor = true; - - # Enable the OpenSSH daemon. - # services.openssh.enable = true; - - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - - # Enable CUPS to print documents. - services.printing.enable = true; - - # Enable sound. - sound.enable = true; - hardware.pulseaudio.enable = true; - - # Enable the X11 windowing system. - services.xserver.enable = true; - services.xserver.layout = "us"; - services.xserver.xkbOptions = "caps:ctrl_modifier,compose:ralt"; - - # Enable touchpad support. - services.xserver.libinput.enable = true; - - # Enable the KDE Desktop Environment. - services.xserver.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; - - # Define a user account. Don't forget to set a password with ‘passwd’. - users.users.cee = { - isNormalUser = true; - extraGroups = [ "wheel" "networkmanager" ]; - }; - - # This value determines the NixOS release with which your system is to be - # compatible, in order to avoid breaking some software such as database - # servers. You should change this only after NixOS release notes say you - # should. - system.stateVersion = "20.03"; # Did you read the comment? -} diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el index eadceea..9c5adfe 100644 --- a/emacs/.emacs.d/init.el +++ b/emacs/.emacs.d/init.el @@ -32,7 +32,7 @@ '(erc-nick "cnx") '(package-selected-packages (quote - (sane-term glsl-mode perl6-mode fireplace lua-mode markdown-mode + (sane-term glsl-mode nix-mode perl6-mode fireplace lua-mode markdown-mode smart-tabs-mode auctex wordnut magit geiser slime pdf-tools))) '(safe-local-variable-values (quote ((Syntax . Common-Lisp)))) '(scroll-bar-mode nil) diff --git a/nix/configuration.nix b/nix/configuration.nix new file mode 100644 index 0000000..5f7e1de --- /dev/null +++ b/nix/configuration.nix @@ -0,0 +1,120 @@ +# 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. + ./hardware-configuration.nix + ]; + + # Use the systemd-boot EFI boot loader. + boot.loader.systemd-boot.enable = true; + + networking.hostName = "nix"; # 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.enp1s0.useDHCP = true; + networking.interfaces.wlp2s0.useDHCP = true; + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Enable NetworkManager + networking.networkmanager.enable = true; + + # Select internationalisation properties. + i18n = { + consoleFont = "Lat2-Terminus16"; + consoleKeyMap = "us"; + defaultLocale = "en_US.UTF-8"; + inputMethod = { + enabled = "ibus"; + ibus.engines = with pkgs.ibus-engines; [ table table-others ]; + }; + }; + + # Set your time zone. + time.timeZone = "Asia/Ho_Chi_Minh"; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; with kdeApplications; [ + ack htop mc stow + alacritty emacs git nix-prefetch-github + aria2 curl firefox ipfs thunderbird w3m wget + ark ktorrent libreoffice okular spectacle + audaciousQt5 ffmpeg-full mpv + blender frei0r glfw gmic-qt-krita kdenlive krita simplescreenrecorder + dict dictdDBs.eng2fra dictdDBs.fra2eng dictdDBs.wiktionary dictdDBs.wordnet + efibootmgr refind + gcc gdb man-pages posix_man_pages + go guile jdk12 lua octave sbcl + lmodern texlive.combined.scheme-full + (python38.withPackages(ps: with ps; + [ pip setuptools twine virtualenvwrapper wheel + numpy moderngl pillow pygame ])) + ]; + + # 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; }; + + # List services that you want to enable: + services.dictd.enable = true; + services.dictd.DBs = with pkgs.dictdDBs; [ eng2fra fra2eng + wiktionary wordnet ]; + + # Emacs daemon + services.emacs.enable = false; + services.emacs.install = true; + services.emacs.defaultEditor = true; + + # Enable the OpenSSH daemon. + # services.openssh.enable = true; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # Enable sound. + sound.enable = true; + hardware.pulseaudio.enable = true; + + # Enable the X11 windowing system. + services.xserver.enable = true; + services.xserver.layout = "us"; + services.xserver.xkbOptions = "caps:ctrl_modifier,compose:ralt"; + + # Enable touchpad support. + services.xserver.libinput.enable = true; + + # Enable the KDE Desktop Environment. + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; + + # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.cee = { + isNormalUser = true; + extraGroups = [ "wheel" "networkmanager" ]; + }; + + # This value determines the NixOS release with which your system is to be + # compatible, in order to avoid breaking some software such as database + # servers. You should change this only after NixOS release notes say you + # should. + system.stateVersion = "20.03"; # Did you read the comment? +} diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc index ec9194d..9046c06 100755 --- a/vim/.vim/vimrc +++ b/vim/.vim/vimrc @@ -32,11 +32,11 @@ command Q q command W w call plug#begin('~/.vim/plugged') +Plug 'https://github.com/vim/killersheep.git' Plug 'https://github.com/sheerun/vim-polyglot.git' Plug 'https://github.com/srcery-colors/srcery-vim.git' Plug 'https://github.com/tpope/vim-abolish.git' Plug 'https://github.com/alx741/vinfo.git' -Plug 'https://github.com/drmikehenry/vim-fontsize.git' Plug 'https://github.com/lervag/vimtex.git', {'for': 'tex'} Plug 'https://github.com/kovisoft/slimv.git', {'for': 'lisp'} Plug 'https://github.com/artur-shaik/vim-javacomplete2.git', {'for': 'java'} -- cgit 1.4.1