From b7e84fa6048007cda7e6c8226e28bc2db90f792a Mon Sep 17 00:00:00 2001 From: Jacob Janzen Date: Sat, 28 Sep 2024 00:01:09 -0500 Subject: add file extensions to files --- nixos/.flake/home/programs/core.nix.org | 46 +++++++++ nixos/.flake/home/programs/core.org | 46 --------- nixos/.flake/home/programs/fastfetch.nix.org | 84 +++++++++++++++ nixos/.flake/home/programs/fastfetch.org | 84 --------------- nixos/.flake/home/programs/foot.nix.org | 42 ++++++++ nixos/.flake/home/programs/foot.org | 42 -------- nixos/.flake/home/programs/git.nix.org | 18 ++++ nixos/.flake/home/programs/git.org | 18 ---- nixos/.flake/home/programs/hyprlock.nix.org | 42 ++++++++ nixos/.flake/home/programs/hyprlock.org | 42 -------- nixos/.flake/home/programs/ncmpcpp.nix.org | 28 +++++ nixos/.flake/home/programs/ncmpcpp.org | 28 ----- nixos/.flake/home/programs/neovim.nix.org | 32 ++++++ nixos/.flake/home/programs/neovim.org | 32 ------ nixos/.flake/home/programs/ssh.nix.org | 13 +++ nixos/.flake/home/programs/ssh.org | 13 --- nixos/.flake/home/programs/waybar.nix.org | 149 +++++++++++++++++++++++++++ nixos/.flake/home/programs/waybar.org | 149 --------------------------- nixos/.flake/home/programs/zsh.nix.org | 87 ++++++++++++++++ nixos/.flake/home/programs/zsh.org | 87 ---------------- 20 files changed, 541 insertions(+), 541 deletions(-) create mode 100644 nixos/.flake/home/programs/core.nix.org delete mode 100644 nixos/.flake/home/programs/core.org create mode 100644 nixos/.flake/home/programs/fastfetch.nix.org delete mode 100644 nixos/.flake/home/programs/fastfetch.org create mode 100644 nixos/.flake/home/programs/foot.nix.org delete mode 100644 nixos/.flake/home/programs/foot.org create mode 100644 nixos/.flake/home/programs/git.nix.org delete mode 100644 nixos/.flake/home/programs/git.org create mode 100644 nixos/.flake/home/programs/hyprlock.nix.org delete mode 100644 nixos/.flake/home/programs/hyprlock.org create mode 100644 nixos/.flake/home/programs/ncmpcpp.nix.org delete mode 100644 nixos/.flake/home/programs/ncmpcpp.org create mode 100644 nixos/.flake/home/programs/neovim.nix.org delete mode 100644 nixos/.flake/home/programs/neovim.org create mode 100644 nixos/.flake/home/programs/ssh.nix.org delete mode 100644 nixos/.flake/home/programs/ssh.org create mode 100644 nixos/.flake/home/programs/waybar.nix.org delete mode 100644 nixos/.flake/home/programs/waybar.org create mode 100644 nixos/.flake/home/programs/zsh.nix.org delete mode 100644 nixos/.flake/home/programs/zsh.org (limited to 'nixos/.flake/home/programs') diff --git a/nixos/.flake/home/programs/core.nix.org b/nixos/.flake/home/programs/core.nix.org new file mode 100644 index 0000000..3bf0fab --- /dev/null +++ b/nixos/.flake/home/programs/core.nix.org @@ -0,0 +1,46 @@ +#+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 = [ + ./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 + pavucontrol + prismlauncher # minecraft + protonvpn-gui + python3 + swaybg + texliveFull + unzip + zip + ]; + } +#+end_src diff --git a/nixos/.flake/home/programs/core.org b/nixos/.flake/home/programs/core.org deleted file mode 100644 index 3bf0fab..0000000 --- a/nixos/.flake/home/programs/core.org +++ /dev/null @@ -1,46 +0,0 @@ -#+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 = [ - ./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 - pavucontrol - prismlauncher # minecraft - protonvpn-gui - python3 - swaybg - texliveFull - unzip - zip - ]; - } -#+end_src diff --git a/nixos/.flake/home/programs/fastfetch.nix.org b/nixos/.flake/home/programs/fastfetch.nix.org new file mode 100644 index 0000000..96b2044 --- /dev/null +++ b/nixos/.flake/home/programs/fastfetch.nix.org @@ -0,0 +1,84 @@ +#+title: Fastfetch Configuration + +Specify the layout for =fastfetch=. +#+begin_src nix :tangle ~/.flake/home/programs/fastfetch.nix :mkdirp yes + { config, pkgs, ... }: + + { + programs.fastfetch = { + enable = true; + settings = { + logo = { + type = "raw"; + source = "~/.config/fastfetch/logo.sixel"; + width = 40; + height = 19; + }; + display = { + separator = " "; + }; + modules = [ + "title" + { + type = "custom"; + format = "──────────────────────────────────"; + } + { + type = "os"; + key = ""; + } + { + type = "kernel"; + key = "󰞸"; + } + { + type = "uptime"; + key = ""; + } + { + type = "packages"; + key = ""; + } + { + type = "shell"; + key = ""; + } + { + type = "display"; + key = "󰍹"; + } + { + type = "wm"; + key = ""; + } + { + type = "terminal"; + key = ""; + } + { + type = "cpu"; + key = ""; + } + { + type = "gpu"; + key = ""; + } + { + type = "memory"; + key = ""; + } + { + type = "disk"; + key = ""; + } + { + type = "locale"; + key = ""; + } + "break" + "colors" + ]; + }; + }; + } +#+end_src diff --git a/nixos/.flake/home/programs/fastfetch.org b/nixos/.flake/home/programs/fastfetch.org deleted file mode 100644 index 96b2044..0000000 --- a/nixos/.flake/home/programs/fastfetch.org +++ /dev/null @@ -1,84 +0,0 @@ -#+title: Fastfetch Configuration - -Specify the layout for =fastfetch=. -#+begin_src nix :tangle ~/.flake/home/programs/fastfetch.nix :mkdirp yes - { config, pkgs, ... }: - - { - programs.fastfetch = { - enable = true; - settings = { - logo = { - type = "raw"; - source = "~/.config/fastfetch/logo.sixel"; - width = 40; - height = 19; - }; - display = { - separator = " "; - }; - modules = [ - "title" - { - type = "custom"; - format = "──────────────────────────────────"; - } - { - type = "os"; - key = ""; - } - { - type = "kernel"; - key = "󰞸"; - } - { - type = "uptime"; - key = ""; - } - { - type = "packages"; - key = ""; - } - { - type = "shell"; - key = ""; - } - { - type = "display"; - key = "󰍹"; - } - { - type = "wm"; - key = ""; - } - { - type = "terminal"; - key = ""; - } - { - type = "cpu"; - key = ""; - } - { - type = "gpu"; - key = ""; - } - { - type = "memory"; - key = ""; - } - { - type = "disk"; - key = ""; - } - { - type = "locale"; - key = ""; - } - "break" - "colors" - ]; - }; - }; - } -#+end_src diff --git a/nixos/.flake/home/programs/foot.nix.org b/nixos/.flake/home/programs/foot.nix.org new file mode 100644 index 0000000..3490bed --- /dev/null +++ b/nixos/.flake/home/programs/foot.nix.org @@ -0,0 +1,42 @@ +#+title: Foot Terminal Configuration + +Specify my font and colour scheme for =foot=. +#+begin_src nix :tangle ~/.flake/home/programs/foot.nix :mkdirp yes +{ config, pkgs, ... }: + +{ + programs.foot = { + enable = true; + settings = { + main = { + font = "SauceCodePro Nerd Font:size=10"; + pad = "6x6"; + }; + mouse = { + hide-when-typing = "yes"; + }; + colors = { + alpha = "0.9"; + background = "ece0c9"; + foreground = "191916"; + regular0 = "191916"; + regular1 = "ac4438"; + regular2 = "354d52"; + regular3 = "ba9151"; + regular4 = "465b91"; + regular5 = "5b5489"; + regular6 = "4e6062"; + regular7 = "c9ad7a"; + bright0 = "293c3c"; + bright1 = "d8611c"; + bright2 = "4b7b53"; + bright3 = "d8974b"; + bright4 = "2f3d91"; + bright5 = "735e82"; + bright6 = "6b8f92"; + bright7 = "ece0c9"; + }; + }; + }; +} +#+end_src diff --git a/nixos/.flake/home/programs/foot.org b/nixos/.flake/home/programs/foot.org deleted file mode 100644 index 3490bed..0000000 --- a/nixos/.flake/home/programs/foot.org +++ /dev/null @@ -1,42 +0,0 @@ -#+title: Foot Terminal Configuration - -Specify my font and colour scheme for =foot=. -#+begin_src nix :tangle ~/.flake/home/programs/foot.nix :mkdirp yes -{ config, pkgs, ... }: - -{ - programs.foot = { - enable = true; - settings = { - main = { - font = "SauceCodePro Nerd Font:size=10"; - pad = "6x6"; - }; - mouse = { - hide-when-typing = "yes"; - }; - colors = { - alpha = "0.9"; - background = "ece0c9"; - foreground = "191916"; - regular0 = "191916"; - regular1 = "ac4438"; - regular2 = "354d52"; - regular3 = "ba9151"; - regular4 = "465b91"; - regular5 = "5b5489"; - regular6 = "4e6062"; - regular7 = "c9ad7a"; - bright0 = "293c3c"; - bright1 = "d8611c"; - bright2 = "4b7b53"; - bright3 = "d8974b"; - bright4 = "2f3d91"; - bright5 = "735e82"; - bright6 = "6b8f92"; - bright7 = "ece0c9"; - }; - }; - }; -} -#+end_src diff --git a/nixos/.flake/home/programs/git.nix.org b/nixos/.flake/home/programs/git.nix.org new file mode 100644 index 0000000..baf3aaa --- /dev/null +++ b/nixos/.flake/home/programs/git.nix.org @@ -0,0 +1,18 @@ +#+title: Git Configuration + +Specify my name and email for =git=. Also enable =delta= and =pull.rebase=. +#+begin_src nix :tangle ~/.flake/home/programs/git.nix :mkdirp yes +{ config, pkgs, ... }: + +{ + programs.git = { + enable = true; + userName = "Jacob Janzen"; + userEmail = "jacob.a.s.janzen@gmail.com"; + delta.enable = true; + extraConfig = { + pull.rebase = true; + }; + }; +} +#+end_src diff --git a/nixos/.flake/home/programs/git.org b/nixos/.flake/home/programs/git.org deleted file mode 100644 index baf3aaa..0000000 --- a/nixos/.flake/home/programs/git.org +++ /dev/null @@ -1,18 +0,0 @@ -#+title: Git Configuration - -Specify my name and email for =git=. Also enable =delta= and =pull.rebase=. -#+begin_src nix :tangle ~/.flake/home/programs/git.nix :mkdirp yes -{ config, pkgs, ... }: - -{ - programs.git = { - enable = true; - userName = "Jacob Janzen"; - userEmail = "jacob.a.s.janzen@gmail.com"; - delta.enable = true; - extraConfig = { - pull.rebase = true; - }; - }; -} -#+end_src diff --git a/nixos/.flake/home/programs/hyprlock.nix.org b/nixos/.flake/home/programs/hyprlock.nix.org new file mode 100644 index 0000000..4e94386 --- /dev/null +++ b/nixos/.flake/home/programs/hyprlock.nix.org @@ -0,0 +1,42 @@ +#+title: Hyprlock Configuration + +Place a textbox in the middle of the screen and use my blurred wallpaper as the background when locking. +#+begin_src nix :tangle ~/.flake/home/programs/hyprlock.nix :mkdirp yes + { config, pkgs, ... }: + + { + programs.hyprlock = { + enable = true; + settings = { + general = { + disable_loading_bar = true; + grace = 0; + hide_cursor = true; + no_fade_in = false; + }; + background = [ + { + path = "~/.wallpaper"; + blur_passes = 3; + blur_size = 8; + } + ]; + input-field = [ + { + size = "200, 50"; + position = "0, -80"; + monitor = ""; + dots_center = true; + fade_on_empty = false; + font_color = "rgb(202, 211, 245)"; + inner_color = "rgb(91, 96, 120)"; + outer_color = "rgb(24, 25, 38)"; + outline_thickness = 5; + placeholder_text = "Password..."; + shadow_passes = 2; + } + ]; + }; + }; + } +#+end_src diff --git a/nixos/.flake/home/programs/hyprlock.org b/nixos/.flake/home/programs/hyprlock.org deleted file mode 100644 index 4e94386..0000000 --- a/nixos/.flake/home/programs/hyprlock.org +++ /dev/null @@ -1,42 +0,0 @@ -#+title: Hyprlock Configuration - -Place a textbox in the middle of the screen and use my blurred wallpaper as the background when locking. -#+begin_src nix :tangle ~/.flake/home/programs/hyprlock.nix :mkdirp yes - { config, pkgs, ... }: - - { - programs.hyprlock = { - enable = true; - settings = { - general = { - disable_loading_bar = true; - grace = 0; - hide_cursor = true; - no_fade_in = false; - }; - background = [ - { - path = "~/.wallpaper"; - blur_passes = 3; - blur_size = 8; - } - ]; - input-field = [ - { - size = "200, 50"; - position = "0, -80"; - monitor = ""; - dots_center = true; - fade_on_empty = false; - font_color = "rgb(202, 211, 245)"; - inner_color = "rgb(91, 96, 120)"; - outer_color = "rgb(24, 25, 38)"; - outline_thickness = 5; - placeholder_text = "Password..."; - shadow_passes = 2; - } - ]; - }; - }; - } -#+end_src diff --git a/nixos/.flake/home/programs/ncmpcpp.nix.org b/nixos/.flake/home/programs/ncmpcpp.nix.org new file mode 100644 index 0000000..eb1f02f --- /dev/null +++ b/nixos/.flake/home/programs/ncmpcpp.nix.org @@ -0,0 +1,28 @@ +#+title: =ncmpcpp= Configuration + +Enable =vi=-like controls and specify directories and MPD address. +#+begin_src nix :tangle ~/.flake/home/programs/ncmpcpp.nix :mkdirp yes +{ 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 = "~/Music"; + settings = { + ncmpcpp_directory = "~/.config/nmcpcpp"; + mpd_host = "localhost"; + mpd_port = "6600"; + }; + }; +} +#+end_src diff --git a/nixos/.flake/home/programs/ncmpcpp.org b/nixos/.flake/home/programs/ncmpcpp.org deleted file mode 100644 index eb1f02f..0000000 --- a/nixos/.flake/home/programs/ncmpcpp.org +++ /dev/null @@ -1,28 +0,0 @@ -#+title: =ncmpcpp= Configuration - -Enable =vi=-like controls and specify directories and MPD address. -#+begin_src nix :tangle ~/.flake/home/programs/ncmpcpp.nix :mkdirp yes -{ 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 = "~/Music"; - settings = { - ncmpcpp_directory = "~/.config/nmcpcpp"; - mpd_host = "localhost"; - mpd_port = "6600"; - }; - }; -} -#+end_src diff --git a/nixos/.flake/home/programs/neovim.nix.org b/nixos/.flake/home/programs/neovim.nix.org new file mode 100644 index 0000000..350eded --- /dev/null +++ b/nixos/.flake/home/programs/neovim.nix.org @@ -0,0 +1,32 @@ +#+title: Neovim Settings + +Create a simple Neovim configuration. +#+begin_src nix :tangle ~/.flake/home/programs/neovim.nix :mkdirp yes + { config, pkgs, ... }: + + { + programs.neovim = { + enable = true; + + defaultEditor = true; + viAlias = true; + vimAlias = true; + plugins = with pkgs.vimPlugins; [ + vim-trailing-whitespace + lightline-vim + delimitMate + ]; + extraLuaConfig = '' + vim.opt.tabstop = 4 + vim.opt.expandtab = true + vim.opt.shiftwidth = 4 + vim.opt.autoindent = true + vim.opt.wildmode = 'longest,list' + vim.opt.number = true + vim.g.background = light + vim.cmd [[colorscheme default]] + vim.cmd [[set notermguicolors]] + ''; + }; + } +#+end_src diff --git a/nixos/.flake/home/programs/neovim.org b/nixos/.flake/home/programs/neovim.org deleted file mode 100644 index 350eded..0000000 --- a/nixos/.flake/home/programs/neovim.org +++ /dev/null @@ -1,32 +0,0 @@ -#+title: Neovim Settings - -Create a simple Neovim configuration. -#+begin_src nix :tangle ~/.flake/home/programs/neovim.nix :mkdirp yes - { config, pkgs, ... }: - - { - programs.neovim = { - enable = true; - - defaultEditor = true; - viAlias = true; - vimAlias = true; - plugins = with pkgs.vimPlugins; [ - vim-trailing-whitespace - lightline-vim - delimitMate - ]; - extraLuaConfig = '' - vim.opt.tabstop = 4 - vim.opt.expandtab = true - vim.opt.shiftwidth = 4 - vim.opt.autoindent = true - vim.opt.wildmode = 'longest,list' - vim.opt.number = true - vim.g.background = light - vim.cmd [[colorscheme default]] - vim.cmd [[set notermguicolors]] - ''; - }; - } -#+end_src diff --git a/nixos/.flake/home/programs/ssh.nix.org b/nixos/.flake/home/programs/ssh.nix.org new file mode 100644 index 0000000..a7502d2 --- /dev/null +++ b/nixos/.flake/home/programs/ssh.nix.org @@ -0,0 +1,13 @@ +#+title: SSH Configuration + +Add keys to SSH agent. +#+begin_src nix :tangle ~/.flake/home/programs/ssh.nix :mkdirp yes +{ config, pkgs, ... }: + +{ + programs.ssh = { + enable = true; + addKeysToAgent = "yes"; + }; +} +#+end_src diff --git a/nixos/.flake/home/programs/ssh.org b/nixos/.flake/home/programs/ssh.org deleted file mode 100644 index a7502d2..0000000 --- a/nixos/.flake/home/programs/ssh.org +++ /dev/null @@ -1,13 +0,0 @@ -#+title: SSH Configuration - -Add keys to SSH agent. -#+begin_src nix :tangle ~/.flake/home/programs/ssh.nix :mkdirp yes -{ config, pkgs, ... }: - -{ - programs.ssh = { - enable = true; - addKeysToAgent = "yes"; - }; -} -#+end_src diff --git a/nixos/.flake/home/programs/waybar.nix.org b/nixos/.flake/home/programs/waybar.nix.org new file mode 100644 index 0000000..7fe40f3 --- /dev/null +++ b/nixos/.flake/home/programs/waybar.nix.org @@ -0,0 +1,149 @@ +#+title: Waybar Configuration + +Show workspaces on the left, the current window in the centre, and MPD status, audio, cpu and memory status, clock, and system tray on the right. +#+begin_src nix :tangle ~/.flake/home/programs/waybar.nix :mkdirp yes + { config, pkgs, ... }: + + { + programs.waybar = { + enable = true; + settings = { + mainBar = { + height = 30; + spacing = 4; + modules-left = [ "hyprland/workspaces" ]; + modules-center = [ "hyprland/window" ]; + modules-right = [ "mpd" "pulseaudio" "cpu" "memory" "clock" "tray" ]; + mpd = { + format = "{stateIcon} {artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) [{songPosition}|{queueLength}] 🎵"; + format-disconnected = "Disconnected 🎵"; + format-stopped = "{consumeIcon}Stopped 🎵"; + unknown-tag = "N/A"; + interval = 2; + state-icons = { + paused = ""; + playing = ""; + }; + tooltip-format = "MPD (connected)"; + tooltip-format-disconnected = "MPD (disconnected)"; + on-click = "foot -e ncmpcpp"; + }; + tray = { + icon-size = 21; + spacing = 10; + show-passive-items = true; + }; + clock = { + format = "{:%H:%M\t%Y-%m-%d}"; + }; + cpu = { + format = "{usage}% "; + tooltip = false; + }; + memory = { + format = "{}% "; + }; + network = { + format-wifi = ""; + tooltip = false; + format-ethernet = ""; + format-linked = ""; + format-disconnected = "⚠"; + on-click = "kcmshell5 kcm_networkmanagement"; + }; + pulseaudio = { + format = "{volume}% {icon}"; + format-bluetooth = "{volume}% {icon}"; + format-bluetooth-muted = " {icon}"; + format-muted = " "; + format-source = "{volume}% "; + format-source-muted = ""; + format-icons = { + headphone = ""; + hands-free = ""; + headset = ""; + phone = ""; + portable = ""; + car = ""; + default = ["" "" ""]; + }; + on-click = "pavucontrol"; + }; + }; + }; + style = '' + window#waybar { + font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif; + font-size: 13px; + background: transparent; + color: #ffffff; + text-shadow: 1px 1px #64727D; + transition-property: background-color; + transition-duration: .5s; + } + button { + border: none; + border-radius: 0; + } + button:hover { + background: inherit; + box-shadow: inset 0 -3px #ffffff; + } + #workspaces button { + padding: 0 5px; + text-shadow: 1px 1px #64727D; + background-color: transparent; + color: #ffffff; + } + #workspaces button:hover { + background: rgba(0, 0, 0, 0.2); + } + #workspaces button.focused { + background: transparent; + box-shadow: inset 0 -3px #ffffff; + } + #workspaces button.urgent { + background-color: #eb4d4b; + } + #clock, + #cpu, + #memory, + #disk, + #network, + #pulseaudio, + #wireplumber, + #custom-media, + #tray, + #mode, + #scratchpad, + #mpd { + padding: 0 10px; + } + #window, + #workspaces { + margin: 0 4px; + } + .modules-left > widget:first-child > #workspaces { + margin-left: 0; + } + + .modules-right > widget:last-child > #workspaces { + margin-right: 0; + } + #tray > .passive { + -gtk-icon-effect: dim; + } + #tray > .needs-attention { + -gtk-icon-effect: highlight; + } + #scratchpad { + background: rgba(0, 0, 0, 0.2); + } + + #scratchpad.empty { + background-color: transparent; + } + ''; + }; + } +#+end_src diff --git a/nixos/.flake/home/programs/waybar.org b/nixos/.flake/home/programs/waybar.org deleted file mode 100644 index 7fe40f3..0000000 --- a/nixos/.flake/home/programs/waybar.org +++ /dev/null @@ -1,149 +0,0 @@ -#+title: Waybar Configuration - -Show workspaces on the left, the current window in the centre, and MPD status, audio, cpu and memory status, clock, and system tray on the right. -#+begin_src nix :tangle ~/.flake/home/programs/waybar.nix :mkdirp yes - { config, pkgs, ... }: - - { - programs.waybar = { - enable = true; - settings = { - mainBar = { - height = 30; - spacing = 4; - modules-left = [ "hyprland/workspaces" ]; - modules-center = [ "hyprland/window" ]; - modules-right = [ "mpd" "pulseaudio" "cpu" "memory" "clock" "tray" ]; - mpd = { - format = "{stateIcon} {artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) [{songPosition}|{queueLength}] 🎵"; - format-disconnected = "Disconnected 🎵"; - format-stopped = "{consumeIcon}Stopped 🎵"; - unknown-tag = "N/A"; - interval = 2; - state-icons = { - paused = ""; - playing = ""; - }; - tooltip-format = "MPD (connected)"; - tooltip-format-disconnected = "MPD (disconnected)"; - on-click = "foot -e ncmpcpp"; - }; - tray = { - icon-size = 21; - spacing = 10; - show-passive-items = true; - }; - clock = { - format = "{:%H:%M\t%Y-%m-%d}"; - }; - cpu = { - format = "{usage}% "; - tooltip = false; - }; - memory = { - format = "{}% "; - }; - network = { - format-wifi = ""; - tooltip = false; - format-ethernet = ""; - format-linked = ""; - format-disconnected = "⚠"; - on-click = "kcmshell5 kcm_networkmanagement"; - }; - pulseaudio = { - format = "{volume}% {icon}"; - format-bluetooth = "{volume}% {icon}"; - format-bluetooth-muted = " {icon}"; - format-muted = " "; - format-source = "{volume}% "; - format-source-muted = ""; - format-icons = { - headphone = ""; - hands-free = ""; - headset = ""; - phone = ""; - portable = ""; - car = ""; - default = ["" "" ""]; - }; - on-click = "pavucontrol"; - }; - }; - }; - style = '' - window#waybar { - font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif; - font-size: 13px; - background: transparent; - color: #ffffff; - text-shadow: 1px 1px #64727D; - transition-property: background-color; - transition-duration: .5s; - } - button { - border: none; - border-radius: 0; - } - button:hover { - background: inherit; - box-shadow: inset 0 -3px #ffffff; - } - #workspaces button { - padding: 0 5px; - text-shadow: 1px 1px #64727D; - background-color: transparent; - color: #ffffff; - } - #workspaces button:hover { - background: rgba(0, 0, 0, 0.2); - } - #workspaces button.focused { - background: transparent; - box-shadow: inset 0 -3px #ffffff; - } - #workspaces button.urgent { - background-color: #eb4d4b; - } - #clock, - #cpu, - #memory, - #disk, - #network, - #pulseaudio, - #wireplumber, - #custom-media, - #tray, - #mode, - #scratchpad, - #mpd { - padding: 0 10px; - } - #window, - #workspaces { - margin: 0 4px; - } - .modules-left > widget:first-child > #workspaces { - margin-left: 0; - } - - .modules-right > widget:last-child > #workspaces { - margin-right: 0; - } - #tray > .passive { - -gtk-icon-effect: dim; - } - #tray > .needs-attention { - -gtk-icon-effect: highlight; - } - #scratchpad { - background: rgba(0, 0, 0, 0.2); - } - - #scratchpad.empty { - background-color: transparent; - } - ''; - }; - } -#+end_src diff --git a/nixos/.flake/home/programs/zsh.nix.org b/nixos/.flake/home/programs/zsh.nix.org new file mode 100644 index 0000000..79795d0 --- /dev/null +++ b/nixos/.flake/home/programs/zsh.nix.org @@ -0,0 +1,87 @@ +#+title: ZSH Configuration + +Open =zsh= configuration. +#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes + { config, pkgs, ... }: + + { + programs.zsh = { + enable = true; +#+end_src + +Automatically =cd= if only the path is used. +#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes + autocd = true; +#+end_src + +Enable auto-suggestions. +#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes + autosuggestion = { + enable = true; + }; +#+end_src + +Use =vi= keybindings. +#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes + defaultKeymap = "viins"; +#+end_src + +Append to the history and ignore duplicates. +#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes + history = { + append = true; + ignoreAllDups = true; + }; +#+end_src + +Specify =ls= aliases. +#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes + shellAliases = { + "ll" = "ls -alF"; + "la" = "ls -a"; + "l" = "ls -F"; + "sl" = "ls"; + }; +#+end_src + +Enable syntax highlighting. +#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes + syntaxHighlighting.enable = true; +#+end_src + +Create potential aliases and create the prompt. +#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes + initExtra = '' + which lesspipe.sh &> /dev/null && export LESSOPEN="|lesspipe.sh %s" + which eza &> /dev/null && alias ls=eza + 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 + +Launch =ssh-agent= at login. +#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes + profileExtra = '' + 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 + +Close =zsh= configuration. +#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes + }; + } +#+end_src diff --git a/nixos/.flake/home/programs/zsh.org b/nixos/.flake/home/programs/zsh.org deleted file mode 100644 index 79795d0..0000000 --- a/nixos/.flake/home/programs/zsh.org +++ /dev/null @@ -1,87 +0,0 @@ -#+title: ZSH Configuration - -Open =zsh= configuration. -#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes - { config, pkgs, ... }: - - { - programs.zsh = { - enable = true; -#+end_src - -Automatically =cd= if only the path is used. -#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes - autocd = true; -#+end_src - -Enable auto-suggestions. -#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes - autosuggestion = { - enable = true; - }; -#+end_src - -Use =vi= keybindings. -#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes - defaultKeymap = "viins"; -#+end_src - -Append to the history and ignore duplicates. -#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes - history = { - append = true; - ignoreAllDups = true; - }; -#+end_src - -Specify =ls= aliases. -#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes - shellAliases = { - "ll" = "ls -alF"; - "la" = "ls -a"; - "l" = "ls -F"; - "sl" = "ls"; - }; -#+end_src - -Enable syntax highlighting. -#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes - syntaxHighlighting.enable = true; -#+end_src - -Create potential aliases and create the prompt. -#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes - initExtra = '' - which lesspipe.sh &> /dev/null && export LESSOPEN="|lesspipe.sh %s" - which eza &> /dev/null && alias ls=eza - 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 - -Launch =ssh-agent= at login. -#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes - profileExtra = '' - 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 - -Close =zsh= configuration. -#+begin_src nix :tangle ~/.flake/home/programs/zsh.nix :mkdirp yes - }; - } -#+end_src -- cgit v1.2.3