diff options
8 files changed, 34 insertions, 70 deletions
@@ -1,4 +1,25 @@ +These are my dotfiles for various machines I use with Nix. + + +Some of machines are standard NixOS, some Darwin + Nix, and some just Nix on a +different distro where I just need my user configs managed, not the full system. + + +I've settled on using Home Manager to trigger even system-level re-builds just because +it is quite convenient to do so, as opposed to doing it separately. It is probably +not the best approach, but it works for me. + + +Having it all be part of the same flake means that I get the same version of software +on all of these machines, which is nice. + + +I use GNU Stow to manage the Nix, and HM dotfiles themselves. ```bash +# On non-NixOS, you can usually find it in your distro's package manager + +# On NixOS, you can do +# nix-shell -p stow stow -v -t ~ nix home-manager ``` diff --git a/home-manager/.config/home-manager/common/scripts/fixwlr b/home-manager/.config/home-manager/common/scripts/fixwlr deleted file mode 100755 index d9f4230..0000000 --- a/home-manager/.config/home-manager/common/scripts/fixwlr +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -systemctl --user import-environment WAYLAND_DISPLAY -systemctl --user restart xdg-desktop-portal diff --git a/home-manager/.config/home-manager/common/scripts/spiceconnect b/home-manager/.config/home-manager/common/scripts/spiceconnect deleted file mode 100755 index 9e410ac..0000000 --- a/home-manager/.config/home-manager/common/scripts/spiceconnect +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -remote-viewer ~/Downloads/"$(ls -1t ~/Downloads | head -n1)" diff --git a/home-manager/.config/home-manager/common/scripts/start b/home-manager/.config/home-manager/common/scripts/start deleted file mode 100755 index c8b1235..0000000 --- a/home-manager/.config/home-manager/common/scripts/start +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# This a sort-of auto-start script. -# Run this from a tty to start my graphical env. -# - -#export XDG_CURRENT_DESKTOP=dwl -#export XDG_SESSION_TYPE=wayland -#export XDG_SESSION_DESKTOP=dwl -# -#systemctl --user import-environment XDG_CURRENT_DESKTOP XDG_SESSION_DESKTOP XDG_SESSION_TYPE -# -#exec dwl -s 'somebar' & -# -## set blocks on bar -#exec /usr/local/bin/someblocks & -# -## give wayland session some time to init -#sleep 1 -# -#exec mako & -# -#sleep 1 -# -## set bg -#exec walp & -# -## set monitor to be left of the laptop display -#exec wlr-randr --output DP-1 --pos 0,0 & -# -## fix for screen-sharing -#exec fixwlr -# -nix run github:guibou/nixGL#nixGLIntel -- Hyprland diff --git a/home-manager/.config/home-manager/common/scripts/walp b/home-manager/.config/home-manager/common/scripts/walp deleted file mode 100755 index 9bac47e..0000000 --- a/home-manager/.config/home-manager/common/scripts/walp +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env bash - -pkill wbg || echo "No wbg process was running." - -WALLPAPERS_HOME=${1:-$HOME/pics/wallpapers} - -# Get a random image file from the dir. -RAND_BG=$(find "$WALLPAPERS_HOME" -type f -name "*.jpeg" -o -name "*.jpg" -o -name "*.png" | shuf | head -n1) - -# Store the chosen bg -cp -a "${RAND_BG}" /tmp/bg - -WBG_PATH="$(command -v wbg || echo "$HOME"/.nix-profile/bin/wbg)" -echo "WBG is $WBG_PATH" - -if [[ ! -f "$WBG_PATH" ]]; then - ehco "WBG is not installed. Exiting." - exit 1 -else - # Set the image file as the background. - notify-send "Setting background." - "${WBG_PATH}" "${RAND_BG}" & -fi diff --git a/home-manager/.config/home-manager/per-user/kdam0-arti/configuration.nix b/home-manager/.config/home-manager/per-user/kdam0-arti/configuration.nix index af18431..d7d2db1 100644 --- a/home-manager/.config/home-manager/per-user/kdam0-arti/configuration.nix +++ b/home-manager/.config/home-manager/per-user/kdam0-arti/configuration.nix @@ -32,6 +32,7 @@ environment.variables.GTK_THEME = "Adwaita:dark"; environment.systemPackages = with pkgs; [ + cifs-utils bitwarden-cli bmon dmenu @@ -201,5 +202,13 @@ nerd-fonts.jetbrains-mono ]; + fileSystems."/home/kdam0/mnt/bacala-media" = { + device = "//lan.nas/bacala-media"; + fsType = "cifs"; + options = let + automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s,user,users"; + in ["${automount_opts},credentials=/home/kdam0/.smb-secrets,uid=1000,gid=100"]; + }; + system.stateVersion = "26.05"; } diff --git a/home-manager/.config/home-manager/per-user/kdam0-arti/home.nix b/home-manager/.config/home-manager/per-user/kdam0-arti/home.nix index c7ca92b..b7ed7ed 100644 --- a/home-manager/.config/home-manager/per-user/kdam0-arti/home.nix +++ b/home-manager/.config/home-manager/per-user/kdam0-arti/home.nix @@ -36,6 +36,7 @@ "image/gif" = "sxiv.desktop"; "image/bmp" = "sxiv.desktop"; "image/tiff" = "sxiv.desktop"; + "application/pdf" = "org.pwmt.zathura.desktop"; }; }; @@ -157,6 +158,9 @@ } ]; }; + services.syncthing = { + enable = true; + }; home.packages = [ pkgs.lynx pkgs.urlscan pkgs.satty pkgs.xdotool ]; home.file.".mailcap".text = '' diff --git a/home-manager/.config/home-manager/per-user/kdam0-arti/hosts.nix b/home-manager/.config/home-manager/per-user/kdam0-arti/hosts.nix deleted file mode 100644 index 975dcf8..0000000 --- a/home-manager/.config/home-manager/per-user/kdam0-arti/hosts.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ config, pkgs, ... }: - -{ - networking.extraHosts = '' - 192.168.0.87 art-jr - 192.168.0.213 sr - ''; -} |