diff --git a/installers/nixos/configuration.nix b/installers/nixos/configuration.nix index 64c65a1..8564255 100644 --- a/installers/nixos/configuration.nix +++ b/installers/nixos/configuration.nix @@ -21,12 +21,16 @@ # accidentally delete configuration.nix. system.copySystemConfiguration = true; + #enable automatic updates + system.autoUpgrade.enable = true; + system.autoUpgrade.allowReboot = false; + # Use the systemd-boot EFI boot loader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - networking.hostName = "bismarck"; # Define your hostname. + networking.hostName = "nixos"; # Define your hostname. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. #networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. @@ -79,6 +83,8 @@ chromium brave keepassxc + monero-cli + cura ]; }; @@ -142,20 +148,20 @@ notmuch isync pinentry-curses + pinentry-bemenu connman-gtk openssl git shellcheck jq - monero-cli bc gnome.zenity - cura udisks2 udiskie python3 python3.pkgs.pip chafa + wget ]; fonts.fonts = with pkgs; [ @@ -163,7 +169,7 @@ noto-fonts-extra noto-fonts-emoji noto-fonts-cjk-sans - nerdfonts + (nerdfonts.override { fonts = [ "Mononoki" ]; }) ]; @@ -178,8 +184,6 @@ pulse.enable = true; }; - - services.pipewire.wireplumber.enable = true; # xdg-desktop-portal works by exposing a series of D-Bus interfaces @@ -193,8 +197,8 @@ enable = true; wlr.enable = true; # gtk portal needed to make gtk apps happy - extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; - gtkUsePortal = true; + extraPortals = [ pkgs.xdg-desktop-portal-wlr ]; + #gtkUsePortal = true; }; } diff --git a/installers/nixos/install.sh b/installers/nixos/install.sh index 3ca222e..4e14e16 100644 --- a/installers/nixos/install.sh +++ b/installers/nixos/install.sh @@ -14,24 +14,6 @@ mkdir -p ~/.cache/zsh touch ~/.cache/zsh/history -<<<<<<< HEAD -sh ~/.local/scripts/install.sh add-repos ~/.local/installers/nixos/repos.list - - -#link rofi themes directory so that theming works -mkdir -p "$HOME"/.local/share/rofi/ -ln -s "$HOME"/.local/src/base16-rofi/themes/ "$HOME"/.local/share/rofi/themes -======= -#sh ~/.local/scripts/install.sh add-repos ~/.local/installers/nixos/repos.list - - -#link rofi themes directory so that theming works -#mkdir -p "$HOME"/.local/share/rofi/ -#ln -s "$HOME"/.local/src/base16-rofi/themes/ "$HOME"/.local/share/rofi/themes ->>>>>>> tmp - - - #set limits for esync #sudo sh -c "echo '$USER hard nofile 524288' >> /etc/security/limits.conf" #set limits for monero @@ -48,11 +30,7 @@ wget http://collapseos.org/files/collapseos-latest.tar.gz cd - #set wallpaper -<<<<<<< HEAD -ln -s ~/media/img/wallpapers/alena-aenami-eclipse-1k.jpg ~/.config/wall -======= #ln -s ~/media/img/wallpapers/alena-aenami-eclipse-1k.jpg ~/.config/wall ->>>>>>> tmp #link Xresources for xwayland ln -s ~/.config/Xresources ~/.Xdefaults diff --git a/installers/nixos/repos.list b/installers/nixos/repos.list deleted file mode 100644 index 2bdf5c6..0000000 --- a/installers/nixos/repos.list +++ /dev/null @@ -1,3 +0,0 @@ -https://github.com/aarowill/base16-alacritty.git -https://github.com/rkubosz/base16-sway.git -https://gitlab.com/jordiorlando/base16-rofi.git diff --git a/sway-bar.sh b/sway-bar.sh index 90e2a32..e1efd36 100755 --- a/sway-bar.sh +++ b/sway-bar.sh @@ -132,8 +132,8 @@ update() { if [ "$1" ] && [ "$1" = "-l" ]; then echo "$$" > ~/.cache/statusbar_pid - sh ~/.local/scripts/update-crypto.sh -i >> /dev/null & - sh ~/.local/scripts/update-weather.sh -i >> /dev/null & + #sh ~/.local/scripts/update-crypto.sh -i >> /dev/null & + #sh ~/.local/scripts/update-weather.sh -i >> /dev/null & while true do