From e6edbad14d8255743c7b259a1985db5fb5bd4e91 Mon Sep 17 00:00:00 2001 From: jjanzen Date: Wed, 5 Mar 2025 22:17:31 -0600 Subject: system changes --- nixos/flake/home/.wallpaper | 1 + nixos/flake/home/clang-format.nix.org | 1 + nixos/flake/home/core.nix.org | 25 ++++++++++++++ nixos/flake/home/cursor.nix.org | 1 + nixos/flake/home/fonts.nix.org | 1 + nixos/flake/home/hyprland.nix.org | 1 + nixos/flake/home/programs/core.nix.org | 52 +++++++++++++++++++++++++++++ nixos/flake/home/programs/emacs | 1 + nixos/flake/home/programs/fastfetch.nix.org | 1 + nixos/flake/home/programs/foot.nix.org | 1 + nixos/flake/home/programs/git.nix.org | 1 + nixos/flake/home/programs/hyprlock.nix.org | 1 + nixos/flake/home/programs/ncmpcpp.nix.org | 1 + nixos/flake/home/programs/neovim.nix.org | 1 + nixos/flake/home/programs/ssh.nix.org | 1 + nixos/flake/home/programs/waybar.nix.org | 1 + nixos/flake/home/programs/zsh.nix.org | 1 + nixos/flake/home/scripts.nix.org | 43 ++++++++++++++++++++++++ nixos/flake/home/services/core.nix.org | 19 +++++++++++ nixos/flake/home/services/emacs.nix.org | 1 + nixos/flake/home/services/mako.nix.org | 1 + nixos/flake/home/services/mpd.nix.org | 1 + nixos/flake/home/services/syncthing.nix.org | 1 + 23 files changed, 158 insertions(+) create mode 120000 nixos/flake/home/.wallpaper create mode 120000 nixos/flake/home/clang-format.nix.org create mode 100644 nixos/flake/home/core.nix.org create mode 120000 nixos/flake/home/cursor.nix.org create mode 120000 nixos/flake/home/fonts.nix.org create mode 120000 nixos/flake/home/hyprland.nix.org create mode 100644 nixos/flake/home/programs/core.nix.org create mode 120000 nixos/flake/home/programs/emacs create mode 120000 nixos/flake/home/programs/fastfetch.nix.org create mode 120000 nixos/flake/home/programs/foot.nix.org create mode 120000 nixos/flake/home/programs/git.nix.org create mode 120000 nixos/flake/home/programs/hyprlock.nix.org create mode 120000 nixos/flake/home/programs/ncmpcpp.nix.org create mode 120000 nixos/flake/home/programs/neovim.nix.org create mode 120000 nixos/flake/home/programs/ssh.nix.org create mode 120000 nixos/flake/home/programs/waybar.nix.org create mode 120000 nixos/flake/home/programs/zsh.nix.org create mode 100644 nixos/flake/home/scripts.nix.org create mode 100644 nixos/flake/home/services/core.nix.org create mode 120000 nixos/flake/home/services/emacs.nix.org create mode 120000 nixos/flake/home/services/mako.nix.org create mode 120000 nixos/flake/home/services/mpd.nix.org create mode 120000 nixos/flake/home/services/syncthing.nix.org (limited to 'nixos/flake/home') diff --git a/nixos/flake/home/.wallpaper b/nixos/flake/home/.wallpaper new file mode 120000 index 0000000..316db81 --- /dev/null +++ b/nixos/flake/home/.wallpaper @@ -0,0 +1 @@ +../../../common/.wallpaper \ No newline at end of file diff --git a/nixos/flake/home/clang-format.nix.org b/nixos/flake/home/clang-format.nix.org new file mode 120000 index 0000000..db7166a --- /dev/null +++ b/nixos/flake/home/clang-format.nix.org @@ -0,0 +1 @@ +../../../common/.flake/home/clang-format.nix.org \ No newline at end of file diff --git a/nixos/flake/home/core.nix.org b/nixos/flake/home/core.nix.org new file mode 100644 index 0000000..ec135d3 --- /dev/null +++ b/nixos/flake/home/core.nix.org @@ -0,0 +1,25 @@ +#+title: Core Home Configuration + +Set up home manager for my user account and import submodules. +#+begin_src nix :tangle ~/.flake/home/core.nix :mkdirp yes + { config, pkgs, ... }: + + { + imports = [ + ./clang-format.nix + ./cursor.nix + ./fonts.nix + ./hyprland.nix + ./programs/core.nix + ./scripts.nix + ./services/core.nix + ]; + + home.username = "jjanzen"; + home.homeDirectory = "/home/jjanzen"; + home.file.".wallpaper".source = ./.wallpaper; + + home.stateVersion = "24.05"; + programs.home-manager.enable = true; + } +#+end_src diff --git a/nixos/flake/home/cursor.nix.org b/nixos/flake/home/cursor.nix.org new file mode 120000 index 0000000..3d3d406 --- /dev/null +++ b/nixos/flake/home/cursor.nix.org @@ -0,0 +1 @@ +../../../common/.flake/home/cursor.nix.org \ No newline at end of file diff --git a/nixos/flake/home/fonts.nix.org b/nixos/flake/home/fonts.nix.org new file mode 120000 index 0000000..53bec1c --- /dev/null +++ b/nixos/flake/home/fonts.nix.org @@ -0,0 +1 @@ +../../../common/.flake/home/fonts.nix.org \ No newline at end of file diff --git a/nixos/flake/home/hyprland.nix.org b/nixos/flake/home/hyprland.nix.org new file mode 120000 index 0000000..d2a0693 --- /dev/null +++ b/nixos/flake/home/hyprland.nix.org @@ -0,0 +1 @@ +../../../common/.flake/home/hyprland.nix.org \ No newline at end of file diff --git a/nixos/flake/home/programs/core.nix.org b/nixos/flake/home/programs/core.nix.org new file mode 100644 index 0000000..9557c8b --- /dev/null +++ b/nixos/flake/home/programs/core.nix.org @@ -0,0 +1,52 @@ +#+title: Core Program Configuration + +This is the core of my program configuration. This file installs programs that do not require additional configuration. Note that Discord is not FOSS and that =prismlauncher= is a launcher for Minecraft. +#+begin_src nix :tangle ~/.flake/home/programs/core.nix :mkdirp yes + { config, pkgs, ... }: + + { + imports = [ + ./emacs/core.nix + ./fastfetch.nix + ./foot.nix + ./git.nix + ./hyprlock.nix + ./ncmpcpp.nix + ./neovim.nix + ./ssh.nix + ./waybar.nix + ./zsh.nix + ]; + + home.packages = with pkgs; [ + discord # not FOSS + clang-tools + eza + fuzzel + ispell + gcc + gzdoom + htop + hyfetch + hyprshot + lesspipe + mpc-cli + mpv + networkmanagerapplet + obs-studio + openresolv + openvpn + pavucontrol + prismlauncher # minecraft + python3 + python312Packages.python-lsp-server + qbittorrent + retroarchFull + swaybg + texliveFull + unzip + zip + zotero + ]; + } +#+end_src diff --git a/nixos/flake/home/programs/emacs b/nixos/flake/home/programs/emacs new file mode 120000 index 0000000..39d7462 --- /dev/null +++ b/nixos/flake/home/programs/emacs @@ -0,0 +1 @@ +../../../../common/.flake/home/programs/emacs \ No newline at end of file diff --git a/nixos/flake/home/programs/fastfetch.nix.org b/nixos/flake/home/programs/fastfetch.nix.org new file mode 120000 index 0000000..25e2716 --- /dev/null +++ b/nixos/flake/home/programs/fastfetch.nix.org @@ -0,0 +1 @@ +../../../../common/.flake/home/programs/fastfetch.nix.org \ No newline at end of file diff --git a/nixos/flake/home/programs/foot.nix.org b/nixos/flake/home/programs/foot.nix.org new file mode 120000 index 0000000..6197c4a --- /dev/null +++ b/nixos/flake/home/programs/foot.nix.org @@ -0,0 +1 @@ +../../../../common/.flake/home/programs/foot.nix.org \ No newline at end of file diff --git a/nixos/flake/home/programs/git.nix.org b/nixos/flake/home/programs/git.nix.org new file mode 120000 index 0000000..e8ddd28 --- /dev/null +++ b/nixos/flake/home/programs/git.nix.org @@ -0,0 +1 @@ +../../../../common/.flake/home/programs/git.nix.org \ No newline at end of file diff --git a/nixos/flake/home/programs/hyprlock.nix.org b/nixos/flake/home/programs/hyprlock.nix.org new file mode 120000 index 0000000..7a25ac8 --- /dev/null +++ b/nixos/flake/home/programs/hyprlock.nix.org @@ -0,0 +1 @@ +../../../../common/.flake/home/programs/hyprlock.nix.org \ No newline at end of file diff --git a/nixos/flake/home/programs/ncmpcpp.nix.org b/nixos/flake/home/programs/ncmpcpp.nix.org new file mode 120000 index 0000000..f91dfd3 --- /dev/null +++ b/nixos/flake/home/programs/ncmpcpp.nix.org @@ -0,0 +1 @@ +../../../../common/.flake/home/programs/ncmpcpp.nix.org \ No newline at end of file diff --git a/nixos/flake/home/programs/neovim.nix.org b/nixos/flake/home/programs/neovim.nix.org new file mode 120000 index 0000000..871eafa --- /dev/null +++ b/nixos/flake/home/programs/neovim.nix.org @@ -0,0 +1 @@ +../../../../common/.flake/home/programs/neovim.nix.org \ No newline at end of file diff --git a/nixos/flake/home/programs/ssh.nix.org b/nixos/flake/home/programs/ssh.nix.org new file mode 120000 index 0000000..363ead0 --- /dev/null +++ b/nixos/flake/home/programs/ssh.nix.org @@ -0,0 +1 @@ +../../../../common/.flake/home/programs/ssh.nix.org \ No newline at end of file diff --git a/nixos/flake/home/programs/waybar.nix.org b/nixos/flake/home/programs/waybar.nix.org new file mode 120000 index 0000000..04d9dd3 --- /dev/null +++ b/nixos/flake/home/programs/waybar.nix.org @@ -0,0 +1 @@ +../../../../common/.flake/home/programs/waybar.nix.org \ No newline at end of file diff --git a/nixos/flake/home/programs/zsh.nix.org b/nixos/flake/home/programs/zsh.nix.org new file mode 120000 index 0000000..59d4ec7 --- /dev/null +++ b/nixos/flake/home/programs/zsh.nix.org @@ -0,0 +1 @@ +../../../../common/.flake/home/programs/zsh.nix.org \ No newline at end of file diff --git a/nixos/flake/home/scripts.nix.org b/nixos/flake/home/scripts.nix.org new file mode 100644 index 0000000..b98b389 --- /dev/null +++ b/nixos/flake/home/scripts.nix.org @@ -0,0 +1,43 @@ +#+title: Custom Scripts + +Open script container. +#+begin_src nix :tangle ~/.flake/home/scripts.nix :mkdirp yes + { config, pkgs, ... }: + + { + home.file = { +#+end_src + +Use =fuzzel= to open a menu to power off, reboot, or log out. +#+begin_src nix :tangle ~/.flake/home/scripts.nix :mkdirp yes + ".local/bin/poweroptions.sh" = { + text = '' + #!/bin/sh + + getoption () { + fuzzel --dmenu -l 3 -x 1 -r 10 << EOF + 󰐥 power off + 󰜉 restart + 󰍃 logout + EOF + } + + option=$(getoption | xargs) + case $option in + '󰐥 power off') + systemctl poweroff;; + '󰜉 restart') + systemctl reboot;; + '󰍃 logout') + hyprctl dispatch exit;; + esac + ''; + executable = true; + }; +#+end_src + +Close script container. +#+begin_src nix :tangle ~/.flake/home/scripts.nix :mkdirp yes + }; + } +#+end_src diff --git a/nixos/flake/home/services/core.nix.org b/nixos/flake/home/services/core.nix.org new file mode 100644 index 0000000..7fbc333 --- /dev/null +++ b/nixos/flake/home/services/core.nix.org @@ -0,0 +1,19 @@ +#+title: Core Service Configuration + +Import service configurations. +#+begin_src nix :tangle ~/.flake/home/services/core.nix :mkdirp yes + { config, pkgs, ... }: + + { + imports = [ + ./emacs.nix + ./mako.nix + ./mpd.nix + ./syncthing.nix + ]; + + home.packages = with pkgs; [ + mpdscribble + ]; + } +#+end_src diff --git a/nixos/flake/home/services/emacs.nix.org b/nixos/flake/home/services/emacs.nix.org new file mode 120000 index 0000000..45c44ee --- /dev/null +++ b/nixos/flake/home/services/emacs.nix.org @@ -0,0 +1 @@ +../../../../common/.flake/home/services/emacs.nix.org \ No newline at end of file diff --git a/nixos/flake/home/services/mako.nix.org b/nixos/flake/home/services/mako.nix.org new file mode 120000 index 0000000..b4d7e40 --- /dev/null +++ b/nixos/flake/home/services/mako.nix.org @@ -0,0 +1 @@ +../../../../common/.flake/home/services/mako.nix.org \ No newline at end of file diff --git a/nixos/flake/home/services/mpd.nix.org b/nixos/flake/home/services/mpd.nix.org new file mode 120000 index 0000000..4b76825 --- /dev/null +++ b/nixos/flake/home/services/mpd.nix.org @@ -0,0 +1 @@ +../../../../common/.flake/home/services/mpd.nix.org \ No newline at end of file diff --git a/nixos/flake/home/services/syncthing.nix.org b/nixos/flake/home/services/syncthing.nix.org new file mode 120000 index 0000000..8d42514 --- /dev/null +++ b/nixos/flake/home/services/syncthing.nix.org @@ -0,0 +1 @@ +../../../../common/.flake/home/services/syncthing.nix.org \ No newline at end of file -- cgit v1.2.3