From eee8ffa30773602391cc5264d721e30410e4f2c9 Mon Sep 17 00:00:00 2001 From: Nguyễn Gia Phong Date: Sat, 6 Nov 2021 20:48:42 +0700 Subject: Prepare for NixOS reinstallation --- nix/awesome.nix | 16 ++++++++++++---- nix/configuration.nix | 33 +++++++++++++++------------------ nix/devel.nix | 22 ++++++---------------- nix/hardware-configuration.nix | 14 +++++++------- 4 files changed, 40 insertions(+), 45 deletions(-) (limited to 'nix') diff --git a/nix/awesome.nix b/nix/awesome.nix index e4c5600..51c0ccc 100644 --- a/nix/awesome.nix +++ b/nix/awesome.nix @@ -1,11 +1,16 @@ { pkgs, ... }: { - fonts.fonts = with pkgs; [ julia-mono lmodern ]; + fonts.fonts = with pkgs; [ gentium lmodern noto-fonts-emoji ]; services = { autorandr.enable = true; xserver = { + videoDrivers = [ "intel" ]; + deviceSection = '' + Option "TearFree" "true" + ''; + enable = true; desktopManager.xterm.enable = false; displayManager.startx.enable = true; @@ -21,16 +26,19 @@ defaultLocale = "en_US.UTF-8"; inputMethod = { enabled = "ibus"; - ibus.engines = with pkgs.ibus-engines; [ table table-others ]; + ibus.engines = with pkgs.ibus-engines; [ + hangul + table table-others + ]; }; }; environment.systemPackages = with pkgs; [ gnome.adwaita-icon-theme gnome.networkmanagerapplet qt5ct - clipbuzz cowsay playerctl pulsemixer xclip xdotool xscreensaver + clipbuzz playerctl pulsemixer xclip xdotool xscreensaver aerc amfora ncdu newsboat ranger ueberzug rxvt-unicode vim_configurable arandr audacious keynav scrot sigil xorg.xkill zathura - dino firefox libreoffice nheko transmission-gtk + firefox libreoffice mumble nheko tor-browser-bundle-bin transmission-gtk ]; hardware.brillo.enable = true; diff --git a/nix/configuration.nix b/nix/configuration.nix index 75fd419..37a0a83 100644 --- a/nix/configuration.nix +++ b/nix/configuration.nix @@ -11,15 +11,17 @@ ./games.nix ]; - # Use the systemd-boot EFI boot loader. - boot.loader = { - efi.canTouchEfiVariables = true; - grub = { - enable = true; - device = "nodev"; - efiSupport = true; - useOSProber = true; - splashImage = null; + boot = { + binfmt.emulatedSystems = [ "aarch64-linux" ]; + loader = { + efi.canTouchEfiVariables = true; + grub = { + enable = true; + device = "nodev"; + efiSupport = true; + useOSProber = true; + splashImage = null; + }; }; }; @@ -44,11 +46,6 @@ # firewall.allowedUDPPorts = [ ... ]; # Or disable the firewall altogether. # firewall.enable = false; - - # Overcoming my strange addiction - extraHosts = '' - 0.0.0.0 9gag.com - ''; }; # Set your time zone. @@ -62,14 +59,14 @@ users.users.sea = { isNormalUser = true; - extraGroups = [ "networkmanager" "video" "wheel" ]; + extraGroups = [ "dialout" "networkmanager" "video" "wheel" ]; }; nix.autoOptimiseStore = true; environment.systemPackages = with pkgs; [ - htop isync killall oathToolkit rsync stow unzip w3m wget + htop inotify-tools isync killall oathToolkit rsync stow tor unzip w3m wget mpv pavucontrol sent vimiv-qt yacreader youtube-dl - ffmpeg gifski gimp imagemagick inkscape pdftk simplescreenrecorder + ffmpeg gifski gimp imagemagick inkscape pdftk simplescreenrecorder sox ]; security.rtkit.enable = true; @@ -93,7 +90,7 @@ }; dictd = { - # enable = true; + enable = true; DBs = with pkgs.dictdDBs; [ wiktionary wordnet ]; }; }; diff --git a/nix/devel.nix b/nix/devel.nix index 1de9179..ebd4da7 100644 --- a/nix/devel.nix +++ b/nix/devel.nix @@ -2,11 +2,11 @@ { environment.systemPackages = with pkgs; [ - exa fd gitAndTools.gitFull glow jq manpages ripgrep rlwrap - clojure gcc guile julia-stable-bin lua python3 rakudo zig - bintools gdb gnumake leiningen mypy nix-index pkg-config - plantuml texlive.combined.scheme-full - ] ++ (with python3Packages; [ flit pip ]); + exa fd gitAndTools.gitFull glow jq minicom manpages ripgrep rlwrap + gcc julia-stable-bin lua python3 rakudo zig + bintools gdb gnumake luaPackages.luacheck mypy pkg-config + plantuml sile texlive.combined.scheme-full + ] ++ (with python3Packages; [ flit pip tox ]); programs.mtr.enable = true; programs.gnupg.agent = { @@ -17,18 +17,8 @@ services = { # openssh.enable = true; ipfs = { - enable = true; + enable = false; dataDir = "/data/IPFS"; }; - - postgresql = { - enable = true; - enableTCPIP = true; - authentication = pkgs.lib.mkOverride 10 '' - local all all trust - host all all ::1/128 trust - host all all 127.0.0.1/32 password - ''; - }; }; } diff --git a/nix/hardware-configuration.nix b/nix/hardware-configuration.nix index 9ac7c6c..4ed5ba4 100644 --- a/nix/hardware-configuration.nix +++ b/nix/hardware-configuration.nix @@ -29,15 +29,15 @@ fsType = "ext4"; }; - "/data" = { - device = "/dev/disk/by-uuid/02594f2b-d681-49fc-8f4a-0616d44c8987"; - fsType = "ext4"; - }; + # "/data" = { + # device = "/dev/disk/by-uuid/02594f2b-d681-49fc-8f4a-0616d44c8987"; + # fsType = "ext4"; + # }; }; - swapDevices = [ - { device = "/dev/disk/by-uuid/6f45a147-3b44-4eb9-8ac3-2201e80cff5e"; } - ]; + # swapDevices = [ + # { device = "/dev/disk/by-uuid/6f45a147-3b44-4eb9-8ac3-2201e80cff5e"; } + # ]; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; } -- cgit 1.4.1