From e6edbad14d8255743c7b259a1985db5fb5bd4e91 Mon Sep 17 00:00:00 2001 From: jjanzen Date: Wed, 5 Mar 2025 22:17:31 -0600 Subject: system changes --- macos.local/.flake/home/.wallpaper | 1 - macos.local/.flake/home/clang-format.nix.org | 1 - macos.local/.flake/home/core.nix.org | 30 --------- macos.local/.flake/home/fonts.nix.org | 1 - macos.local/.flake/home/programs/.DS_Store | Bin 6148 -> 0 bytes macos.local/.flake/home/programs/core.nix.org | 68 --------------------- .../.flake/home/programs/emacs/core.nix.org | 14 ----- .../.flake/home/programs/emacs/early-init.el.org | 1 - .../.flake/home/programs/emacs/feed.org.org | 1 - macos.local/.flake/home/programs/emacs/init.el.org | 1 - macos.local/.flake/home/programs/fastfetch.nix.org | 1 - macos.local/.flake/home/programs/ghostty.nix.org | 23 ------- macos.local/.flake/home/programs/git.nix.org | 1 - macos.local/.flake/home/programs/ncmpcpp.nix.org | 28 --------- macos.local/.flake/home/programs/neovim.nix.org | 1 - macos.local/.flake/home/programs/ssh.nix.org | 44 ------------- macos.local/.flake/home/programs/zsh/core.nix.org | 36 ----------- .../.flake/home/programs/zsh/init-extra.sh.org | 28 --------- .../.flake/home/programs/zsh/profile-extra.sh.org | 10 --- macos.local/.flake/home/scripts/core.nix.org | 27 -------- macos.local/.flake/home/scripts/deploy-website.org | 7 --- macos.local/.flake/home/scripts/launcher.org | 7 --- macos.local/.flake/home/scripts/manage-system.org | 47 -------------- .../.flake/home/scripts/remove-quarantine.org | 7 --- macos.local/.flake/home/services/core.nix.org | 12 ---- macos.local/.flake/home/services/mpd.nix.org | 49 --------------- 26 files changed, 446 deletions(-) delete mode 120000 macos.local/.flake/home/.wallpaper delete mode 120000 macos.local/.flake/home/clang-format.nix.org delete mode 100644 macos.local/.flake/home/core.nix.org delete mode 120000 macos.local/.flake/home/fonts.nix.org delete mode 100644 macos.local/.flake/home/programs/.DS_Store delete mode 100644 macos.local/.flake/home/programs/core.nix.org delete mode 100644 macos.local/.flake/home/programs/emacs/core.nix.org delete mode 120000 macos.local/.flake/home/programs/emacs/early-init.el.org delete mode 120000 macos.local/.flake/home/programs/emacs/feed.org.org delete mode 120000 macos.local/.flake/home/programs/emacs/init.el.org delete mode 120000 macos.local/.flake/home/programs/fastfetch.nix.org delete mode 100644 macos.local/.flake/home/programs/ghostty.nix.org delete mode 120000 macos.local/.flake/home/programs/git.nix.org delete mode 100644 macos.local/.flake/home/programs/ncmpcpp.nix.org delete mode 120000 macos.local/.flake/home/programs/neovim.nix.org delete mode 100644 macos.local/.flake/home/programs/ssh.nix.org delete mode 100644 macos.local/.flake/home/programs/zsh/core.nix.org delete mode 100644 macos.local/.flake/home/programs/zsh/init-extra.sh.org delete mode 100644 macos.local/.flake/home/programs/zsh/profile-extra.sh.org delete mode 100644 macos.local/.flake/home/scripts/core.nix.org delete mode 100644 macos.local/.flake/home/scripts/deploy-website.org delete mode 100644 macos.local/.flake/home/scripts/launcher.org delete mode 100644 macos.local/.flake/home/scripts/manage-system.org delete mode 100644 macos.local/.flake/home/scripts/remove-quarantine.org delete mode 100644 macos.local/.flake/home/services/core.nix.org delete mode 100644 macos.local/.flake/home/services/mpd.nix.org (limited to 'macos.local/.flake/home') diff --git a/macos.local/.flake/home/.wallpaper b/macos.local/.flake/home/.wallpaper deleted file mode 120000 index 316db81..0000000 --- a/macos.local/.flake/home/.wallpaper +++ /dev/null @@ -1 +0,0 @@ -../../../common/.wallpaper \ No newline at end of file diff --git a/macos.local/.flake/home/clang-format.nix.org b/macos.local/.flake/home/clang-format.nix.org deleted file mode 120000 index db7166a..0000000 --- a/macos.local/.flake/home/clang-format.nix.org +++ /dev/null @@ -1 +0,0 @@ -../../../common/.flake/home/clang-format.nix.org \ No newline at end of file diff --git a/macos.local/.flake/home/core.nix.org b/macos.local/.flake/home/core.nix.org deleted file mode 100644 index cb2b34d..0000000 --- a/macos.local/.flake/home/core.nix.org +++ /dev/null @@ -1,30 +0,0 @@ -#+title: Home Configuration - -Set up home manager for my user account and import submodules. Define my user as =jjanzen= and specify the wallpaper and add items to the =PATH= variable. -#+begin_src nix - { config, pkgs, ... }: - - { - imports = [ - ./clang-format.nix - ./fonts.nix - ./programs/core.nix - ./scripts/core.nix - ./services/core.nix - ]; - - home.stateVersion = "24.05"; - programs.home-manager.enable = true; - - home.username = "jjanzen"; - home.homeDirectory = "/Users/jjanzen"; - - home.file.".wallpaper".source = ./.wallpaper; - - home.sessionPath = [ - "$HOME/.local/bin" - "/usr/local/bin" - "/opt/homebrew/bin" - ]; - } -#+end_src diff --git a/macos.local/.flake/home/fonts.nix.org b/macos.local/.flake/home/fonts.nix.org deleted file mode 120000 index 53bec1c..0000000 --- a/macos.local/.flake/home/fonts.nix.org +++ /dev/null @@ -1 +0,0 @@ -../../../common/.flake/home/fonts.nix.org \ No newline at end of file diff --git a/macos.local/.flake/home/programs/.DS_Store b/macos.local/.flake/home/programs/.DS_Store deleted file mode 100644 index 668825b..0000000 Binary files a/macos.local/.flake/home/programs/.DS_Store and /dev/null differ diff --git a/macos.local/.flake/home/programs/core.nix.org b/macos.local/.flake/home/programs/core.nix.org deleted file mode 100644 index 24b2555..0000000 --- a/macos.local/.flake/home/programs/core.nix.org +++ /dev/null @@ -1,68 +0,0 @@ -#+title: Core Program Configuration - -Import configurations for programs and install programs with no configuration. -#+begin_src nix - { config, pkgs, ... }: - - { - imports = [ - ./emacs/core.nix - ./fastfetch.nix - ./ghostty.nix - ./git.nix - ./ncmpcpp.nix - ./neovim.nix - ./ssh.nix - ./zsh/core.nix - ]; - - home.packages = with pkgs; [ - aescrypt - bash-language-server - bear - bison - cmake - cmake-language-server - curl - dos2unix - eza - ffmpeg - fzf - gnutls - go - gopls - gpgme - htop - hunspell - hyfetch # TODO: configure - inetutils - ispell - lesspipe - marksman - mailutils - meson - mpv - ninja - nodejs_23 - notcurses - p7zip - pandoc - python312 - python312Packages.black - python312Packages.pylint - python312Packages.python-lsp-server - ripgrep - rsync - rustup - shellcheck - shfmt - texliveFull - typescript-language-server - vscode-langservers-extracted - wget - yt-dlp - zig - zls - ]; - } -#+end_src diff --git a/macos.local/.flake/home/programs/emacs/core.nix.org b/macos.local/.flake/home/programs/emacs/core.nix.org deleted file mode 100644 index 2bb4237..0000000 --- a/macos.local/.flake/home/programs/emacs/core.nix.org +++ /dev/null @@ -1,14 +0,0 @@ -#+title: Emacs Configuration - -Here is my Emacs configuration. This file just defines configurations that should exist. Emacs is installed with Homebrew. -#+begin_src nix - { config, pkgs, ... }: - - { - home.file = { - "./.config/emacs/early-init.el".source = ./early-init.el; - "./.config/emacs/feed.org".source = ./feed.org; - "./.config/emacs/init.el".source = ./init.el; - }; - } -#+end_src diff --git a/macos.local/.flake/home/programs/emacs/early-init.el.org b/macos.local/.flake/home/programs/emacs/early-init.el.org deleted file mode 120000 index 7c20436..0000000 --- a/macos.local/.flake/home/programs/emacs/early-init.el.org +++ /dev/null @@ -1 +0,0 @@ -../../../../../common/.config/emacs/early-init.el.org \ No newline at end of file diff --git a/macos.local/.flake/home/programs/emacs/feed.org.org b/macos.local/.flake/home/programs/emacs/feed.org.org deleted file mode 120000 index d074855..0000000 --- a/macos.local/.flake/home/programs/emacs/feed.org.org +++ /dev/null @@ -1 +0,0 @@ -../../../../../common/.config/emacs/feed.org.org \ No newline at end of file diff --git a/macos.local/.flake/home/programs/emacs/init.el.org b/macos.local/.flake/home/programs/emacs/init.el.org deleted file mode 120000 index 6b2f721..0000000 --- a/macos.local/.flake/home/programs/emacs/init.el.org +++ /dev/null @@ -1 +0,0 @@ -../../../../../common/.config/emacs/init.el.org \ No newline at end of file diff --git a/macos.local/.flake/home/programs/fastfetch.nix.org b/macos.local/.flake/home/programs/fastfetch.nix.org deleted file mode 120000 index 25e2716..0000000 --- a/macos.local/.flake/home/programs/fastfetch.nix.org +++ /dev/null @@ -1 +0,0 @@ -../../../../common/.flake/home/programs/fastfetch.nix.org \ No newline at end of file diff --git a/macos.local/.flake/home/programs/ghostty.nix.org b/macos.local/.flake/home/programs/ghostty.nix.org deleted file mode 100644 index 29bc15a..0000000 --- a/macos.local/.flake/home/programs/ghostty.nix.org +++ /dev/null @@ -1,23 +0,0 @@ -#+title: ghostty Configuration - -I use =ghostty= as a terminal emulator on macOS. I disable auto-update and set some sensible options. -#+begin_src nix - { config, pkgs, ... }: - - { - home.file."./.config/ghostty/config".text = '' - auto-update = "off" - background-blur-radius = 20 - background-opacity = 0.8 - clipboard-trim-trailing-spaces = true - font-family = "SauceCodePro Nerd Font" - font-thicken = true - macos-option-as-alt = true - macos-window-shadow = false - mouse-hide-while-typing = true - quit-after-last-window-closed = true - theme = "Builtin Light" - window-decoration = true - ''; - } -#+end_src diff --git a/macos.local/.flake/home/programs/git.nix.org b/macos.local/.flake/home/programs/git.nix.org deleted file mode 120000 index e8ddd28..0000000 --- a/macos.local/.flake/home/programs/git.nix.org +++ /dev/null @@ -1 +0,0 @@ -../../../../common/.flake/home/programs/git.nix.org \ No newline at end of file diff --git a/macos.local/.flake/home/programs/ncmpcpp.nix.org b/macos.local/.flake/home/programs/ncmpcpp.nix.org deleted file mode 100644 index 6c697ef..0000000 --- a/macos.local/.flake/home/programs/ncmpcpp.nix.org +++ /dev/null @@ -1,28 +0,0 @@ -#+title: =ncmpcpp= Configuration - -Enable =vi=-like controls and specify directories and =mpd= address. -#+begin_src nix - { config, pkgs, ... }: - - { - programs.ncmpcpp = { - enable = true; - bindings = [ - { key = "j"; command = "scroll_down"; } - { key = "k"; command = "scroll_up"; } - { key = "h"; command = "previous_column"; } - { key = "l"; command = "next_column"; } - { key = "g"; command = "move_home"; } - { key = "G"; command = "move_end"; } - { key = "n"; command = "next_found_item"; } - { key = "N"; command = "previous_found_item"; } - ]; - mpdMusicDir = "/Volumes/Media/Music"; - settings = { - ncmpcpp_directory = "~/.config/nmcpcpp"; - mpd_host = "localhost"; - mpd_port = "6600"; - }; - }; - } -#+end_src diff --git a/macos.local/.flake/home/programs/neovim.nix.org b/macos.local/.flake/home/programs/neovim.nix.org deleted file mode 120000 index 871eafa..0000000 --- a/macos.local/.flake/home/programs/neovim.nix.org +++ /dev/null @@ -1 +0,0 @@ -../../../../common/.flake/home/programs/neovim.nix.org \ No newline at end of file diff --git a/macos.local/.flake/home/programs/ssh.nix.org b/macos.local/.flake/home/programs/ssh.nix.org deleted file mode 100644 index 28f779f..0000000 --- a/macos.local/.flake/home/programs/ssh.nix.org +++ /dev/null @@ -1,44 +0,0 @@ -#+title: SSH Configuration - -Configure SSH. Keys should be added to the SSH agent. Use the system keychain on all configurations. -#+begin_src nix - { config, pkgs, ... }: - { - programs.ssh = { - enable = true; - addKeysToAgent = "yes"; - matchBlocks = { - "*" = { - identityFile = "~/.ssh/id_ed25519"; - extraOptions = { - "UseKeychain" = "yes"; - }; - }; - - "aviary" = { - hostname = "aviary.cs.umanitoba.ca"; - user = "janzenj2"; - setEnv = { - "TERM" = "xterm"; - }; - }; - - "jjanzen.ca" = { - setEnv = { - "TERM" = "xterm"; - }; - }; - - "oracle" = { - setEnv = { - "TERM" = "xterm"; - }; - hostname = "jjanzen.ca"; - identityFile = "~/.ssh/oracle"; - identitiesOnly = true; - user = "opc"; - }; - }; - }; - } -#+end_src diff --git a/macos.local/.flake/home/programs/zsh/core.nix.org b/macos.local/.flake/home/programs/zsh/core.nix.org deleted file mode 100644 index 84e9aff..0000000 --- a/macos.local/.flake/home/programs/zsh/core.nix.org +++ /dev/null @@ -1,36 +0,0 @@ -#+title: ZSH Configuration - -Open =zsh= configuration. -#+begin_src nix - { config, pkgs, ... }: - - { - programs.zsh = { - enable = true; - - autocd = true; - - autosuggestion.enable = true; - - defaultKeymap = "emacs"; - - history = { - append = true; - ignoreAllDups = true; - }; - - shellAliases = { - "ll" = "ls -alF"; - "la" = "ls -a"; - "l" = "ls -F"; - "sl" = "ls"; - }; - - syntaxHighlighting.enable = true; - - initExtra = builtins.readFile ./init-extra.sh; - - profileExtra = builtins.readFile ./profile-extra.sh; - }; - } -#+end_src diff --git a/macos.local/.flake/home/programs/zsh/init-extra.sh.org b/macos.local/.flake/home/programs/zsh/init-extra.sh.org deleted file mode 100644 index 8255ce1..0000000 --- a/macos.local/.flake/home/programs/zsh/init-extra.sh.org +++ /dev/null @@ -1,28 +0,0 @@ -#+title: ZSH Extra Initialization Code - -Define optional aliases. -#+begin_src sh - which lesspipe.sh &> /dev/null && export LESSOPEN="|lesspipe.sh %s" - which eza &> /dev/null && alias ls=eza -#+end_src - -Enable =fzf= extensions for =zsh=. -#+begin_src sh - which zsh &> /dev/null && source <(fzf --zsh) -#+end_src - -Enable git status in =zsh= prompt. -#+begin_src sh - parse_git_dirty() { - git_status="$(git status 2> /dev/null)" - [[ "$git_status" =~ "use \"git push\" to publish your local commits" ]] && echo -n " %F{green}%f" - [[ "$git_status" =~ "Changes to be committed:" ]] && echo -n " %F{magenta}%f" - [[ "$git_status" =~ "Changes not staged for commit:" ]] && echo -n " %F{yellow}%f" - [[ "$git_status" =~ "Untracked files:" ]] && echo -n " %F{red}%f" - } - setopt prompt_subst - autoload -Uz vcs_info - precmd () { vcs_info } - zstyle ':vcs_info:*' formats ' %F{blue}%b%f' # git(main) - PS1='%(?..%B%F{red}[%?%\]%f%b )%F{green}%20<...<%~%<<%f$vcs_info_msg_0_$(parse_git_dirty) $ ' -#+end_src diff --git a/macos.local/.flake/home/programs/zsh/profile-extra.sh.org b/macos.local/.flake/home/programs/zsh/profile-extra.sh.org deleted file mode 100644 index 64457ed..0000000 --- a/macos.local/.flake/home/programs/zsh/profile-extra.sh.org +++ /dev/null @@ -1,10 +0,0 @@ -#+title: Profile Extra Code - -Enable =ssh-agent= at login. -#+begin_src sh - if [ ! -S ~/.ssh/ssh_auth_sock ]; then - eval `ssh-agent` > /dev/null - ln -sf "$SSH_AUTH_SOCK" ~/.ssh/ssh_auth_sock - fi - export SSH_AUTH_SOCK=~/.ssh/ssh_auth_sock -#+end_src diff --git a/macos.local/.flake/home/scripts/core.nix.org b/macos.local/.flake/home/scripts/core.nix.org deleted file mode 100644 index f3fd314..0000000 --- a/macos.local/.flake/home/scripts/core.nix.org +++ /dev/null @@ -1,27 +0,0 @@ -#+title: Custom Scripts - -Import various scripts useful on my system. -#+begin_src nix - { config, pkgs, ... }: - - { - home.file = { - "./.local/bin/deploy-website" = { - executable = true; - source = ./deploy-website; - }; - "./.local/bin/launcher" = { - executable = true; - source = ./launcher; - }; - "./.local/bin/remove-quarantine" = { - executable = true; - source = ./remove-quarantine; - }; - "./.local/bin/manage-system" = { - executable = true; - source = ./manage-system; - }; - }; - } -#+end_src diff --git a/macos.local/.flake/home/scripts/deploy-website.org b/macos.local/.flake/home/scripts/deploy-website.org deleted file mode 100644 index 76e5d54..0000000 --- a/macos.local/.flake/home/scripts/deploy-website.org +++ /dev/null @@ -1,7 +0,0 @@ -#+title: Website Deploy Script - -Deploy my website from a specified branch by using =ssh= to get into my server and running the deploy script, passing command line arguments to the script. -#+begin_src sh - #!/bin/sh - /usr/bin/ssh jjanzen.ca "sudo /usr/local/bin/deploy.sh "$@"" -#+end_src diff --git a/macos.local/.flake/home/scripts/launcher.org b/macos.local/.flake/home/scripts/launcher.org deleted file mode 100644 index 0063bf1..0000000 --- a/macos.local/.flake/home/scripts/launcher.org +++ /dev/null @@ -1,7 +0,0 @@ -#+title: Launcher Script - -Use =choose-gui= to launch an application. This is used for a keyboard command to launch applications. -#+begin_src sh - #!/bin/sh - open -n $(find -L /Applications /System/Applications /System/Applications/Utilities ~/Applications /opt/homebrew/opt/emacs-plus@* -maxdepth 1 -name "*.app" | choose -f "SauceCodePro Nerd Font" -s 15) -#+end_src diff --git a/macos.local/.flake/home/scripts/manage-system.org b/macos.local/.flake/home/scripts/manage-system.org deleted file mode 100644 index e8da0d9..0000000 --- a/macos.local/.flake/home/scripts/manage-system.org +++ /dev/null @@ -1,47 +0,0 @@ -#+title: System Management Script - -#+begin_src sh - #!/bin/sh - - usage () - { - echo "Usage: $0 [command] where command is one of" - echo "help - show this message and exit" - echo "backup - push the configuration to the remote" - echo "update - update the system" - echo "install - install the system configurations" - } - - [ "$#" -eq 0 ] && usage && exit 1 - - dir="$pwd" - cd ~/.dotfiles || exit 1 - - case "$1" in - help) - usage - cd "$dir" || exit 1 - exit 0 - ;; - backup) - git push - cd "$dir" || exit 1 - exit 0 - ;; - update) - make update - cd "$dir" || exit 1 - exit 0 - ;; - install) - make install - cd "$dir" || exit 1 - exit 0 - ;; - ,*) - usage - cd "$dir" || exit 1 - exit 1 - ;; - esac -#+end_src diff --git a/macos.local/.flake/home/scripts/remove-quarantine.org b/macos.local/.flake/home/scripts/remove-quarantine.org deleted file mode 100644 index 373c503..0000000 --- a/macos.local/.flake/home/scripts/remove-quarantine.org +++ /dev/null @@ -1,7 +0,0 @@ -#+title: Remove Quarantine - -macOS likes putting applications in quarantine without me wanting. This script removes an application from the quarantine. Remove the app from quarantine by recursively deleting the quarantine attribute on the application. -#+begin_src sh - #!/bin/sh - /usr/bin/xattr -dr com.apple.quarantine "$@" -#+end_src diff --git a/macos.local/.flake/home/services/core.nix.org b/macos.local/.flake/home/services/core.nix.org deleted file mode 100644 index d504770..0000000 --- a/macos.local/.flake/home/services/core.nix.org +++ /dev/null @@ -1,12 +0,0 @@ -#+title: Service Configuration - -Load service configurations. -#+begin_src nix - { config, pkgs, ... }: - - { - imports = [ - ./mpd.nix - ]; - } -#+end_src diff --git a/macos.local/.flake/home/services/mpd.nix.org b/macos.local/.flake/home/services/mpd.nix.org deleted file mode 100644 index f3f7f8b..0000000 --- a/macos.local/.flake/home/services/mpd.nix.org +++ /dev/null @@ -1,49 +0,0 @@ -#+title: =mpd= Configuration - -Configure =mpd= as a music player. =services.mpd= only works on Linux for some reason so I manually write out the configuration here. This is actually a really gross setup and requires manually creating files in =.mpd= and manually starting =mpd=, but it does seem to work at least. -#+begin_src nix - { config, pkgs, ... }: - - { - home.packages = with pkgs; [ - mpd - ]; - home.file."./.mpdconf".text = '' - music_directory "/Volumes/Media/Music" - playlist_directory "~/.mpd/playlists" - db_file "~/.mpd/mpd.db" - log_file "~/.mpd/mpd.log" - pid_file "~/.mpd/mpd.pid" - state_file "~/.mpd/mpdstate" - auto_update "yes" - auto_update_depth "2" - follow_outside_symlinks "yes" - follow_inside_symlinks "yes" - - audio_output { - type "osx" - name "CoreAudio" - mixer_type "software" - } - - decoder { - plugin "mp4ff" - enabled "no" - } - - bind_to_address "127.0.0.1" - port "6600" - user "jjanzen" - - # Visualizer - audio_output { - type "fifo" - name "my_fifo" - path "/tmp/mpd.fifo" - format "44100:16:2" - auto_resample "no" - use_mmap "yes" - } - ''; - } -#+end_src -- cgit v1.2.3