diff options
| -rw-r--r-- | nix/awesome.nix | 27 | ||||
| -rw-r--r-- | nix/configuration.nix | 38 | ||||
| -rw-r--r-- | nix/devel.nix | 23 | ||||
| -rw-r--r-- | nix/games.nix | 4 | ||||
| -rw-r--r-- | nix/hardware-configuration.nix | 1 |
5 files changed, 45 insertions, 48 deletions
diff --git a/nix/awesome.nix b/nix/awesome.nix index f80b852..7b106a0 100644 --- a/nix/awesome.nix +++ b/nix/awesome.nix @@ -1,13 +1,17 @@ { pkgs, ... }: { - environment.systemPackages = with pkgs; [ - barrier gnome.adwaita-icon-theme networkmanagerapplet - clipbuzz keynav playerctl pulsemixer xclip xdotool xorg.xkill - aerc amfora calcurse dante khard ncdu ranger ueberzug vim_configurable - arandr audacious gnucash liferea scrot rxvt-unicode zathura - firefox libreoffice mepo-x11 nheko tor-browser-bundle-bin - nextcloud-client transmission-gtk - nordzy-cursor-theme + environment.systemPackages = with pkgs; let wee-slack = weechat.override { + configure = { ... }: { + scripts = [ weechatScripts.wee-slack ]; + }; + }; + in [ + clipbuzz keynav labwc playerctl pulsemixer xclip xdotool xorg.xkill + aerc amfora calcurse dante khard mu ncdu ranger senpai ueberzug + arandr audacious foot liferea scrot rxvt-unicode zathura + firefox libreoffice nheko tor-browser-bundle-bin wee-slack + networkmanagerapplet nextcloud-client transmission-gtk + gnome.adwaita-icon-theme qt5ct ]; fonts.fonts = with pkgs; [ lmodern noto-fonts-cjk-sans noto-fonts-emoji ]; @@ -26,19 +30,18 @@ }; programs = { + mepo.enable = true; nm-applet.enable = true; slock.enable = true; }; - qt5 = { + qt = { enable = true; - platformTheme = "gnome"; - style = "adwaita-dark"; + platformTheme = "qt5ct"; }; services = { autorandr.enable = true; - geoclue2.enable = true; xserver = { videoDrivers = [ "intel" ]; deviceSection = '' diff --git a/nix/configuration.nix b/nix/configuration.nix index cc9d6ef..eef0813 100644 --- a/nix/configuration.nix +++ b/nix/configuration.nix @@ -12,7 +12,6 @@ ]; boot = { - binfmt.emulatedSystems = [ "aarch64-linux" ]; supportedFilesystems = [ "btrfs" ]; loader = { efi.canTouchEfiVariables = true; @@ -31,7 +30,7 @@ hosts = let loang = [ "danh.loang.net" "tin.loang.net" "than.loang.net" "xem.loang.net" - "cnx.gdn" "cmx.cnx.gdn" "px.cnx.gdn" "src.cnx.gdn" + "cnx.gdn" "px.cnx.gdn" "src.cnx.gdn" ]; in { "127.0.0.1" = [ "9gag.com" "voz.vn" ]; @@ -138,35 +137,36 @@ extraGroups = [ "dialout" "ipfs" "networkmanager" "video" "wheel" ]; }; - environment.systemPackages = with pkgs; [ - compsize cryptsetup htop-vim inotify-tools killall rsync unzip zip - oathToolkit isync stow tor w3m wget yt-dlp - imv mpv pavucontrol sent yacreader - ffmpeg gimp imagemagick mkvtoolnix mediainfo pdftk simplescreenrecorder sox - ]; + environment = { + localBinInPath = true; + systemPackages = with pkgs; [ + atool compsize cryptsetup htop-vim inotify-tools killall rsync unzip zip + oathToolkit isync stow tor w3m wget yt-dlp + imv mpv pavucontrol sent yacreader + ffmpeg mkvtoolnix mediainfo simplescreenrecorder sox + # darktable + gimp imagemagick pdftk + ]; + wordlist.enable = true; + }; programs.iotop.enable = true; programs.udevil.enable = true; security.rtkit.enable = true; - # List services that you want to enable: services = { - pipewire = { + dictd = { enable = true; - alsa.enable = true; - pulse.enable = true; - # jack.enable = true; + DBs = with pkgs.dictdDBs; [ wiktionary wordnet ]; }; - printing = { + pipewire = { enable = true; - drivers = with pkgs; [ hplip ]; + alsa.enable = true; + pulse.enable = true; }; - dictd = { - enable = true; - DBs = with pkgs.dictdDBs; [ wiktionary wordnet ]; - }; + udisks2.enable = true; }; # This value determines the NixOS release from which the default diff --git a/nix/devel.nix b/nix/devel.nix index dacec24..8840a1b 100644 --- a/nix/devel.nix +++ b/nix/devel.nix @@ -2,32 +2,27 @@ { environment.systemPackages = with pkgs; [ - exa fd gitAndTools.gitFull glow jq minicom man-pages ripgrep rlwrap - gcc go guile_3_0 lua python3 rakudo zig + bat fd jq ripgrep vim_configurable vimpager-latest + exa gitAndTools.gitFull minicom man-pages man-pages-posix rlwrap + gcc go guile_3_0 lua rakudo zig bintools gdb gnumake pkg-config texlive.combined.scheme-full - ] ++ (with python3Packages; [ flit ]); + (python3.withPackages (pypkgs: with pypkgs; [ flit rsskey ])) + ]; programs.mtr.enable = true; programs.gnupg.agent = { enable = true; enableSSHSupport = true; + pinentryFlavor = "qt"; }; - services = { - openssh = { - enable = true; + services.openssh = { + enable = true; + settings = { passwordAuthentication = false; kbdInteractiveAuthentication = false; }; - - ipfs = { - enableGC = true; - user = "sea"; - dataDir = "/home/sea/.ipfs"; - # autoMount = true; - localDiscovery = true; - }; }; virtualisation.podman = { diff --git a/nix/games.nix b/nix/games.nix index a146931..827631d 100644 --- a/nix/games.nix +++ b/nix/games.nix @@ -1,11 +1,11 @@ { config, pkgs, ... }: { environment.systemPackages = with pkgs; [ - scorched3d zeroad # _20kly hedgewars strategy + _20kly hedgewars scorched3d zeroad # strategy astromenace chromium-bsu # scrolling taisei # shmup bastet moon-buggy n2048 ttyper # text - blackshades openmw xonotic-glx # fps + blackshades xonotic-glx # fps blobwars superTux teeworlds # platformer bonzomatic # engine extremetuxracer gl117 gltron superTuxKart # vehicle diff --git a/nix/hardware-configuration.nix b/nix/hardware-configuration.nix index 94bf58c..a7e89d3 100644 --- a/nix/hardware-configuration.nix +++ b/nix/hardware-configuration.nix @@ -19,7 +19,6 @@ extraModulePackages = [ ]; }; - nix.readOnlyStore = false; fileSystems = { "/" = { device = "none"; |