diff --git a/configuration.nix b/configuration.nix index 1e8d477..23bee02 100644 --- a/configuration.nix +++ b/configuration.nix @@ -4,6 +4,9 @@ { config, lib, pkgs, ... }: +let + upkgs = import {}; +in { imports = [ # Include the results of the hardware scan. @@ -13,7 +16,7 @@ # List packages installed in system profile. To search, run: # $ nix search wget - environment.systemPackages = with pkgs; [ + environment.systemPackages = with upkgs; [ vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. helix wget @@ -27,6 +30,7 @@ fira-code htop rustup + pkg-config clang nodejs git @@ -39,16 +43,27 @@ zulu8 ffmpeg imagemagick + zbar + usbutils + revpfw3 + arch-install-scripts + proot + inetutils + openjdk17 (import ./sl.script.nix) (import ./startsync.script.nix) (import ./bright.script.nix) (import ./nix-cmd.script.nix) (import ./sshpc.script.nix) + (import ./pushfile.script.nix) + (import ./dropfile.script.nix) ]; + programs.fish.enable = true; # Use the GRUB 2 boot loader. boot.loader.grub.enable = true; + boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; # boot.loader.grub.efiSupport = true; # boot.loader.grub.efiInstallAsRemovable = true; # boot.loader.efi.efiSysMountPoint = "/boot/efi"; @@ -119,6 +134,7 @@ # Enable sound. hardware.pulseaudio.enable = true; # OR + services.pipewire.enable = false; # services.pipewire = { # enable = true; # pulse.enable = true; diff --git a/home.nix b/home.nix index 2442a27..3ad5afc 100644 --- a/home.nix +++ b/home.nix @@ -1,15 +1,16 @@ { lib, config, pkgs, ... }: + let home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/master.tar.gz"; + upkgs = import {}; in { imports = [ (import "${home-manager}/nixos") ]; - users.users.tudbut.packages = with pkgs; [ - nheko + users.users.tudbut.packages = with upkgs; [ firefox thunderbird tree @@ -18,17 +19,24 @@ in arc-theme signal-desktop gimp - graphviz - mkchromecast yt-dlp + mpv + graphviz giac-with-xcas sqlite-interactive - mpv acpi nix-init - (import /home/tudbut/gitshit/spl {}) - (import /home/tudbut/gitshit/revpfw3 {}) - ]; + hydra-check + mate.eom + jdt-language-server + bluej + pcmanfm + filezilla + ] ++ (with pkgs; [ + nheko + olm + mkchromecast + ]); nixpkgs.config.permittedInsecurePackages = [ "olm-3.2.16" @@ -44,8 +52,27 @@ in programs.fish.enable = true; programs.fish.shellInit = '' export PATH="$PATH:$HOME/.cargo/bin" - export SPL_PATH="$HOME/gitshit/spl" + export SPL_PATH="$HOME/gitshit/spl/spl" export ISBPL_PATH="$HOME/gitshit/isbpl" + function mmgui + sudo modem-manager-gui & disown + exit + end + function jjci + jjc "$(head -n1)" + end + function jjc + echo "public class _main { public static void p(Object o) { System.out.println(o); } public static void main(String[] args) { $argv ; } }" > src/_main.java + jjj _main + rm src/_main.java + end + function jjj + mkdir src build lib res 2> /dev/null + pushd src + javac -cp "../lib" -d ../build $(find -type f) + popd + java -cp "build/:lib/:res/" $argv + end ''; programs.alacritty.enable = true; /* Here goes the rest of your home-manager config, e.g. home.packages = [ pkgs.foo ]; */ @@ -83,6 +110,10 @@ in }; }; programs.i3status.enable = true; + programs.i3status.modules."cpu_temperature 0" = { + enable = true; + position = 6; + }; programs.i3status.modules."battery all".settings.format = "%status %percentage %remaining %emptytime %consumption"; programs.i3status.modules."battery all".settings.last_full_capacity = true; services.dunst.enable = true;