From d666f30475528ce7f50cc3dd92a1693241083fe8 Mon Sep 17 00:00:00 2001 From: rubiigen Date: Fri, 2 Feb 2024 18:29:45 +0000 Subject: major refactor (treewide amongst general cleaning based on my modified dots (with help from notashelf) - perks 1: it works --- .github/workflows/check.yml | 23 + .github/workflows/nix.yml | 33 + .gitignore | 1 - common/arrpc.nix | 15 + common/foot.ini | 225 +++++++ common/gita.nix | 17 + common/gitm.nix | 17 + common/nvim-flake.nix | 23 + common/programs.nix | 8 + common/toggle-keyboard.sh | 6 + common/waybar-style.nix | 174 ++++++ common/waybar.nix | 213 +++++++ common/waybarAU.nix | 230 +++++++ flake.lock | 1029 +++++++++++++++++++++---------- flake.nix | 138 ++--- homes/default.nix | 7 +- homes/floppydisk/arrpc.nix | 3 +- homes/floppydisk/default.nix | 278 +++------ homes/floppydisk/lock.sh | 2 + homes/floppydisk/neovim-flake.nix | 26 +- homes/floppydisk/packages.nix | 124 ++++ hosts/default.nix | 46 +- hosts/nixbox/configuration.nix | 219 ------- hosts/nixbox/hardware-configuration.nix | 44 -- hosts/nixpad/configuration.nix | 267 ++++---- hosts/nixpad/hardware-configuration.nix | 50 +- modules/public/home-manager/default.nix | 6 - modules/public/nixos/default.nix | 6 - nixpkgs.nix | 9 - pkgs/default.nix | 5 - shell.nix | 9 - 31 files changed, 2124 insertions(+), 1129 deletions(-) create mode 100644 .github/workflows/check.yml create mode 100644 .github/workflows/nix.yml delete mode 100644 .gitignore create mode 100644 common/arrpc.nix create mode 100644 common/foot.ini create mode 100644 common/gita.nix create mode 100644 common/gitm.nix create mode 100644 common/nvim-flake.nix create mode 100644 common/programs.nix create mode 100755 common/toggle-keyboard.sh create mode 100644 common/waybar-style.nix create mode 100644 common/waybar.nix create mode 100644 common/waybarAU.nix create mode 100644 homes/floppydisk/lock.sh create mode 100644 homes/floppydisk/packages.nix delete mode 100644 hosts/nixbox/configuration.nix delete mode 100644 hosts/nixbox/hardware-configuration.nix delete mode 100644 modules/public/home-manager/default.nix delete mode 100644 modules/public/nixos/default.nix delete mode 100644 nixpkgs.nix delete mode 100644 pkgs/default.nix delete mode 100644 shell.nix diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml new file mode 100644 index 0000000..e7560e6 --- /dev/null +++ b/.github/workflows/check.yml @@ -0,0 +1,23 @@ +name: Check Flake + +on: + workflow_dispatch: + pull_request: + paths: + - "**.nix" + - "**.lock" + - ".github/workflows/check.yml" + push: + paths: + - "**.nix" + - "**.lock" + - ".github/workflows/check.yml" + +jobs: + check: + # uses the local reusable workflow + uses: ./.github/workflows/nix.yml + secrets: + GH_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + with: + command: nix flake check --accept-flake-config diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml new file mode 100644 index 0000000..cc8f046 --- /dev/null +++ b/.github/workflows/nix.yml @@ -0,0 +1,33 @@ +name: Nix Setup + +on: + workflow_call: + inputs: + command: + required: false + type: string + platform: + default: "ubuntu" + required: false + type: string + secrets: + GH_TOKEN: + required: true + +jobs: + nix: + runs-on: "${{ inputs.platform }}-latest" + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + token: "${{ secrets.GH_TOKEN }}" + + - name: Install Nix + uses: DeterminateSystems/nix-installer-action@main + + - name: Nix Magic Cache + uses: DeterminateSystems/magic-nix-cache-action@main + + - name: "Run Input: ${{ inputs.command }}" + run: "${{ inputs.command }}" diff --git a/.gitignore b/.gitignore deleted file mode 100644 index dbe9c82..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.vscode/ \ No newline at end of file diff --git a/common/arrpc.nix b/common/arrpc.nix new file mode 100644 index 0000000..16f8be6 --- /dev/null +++ b/common/arrpc.nix @@ -0,0 +1,15 @@ +{ + inputs, + pkgs, + home, + ... +}: { + imports = [ + inputs.arrpc.homeManagerModules.default + ]; + + home.packages = [pkgs.webcord-vencord]; + + # provided by the arrpc-flake home-manager module + services.arrpc.enable = true; +} diff --git a/common/foot.ini b/common/foot.ini new file mode 100644 index 0000000..b738306 --- /dev/null +++ b/common/foot.ini @@ -0,0 +1,225 @@ +# -*- conf -*- + +# shell=$SHELL (if set, otherwise user's default shell from /etc/passwd) +# term=foot (or xterm-256color if built with -Dterminfo=disabled) +# login-shell=no + +# app-id=foot # globally set wayland app-id. Default values are "foot" and "footclient" for desktop and server mode +# title=foot +# locked-title=no + + font=monospace:size=14 +# font-bold= +# font-italic= +# font-bold-italic= +# font-size-adjustment=0.5 +# line-height= +# letter-spacing=0 +# horizontal-letter-offset=0 +# vertical-letter-offset=0 +# underline-offset= +# underline-thickness= +# box-drawings-uses-font-glyphs=no +# dpi-aware=no + +# initial-window-size-pixels=700x500 # Or, +# initial-window-size-chars= +# initial-window-mode=windowed +# pad=0x0 # optionally append 'center' +# resize-delay-ms=100 + +# notify=notify-send -a ${app-id} -i ${app-id} ${title} ${body} + +# bold-text-in-bright=no +# word-delimiters=,│`|:"'()[]{}<> +# selection-target=primary +# workers= +# utmp-helper=/usr/lib/utempter/utempter # When utmp backend is ‘libutempter’ (Linux) +# utmp-helper=/usr/libexec/ulog-helper # When utmp backend is ‘ulog’ (FreeBSD) + +[environment] +# name=value + +[bell] +# urgent=no +# notify=no +# visual=no +# command= +# command-focused=no + +[scrollback] +# lines=1000 +# multiplier=3.0 +# indicator-position=relative +# indicator-format="" + +[url] +# launch=xdg-open ${url} +# label-letters=sadfjklewcmpgh +# osc8-underline=url-mode +# protocols=http, https, ftp, ftps, file, gemini, gopher +# uri-characters=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.,~:;/?#@!$&%*+="'()[] + +[cursor] +# style=block +# color= +# blink=no +# beam-thickness=1.5 +# underline-thickness= + +[mouse] +# hide-when-typing=no +# alternate-scroll-mode=yes + +[touch] +# long-press-delay=400 + +[colors] + alpha=0.8 + background=1E1E2E + foreground=CDD6F4 +# flash=7f7f00 +# flash-alpha=0.5 + +## Normal/regular colors (color palette 0-7) +# regular0=242424 # black +# regular1=f62b5a # red +# regular2=47b413 # green +# regular3=e3c401 # yellow +# regular4=24acd4 # blue +# regular5=f2affd # magenta +# regular6=13c299 # cyan +# regular7=e6e6e6 # white + +## Bright colors (color palette 8-15) +# bright0=616161 # bright black +# bright1=ff4d51 # bright red +# bright2=35d450 # bright green +# bright3=e9e836 # bright yellow +# bright4=5dc5f8 # bright blue +# bright5=feabf2 # bright magenta +# bright6=24dfc4 # bright cyan +# bright7=ffffff # bright white + +## dimmed colors (see foot.ini(5) man page) +# dim0= +# ... +# dim7= + +## The remaining 256-color palette +# 16 = <256-color palette #16> +# ... +# 255 = <256-color palette #255> + +## Misc colors +# selection-foreground= +# selection-background= +# jump-labels= # black-on-yellow +# scrollback-indicator= # black-on-bright-blue +# search-box-no-match= # black-on-red +# search-box-match= # black-on-yellow +# urls= + +[csd] +# preferred=server +# size=26 +# font= +# color= +# hide-when-maximized=no +# double-click-to-maximize=yes +# border-width=0 +# border-color= +# button-width=26 +# button-color= +# button-minimize-color= +# button-maximize-color= +# button-close-color= + +[key-bindings] +# scrollback-up-page=Shift+Page_Up +# scrollback-up-half-page=none +# scrollback-up-line=none +# scrollback-down-page=Shift+Page_Down +# scrollback-down-half-page=none +# scrollback-down-line=none +# scrollback-home=none +# scrollback-end=none +# clipboard-copy=Control+Shift+c XF86Copy +# clipboard-paste=Control+Shift+v XF86Paste +# primary-paste=Shift+Insert +# search-start=Control+Shift+r +# font-increase=Control+plus Control+equal Control+KP_Add +# font-decrease=Control+minus Control+KP_Subtract +# font-reset=Control+0 Control+KP_0 +# spawn-terminal=Control+Shift+n +# minimize=none +# maximize=none +# fullscreen=none +# pipe-visible=[sh -c "xurls | fuzzel | xargs -r firefox"] none +# pipe-scrollback=[sh -c "xurls | fuzzel | xargs -r firefox"] none +# pipe-selected=[xargs -r firefox] none +# show-urls-launch=Control+Shift+o +# show-urls-copy=none +# show-urls-persistent=none +# prompt-prev=Control+Shift+z +# prompt-next=Control+Shift+x +# unicode-input=Control+Shift+u +# noop=none + +[search-bindings] +# cancel=Control+g Control+c Escape +# commit=Return +# find-prev=Control+r +# find-next=Control+s +# cursor-left=Left Control+b +# cursor-left-word=Control+Left Mod1+b +# cursor-right=Right Control+f +# cursor-right-word=Control+Right Mod1+f +# cursor-home=Home Control+a +# cursor-end=End Control+e +# delete-prev=BackSpace +# delete-prev-word=Mod1+BackSpace Control+BackSpace +# delete-next=Delete +# delete-next-word=Mod1+d Control+Delete +# extend-char=Shift+Right +# extend-to-word-boundary=Control+w Control+Shift+Right +# extend-to-next-whitespace=Control+Shift+w +# extend-line-down=Shift+Down +# extend-backward-char=Shift+Left +# extend-backward-to-word-boundary=Control+Shift+Left +# extend-backward-to-next-whitespace=none +# extend-line-up=Shift+Up +# clipboard-paste=Control+v Control+Shift+v Control+y XF86Paste +# primary-paste=Shift+Insert +# unicode-input=none +# scrollback-up-page=Shift+Page_Up +# scrollback-up-half-page=none +# scrollback-up-line=none +# scrollback-down-page=Shift+Page_Down +# scrollback-down-half-page=none +# scrollback-down-line=none +# scrollback-home=none +# scrollback-end=none + +[url-bindings] +# cancel=Control+g Control+c Control+d Escape +# toggle-url-visible=t + +[text-bindings] +# \x03=Mod4+c # Map Super+c -> Ctrl+c + +[mouse-bindings] +# scrollback-up-mouse=BTN_BACK +# scrollback-down-mouse=BTN_FORWARD +# selection-override-modifiers=Shift +# primary-paste=BTN_MIDDLE +# select-begin=BTN_LEFT +# select-begin-block=Control+BTN_LEFT +# select-extend=BTN_RIGHT +# select-extend-character-wise=Control+BTN_RIGHT +# select-word=BTN_LEFT-2 +# select-word-whitespace=Control+BTN_LEFT-2 +# select-quote = BTN_LEFT-3 +# select-row=BTN_LEFT-4 + +# vim: ft=dosini diff --git a/common/gita.nix b/common/gita.nix new file mode 100644 index 0000000..9dee562 --- /dev/null +++ b/common/gita.nix @@ -0,0 +1,17 @@ +_: { + # enable programs + programs = { + git = { + enable = true; + userName = "rubiigen"; + userEmail = "alyxwren@proton.me"; + extraConfig = { + commit.gpgsign = true; + gpg.format = "ssh"; + user.signingkey = "~/.ssh/id_ed25519.pub"; + init.defaultBranch = "master"; + }; + }; + # ... add more programs as you see fit + }; +} diff --git a/common/gitm.nix b/common/gitm.nix new file mode 100644 index 0000000..ef78829 --- /dev/null +++ b/common/gitm.nix @@ -0,0 +1,17 @@ +_: { + # enable programs + programs = { + git = { + enable = true; + userName = "beanigen"; + userEmail = "beanigit@protonmail.com"; + extraConfig = { + commit.gpgsign = true; + gpg.format = "ssh"; + user.signingkey = "~/.ssh/id_ed25519.pub"; + init.defaultBranch = "master"; + }; + }; + # ... add more programs as you see fit + }; +} diff --git a/common/nvim-flake.nix b/common/nvim-flake.nix new file mode 100644 index 0000000..daed404 --- /dev/null +++ b/common/nvim-flake.nix @@ -0,0 +1,23 @@ +{inputs, ...}: { + + imports = [ inputs.neovim-flake.homeManagerModules.default ]; + # enable programs + programs = { + neovim-flake = { + enable = true; + settings = { + vim.languages = { + nix.enable = true; + nix.lsp.enable = true; + ts.enable = true; + python.enable = true; + html.enable = true; + }; + vim.lsp = { + enable = true; + }; + }; + }; + # ... add more programs as you see fit + }; +} diff --git a/common/programs.nix b/common/programs.nix new file mode 100644 index 0000000..6970d2c --- /dev/null +++ b/common/programs.nix @@ -0,0 +1,8 @@ +_: { + # enable programs + programs = { + foot.enable = true; + wezterm.enable = true; + # ... add more programs as you see fit + }; +} diff --git a/common/toggle-keyboard.sh b/common/toggle-keyboard.sh new file mode 100755 index 0000000..37d9984 --- /dev/null +++ b/common/toggle-keyboard.sh @@ -0,0 +1,6 @@ +if pgrep -x "wvkbd-mobintl" > /dev/null +then + pkill wvkbd +else + wvkbd-mobintl -L 325 & +fi diff --git a/common/waybar-style.nix b/common/waybar-style.nix new file mode 100644 index 0000000..1297ade --- /dev/null +++ b/common/waybar-style.nix @@ -0,0 +1,174 @@ +'' + * { + border: none; + font-family: "JetbrainsMono Nerd Font", "Font Awesome 5" ; + font-size: 14px; + border-radius: 12px; /* Controls Rounding */ + } + + #window { + /*font-weight: bold;*/ + margin-top: 2px; + padding-left: 10px; + padding-right: 10px; + padding-bottom: 2px; + border-radius: 8px; + transition: none; + } + + window#waybar { + background: #000000; + padding: 2px 2px 2px 0px; + margin: 7; + /* background: transparent; */ + } + + window#waybar.empty { + animation: fadeIn 5s; + } + + # tray { + padding: 0 10px; + } + + window#waybar.hidden { + opacity: 0.2; + } + + /*-----module groups----*/ + .modules-right { + /* margin: 0 -12px 0 0; */ + padding-right:7px; + margin: 4px; + } + + .mnodules-center { + /* background: transparent; */ + margin: 0 0 0 0; + + } + + .modules-left { + /* margin: 0 -12px 0 0; */ + padding-left:7px; + } + + tooltip { + background: #060606; + color: #ffffff; + border-radius: 10; + } + + #workspaces { + padding: 0 10px; + } + + /*-----modules indv----*/ + #workspaces button { + font-weight: bold; + padding-right: 0px; + /* padding-right: 7px */ + } + #workspaces button:hover { + font-weight: bold; + padding-right: 0px; + /* padding-right: 7px */ + } + + #workspaces button.focused { + font-weight: bold; + padding-right: 0px; + /* padding-right: 7px */ + } + + #workspaces button.active { + font-weight: bold; + /* background-color: #ffffff; */ + /* padding-right: 7px */ + } + + #custom-sep_l { + color: #ffffff; + margin: 0px 10px 0px 10px; + } + + #custom-sep_r { + color: #ffffff; + padding-left: 4px; + padding-right: 4px; + } + + #custom-sep { + color: #ffffff; + } + + #custom-empty { + color: #ffffff; + } + + #clock { + font-weight: bold; + padding: 0px 4px + } + + #battery, #cpu, #memory, #temperature, #network, #pulseaudio, #custom-media, #backlight { + padding: 0 10px; + } + + #custom-updates { + padding: 0px 0px + } + + #keyboard-state { + padding-left: 0px; + padding-right: 0px; + } + + #mode, + #custom-power { + padding: 0 10px; + } + + #custom-launcher { + font-weight: bold; + /* padding-right: 7px */ + } + #custom-menu { + font-weight: bold; + /* padding-right: 7px; */ + } + #idle_inhibitor { + padding: 0 5px; + } + + #mode { + color: #cc3436; + font-weight: bold; + } + + /*-----Indicators----*/ + #network.disconnected { + color: #ff5454; + } + #network.disabled { + color: #e3c78a; + } + #idle_inhibitor.activated { + color: #2dcc36; + } + #pulseaudio.muted { + color: #aaaaaa; + } + #battery.charging { + color: #8cc85f; + } + #battery.warning:not(.charging) { + color: #e3c78a; + } + #battery.critical:not(.charging) { + color: #ff5454; + } + #temperature.critical { + color: #ff5454; + } +'' diff --git a/common/waybar.nix b/common/waybar.nix new file mode 100644 index 0000000..812da4d --- /dev/null +++ b/common/waybar.nix @@ -0,0 +1,213 @@ +{ + mainBar = { + margin-top = 7; + margin-left = 7; + margin-right = 7; + layer = "top"; + position = "top"; + fixed-center = true; + + modules-left = [ + "custom/wvkbd" + "custom/nwggrid" + "hyprland/workspaces" + "tray" + "custom/power" + ]; + + modules-center = [ + "clock" + "sep" + "custom/notification" + ]; + + modules-right = [ + "battery" + "cpu" + "temperature" + "backlight" + "disk" + "memory" + "pulseaudio" + "network" + ]; + + "custom/sep_r" = { + format = " "; + }; + + "custom/sep" = { + format = " "; + }; + + "custom/sep_l" = { + format = " "; + }; + + "custom/wvkbd" = { + format = " 󰌌 "; + on-click = "~/.config/nixos/homes/common/toggle-keyboard.sh"; + }; + + "custom/nwggrid" = { + format = " 󰕰 "; + on-click = "nwggrid"; + }; + + "backlight" = { + device = "acpi_video1"; + format = "{icon}{percent}%"; + format-icons = [" " " " " " " " " " " " " " " " " "]; + }; + + "custom/notification" = { + tooltip = true; + format = "{icon}"; + format-icons = { + "notification" = "  "; + "none" = "  "; + "dnd-notification" = "  "; + "dnd-none" = "  "; + }; + return-type = "json"; + exec-if = "which swaync-client"; + exec = "swaync-client -swb"; + on-click = "swaync-client -t -sw"; + on-click-middle = "swaync-client -d -sw"; + on-click-right = "swaync-client -C"; + escape = true; + }; + + "hyprland/workspaces" = { + disable-scroll = false; + all-outputs = true; + format = "{icon}"; + "on-scroll-up" = "hyprctl dispatch workspace e+1"; + "on-scroll-down" = "hyprctl dispatch workspace e-1"; + "on-click" = "activate"; + active-only = true; + format-icons = { + "1" = "I"; + "2" = "II"; + "3" = "III"; + "4" = "IV"; + "5" = "V"; + "6" = "VI"; + "7" = "VII"; + "8" = "VIII"; + "9" = "IX"; + "10" = "X"; + "11" = "XI"; + "12" = "XII"; + }; + }; + + "hyprland/language" = { + format = "{}"; + format-tr = "TR"; + }; + + "temperature" = { + critical-threshold = 85; + format-critical = "{temperatureC}°C {icon}"; + format = "{icon} {temperatureC}°C"; + format-icons = [" " "" " "]; + }; + + "hyprland/window" = { + format = "{}"; + seperate-outputs = true; + }; + + "keyboard-state" = { + interval = 1; + numlock = false; + capslock = false; + format = "{icon}"; + format-icons = { + "locked" = " "; + "unlocked" = ""; + }; + }; + + "idle_inhibitor" = { + format = "{icon}"; + format-icons = { + "activated" = ""; + "deactivated" = ""; + }; + }; + + "tray" = { + icon-size = 16; + spacing = 6; + }; + + "clock" = { + timezone = "Europe/London"; + format = "{: %H:%M}"; + format-alt = "{: %H:%M  %d/%m/%Y}"; + tooltip-format = "{: %H:%M  %d/%m/%Y}"; + today-format = "{}"; + calendar-weeks-pos = "right"; + format-calendar = "{}"; + format-calendar-weeks = "{}"; + format-calendar-weekdays = "{}"; + interval = 10; + on-click-middle = "kalendar"; + }; + + "cpu" = { + format = " {usage}%"; + tooltip = false; + }; + + "memory" = { + format = " {}%"; + }; + + "battery" = { + states = { + "good" = 80; + "warning" = 30; + "critical" = 5; + }; + format = "{icon}{capacity}% "; + format-charging = " {capacity}% "; + format-plugged = " {capacity}% "; + format-alt = "{icon}{time}"; + format-icons = [" " " " " " " " " "]; + }; + + "network" = { + format-wifi = " Connected"; + format-ethernet = " Connected"; + format-disconnected = " Disconnected"; + tooltip-format-wifi = "{essid} | Signal Strenght: {signalStrength}% | Down Speed: {bandwidthDownBits}, Up Speed: {bandwidthUpBits}"; + tooltip-format = "{ifname} via {gwaddr} "; + tooltip-format-ethernet = "{ipaddr} "; + format-linked = "{ifname} (No IP) "; + format-alt = "{ifname}: {ipaddr}/{cidr}"; + }; + + "pulseaudio" = { + on-click = "pavucontrol"; + format = "{icon}{volume}%"; + format-icons = { + "default" = [" " " " " "]; + }; + }; + + "disk" = { + interval = 90; + format = " {free} (/)"; + tooltip-format = "{used} / {total} ({percentage_used}%)"; + path = "/"; + }; + + "custom/power" = { + format = " "; + on-click = "hyprctl dispatch exit"; + }; + }; +} diff --git a/common/waybarAU.nix b/common/waybarAU.nix new file mode 100644 index 0000000..a59842c --- /dev/null +++ b/common/waybarAU.nix @@ -0,0 +1,230 @@ +{ + mainBar = { + margin-top = 7; + margin-left = 7; + margin-right = 7; + layer = "top"; + position = "top"; + fixed-center = true; + + modules-left = [ + "custom/wvkbd" + "custom/nwggrid" + "hyprland/workspaces" + "tray" + "custom/power" + ]; + + modules-center = [ + "clock" + "sep" + "custom/notification" + ]; + + modules-right = [ + "battery" + "battery#bat2" + "cpu" + "temperature" + "backlight" + "disk" + "memory" + "pulseaudio" + "network" + ]; + + "custom/sep_r" = { + format = " "; + }; + + "custom/sep" = { + format = " "; + }; + + "custom/sep_l" = { + format = " "; + }; + + "custom/wvkbd" = { + format = " 󰌌 "; + on-click = "~/.config/nixos/homes/common/toggle-keyboard.sh"; + }; + + "custom/nwggrid" = { + format = " 󰕰 "; + on-click = "nwggrid"; + }; + + "backlight" = { + device = "acpi_video1"; + format = "{icon}{percent}%"; + format-icons = [" " " " " " " " " " " " " " " " " "]; + }; + + "custom/notification" = { + tooltip = true; + format = "{icon}"; + format-icons = { + "notification" = "  "; + "none" = "  "; + "dnd-notification" = "  "; + "dnd-none" = "  "; + }; + return-type = "json"; + exec-if = "which swaync-client"; + exec = "swaync-client -swb"; + on-click = "swaync-client -t -sw"; + on-click-middle = "swaync-client -d -sw"; + on-click-right = "swaync-client -C"; + escape = true; + }; + + "hyprland/workspaces" = { + disable-scroll = false; + all-outputs = true; + format = "{icon}"; + "on-scroll-up" = "hyprctl dispatch workspace e+1"; + "on-scroll-down" = "hyprctl dispatch workspace e-1"; + "on-click" = "activate"; + active-only = true; + format-icons = { + "1" = "I"; + "2" = "II"; + "3" = "III"; + "4" = "IV"; + "5" = "V"; + "6" = "VI"; + "7" = "VII"; + "8" = "VIII"; + "9" = "IX"; + "10" = "X"; + "11" = "XI"; + "12" = "XII"; + }; + }; + + "hyprland/language" = { + format = "{}"; + format-tr = "TR"; + }; + + "temperature" = { + critical-threshold = 85; + format-critical = "{temperatureC}°C {icon}"; + format = "{icon} {temperatureC}°C"; + format-icons = [" " "" " "]; + }; + + "hyprland/window" = { + format = "{}"; + seperate-outputs = true; + }; + + "keyboard-state" = { + interval = 1; + numlock = false; + capslock = false; + format = "{icon}"; + format-icons = { + "locked" = " "; + "unlocked" = ""; + }; + }; + + "idle_inhibitor" = { + format = "{icon}"; + format-icons = { + "activated" = ""; + "deactivated" = ""; + }; + }; + + "tray" = { + icon-size = 16; + spacing = 6; + }; + + "clock" = { + timezone = "Australia/Perth"; + format = "{: %H:%M}"; + format-alt = "{: %H:%M  %d/%m/%Y}"; + tooltip-format = "{: %H:%M  %d/%m/%Y}"; + today-format = "{}"; + calendar-weeks-pos = "right"; + format-calendar = "{}"; + format-calendar-weeks = "{}"; + format-calendar-weekdays = "{}"; + interval = 10; + on-click-middle = "kalendar"; + }; + + "cpu" = { + format = " {usage}%"; + tooltip = false; + }; + + "memory" = { + format = " {}%"; + }; + + "battery" = { + states = { + "good" = 80; + "warning" = 30; + "critical" = 5; + }; + format = "{icon}{capacity}% "; + format-charging = " {capacity}% "; + format-plugged = " {capacity}% "; + format-alt = "{icon}{time}"; + format-icons = [" " " " " " " " " "]; + interval = 3; + }; + + "battery#bat2" = { + states = { + "good" = 80; + "warning" = 30; + "critical" = 5; + }; + format = "{icon}{capacity}% "; + format-charging = " {capacity}% "; + format-plugged = " {capacity}% "; + format-alt = "{icon}{time}"; + format-icons = [" " " " " " " " " "]; + interval = 3; + bat = "BAT2"; + }; + + "network" = { + format-wifi = " Connected"; + format-ethernet = " Connected"; + format-disconnected = " Disconnected"; + tooltip-format-wifi = "{essid} | Signal Strenght: {signalStrength}% | Down Speed: {bandwidthDownBits}, Up Speed: {bandwidthUpBits}"; + tooltip-format = "{ifname} via {gwaddr} "; + tooltip-format-ethernet = "{ipaddr} "; + format-linked = "{ifname} (No IP) "; + format-alt = "{ifname}: {ipaddr}/{cidr}"; + }; + + "pulseaudio" = { + on-click = "pavucontrol"; + format = "{icon}{volume}%"; + format-icons = { + "default" = [" " " " " "]; + }; + }; + + "disk" = { + interval = 90; + format = " {free} (/)"; + tooltip-format = "{used} / {total} ({percentage_used}%)"; + path = "/"; + }; + + "custom/power" = { + format = " "; + on-click = "hyprctl dispatch exit"; + }; + }; +} diff --git a/flake.lock b/flake.lock index 81f7343..816f22e 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "alpha-nvim": { "flake": false, "locked": { - "lastModified": 1689470865, - "narHash": "sha256-wgjYus4XlJ0GoQWTo5gf7yyKYhseOXKOqUXEiwXpEJQ=", + "lastModified": 1705520464, + "narHash": "sha256-Yz5ZqxjaargJjnbmH1L43EwYp5J5w5RPREG7/smdRQc=", "owner": "goolord", "repo": "alpha-nvim", - "rev": "e4fc5e29b731bdf55d204c5c6a11dc3be70f3b65", + "rev": "4b36c1ca9ea475bdc006896657cf1ccc486aeffa", "type": "github" }, "original": { @@ -23,11 +23,11 @@ ] }, "locked": { - "lastModified": 1690915766, - "narHash": "sha256-YynUr5VU7AKjFl74tGKo9RHkyYw4TSFLLtRsNg9SDbQ=", + "lastModified": 1702716624, + "narHash": "sha256-IiPLKu8URsOeeWePz30PzU8Qj38XzeEWnLLP6bvzw/w=", "owner": "notashelf", "repo": "arrpc-flake", - "rev": "4d72fe05df250a93e32c70ba6893ddadde438e28", + "rev": "136eca7e4d13dc8c8cce24480614cbf9b120cc14", "type": "github" }, "original": { @@ -39,11 +39,11 @@ "bufdelete-nvim": { "flake": false, "locked": { - "lastModified": 1688027130, - "narHash": "sha256-UubYRfRAXZ89WOc3QFMvAMjNjLW6bV4nDgSa1CRZkIM=", + "lastModified": 1703393686, + "narHash": "sha256-O0JRhx6UJzeZTG+XwGi/6DLaoX8hfqxwSt0W9yQXhBw=", "owner": "famiu", "repo": "bufdelete.nvim", - "rev": "07d1f8ba79dec59d42b975a4df1c732b2e4e37b4", + "rev": "0b9c0f182b09c51170bb9f252f15de7695e4d507", "type": "github" }, "original": { @@ -55,11 +55,11 @@ "catppuccin": { "flake": false, "locked": { - "lastModified": 1690630440, - "narHash": "sha256-MSZcIrV3vvgb5mlMpO5uRlAYoENm2pZyuZbV5Q9Vg58=", + "lastModified": 1706227543, + "narHash": "sha256-br32TBzK++QK6RqlMjyN4vmNi1cgNgDca8byZqV3oUQ=", "owner": "catppuccin", "repo": "nvim", - "rev": "057c34f849cf21059487d849e2f3b3efcd4ee0eb", + "rev": "afab7ec2a79c7127627dede79c0018b6e45663d0", "type": "github" }, "original": { @@ -71,11 +71,11 @@ "ccc": { "flake": false, "locked": { - "lastModified": 1686587775, - "narHash": "sha256-T1ryyTdbU/335MpD184PSnBLgj4S2Kzf9hZnwc9to+I=", + "lastModified": 1702716924, + "narHash": "sha256-nWe7uYWPZ1LjQRVynYnPomb4EFfyh919Jsh07UPSdvg=", "owner": "uga-rosa", "repo": "ccc.nvim", - "rev": "4a0ddaf787cc82796e84ab8a7f70d086f250aeb6", + "rev": "ec6e23fd2c0bf4ffcf71c1271acdcee6e2c6f49c", "type": "github" }, "original": { @@ -87,11 +87,11 @@ "cellular-automaton": { "flake": false, "locked": { - "lastModified": 1674679594, - "narHash": "sha256-h4KQCf8+GbxWSyZzDny07YFZm7j+aSSfm51lsaK0Ers=", + "lastModified": 1693589931, + "narHash": "sha256-szbd6m7hH7NFI0UzjWF83xkpSJeUWCbn9c+O8F8S/Fg=", "owner": "Eandrju", "repo": "cellular-automaton.nvim", - "rev": "679943b8e1e5ef79aaeeaf4b00782c52eb4e928f", + "rev": "b7d056dab963b5d3f2c560d92937cb51db61cb5b", "type": "github" }, "original": { @@ -151,11 +151,11 @@ "cmp-nvim-lsp": { "flake": false, "locked": { - "lastModified": 1687494203, - "narHash": "sha256-mU0soCz79erJXMMqD/FyrJZ0mu2n6fE0deymPzQlxts=", + "lastModified": 1702205473, + "narHash": "sha256-/0sh9vJBD9pUuD7q3tNSQ1YLvxFMNykdg5eG+LjZAA8=", "owner": "hrsh7th", "repo": "cmp-nvim-lsp", - "rev": "44b16d11215dce86f253ce0c30949813c0a90765", + "rev": "5af77f54de1b16c34b23cba810150689a3a90312", "type": "github" }, "original": { @@ -183,11 +183,11 @@ "cmp-treesitter": { "flake": false, "locked": { - "lastModified": 1680745848, - "narHash": "sha256-WOcg6w4M20gpMCZjZ3DpPIA55SGLjV75fhckefiVfU0=", + "lastModified": 1702163214, + "narHash": "sha256-K7F9iqmB13ONenwsbaND8F4010MvHQXp7DxMFfcsZ4A=", "owner": "ray-x", "repo": "cmp-treesitter", - "rev": "389eadd48c27aa6dc0e6b992644704f026802a2e", + "rev": "13e4ef8f4dd5639fca2eb9150e68f47639a9b37d", "type": "github" }, "original": { @@ -215,11 +215,11 @@ "codewindow-nvim": { "flake": false, "locked": { - "lastModified": 1690128662, - "narHash": "sha256-7ntC06PhxfuKnGyXpiW4juP3fWR97DH3Gygwvscv3OY=", + "lastModified": 1695487629, + "narHash": "sha256-/u2Zjbd9m3/iJU3I3HzFzXWxuvoycwJoIq7UFeHNtKM=", "owner": "gorbit99", "repo": "codewindow.nvim", - "rev": "11fb5520898d22a563fe6a124a61c0d2887f3d3f", + "rev": "8c8f5ff66e123491c946c04848d744fcdc7cac6c", "type": "github" }, "original": { @@ -231,11 +231,11 @@ "comment-nvim": { "flake": false, "locked": { - "lastModified": 1686546603, - "narHash": "sha256-XM9yhp+SGxfAOdN/eDunzM0TMoCJhVth3wpFKNCGf3g=", + "lastModified": 1691409559, + "narHash": "sha256-+dF1ZombrlO6nQggufSb0igXW5zwU++o0W/5ZA07cdc=", "owner": "numToStr", "repo": "Comment.nvim", - "rev": "176e85eeb63f1a5970d6b88f1725039d85ca0055", + "rev": "0236521ea582747b58869cb72f70ccfa967d2e89", "type": "github" }, "original": { @@ -247,11 +247,11 @@ "copilot-cmp": { "flake": false, "locked": { - "lastModified": 1683831407, - "narHash": "sha256-+MzEGnhlrYRvAfskOwmw69OC1CsPXt7s3z+xPe9XPqs=", + "lastModified": 1694286652, + "narHash": "sha256-srgNohm/aJpswNJ5+T7p+zi9Jinp9e5FA8/wdk6VRiY=", "owner": "zbirenbaum", "repo": "copilot-cmp", - "rev": "c2cdb3c0f5078b0619055af192295830a7987790", + "rev": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3", "type": "github" }, "original": { @@ -263,11 +263,11 @@ "copilot-lua": { "flake": false, "locked": { - "lastModified": 1688190439, - "narHash": "sha256-lD9FdbKKZ6d/BjIfqp0Ust2hqSYNLpCFWxuaKUO9qLs=", + "lastModified": 1704638182, + "narHash": "sha256-8/EPnigWaY2P4ZlVyu42DOQVOjRPgSCtmdOVbl2ACN8=", "owner": "zbirenbaum", "repo": "copilot.lua", - "rev": "e48bd7020a98be217d85c006a298656294fd6210", + "rev": "b03617a6dc4bc88b65ab5deac1631da9a9c2dcaf", "type": "github" }, "original": { @@ -276,14 +276,35 @@ "type": "github" } }, + "crane": { + "inputs": { + "nixpkgs": [ + "lanzaboote", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1706473964, + "narHash": "sha256-Fq6xleee/TsX6NbtoRuI96bBuDHMU57PrcK9z1QEKbk=", + "owner": "ipetkov", + "repo": "crane", + "rev": "c798790eabec3e3da48190ae3698ac227aab770c", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "crates-nvim": { "flake": false, "locked": { - "lastModified": 1688295570, - "narHash": "sha256-ah+fTmzkZn+xuL3sG2RxlCtDiFsRv3SY1iJzYKMIaMg=", + "lastModified": 1706141227, + "narHash": "sha256-vkq1N6XvJOSsIbCCcAk1+9ReRMF4it/mofq55JhwQRY=", "owner": "Saecki", "repo": "crates.nvim", - "rev": "4ce7c51b881e58f1e2f8f437f30e4e583cbac319", + "rev": "f2a169840e97a8ed2048abb507d2742c3895c85b", "type": "github" }, "original": { @@ -295,11 +316,11 @@ "dashboard-nvim": { "flake": false, "locked": { - "lastModified": 1690351087, - "narHash": "sha256-aVMugjgA9lnORUVDBpa8G800Ev86htP4hDGrBq6Sw6s=", + "lastModified": 1699578883, + "narHash": "sha256-LNjYIRL5xZyLgFkoTu3K5USOfk1mtaXe5RhKBAbzYRw=", "owner": "glepnir", "repo": "dashboard-nvim", - "rev": "c17d3210b3dec8798b4fc82a11c542989251f85d", + "rev": "63df28409d940f9cac0a925df09d3dc369db9841", "type": "github" }, "original": { @@ -311,11 +332,11 @@ "diffview-nvim": { "flake": false, "locked": { - "lastModified": 1689788060, - "narHash": "sha256-0tsgwI/qZm8Gj3NyN9CA+YHf3qim7vGXI+vbEcFBKbQ=", + "lastModified": 1700506468, + "narHash": "sha256-3EdnBUka9Rh5Brl6TWpN6GlD9z32mmY3Ip+wyiKob/8=", "owner": "sindrets", "repo": "diffview.nvim", - "rev": "e91110d2a7f8e2f667666aba6ea089ff823f8748", + "rev": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f", "type": "github" }, "original": { @@ -327,11 +348,11 @@ "dirt-samples-src": { "flake": false, "locked": { - "lastModified": 1588278411, - "narHash": "sha256-h8vQxRym6QzNLOTZU7A43VCHuG0H77l+BFwXnC0L1CE=", + "lastModified": 1667426233, + "narHash": "sha256-Zl2bi9QofcrhU63eMtg+R6lhV9ExQS/0XNTJ+oq65Uo=", "owner": "tidalcycles", "repo": "dirt-samples", - "rev": "66d432418c9a7d82cf049d9246adfa62f46df2a6", + "rev": "92f2145e661b397e62ca0ff3965819e7c7db0dad", "type": "github" }, "original": { @@ -344,11 +365,11 @@ "dracula": { "flake": false, "locked": { - "lastModified": 1690594744, - "narHash": "sha256-gblqxRTphGBpEOx57/4oU/B50O0OguIm1bFtd4LXuQ4=", + "lastModified": 1705994462, + "narHash": "sha256-yGV/bA7+Xi+LBi4Iz/SZDVl0KWoo+IO9kgfSIgTk0Ow=", "owner": "Mofiqul", "repo": "dracula.nvim", - "rev": "9fe831e685a76e1a1898a694623b33247c4d036c", + "rev": "a6cb758d4b182d9f2b7e742910078d94877c1059", "type": "github" }, "original": { @@ -360,11 +381,11 @@ "dressing-nvim": { "flake": false, "locked": { - "lastModified": 1690648598, - "narHash": "sha256-hndRErSXhX1BHM90nuhiZkgHwkclLEMv5vtF+GDzUP4=", + "lastModified": 1706209758, + "narHash": "sha256-P8XlaiNNbOtkOS2un+pfCOOayOzJ/8uLQFrcFlSW7tQ=", "owner": "stevearc", "repo": "dressing.nvim", - "rev": "829bc80400651aea31b03d8fc9a99135512fe67a", + "rev": "0e88293ce3459f4bb310125f3366304af6dc7990", "type": "github" }, "original": { @@ -376,11 +397,11 @@ "elixir-ls": { "flake": false, "locked": { - "lastModified": 1690526097, - "narHash": "sha256-lR1xsOJhz0W/Z3E2EUWujpUvpgUkLLDr0E6Ao31zi8s=", + "lastModified": 1705860624, + "narHash": "sha256-pd/ZkDpzlheEJfX7X6fFWY4Y5B5Y2EnJMBtuNHPuUJw=", "owner": "elixir-lsp", "repo": "elixir-ls", - "rev": "216ff0e2969c2bbe45d324c4d6a5f08e6b681f5e", + "rev": "d10ce2cfe3acf475949e9a21984d18be579d7ec4", "type": "github" }, "original": { @@ -392,11 +413,11 @@ "elixir-tools": { "flake": false, "locked": { - "lastModified": 1690555653, - "narHash": "sha256-7wDEChXTUGp8ONT6jufIJp05vawzo4AXg35ELNLvysA=", + "lastModified": 1703976612, + "narHash": "sha256-6QdjqugY2kouDVzQa4bxFb9dp9vVantueO+6nnbnOwo=", "owner": "elixir-tools", "repo": "elixir-tools.nvim", - "rev": "883933b57c9150c71ad2b99a4080685d83e095b8", + "rev": "163522196c962fa87cac0df2a0d1ad332e1e0755", "type": "github" }, "original": { @@ -408,11 +429,11 @@ "fidget-nvim": { "flake": false, "locked": { - "lastModified": 1686378433, - "narHash": "sha256-N3O/AvsD6Ckd62kDEN4z/K5A3SZNR15DnQeZhH6/Rr0=", + "lastModified": 1699509702, + "narHash": "sha256-8Gl2Ck4YJGReSEq1Xeh1dpdRq4eImmrxvIHrfxdem3Q=", "owner": "j-hui", "repo": "fidget.nvim", - "rev": "90c22e47be057562ee9566bad313ad42d622c1d3", + "rev": "2f7c08f45639a64a5c0abcf67321d52c3f499ae6", "type": "github" }, "original": { @@ -423,6 +444,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1673956053, @@ -439,15 +476,36 @@ } }, "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "lanzaboote", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1704982712, + "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "07f6395285469419cf9d078f59b5b49993198c00", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1688466019, - "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", + "lastModified": 1704982712, + "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", + "rev": "07f6395285469419cf9d078f59b5b49993198c00", "type": "github" }, "original": { @@ -461,11 +519,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "type": "github" }, "original": { @@ -475,6 +533,24 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -492,11 +568,11 @@ "flutter-tools": { "flake": false, "locked": { - "lastModified": 1690188839, - "narHash": "sha256-h8s5g6KU7dMesDqiwzv2MmUGk6jlU5lBnuVA3LaoI1g=", + "lastModified": 1705943990, + "narHash": "sha256-g/cgFJ8kwBk1gNVaio+s1sa5KqpC/LMf06/6+MOPZk4=", "owner": "akinsho", "repo": "flutter-tools.nvim", - "rev": "561d85b16d8ca2938820a9c26b2fe74096d89c81", + "rev": "271eec9edb0f1a2bf30ad449ec3b4eeb2c88af05", "type": "github" }, "original": { @@ -508,11 +584,11 @@ "gesture-nvim": { "flake": false, "locked": { - "lastModified": 1687655077, - "narHash": "sha256-ps/dAKIga2ZVunwj+KU/Iej4PGZbBvm5ZzcK30EiKMc=", + "lastModified": 1704802204, + "narHash": "sha256-vAky7yvPw2ZmS0i268eKCpUp75bylNGA+ckvhuWVKgc=", "owner": "notomo", "repo": "gesture.nvim", - "rev": "aa273e7982943ac6ccf6b864f3fd40ad287a9fe2", + "rev": "5124a05debd62326cc899a35a09862a675d7f3da", "type": "github" }, "original": { @@ -521,14 +597,36 @@ "type": "github" } }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "lanzaboote", + "pre-commit-hooks-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1703887061, + "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "gitsigns-nvim": { "flake": false, "locked": { - "lastModified": 1690463120, - "narHash": "sha256-kraK0GP5aLGbh1eVZCm41D6BztjFxthSXGnE5CxhrZs=", + "lastModified": 1706282483, + "narHash": "sha256-jVzZPD9RdM0Ie3nWuZgv+XVhwWzLJ2QODrIGRCENWjo=", "owner": "lewis6991", "repo": "gitsigns.nvim", - "rev": "5d73da785a3c05fd63ac31769079db05169a6ec7", + "rev": "fb9fd5312476b51a42a98122616e1c448d823d5c", "type": "github" }, "original": { @@ -540,11 +638,11 @@ "glow-nvim": { "flake": false, "locked": { - "lastModified": 1690579937, - "narHash": "sha256-ZDlQfSJHq9CbOpTDgmIoMq4gDzHxoUslFfN5XKtrDtM=", + "lastModified": 1703345545, + "narHash": "sha256-GsNcASzVvY0066kak2nvUY5luzanoBclqcUOsODww8g=", "owner": "ellisonleao", "repo": "glow.nvim", - "rev": "8942dfb05794f436af4fbc90a34393f1fd36f361", + "rev": "238070a686c1da3bccccf1079700eb4b5e19aea4", "type": "github" }, "original": { @@ -553,6 +651,38 @@ "type": "github" } }, + "gruvbox": { + "flake": false, + "locked": { + "lastModified": 1704132908, + "narHash": "sha256-p/y65ub1qL+5g0ZiWzaTyQeiP7LtVfsdcdJ0eb0A7Og=", + "owner": "ellisonleao", + "repo": "gruvbox.nvim", + "rev": "4176b0b720db0c90ab4030e5c1b4893faf41fd51", + "type": "github" + }, + "original": { + "owner": "ellisonleao", + "repo": "gruvbox.nvim", + "type": "github" + } + }, + "highlight-undo": { + "flake": false, + "locked": { + "lastModified": 1695227852, + "narHash": "sha256-I1AwVYqpJNA3K1AwGy/VgPnbrYvX19qfI9bQFZNu1SU=", + "owner": "tzachar", + "repo": "highlight-undo.nvim", + "rev": "50a6884a8476be04ecce8f1c4ed692c5000ef0a1", + "type": "github" + }, + "original": { + "owner": "tzachar", + "repo": "highlight-undo.nvim", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -560,11 +690,11 @@ ] }, "locked": { - "lastModified": 1693972774, - "narHash": "sha256-Dt9UZs0/DaIex598quYRYFuGabUbvFdNrHuvGc6HjBc=", + "lastModified": 1706798041, + "narHash": "sha256-BbvuF4CsVRBGRP8P+R+JUilojk0M60D7hzqE0bEvJBQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "b22d7bab30076bbb73744867d6c5bf7d6380570c", + "rev": "4d53427bce7bf3d17e699252fd84dc7468afc46e", "type": "github" }, "original": { @@ -576,11 +706,11 @@ "hop-nvim": { "flake": false, "locked": { - "lastModified": 1684332066, - "narHash": "sha256-xdjFbdp0+S3pVdwcOFmad8PMUU033WeDzswOSdxSQjg=", + "lastModified": 1694283445, + "narHash": "sha256-SnuFeD/lrMxKtpBRPgIwdG0kVF7BWe02PiV7URVDASI=", "owner": "phaazon", "repo": "hop.nvim", - "rev": "03f0434869f1f38868618198b5f4f2ab6d39aef2", + "rev": "1a1eceafe54b5081eae4cb91c723abd1d450f34b", "type": "github" }, "original": { @@ -589,6 +719,26 @@ "type": "github" } }, + "hyprgrass": { + "inputs": { + "hyprland": [ + "hyprland" + ] + }, + "locked": { + "lastModified": 1706014834, + "narHash": "sha256-LjS70aH4NH0WRGTlzY94pJM6aQj84DBbKk+rg/X21JI=", + "owner": "horriblename", + "repo": "hyprgrass", + "rev": "1397ae8dad74474f5e967d53c26f981af0bb862d", + "type": "github" + }, + "original": { + "owner": "horriblename", + "repo": "hyprgrass", + "type": "github" + } + }, "hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols", @@ -598,11 +748,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1694097781, - "narHash": "sha256-z2ctVzvAftPUCV5TExLKUBDfAdaF7KpxqEOpG0hFBRg=", + "lastModified": 1706888173, + "narHash": "sha256-D7bJTQeDqkNYYw6Tc+AJplFw2eutke1SjppsarU+N5I=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "398e861b554268e43e8af64ba72c682630302ec3", + "rev": "cf1886ca44c78de3424d96fd18023eb0db759af6", "type": "github" }, "original": { @@ -636,14 +786,36 @@ "type": "github" } }, + "hyprlang": { + "inputs": { + "nixpkgs": [ + "hyprland", + "xdph", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1704287638, + "narHash": "sha256-TuRXJGwtK440AXQNl5eiqmQqY4LZ/9+z/R7xC0ie3iA=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "6624f2bb66d4d27975766e81f77174adbe58ec97", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, "icon-picker-nvim": { "flake": false, "locked": { - "lastModified": 1683205244, - "narHash": "sha256-/oi2Kj7GDXzN3ccPoxyxXtQTYSxtZndgELZa2XgZ3U8=", + "lastModified": 1704321319, + "narHash": "sha256-VZKsVeSmPR3AA8267Mtd5sSTZl2CAqnbgqceCptgp4w=", "owner": "ziontee113", "repo": "icon-picker.nvim", - "rev": "e6dca182518eeb7a51470c13605a5bce08a816e4", + "rev": "3ee9a0ea9feeef08ae35e40c8be6a2fa2c20f2d3", "type": "github" }, "original": { @@ -655,11 +827,11 @@ "indent-blankline": { "flake": false, "locked": { - "lastModified": 1688727830, - "narHash": "sha256-efMRkxjbr6o7kSKAEn0Kaw8lsDubRmc1N0Kd1BZ3A7k=", + "lastModified": 1705027513, + "narHash": "sha256-T0tbTyD9+J7OWcvfrPolrXbjGiXzEXhTtgC9Xj3ANFc=", "owner": "lukas-reineke", "repo": "indent-blankline.nvim", - "rev": "4541d690816cb99a7fc248f1486aa87f3abce91c", + "rev": "12e92044d313c54c438bd786d11684c88f6f78cd", "type": "github" }, "original": { @@ -671,11 +843,11 @@ "kommentary": { "flake": false, "locked": { - "lastModified": 1672983049, - "narHash": "sha256-N4n5tjNB1yX/QxH+t5aG0VxNwZhUJejv0b5V62WEKDU=", + "lastModified": 1701264889, + "narHash": "sha256-lpa3o42jieVKqs+ZCU8HBqWsoqoc53JKMmCNmIJ0rH0=", "owner": "b3nj5m1n", "repo": "kommentary", - "rev": "3a80117148c6798972bb69414423311ab151d368", + "rev": "d5a111a3bc4109a8f913a5863c9092b3b3801482", "type": "github" }, "original": { @@ -684,14 +856,38 @@ "type": "github" } }, + "lanzaboote": { + "inputs": { + "crane": "crane", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_2", + "pre-commit-hooks-nix": "pre-commit-hooks-nix", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1706522979, + "narHash": "sha256-2wP2qEFVoZ9q8C9MZdAwXPKDkIIQiEwUzuzCxVKafDc=", + "owner": "nix-community", + "repo": "lanzaboote", + "rev": "c42edac7eb881315bb2a8dfd5190c8c87b91e084", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "lanzaboote", + "type": "github" + } + }, "leap-nvim": { "flake": false, "locked": { - "lastModified": 1690120911, - "narHash": "sha256-9GFZ5CuR92kFGwh/ouqSSp14eOLZLpzpoFTEuYL7biQ=", + "lastModified": 1706284537, + "narHash": "sha256-kA6Lkfx7RHPUZjhxx4tc0gsAdhrfFvp6yY5qO+ZXUtM=", "owner": "ggandor", "repo": "leap.nvim", - "rev": "5efe985cf68fac3b6a6dfe7a75fbfaca8db2af9c", + "rev": "14eda5bb233354933baa99b6d40bef3a40dbeaae", "type": "github" }, "original": { @@ -703,11 +899,11 @@ "lsp-lines": { "flake": false, "locked": { - "lastModified": 1684163755, - "narHash": "sha256-Zhf2xitLWtE+dWqhvWtLM1K1WdtBvkqqoRLSYIO42oY=", + "lastModified": 1698584731, + "narHash": "sha256-3DWM2mTnm6b7J4cYUwCKBGHkXw/dQDO0ZTJXkTl06aE=", "owner": "~whynothugo", "repo": "lsp_lines.nvim", - "rev": "f53af96d4789eef39a082dbcce078d2bfc384ece", + "rev": "cf2306dd332e34a3e91075b40bdd4f6db824b2ee", "type": "sourcehut" }, "original": { @@ -719,11 +915,11 @@ "lsp-signature": { "flake": false, "locked": { - "lastModified": 1690267930, - "narHash": "sha256-qvcs0KuO2/NdtiTZIxJ2vrwV0I5PjzjMvoAePPasaJM=", + "lastModified": 1701211782, + "narHash": "sha256-4GcTfu7MRpZUi5dqewaddSvaOezRl9ROKrR7wnnLnKE=", "owner": "ray-x", "repo": "lsp_signature.nvim", - "rev": "58d4e810801da74c29313da86075d6aea537501f", + "rev": "fed2c8389c148ff1dfdcdca63c2b48d08a50dea0", "type": "github" }, "original": { @@ -735,11 +931,11 @@ "lspkind": { "flake": false, "locked": { - "lastModified": 1683275543, - "narHash": "sha256-S+qZm51hw/cRujIfHV/1x1fYyCKI4XQ0utSL8uy4l6I=", + "lastModified": 1704982040, + "narHash": "sha256-/QLdBU/Zwmkw1NGuLBD48tvrmIP9d9WHhgcLEQgRTWo=", "owner": "onsails", "repo": "lspkind-nvim", - "rev": "57610d5ab560c073c465d6faf0c19f200cb67e6e", + "rev": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf", "type": "github" }, "original": { @@ -767,11 +963,11 @@ "lualine": { "flake": false, "locked": { - "lastModified": 1683213422, - "narHash": "sha256-ltHE8UIquGo07BSlFGM1l3wmTNN43i8kx6QY7Fj2CNo=", + "lastModified": 1706181415, + "narHash": "sha256-LMMcRY4qnGywdK6Bl4YeAEKLhnRuOZ2txn4oYoso2gI=", "owner": "hoob3rt", "repo": "lualine.nvim", - "rev": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9", + "rev": "7d131a8d3ba5016229e8a1d08bf8782acea98852", "type": "github" }, "original": { @@ -799,11 +995,11 @@ "minimap-vim": { "flake": false, "locked": { - "lastModified": 1690301768, - "narHash": "sha256-yRWZH9caSxrWjUXlM84fU90tZjNfX97m0m491ZsIHxA=", + "lastModified": 1696276849, + "narHash": "sha256-bPW/wDCvItpl0VIQCgz5AEYfx1aAnIMhB1S/tJN5/80=", "owner": "wfxr", "repo": "minimap.vim", - "rev": "74573b63b9ef0583262b6bf6ef209eb7f3b06b94", + "rev": "701f4cf4b60a3e1685d2da484282f3a3d8bf9db6", "type": "github" }, "original": { @@ -815,11 +1011,11 @@ "modes-nvim": { "flake": false, "locked": { - "lastModified": 1682778003, - "narHash": "sha256-qrGgraBdAvIc6AXqMMWESlOV29lM5zC1du1r5L2kpQQ=", + "lastModified": 1702245923, + "narHash": "sha256-Kd2hf5obrPvCVLtRcFjLd75byyrB2o3uYCSEMW6IeCc=", "owner": "mvllow", "repo": "modes.nvim", - "rev": "4d97a51ebbdb649b85f6d79da0009fddd7081a6b", + "rev": "4035a46aaabe43faf1b54740575af9dd5bb03809", "type": "github" }, "original": { @@ -850,6 +1046,38 @@ "type": "github" } }, + "neocord": { + "flake": false, + "locked": { + "lastModified": 1704948184, + "narHash": "sha256-HnaMKTNjMuDwHDvxHH5kd4ysa5WU+MlbdD9jH/iJcU8=", + "owner": "IogaMaster", + "repo": "neocord", + "rev": "9b624d5189f699ab454e9515262c13965395b8dd", + "type": "github" + }, + "original": { + "owner": "IogaMaster", + "repo": "neocord", + "type": "github" + } + }, + "neodev-nvim": { + "flake": false, + "locked": { + "lastModified": 1706249139, + "narHash": "sha256-BRsZdc1TO88pCoehDv7ervBjaeOpcmSGm/RZAInhI9Q=", + "owner": "folke", + "repo": "neodev.nvim", + "rev": "64b2a51b02c6f2ae177c745e4d8bc801a339fe09", + "type": "github" + }, + "original": { + "owner": "folke", + "repo": "neodev.nvim", + "type": "github" + } + }, "neovim-flake": { "inputs": { "alpha-nvim": "alpha-nvim", @@ -876,12 +1104,14 @@ "elixir-ls": "elixir-ls", "elixir-tools": "elixir-tools", "fidget-nvim": "fidget-nvim", - "flake-parts": "flake-parts", - "flake-utils": "flake-utils", + "flake-parts": "flake-parts_2", + "flake-utils": "flake-utils_2", "flutter-tools": "flutter-tools", "gesture-nvim": "gesture-nvim", "gitsigns-nvim": "gitsigns-nvim", "glow-nvim": "glow-nvim", + "gruvbox": "gruvbox", + "highlight-undo": "highlight-undo", "hop-nvim": "hop-nvim", "icon-picker-nvim": "icon-picker-nvim", "indent-blankline": "indent-blankline", @@ -895,14 +1125,16 @@ "mind-nvim": "mind-nvim", "minimap-vim": "minimap-vim", "modes-nvim": "modes-nvim", + "neocord": "neocord", + "neodev-nvim": "neodev-nvim", "nil": "nil", "nixpkgs": [ "nixpkgs" ], "nmd": "nmd", "noice-nvim": "noice-nvim", + "none-ls": "none-ls", "nui-nvim": "nui-nvim", - "null-ls": "null-ls", "nvim-autopairs": "nvim-autopairs", "nvim-bufferline-lua": "nvim-bufferline-lua", "nvim-cmp": "nvim-cmp", @@ -912,6 +1144,7 @@ "nvim-cursorline": "nvim-cursorline", "nvim-dap": "nvim-dap", "nvim-dap-ui": "nvim-dap-ui", + "nvim-docs-view": "nvim-docs-view", "nvim-lightbulb": "nvim-lightbulb", "nvim-lspconfig": "nvim-lspconfig", "nvim-navbuddy": "nvim-navbuddy", @@ -927,8 +1160,8 @@ "obsidian-nvim": "obsidian-nvim", "onedark": "onedark", "orgmode-nvim": "orgmode-nvim", + "oxocarbon": "oxocarbon", "plenary-nvim": "plenary-nvim", - "presence-nvim": "presence-nvim", "project-nvim": "project-nvim", "registers": "registers", "rnix-lsp": "rnix-lsp", @@ -936,6 +1169,7 @@ "scrollbar-nvim": "scrollbar-nvim", "smartcolumn": "smartcolumn", "sqls-nvim": "sqls-nvim", + "systems": "systems_4", "tabular": "tabular", "telescope": "telescope", "tidalcycles": "tidalcycles", @@ -953,11 +1187,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1693907367, - "narHash": "sha256-mXYG1bgyhQs4WJKAQXwZ8++DbbHU6i1ux/2HOIKfvWo=", + "lastModified": 1706712454, + "narHash": "sha256-jRfU3KxQ0oVg22cbTum/RSusFxMZQQgYXQ3+3TbaDGQ=", "owner": "notashelf", "repo": "neovim-flake", - "rev": "42b952dc1b79b5e2fee2a0eecb91a6d468b1474a", + "rev": "232c8129ca44e522459d01b19cdae048d49199cd", "type": "github" }, "original": { @@ -976,14 +1210,14 @@ "neovim-flake", "nixpkgs" ], - "rust-overlay": "rust-overlay" + "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1689759503, - "narHash": "sha256-wFrcae6V58hIlDW+7NDoUXzXBmsU7W/k3V1KIePcwRA=", + "lastModified": 1704611696, + "narHash": "sha256-4ZCgV5oHdEc3q+XaIzy//gh20uC/aSuAtMU9bsfgLZk=", "owner": "oxalica", "repo": "nil", - "rev": "59bcad0b13b5d77668c0c125fef71d7b41406d7a", + "rev": "059d33a24bb76d2048740bcce936362bf54b5bc9", "type": "github" }, "original": { @@ -992,13 +1226,29 @@ "type": "github" } }, + "nixos-hardware": { + "locked": { + "lastModified": 1706834982, + "narHash": "sha256-3CfxA7gZ+DVv/N9Pvw61bV5Oe/mWfxYPyVQGqp9TMJA=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "83e571bb291161682b9c3ccd48318f115143a550", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixos-hardware", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1693844670, - "narHash": "sha256-t69F2nBB8DNQUWHD809oJZJVE+23XBrth4QZuVd6IE0=", + "lastModified": 1706191920, + "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3c15feef7770eb5500a4b8792623e2d6f598c9c1", + "rev": "ae5c332cbb5827f6b1f02572496b141021de335f", "type": "github" }, "original": { @@ -1011,11 +1261,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1688049487, - "narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=", + "lastModified": 1703961334, + "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9", + "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", "type": "github" }, "original": { @@ -1026,23 +1276,39 @@ "type": "github" } }, - "nixpkgs-master": { + "nixpkgs-stable": { "locked": { - "lastModified": 1694098225, - "narHash": "sha256-GrfFAMprPADFxoEBAbZIbyESytno2YGACk96kY8IGYU=", - "owner": "nixos", + "lastModified": 1704874635, + "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "98d24eaa83cafdc4760a15c15fa24db8f853e218", + "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", "type": "github" }, "original": { - "owner": "nixos", - "ref": "master", + "owner": "NixOS", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { + "locked": { + "lastModified": 1706370590, + "narHash": "sha256-vq8hTMHsmPkBDaLR2i3m2nSmFObWmo7YwK51KQdI6RY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3fb3707af869e32b0ad0676f589b16cc7711a376", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1656753965, "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=", @@ -1058,13 +1324,13 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { - "lastModified": 1655400192, - "narHash": "sha256-49OBVVRgb9H/PSmNT9W61+NRdDbuSJVuDDflwXlaUKU=", + "lastModified": 1693844670, + "narHash": "sha256-t69F2nBB8DNQUWHD809oJZJVE+23XBrth4QZuVd6IE0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3d7435c638baffaa826b85459df0fff47f12317d", + "rev": "3c15feef7770eb5500a4b8792623e2d6f598c9c1", "type": "github" }, "original": { @@ -1074,29 +1340,29 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { - "lastModified": 1689088367, - "narHash": "sha256-Y2tl2TlKCWEHrOeM9ivjCLlRAKH3qoPUE/emhZECU14=", + "lastModified": 1702350026, + "narHash": "sha256-A+GNZFZdfl4JdDphYKBJ5Ef1HOiFsP18vQe9mqjmUis=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5c9ddb86679c400d6b7360797b8a22167c2053f8", + "rev": "9463103069725474698139ab10f17a9d125da859", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.05", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { - "lastModified": 1693985761, - "narHash": "sha256-K5b+7j7Tt3+AqbWkcw+wMeqOAWyCD1MH26FPZyWXpdo=", + "lastModified": 1706732774, + "narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0bffda19b8af722f8069d09d8b6a24594c80b352", + "rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d", "type": "github" }, "original": { @@ -1109,11 +1375,11 @@ "nmd": { "flake": false, "locked": { - "lastModified": 1687627428, - "narHash": "sha256-7zGfXuNS5RHqhpEdz2fwrtqvF86JRo5U1hrxZSYgcm8=", + "lastModified": 1705050560, + "narHash": "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=", "owner": "~rycee", "repo": "nmd", - "rev": "824a380546b5d0d0eb701ff8cd5dbafb360750ff", + "rev": "66d9334933119c36f91a78d565c152a4fdc8d3d3", "type": "sourcehut" }, "original": { @@ -1125,11 +1391,11 @@ "noice-nvim": { "flake": false, "locked": { - "lastModified": 1690306450, - "narHash": "sha256-Zca6meJkfF4fl17Y+6s77GYrqnhkkzIYW73vAhKg7e4=", + "lastModified": 1705952416, + "narHash": "sha256-lNCdwB0B5arbTEIHdDoQ19/vQ0UT89AQFwZM+RHqOTg=", "owner": "folke", "repo": "noice.nvim", - "rev": "894db25ec726d32047799d4d0a982b701bec453b", + "rev": "bf67d70bd7265d075191e7812d8eb42b9791f737", "type": "github" }, "original": { @@ -1138,46 +1404,46 @@ "type": "github" } }, - "nui-nvim": { + "none-ls": { "flake": false, "locked": { - "lastModified": 1689828309, - "narHash": "sha256-nSUs9zAX7hQ3PuFrH4zQblMfTY6ALDNggmqaQnkbR5E=", - "owner": "MunifTanjim", - "repo": "nui.nvim", - "rev": "9e3916e784660f55f47daa6f26053ad044db5d6a", + "lastModified": 1706069423, + "narHash": "sha256-s+Hp0Yzge7FKKDez4DO8uytsNORIqeNWYOLSO7kSZbo=", + "owner": "nvimtools", + "repo": "none-ls.nvim", + "rev": "a311c7cc8f17543143a7482cdbe3a384c371d56a", "type": "github" }, "original": { - "owner": "MunifTanjim", - "repo": "nui.nvim", + "owner": "nvimtools", + "repo": "none-ls.nvim", "type": "github" } }, - "null-ls": { + "nui-nvim": { "flake": false, "locked": { - "lastModified": 1688652536, - "narHash": "sha256-6KJtj9pbvBm6fOVpnyzO2fEVC+cVrw2XtZHOgq9ieIw=", - "owner": "jose-elias-alvarez", - "repo": "null-ls.nvim", - "rev": "db09b6c691def0038c456551e4e2772186449f35", + "lastModified": 1704411133, + "narHash": "sha256-SWG0IQDNXrgWK1ApQSpc2oPKNYgTPend877DQ6FuqUc=", + "owner": "MunifTanjim", + "repo": "nui.nvim", + "rev": "35da9ca1de0fc4dda96c2e214d93d363c145f418", "type": "github" }, "original": { - "owner": "jose-elias-alvarez", - "repo": "null-ls.nvim", + "owner": "MunifTanjim", + "repo": "nui.nvim", "type": "github" } }, "nvim-autopairs": { "flake": false, "locked": { - "lastModified": 1689332359, - "narHash": "sha256-bu+WpW5Wfk3pS74mzVvehl7dVMHgrttmV4ZSlfwbai4=", + "lastModified": 1705959312, + "narHash": "sha256-4sZoZfg6ORbEwbvjIRnaDrKtVnoHpx7cAOcxn1Er6pg=", "owner": "windwp", "repo": "nvim-autopairs", - "rev": "ae5b41ce880a6d850055e262d6dfebd362bb276e", + "rev": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b", "type": "github" }, "original": { @@ -1189,11 +1455,11 @@ "nvim-bufferline-lua": { "flake": false, "locked": { - "lastModified": 1690184232, - "narHash": "sha256-MiQsYeLgADCaUf1x88q/7gO17F992HMlt1pu9dYEmp0=", + "lastModified": 1706180994, + "narHash": "sha256-/iGzUDJaodkUyWpwim8UtwaRuarfu/Nk6wxVApk+QxY=", "owner": "akinsho", "repo": "nvim-bufferline.lua", - "rev": "99f0932365b34e22549ff58e1bea388465d15e99", + "rev": "d6cb9b7cac52887bcac65f8698e67479553c0748", "type": "github" }, "original": { @@ -1205,11 +1471,11 @@ "nvim-cmp": { "flake": false, "locked": { - "lastModified": 1688965049, - "narHash": "sha256-Hq6YUfMQo1rHoay3/NieGCne7U/f06GwUPhN2HO0PdQ=", + "lastModified": 1702541213, + "narHash": "sha256-BtAYRYn6m788zAq/mNnbAzAxp1TGf9QkRE0hSOp9sdc=", "owner": "hrsh7th", "repo": "nvim-cmp", - "rev": "c4e491a87eeacf0408902c32f031d802c7eafce8", + "rev": "538e37ba87284942c1d76ed38dd497e54e65b891", "type": "github" }, "original": { @@ -1221,11 +1487,11 @@ "nvim-code-action-menu": { "flake": false, "locked": { - "lastModified": 1671523188, - "narHash": "sha256-7szx+Me6WhrANbmfQ6C6gfSVB2owd02b3iZYhz7K6wY=", + "lastModified": 1702287297, + "narHash": "sha256-pY+aP9iBuJhvDZzVEsOHZmnfaq3vUP7TfKEEQrj+Mo8=", "owner": "weilbith", "repo": "nvim-code-action-menu", - "rev": "e4399dbaf6eabff998d3d5f1cbcd8d9933710027", + "rev": "8c7672a4b04d3cc4edd2c484d05b660a9cb34a1b", "type": "github" }, "original": { @@ -1285,11 +1551,11 @@ "nvim-dap": { "flake": false, "locked": { - "lastModified": 1690444190, - "narHash": "sha256-OSJA+K8eGj87RWo2tE0kT6bAItGkMMtuR0HB8WEXZ4k=", + "lastModified": 1705151920, + "narHash": "sha256-9Rc4dxbgN1LxoXPXHTi+V92MA0fEn5PveqCSMHbgn98=", "owner": "mfussenegger", "repo": "nvim-dap", - "rev": "2f28ea843bcdb378b171a66ddcd568516e431d55", + "rev": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5", "type": "github" }, "original": { @@ -1301,11 +1567,11 @@ "nvim-dap-ui": { "flake": false, "locked": { - "lastModified": 1689371609, - "narHash": "sha256-z6TFe7+r/g2tfgdXr6PCPri5lSboi66zZmsdyWTI1BM=", + "lastModified": 1705942789, + "narHash": "sha256-4tYSdxPj+/hxd8KNzCU6Lvf+ACxpKgYyGOlF+Jwzxa8=", "owner": "rcarriga", "repo": "nvim-dap-ui", - "rev": "85b16ac2309d85c88577cd8ee1733ce52be8227e", + "rev": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f", "type": "github" }, "original": { @@ -1314,6 +1580,22 @@ "type": "github" } }, + "nvim-docs-view": { + "flake": false, + "locked": { + "lastModified": 1705711563, + "narHash": "sha256-N5PrJKhF6pHkel4EyAllNdEYQRninfSyaAXPbuAiD+s=", + "owner": "amrbashir", + "repo": "nvim-docs-view", + "rev": "78d88bca16f32a430572758677f9246f6d7f7b94", + "type": "github" + }, + "original": { + "owner": "amrbashir", + "repo": "nvim-docs-view", + "type": "github" + } + }, "nvim-lightbulb": { "flake": false, "locked": { @@ -1333,11 +1615,11 @@ "nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1690356683, - "narHash": "sha256-Ama9nLC/T1wJWal6bKvgY0ywUUiJ5VLuIxoY1xbJKtY=", + "lastModified": 1705757419, + "narHash": "sha256-StYsN9C2rV471JkncUR1PFeXs0S15ZGTF1DigSbwOHI=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "b6091272422bb0fbd729f7f5d17a56d37499c54f", + "rev": "8917d2c830e04bf944a699b8c41f097621283828", "type": "github" }, "original": { @@ -1349,11 +1631,11 @@ "nvim-navbuddy": { "flake": false, "locked": { - "lastModified": 1688569844, - "narHash": "sha256-011RT/wnQdBR1vMrXFwxbicBAgdcd4eQYPbok/o3CIE=", + "lastModified": 1694669446, + "narHash": "sha256-zy1Tq8M5UITNAwtAlFYaUFlHnIZ5LWD9ZLaZcy7ulQ8=", "owner": "SmiteshP", "repo": "nvim-navbuddy", - "rev": "244a4cded6f2b568403684131d148048efe4e8af", + "rev": "f137a3466a6cd1965cdcc5398daff54e66eebbe5", "type": "github" }, "original": { @@ -1365,11 +1647,11 @@ "nvim-navic": { "flake": false, "locked": { - "lastModified": 1689944100, - "narHash": "sha256-M7BT1C9xHyLgr22JI3b+wyD+bYs6FgKc6PIqMrXnNr4=", + "lastModified": 1701345631, + "narHash": "sha256-0p5n/V8Jlj9XyxV/fuMwsbQ7oV5m9H2GqZZEA/njxCQ=", "owner": "SmiteshP", "repo": "nvim-navic", - "rev": "9c89730da6a05acfeb6a197e212dfadf5aa60ca0", + "rev": "8649f694d3e76ee10c19255dece6411c29206a54", "type": "github" }, "original": { @@ -1381,11 +1663,11 @@ "nvim-neoclip": { "flake": false, "locked": { - "lastModified": 1684196333, - "narHash": "sha256-96AwMgyC7PTDEPS5tXwDT3WfK8jJJuIYGE+q+j6U5Uc=", + "lastModified": 1701664728, + "narHash": "sha256-QtqLKdrDGzIiSEo3DZtv0C7wx3KlrcyePoIYdvH6vpk=", "owner": "AckslD", "repo": "nvim-neoclip.lua", - "rev": "4e406ae0f759262518731538f2585abb9d269bac", + "rev": "798cd0592a81c185465db3a091a0ff8a21af60fd", "type": "github" }, "original": { @@ -1397,11 +1679,11 @@ "nvim-notify": { "flake": false, "locked": { - "lastModified": 1685978736, - "narHash": "sha256-Rr2tzuEr06M9ZbvQbC07qcxkyjFJFYdABwRpYelKBFI=", + "lastModified": 1705342184, + "narHash": "sha256-WhC80NnWXEAYHLORpUPIXb2s1ERJxyK3l2L9oke68mo=", "owner": "rcarriga", "repo": "nvim-notify", - "rev": "ea9c8ce7a37f2238f934e087c255758659948e0f", + "rev": "80b67b265530632505193553d05127ae7fe09ddd", "type": "github" }, "original": { @@ -1413,11 +1695,11 @@ "nvim-session-manager": { "flake": false, "locked": { - "lastModified": 1689976511, - "narHash": "sha256-04GL+0JdtD2hEOSrRJUh3Wdpoy2igjHt95Nf3WioFU4=", + "lastModified": 1705767424, + "narHash": "sha256-BTVhCevq40A7yOYp2fLg6N9A+yarIWJM83Z2bfvlQuU=", "owner": "Shatur", "repo": "neovim-session-manager", - "rev": "4883372b1ef2bdcf4cbdac44c98d68c216914462", + "rev": "b8a22f2c88429a11272117a901db66055abf3e7f", "type": "github" }, "original": { @@ -1429,11 +1711,11 @@ "nvim-surround": { "flake": false, "locked": { - "lastModified": 1685464327, - "narHash": "sha256-r3D5WTqEnIL1T3p7cmkRmBY8qgwFFJptM7BKNNsCT8k=", + "lastModified": 1705526094, + "narHash": "sha256-CGAQtBxhiP6AUQzwdra5AOpsNu+oeLO2hCJnmL61jgE=", "owner": "kylechui", "repo": "nvim-surround", - "rev": "10b20ca7d9da1ac8df8339e140ffef94f9ab3b18", + "rev": "0c02c52182a9c2a7fa7e122b4037f6408e98434a", "type": "github" }, "original": { @@ -1445,11 +1727,11 @@ "nvim-tree-lua": { "flake": false, "locked": { - "lastModified": 1690616703, - "narHash": "sha256-kTbYvT21wLfiwEpQAgGZtep2GP4F9e7e6XGVpr4D1hY=", + "lastModified": 1705818283, + "narHash": "sha256-EKAzWIT2Qs65Il1pwgpkFsCogFViapUiSHcZgVy+QsY=", "owner": "nvim-tree", "repo": "nvim-tree.lua", - "rev": "4bd30f0137e44dcf3e74cc1164efb568f78f2b02", + "rev": "7bdb220d0fe604a77361e92cdbc7af1b8a412126", "type": "github" }, "original": { @@ -1461,11 +1743,11 @@ "nvim-treesitter-context": { "flake": false, "locked": { - "lastModified": 1689239188, - "narHash": "sha256-AJamiDezFK7l0bqb/VFm+pzBKugQNCmQ6JAWKmjH76g=", + "lastModified": 1706217055, + "narHash": "sha256-QhmTXikUIye+xxLw52ttRJz9T0bfhn/ks5VSQd8tDo0=", "owner": "nvim-treesitter", "repo": "nvim-treesitter-context", - "rev": "6f8f788738b968f24a108ee599c5be0031f94f06", + "rev": "9c06b115abc57c99cf0aa81dc29490f5001f57a1", "type": "github" }, "original": { @@ -1477,11 +1759,11 @@ "nvim-ts-autotag": { "flake": false, "locked": { - "lastModified": 1686883732, - "narHash": "sha256-4qTtXYA5HyG1sADV0wsiccO/G89qEoYPmlg8tTx7h8g=", + "lastModified": 1706174398, + "narHash": "sha256-C3FOh11eF5Blzh6vsFSA6AB7opXl5Gocdti1QhFZ2vM=", "owner": "windwp", "repo": "nvim-ts-autotag", - "rev": "6be1192965df35f94b8ea6d323354f7dc7a557e4", + "rev": "a65b202cfd08e0e69e531eab737205ff5bc082a4", "type": "github" }, "original": { @@ -1493,11 +1775,11 @@ "nvim-web-devicons": { "flake": false, "locked": { - "lastModified": 1689474464, - "narHash": "sha256-FtEJBhqvs+c/Rvy4qXf3iyoMTTKrDBvQw5g63n4KEYo=", + "lastModified": 1706072160, + "narHash": "sha256-w038PU9i1onEBo3x4bo1kDz9Fo46Whd8ZJhyIqxz3I8=", "owner": "nvim-tree", "repo": "nvim-web-devicons", - "rev": "efbfed0567ef4bfac3ce630524a0f6c8451c5534", + "rev": "b427ac5f9dff494f839e81441fb3f04a58cbcfbc", "type": "github" }, "original": { @@ -1509,11 +1791,11 @@ "obsidian-nvim": { "flake": false, "locked": { - "lastModified": 1690662423, - "narHash": "sha256-qemlp11QSp4BnWadN3+3ndv47e+1yS+w91GumbzQric=", + "lastModified": 1706230460, + "narHash": "sha256-jl03+C9/L081eza6XwK05GiGZI0U82wqQBMwTjtedv8=", "owner": "epwalsh", "repo": "obsidian.nvim", - "rev": "f81ddfa56b87fda158d3a56625a8040a7cf23fef", + "rev": "194f9fc798ac0f73dbac2e83fc3d5c99b8f70e78", "type": "github" }, "original": { @@ -1525,11 +1807,11 @@ "onedark": { "flake": false, "locked": { - "lastModified": 1689269544, - "narHash": "sha256-HfyYEppo9NFswYlPKnHNOZO5eiTQSORQhWAkzCmM2m4=", + "lastModified": 1705931596, + "narHash": "sha256-jjvZ2z93xd1Yng8g6+cdsXhLkm2lC7DSUHiFYC+Gg5k=", "owner": "navarasu", "repo": "onedark.nvim", - "rev": "cae5fdf035ee92c407a29ee2ccfcff503d2be7f1", + "rev": "14e5de43cf1ff761c280d1ff5b9980897f5b46c7", "type": "github" }, "original": { @@ -1541,11 +1823,11 @@ "orgmode-nvim": { "flake": false, "locked": { - "lastModified": 1690291768, - "narHash": "sha256-jc89zEAtHBh8785gNW/UZ9jkgTee/XYMm4+jyW7G2Oo=", + "lastModified": 1706216082, + "narHash": "sha256-M9AI3LlJvs6ZqQPeYr+rqRFu4gYVZbLFV3PUuZ77ReE=", "owner": "nvim-orgmode", "repo": "orgmode", - "rev": "6b6eb8eabbed4d95568fd1f5374a3dff7ed51a3b", + "rev": "ab045e3084d5987e8939d25d69b09baaf762278c", "type": "github" }, "original": { @@ -1554,14 +1836,31 @@ "type": "github" } }, + "oxocarbon": { + "flake": false, + "locked": { + "lastModified": 1687168305, + "narHash": "sha256-2o++5aRDULfI35d+7psa6bk0eSXH2HwfuGjGtYGjR4w=", + "owner": "glyh", + "repo": "oxocarbon.nvim", + "rev": "7591d2e18df05374d612acba2b2573c7ff44dce4", + "type": "github" + }, + "original": { + "owner": "glyh", + "ref": "lualine-support", + "repo": "oxocarbon.nvim", + "type": "github" + } + }, "plenary-nvim": { "flake": false, "locked": { - "lastModified": 1689589150, - "narHash": "sha256-oRtNcURQzrIRS3D88tWAl3HuFHxVJr8m/zzL7xoa/II=", + "lastModified": 1705841956, + "narHash": "sha256-awRAI1ov9OBt6VuNxk/qjPTSPBYsMJzURKVV+IA7kok=", "owner": "nvim-lua", "repo": "plenary.nvim", - "rev": "267282a9ce242bbb0c5dc31445b6d353bed978bb", + "rev": "663246936325062427597964d81d30eaa42ab1e4", "type": "github" }, "original": { @@ -1570,19 +1869,34 @@ "type": "github" } }, - "presence-nvim": { - "flake": false, + "pre-commit-hooks-nix": { + "inputs": { + "flake-compat": [ + "lanzaboote", + "flake-compat" + ], + "flake-utils": [ + "lanzaboote", + "flake-utils" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "lanzaboote", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, "locked": { - "lastModified": 1674984077, - "narHash": "sha256-ZpsunLsn//zYgUtmAm5FqKVueVd/Pa1r55ZDqxCimBk=", - "owner": "andweeb", - "repo": "presence.nvim", - "rev": "87c857a56b7703f976d3a5ef15967d80508df6e6", + "lastModified": 1706424699, + "narHash": "sha256-Q3RBuOpZNH2eFA1e+IHgZLAOqDD9SKhJ/sszrL8bQD4=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "7c54e08a689b53c8a1e5d70169f2ec9e2a68ffaf", "type": "github" }, "original": { - "owner": "andweeb", - "repo": "presence.nvim", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", "type": "github" } }, @@ -1605,11 +1919,11 @@ "registers": { "flake": false, "locked": { - "lastModified": 1680595111, - "narHash": "sha256-MeBlcF5LLk6bhIofYuG+0Z2xwc0BVqP85yNCvjH66fw=", + "lastModified": 1703954003, + "narHash": "sha256-/MwIOR7H6ZkH/uLZOcMgg9XOWQB0yYYonbSKl51bXzo=", "owner": "tversteeg", "repo": "registers.nvim", - "rev": "2ab8372bb837f05fae6b43091f10a0b725d113ca", + "rev": "22bb98f93a423252fffeb3531f7bc12a3e07b63f", "type": "github" }, "original": { @@ -1621,7 +1935,7 @@ "rnix-lsp": { "inputs": { "naersk": "naersk", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "utils": "utils" }, "locked": { @@ -1642,13 +1956,40 @@ "inputs": { "arrpc": "arrpc", "home-manager": "home-manager", + "hyprgrass": "hyprgrass", "hyprland": "hyprland", + "lanzaboote": "lanzaboote", "neovim-flake": "neovim-flake", - "nixpkgs": "nixpkgs_5", - "nixpkgs-master": "nixpkgs-master" + "nixos-hardware": "nixos-hardware", + "nixpkgs": "nixpkgs_6" } }, "rust-overlay": { + "inputs": { + "flake-utils": [ + "lanzaboote", + "flake-utils" + ], + "nixpkgs": [ + "lanzaboote", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1706494265, + "narHash": "sha256-4ilEUJEwNaY9r/8BpL3VmZiaGber0j09lvvx0e/bosA=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "246ba7102553851af60e0382f558f6bc5f63fa13", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { "inputs": { "flake-utils": [ "neovim-flake", @@ -1662,11 +2003,11 @@ ] }, "locked": { - "lastModified": 1688783586, - "narHash": "sha256-HHaM2hk2azslv1kH8zmQxXo2e7i5cKgzNIuK4yftzB0=", + "lastModified": 1704593904, + "narHash": "sha256-nDoXZDTRdgF3b4n3m011y99nYFewvOl9UpzFvP8Rb3c=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7a29283cc242c2486fc67f60b431ef708046d176", + "rev": "c36fd70a99decfa6e110c86f296a97613034a680", "type": "github" }, "original": { @@ -1678,11 +2019,11 @@ "rust-tools": { "flake": false, "locked": { - "lastModified": 1689033186, - "narHash": "sha256-jtfyDxifchznUupLSao6nmpVqaX1yO0xN+NhqS9fgxg=", + "lastModified": 1704259376, + "narHash": "sha256-kFane5ze7VDiOzF7jdmXkr50XQsNvdb+a9HQtybEVE0=", "owner": "simrat39", "repo": "rust-tools.nvim", - "rev": "0cc8adab23117783a0292a0c8a2fbed1005dc645", + "rev": "676187908a1ce35ffcd727c654ed68d851299d3e", "type": "github" }, "original": { @@ -1710,11 +2051,11 @@ "smartcolumn": { "flake": false, "locked": { - "lastModified": 1679417638, - "narHash": "sha256-DjPWBOLbzdfOQAx+6xgV1CD5NKuP1N6An2lmHNHd39Q=", + "lastModified": 1703592909, + "narHash": "sha256-c5tENO4LJaSRELxuCOp/aI94ifhKjqd8J2chJbxfFdc=", "owner": "m4xshen", "repo": "smartcolumn.nvim", - "rev": "0c572e3eae48874f25b74394a486f38cadb5c958", + "rev": "a52915d6d9abf9972e249ebcffcc651cf9b062dd", "type": "github" }, "original": { @@ -1786,6 +2127,51 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tabular": { "flake": false, "locked": { @@ -1805,11 +2191,11 @@ "telescope": { "flake": false, "locked": { - "lastModified": 1690663693, - "narHash": "sha256-okyOr5t0e+oV3mY7Yq1ad/7f6qEEDS/ZQrqJcjktYRI=", + "lastModified": 1706154992, + "narHash": "sha256-uagWtwd/L07RRUpSu+kVv0qD+neySSmSrIeFBJ0gZiM=", "owner": "nvim-telescope", "repo": "telescope.nvim", - "rev": "b6fccfb0f7589a87587875206786daccba62acc3", + "rev": "1bfbb1fb5c56d2dbe33216fcb2ebe82e499aa06c", "type": "github" }, "original": { @@ -1838,7 +2224,7 @@ "tidalcycles": { "inputs": { "dirt-samples-src": "dirt-samples-src", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "superdirt-src": "superdirt-src", "tidal-src": "tidal-src", "utils": "utils_2", @@ -1846,11 +2232,11 @@ "vowel-src": "vowel-src" }, "locked": { - "lastModified": 1664760044, - "narHash": "sha256-e5LGk/tDnphory1mYhADgPnVtShofY2w/3xY09jEE2A=", + "lastModified": 1694087816, + "narHash": "sha256-GMV5ONQhLwa6xRYhZkmwc2W2jbjAfHfB/OR9vR0+PFA=", "owner": "mitchmindtree", "repo": "tidalcycles.nix", - "rev": "3f3a820cd43709077d15a24fa6062de7d623a6bf", + "rev": "1b1c4df5303e07930d23e8361ab8253ebec0c7bb", "type": "github" }, "original": { @@ -1862,11 +2248,11 @@ "todo-comments": { "flake": false, "locked": { - "lastModified": 1690569591, - "narHash": "sha256-Qm8AJ8omU5eCfjLt91DVxLS0R3QHbfW55ZTegB1JvWI=", + "lastModified": 1705847650, + "narHash": "sha256-DiyieXXx7iYGWkpeOvduJf0n7dnpaQ7rXmaWvZQaCyE=", "owner": "folke", "repo": "todo-comments.nvim", - "rev": "3094ead8edfa9040de2421deddec55d3762f64d1", + "rev": "833d8dd8b07eeda37a09e99460f72a02616935cb", "type": "github" }, "original": { @@ -1878,11 +2264,11 @@ "toggleterm-nvim": { "flake": false, "locked": { - "lastModified": 1689602083, - "narHash": "sha256-/sUulN93nRHa3Je+tXr8/i1cgCrd/wtrvMPkjG5Ofzs=", + "lastModified": 1705944058, + "narHash": "sha256-y+83w0D2jD68QJpBCYXLqUUxVu9MTBZ+nJutYD7jAoQ=", "owner": "akinsho", "repo": "toggleterm.nvim", - "rev": "00c13dccc78c09fa5da4c5edda990a363e75035e", + "rev": "b49df5cdce67a8964d1b027dae94bde212092b51", "type": "github" }, "original": { @@ -1894,11 +2280,11 @@ "tokyonight": { "flake": false, "locked": { - "lastModified": 1689285710, - "narHash": "sha256-x26qLaZzg7sJIc1d/5Q/DJ/YvRSc3s87PwPHTPTl+Xk=", + "lastModified": 1706078362, + "narHash": "sha256-qHuX21iC8edV5K0RgHin4PowMtKBXWXQgvHjx2SPTKE=", "owner": "folke", "repo": "tokyonight.nvim", - "rev": "1ee11019f8a81dac989ae1db1a013e3d582e2033", + "rev": "e3301873c1e96903daebb98cc9b5926810bf73dd", "type": "github" }, "original": { @@ -1910,11 +2296,11 @@ "trouble": { "flake": false, "locked": { - "lastModified": 1690614197, - "narHash": "sha256-Ee0AM8S/A8DU0hyOnZoKC1hkW0fvk0A+c3WGvPqmKcU=", + "lastModified": 1697626811, + "narHash": "sha256-8nLghiueYOtWY7OGVxow9A2G/5lgt+Kt5D8q1xeJvVg=", "owner": "folke", "repo": "trouble.nvim", - "rev": "40aad004f53ae1d1ba91bcc5c29d59f07c5f01d3", + "rev": "f1168feada93c0154ede4d1fe9183bf69bac54ea", "type": "github" }, "original": { @@ -1939,12 +2325,15 @@ } }, "utils_2": { + "inputs": { + "systems": "systems_5" + }, "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", + "lastModified": 1692799911, + "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", + "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", "type": "github" }, "original": { @@ -1956,11 +2345,11 @@ "vim-dirtytalk": { "flake": false, "locked": { - "lastModified": 1690722430, - "narHash": "sha256-kjyLwkAk6mqK7u4+zAr+Yh+zbSiukNKtXwb7t39LUco=", + "lastModified": 1697142601, + "narHash": "sha256-ezbcgCvOXhPSpsOZpCI2QIaFFaRGZAFbuAluMvB7Jjk=", "owner": "psliwka", "repo": "vim-dirtytalk", - "rev": "a49251dce1852875951d95f7013979ece5caebf0", + "rev": "f5b0d51a7d822177814e7edc116ca484f852665f", "type": "github" }, "original": { @@ -1972,11 +2361,11 @@ "vim-illuminate": { "flake": false, "locked": { - "lastModified": 1679187974, - "narHash": "sha256-8dL3cBjQ2iY4D4gTxKVVmOGhxcSSRuDBvmEwwFIbWsQ=", + "lastModified": 1706241276, + "narHash": "sha256-8stuFv+PzjmFKib1Y7kwK4C1db5dlDyptuaz9iU+ptM=", "owner": "RRethy", "repo": "vim-illuminate", - "rev": "a2907275a6899c570d16e95b9db5fd921c167502", + "rev": "97c1265ff0b67064b6cfdc15bafc50202a537ae2", "type": "github" }, "original": { @@ -1988,11 +2377,11 @@ "vim-markdown": { "flake": false, "locked": { - "lastModified": 1680951012, - "narHash": "sha256-B00rad/Bbp+kJBN/fYliOaGiUe0AfBng6gs/fVBve9A=", + "lastModified": 1698870120, + "narHash": "sha256-d3GDuMlnhweAajSc284wWN/h0teu5uFG6NQTWa+dcxo=", "owner": "preservim", "repo": "vim-markdown", - "rev": "cc82d88e2a791f54d2b6e2b26e41f743351ac947", + "rev": "46add6c3017d3e4035dc10ffa9cb54221d8dfe1a", "type": "github" }, "original": { @@ -2020,11 +2409,11 @@ "vim-startify": { "flake": false, "locked": { - "lastModified": 1620487920, - "narHash": "sha256-//3bzFTe1WKqvQ3uYrDbk5Zu5BKq2hXQGeBhmhKIHvk=", + "lastModified": 1695213983, + "narHash": "sha256-W5N/Dqxf9hSXEEJsrEkXInFwBXNBJe9Dzx9TVS12mPk=", "owner": "mhinz", "repo": "vim-startify", - "rev": "81e36c352a8deea54df5ec1e2f4348685569bed2", + "rev": "4e089dffdad46f3f5593f34362d530e8fe823dcf", "type": "github" }, "original": { @@ -2045,7 +2434,6 @@ }, "original": { "owner": "tidalcycles", - "ref": "master", "repo": "vim-tidal", "type": "github" } @@ -2053,11 +2441,11 @@ "vim-vsnip": { "flake": false, "locked": { - "lastModified": 1678609126, - "narHash": "sha256-ehPnvGle7YrECn76YlSY/2V7Zeq56JGlmZPlwgz2FdE=", + "lastModified": 1704937299, + "narHash": "sha256-gvm6z4pgSULBVPukewRyjwxZ0vZgreQWbG/0kOB1QBo=", "owner": "hrsh7th", "repo": "vim-vsnip", - "rev": "7753ba9c10429c29d25abfd11b4c60b76718c438", + "rev": "02a8e79295c9733434aab4e0e2b8c4b7cea9f3a9", "type": "github" }, "original": { @@ -2086,11 +2474,11 @@ "which-key": { "flake": false, "locked": { - "lastModified": 1690570286, - "narHash": "sha256-B1+EHd2eH/EbD5Kip9PfhdPyyGfIkD6rsx0Z3rXvb5w=", + "lastModified": 1697801635, + "narHash": "sha256-uvghPj/teWrRMm09Gh8iQ/LV2nYJw0lmoiZK6L4+1cY=", "owner": "folke", "repo": "which-key.nvim", - "rev": "7ccf476ebe0445a741b64e36c78a682c1c6118b7", + "rev": "4433e5ec9a507e5097571ed55c02ea9658fb268a", "type": "github" }, "original": { @@ -2103,18 +2491,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1692976565, - "narHash": "sha256-eBKkG7tMxg92NskEn8dHRFY245JwjirWRoOZzW6DnUw=", + "lastModified": 1706359063, + "narHash": "sha256-5HUTG0p+nCJv3cn73AmFHRZdfRV5AD5N43g8xAePSKM=", "owner": "wlroots", "repo": "wlroots", - "rev": "717ded9bb0191ea31bf4368be32e7a15fe1b8294", + "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "717ded9bb0191ea31bf4368be32e7a15fe1b8294", + "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", "type": "gitlab" } }, @@ -2124,6 +2512,7 @@ "hyprland", "hyprland-protocols" ], + "hyprlang": "hyprlang", "nixpkgs": [ "hyprland", "nixpkgs" @@ -2134,11 +2523,11 @@ ] }, "locked": { - "lastModified": 1694025408, - "narHash": "sha256-oJNhGfZH8Z2w3ztXdzsYVg32//cWEcPVDM3+tp/ZVfU=", + "lastModified": 1706145785, + "narHash": "sha256-j9MP4fv2U/vdRKAXXc2gyMTmYwVnHP6kHx1/y6jprrU=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "022469529c8bc95acf222dc5a62389b04c8b1205", + "rev": "5a592647587cd20b9692a347df6939b6d371b3bb", "type": "github" }, "original": { @@ -2149,16 +2538,16 @@ }, "zig": { "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_4" + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1690718829, - "narHash": "sha256-GN19SrCqWxIJN+rnbv+pIkF/yynh6FG2y7jY6PZRiYw=", + "lastModified": 1706288111, + "narHash": "sha256-CvSS/BMm86Uzjeb8pEkWa3qnuzMiPPmT8hf5lDOP6TE=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "92e485cc7887f57be4d2921ed077f467912b7d33", + "rev": "7f5d4cbecf3aa75ac8afaef8a20723b3a57f7d20", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b3fdd27..02a2d7e 100644 --- a/flake.nix +++ b/flake.nix @@ -1,103 +1,77 @@ { description = "Your new nix config"; - - inputs = { - # Nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # based unstable packages - nixpkgs-master.url = "github:nixos/nixpkgs/master"; # cringe stable packages - - # Home manager - home-manager = { - url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - # neovim-flake - neovim-flake = { - url = "github:notashelf/neovim-flake"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - # arrpc - arrpc = { - url = "github:notashelf/arrpc-flake"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - # hyprland - hyprland.url = "github:hyprwm/Hyprland"; - }; - outputs = { self, nixpkgs, - home-manager, - hyprland, ... - } @ inputs: let - inherit (self) outputs; + }: let forAllSystems = nixpkgs.lib.genAttrs [ "aarch64-linux" - "i686-linux" "x86_64-linux" - "aarch64-darwin" - "x86_64-darwin" + #"i686-linux" + #"aarch64-darwin" + #"x86_64-darwin" ]; - in rec { - # Your custom packages - # Acessible through 'nix build', 'nix shell', etc - packages = forAllSystems ( - system: let - pkgs = nixpkgs.legacyPackages.${system}; - in - import ./pkgs {inherit pkgs;} - ); - # Devshell for bootstrapping - # Acessible through 'nix develop' or 'nix-shell' (legacy) + in { + # Entrypoint for NixOS configurations + nixosConfigurations = import ./hosts {inherit self;}; + + # devshells that are provided by this flake + # adding more packages to buildInputs makes them available + # while inside the devshell - enetered via `nix develop` devShells = forAllSystems ( system: let pkgs = nixpkgs.legacyPackages.${system}; - in - import ./shell.nix {inherit pkgs;} + in { + default = pkgs.mkShell { + buildInputs = with pkgs; [ + alejandra # opionated Nix formatter + + # example of bootstrapping self-contained shell + # applications for your flake + # this adds an `update` command to your shell + # which'll update all inputs and commit + (writeShellApplication { + name = "update"; + text = '' + nix flake update && git commit flake.lock -m "flake: bump inputs" + ''; + }) + ]; + }; + } ); - # Your custom packages and modifications, exported as overlays - # overlays = import ./overlays {inherit inputs;}; # TODO: only use overlays when you understand what tthey do + formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); + }; - # Reusable nixos modules you might want to export - # These are usually stuff you would upstream into nixpkgs - # nixosModules = import ./modules/public/nixos; - # Reusable home-manager modules you might want to export - # These are usually stuff you would upstream into home-manager - # homeManagerModules = import ./modules/public/home-manager; + inputs = { + # Nixpkgs (unstable) + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - # NixOS configuration entrypoint - # Available through 'nixos-rebuild --flake .#your-hostname' - nixosConfigurations = import ./hosts {inherit nixpkgs self outputs;}; + # Home manager + home-manager.url = "github:nix-community/home-manager/"; + home-manager.inputs.nixpkgs.follows = "nixpkgs"; - # Standalone home-manager configuration entrypoint - # Available through 'home-manager --flake .#your-username@your-hostname' - homeConfigurations = { - "floppydisk@nixbox" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance - extraSpecialArgs = {inherit inputs outputs;}; - modules = [ - hyprland.homeManagerModules.default - {wayland.windowManager.hyprland.enable = true;} - # > Our main home-manager configuration file < - ./homes/floppydisk - ]; - }; - "floppydisk@nixpad" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance - extraSpecialArgs = {inherit inputs outputs;}; - modules = [ - hyprland.homeManagerModules.default - {wayland.windowManager.hyprland.enable = true;} - # > Our main home-manager configuration file < - ./homes/floppydisk - ]; - }; + # arrpc + arrpc = { + url = "github:notashelf/arrpc-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + # nixos-hardware + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; + + lanzaboote.url = "github:nix-community/lanzaboote"; + + hyprland.url = "github:hyprwm/Hyprland"; + hyprgrass = { + url = "github:horriblename/hyprgrass"; + inputs.hyprland.follows = "hyprland"; + }; + neovim-flake = { + url = "github:notashelf/neovim-flake"; + inputs.nixpkgs.follows = "nixpkgs"; }; }; } diff --git a/homes/default.nix b/homes/default.nix index 267a3d0..27a7c0b 100644 --- a/homes/default.nix +++ b/homes/default.nix @@ -1,19 +1,18 @@ { inputs, self, - outputs, + config, ... }: { home-manager = { useUserPackages = true; useGlobalPkgs = true; extraSpecialArgs = { - inherit inputs self outputs; + inherit inputs self; }; users = { - # TODO: "base" user that will be used by default is there is no defined - # home directory for the user floppydisk = ./floppydisk; + # more users can go here, the format is only for convenience }; }; } diff --git a/homes/floppydisk/arrpc.nix b/homes/floppydisk/arrpc.nix index 5431d57..16f8be6 100644 --- a/homes/floppydisk/arrpc.nix +++ b/homes/floppydisk/arrpc.nix @@ -1,12 +1,13 @@ { inputs, pkgs, + home, ... }: { imports = [ inputs.arrpc.homeManagerModules.default ]; - + home.packages = [pkgs.webcord-vencord]; # provided by the arrpc-flake home-manager module diff --git a/homes/floppydisk/default.nix b/homes/floppydisk/default.nix index c16ded5..658c64c 100644 --- a/homes/floppydisk/default.nix +++ b/homes/floppydisk/default.nix @@ -1,240 +1,100 @@ -# This is your home-manager configuration file -# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) { - inputs, pkgs, + lib, + inputs, ... }: { - # You can import other home-manager modules here imports = [ - # If you want to use modules your own flake exports (from modules/home-manager): - # outputs.homeManagerModules.example - - # Or modules exported from other flakes (such as nix-colors): - # inputs.nix-colors.homeManagerModules.default - - # You can also split up your configuration and import pieces of it here: - ./neovim-flake.nix ./arrpc.nix + ./packages.nix # home.packages and similar stuff + ./neovim-flake.nix ]; home = { username = "floppydisk"; homeDirectory = "/home/floppydisk"; - file.".config/hypr/hyprpaper.conf".text = '' - preload = ${/. + ../../misc/wallpapers/oneshot-1.jpg} - wallpaper = ,${/. + ../../misc/wallpapers/oneshot-1.jpg} - ''; - packages = with pkgs; [ - # Utils - handbrake - thunderbird - picard - realvnc-vnc-viewer - rpi-imager - obs-studio - yt-dlp - _1password-gui - _1password - git-credential-1password - firefox-devedition - inputs.arrpc.packages.${pkgs.system}.arrpc - rdesktop - _3llo - gimp - qemu - virt-manager - exactaudiocopy - fsv - lsd - lsdvd - thefuck - zip - unzip - notion-app-enhanced - libresprite - qbittorrent - wine - vifm - cloudflared - ansible - just - pwgen - grafx2 - libreoffice-fresh - wiki-tui - calcurse - - # Fetch - neofetch - yafetch - cpufetch - bunnyfetch - nitch - screenfetch - starfetch - - # DevTools - github-desktop - gh - codeql - vscode - jetbrains.ruby-mine - jetbrains.rider - jetbrains.phpstorm - jetbrains.idea-ultimate - jetbrains.webstorm - lazygit - wakatime - mongodb-compass - mongosh - httpie - ngrok - mycli - squirrel-sql - figma-linux - - # Langs - openscad - nodejs_18 - nodePackages.yarn - nodePackages.ts-node - nodePackages.pnpm - php82 - php82Packages.composer - deno - python310 - python310Packages.pip - python310Packages.discordpy - dotnet-sdk - jdk17 - maven - purescript - lua - flutter - - # Comms - nheko - element-desktop - (discord.override { - withOpenASAR = true; - withVencord = true; - }) - caprine-bin - teamspeak5_client - - # Gaming - rpcs3 - pcsxr - pcsx2 - steam - gzdoom - minecraft - dolphin-emu - prismlauncher - fceux - snes9x - heroic - openrct2 - osu-lazer-bin + file.".config/lockonsleep/config.sh".source = ./lock.sh; + }; - # Media - vlc - libsForQt5.vvave - tidal-hifi - spotify-tui - youtube-tui - mpv + wayland.windowManager.hyprland = { + enable = true; + systemd.enable = true; + settings = import ./hyprland.nix; + }; - # zsh Themes - zsh-powerlevel10k - ]; + programs.waybar = { + enable = true; + settings = import ./waybar.nix; + style = import ./waybar-style.nix; }; - # Add stuff for your user as you see fit: - programs = { - # Enable home-manager - home-manager.enable = true; + services.udiskie.enable = true; - # Enable z-shell - zsh = { - enable = true; - shellAliases = { - ls = "lsd"; - ll = "ls -l"; - la = "ls -la"; - }; - history = { - size = 10000; - path = "$HOME/.config/zsh/history"; - }; - oh-my-zsh = { - enable = true; - plugins = [ - "git" - "thefuck" - ]; - custom = "$HOME/.oh-my-custom"; - theme = "powerlevel10k/powerlevel10k"; - }; - plugins = [ - { - name = "powerlevel10k"; - src = pkgs.zsh-powerlevel10k; - file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme"; - } - ]; - initExtra = '' - source ~/.p10k.zsh - ''; + programs.zsh = { + enable = true; + shellAliases = { + ls = "lsd"; + ll = "ls -l"; + la = "ls -la"; }; - - # enable git and configure users - git = { - enable = true; - userName = "Frankie B."; - userEmail = "git@diskfloppy.me"; - extraConfig = { - # Sign all commits using ssh key - commit.gpgsign = true; - gpg.format = "ssh"; - user.signingkey = "~/.ssh/id_ed25519.pub"; - init.defaultBranch = "master"; - }; + history = { + size = 10000; + path = "$HOME/.config/zsh/history"; }; - - irssi = { + oh-my-zsh = { enable = true; - networks = { - znc = { - nick = "floppydisk"; - server = { - address = "irc.nick99nack.com"; - port = 8888; - autoConnect = true; - ssl.enable = false; - }; - }; - }; + plugins = [ + "git" + "thefuck" + ]; + custom = "$HOME/.oh-my-custom"; + theme = "powerlevel10k/powerlevel10k"; }; + plugins = [ + { + name = "powerlevel10k"; + src = pkgs.zsh-powerlevel10k; + file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme"; + } + ]; + initExtra = '' + source ~/.p10k.zsh + ''; }; - wayland.windowManager.hyprland = { + programs.git = { enable = true; - systemdIntegration = true; - package = inputs.hyprland.packages.${pkgs.system}.hyprland; - settings = import ./hyprland.nix; + userName = "Frankie B."; + userEmail = "git@diskfloppy.me"; + extraConfig = { + commit.gpgsign = true; + gpg.format = "ssh"; + user.signingkey = "~/.ssh/id_ed25519.pub"; + init.defaultBranch = "master"; + }; }; - programs.waybar = { + programs.irssi = { enable = true; - settings = import ./waybar.nix; - style = import ./waybar-style.nix; + networks = { + znc = { + nick = "floppydisk"; + server = { + address = "irc.nick99nack.com"; + port = 8888; + autoConnect = true; + ssl.enable = false; + }; + }; + }; }; - # Nicely reload system units when changing configs - systemd.user.startServices = "sd-switch"; + # let HM manage itself when in standalone mode + programs.home-manager.enable = true; + + # Nicely reload system(d) units when changing configs + systemd.user.startServices = lib.mkDefault "sd-switch"; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion - home.stateVersion = "22.11"; + home.stateVersion = "24.05"; } diff --git a/homes/floppydisk/lock.sh b/homes/floppydisk/lock.sh new file mode 100644 index 0000000..dc397b0 --- /dev/null +++ b/homes/floppydisk/lock.sh @@ -0,0 +1,2 @@ +exec swayidle -w \ + before-sleep 'gtklock -d -i' diff --git a/homes/floppydisk/neovim-flake.nix b/homes/floppydisk/neovim-flake.nix index 943fd90..f4246d0 100644 --- a/homes/floppydisk/neovim-flake.nix +++ b/homes/floppydisk/neovim-flake.nix @@ -63,7 +63,7 @@ enable = true; fillChar = null; eolChar = null; - showCurrContext = true; + scope.enabled = true; }; cursorline = { enable = true; @@ -235,18 +235,18 @@ comment-nvim.enable = true; }; - vim.presence = { - presence-nvim = { - enable = true; - auto_update = true; - image_text = "The Superior Text Editor"; - client_id = "793271441293967371"; - main_image = "neovim"; - rich_presence = { - editing_text = "Editing %s"; - }; - }; - }; + #vim.presence = { + # presence-nvim = { + # enable = true; + # auto_update = true; + # image_text = "The Superior Text Editor"; + # client_id = "793271441293967371"; + # main_image = "neovim"; + # rich_presence = { + # editing_text = "Editing %s"; + # }; + # }; + #}; }; }; } diff --git a/homes/floppydisk/packages.nix b/homes/floppydisk/packages.nix new file mode 100644 index 0000000..d4c2c85 --- /dev/null +++ b/homes/floppydisk/packages.nix @@ -0,0 +1,124 @@ +{ + pkgs, ...}: { + + home.packages = with pkgs; [ + # utils + handbrake + thunderbird + picard + realvnc-vnc-viewer + rpi-imager + obs-studio + yt-dlp + _1password-gui + _1password + git-credential-1password + firefox-devedition + rdesktop + _3llo + gimp + qemu + virt-manager + exactaudiocopy + fsv + lsd + lsdvd + thefuck + zip + unzip + notion-app-enhanced + libresprite + qbittorrent + wine + vifm + cloudflared + ansible + just + pwgen + grafx2 + libreoffice-fresh + wiki-tui + calcurse + + # fetch + neofetch + yafetch + cpufetch + bunnyfetch + nitch + screenfetch + starfetch + + # devtools + github-desktop + gh + codeql + vscode + jetbrains.ruby-mine + jetbrains.rider + jetbrains.phpstorm + jetbrains.idea-ultimate + jetbrains.webstorm + lazygit + wakatime + mongodb-compass + mongosh + httpie + ngrok + mycli + squirrel-sql + figma-linux + + # langs + openscad + nodejs_18 + nodePackages.yarn + nodePackages.ts-node + nodePackages.pnpm + php82 + php82Packages.composer + deno + python310 + python310Packages.pip + python310Packages.discordpy + dotnet-sdk + jdk17 + maven + purescript + lua + flutter + + # comms + nheko + element-desktop + vesktop + caprine-bin + teamspeak5_client + + # gaming + rpcs3 + pcsxr + pcsx2 + steam + gzdoom + minecraft + dolphin-emu + prismlauncher + fceux + snes9x + heroic + openrct2 + osu-lazer-bin + + # media + vlc + libsForQt5.vvave + tidal-hifi + spotify-tui + youtube-tui + mpv + + # zsh themes + zsh-powerlevel10k + ]; +} diff --git a/hosts/default.nix b/hosts/default.nix index e12b1f6..5abd965 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -1,35 +1,33 @@ -{ - nixpkgs, - self, - outputs, - ... -}: let - inputs = self.inputs; +{self, ...}: let + # get inputs from self + inherit (self) inputs; + # get necessary inputs from self.inputs + inherit (inputs) nixpkgs lanzaboote nixos-hardware; + inherit (inputs.home-manager.nixosModules) home-manager; + # get lib from nixpkgs and create and alias for lib.nixosSystem + # for potential future overrides & abstractions + inherit (nixpkgs) lib; + mkSystem = lib.nixosSystem; - home-manager = inputs.home-manager.nixosModules.home-manager; - homes = ../homes; -in { - nixbox = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs outputs;}; - modules = [ - # this list defines which files will be imported to be used as "modules" in the system config - ./nixbox/configuration.nix + home = ../homes; - # use the nixos-module for home-manager - home-manager - homes - ]; - }; + # define a sharedArgs variable that we can simply inherit + # across all hosts to avoid traversing the file whenever + # we need to add a common specialArg + # if a host needs a specific arg that others do not need + # then we can merge into the old attribute set as such: + # specialArgs = commonArgs // { newArg = "value"; }; - nixpad = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs outputs;}; + commonArgs = {inherit self inputs;}; +in { + "nixpad" = mkSystem { + specialArgs = commonArgs; modules = [ # this list defines which files will be imported to be used as "modules" in the system config ./nixpad/configuration.nix - # use the nixos-module for home-manager home-manager - homes + home ]; }; } diff --git a/hosts/nixbox/configuration.nix b/hosts/nixbox/configuration.nix deleted file mode 100644 index f1790d8..0000000 --- a/hosts/nixbox/configuration.nix +++ /dev/null @@ -1,219 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). -{ - config, - pkgs, - ... -}: { - imports = [ - # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; - - # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - boot.loader.efi.efiSysMountPoint = "/boot/efi"; - - networking.hostName = "nixbox"; # Define your hostname. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Enable networking - networking.networkmanager.enable = true; - - # Set your time zone. - time.timeZone = "Europe/London"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_GB.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "en_GB.UTF-8"; - LC_IDENTIFICATION = "en_GB.UTF-8"; - LC_MEASUREMENT = "en_GB.UTF-8"; - LC_MONETARY = "en_GB.UTF-8"; - LC_NAME = "en_GB.UTF-8"; - LC_NUMERIC = "en_GB.UTF-8"; - LC_PAPER = "en_GB.UTF-8"; - LC_TELEPHONE = "en_GB.UTF-8"; - LC_TIME = "en_GB.UTF-8"; - }; - - # Enable the X11 windowing system. - services.xserver.enable = true; - - # Enable the flatpak service - services.flatpak.enable = true; - - # Enable SDDM and set second display resolution/position - services.xserver.displayManager = { - sddm.enable = true; - setupCommands = "xrandr --output HDMI-0 --mode 1280x1024 --output HDMI-0 --right-of DP-0"; - }; - - # Enable the KDE Plasma Desktop Environment. - services.xserver.desktopManager.plasma5.enable = true; - - # Enable hyprland - programs.hyprland = { - enable = true; - enableNvidiaPatches = true; - xwayland.enable = true; - }; - - # Configure keymap in X11 - services.xserver = { - layout = "us"; - xkbVariant = ""; - }; - - # Enable experimental features - nix.settings.extra-experimental-features = ["flakes" "nix-command"]; - - # Enable automatic gc - nix.gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 30d"; - }; - - # I never want to touch this again - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - jack.enable = true; - }; - - services.xserver.videoDrivers = ["nvidia"]; - hardware = { - opengl = { - enable = true; - driSupport = true; - driSupport32Bit = true; - }; - nvidia = { - modesetting.enable = true; - nvidiaSettings = true; - }; - }; - - # Enable touchpad support (enabled default in most desktopManager). - # services.xserver.libinput.enable = true; - - # Define a user account. Don't forget to set a password with ‘passwd’. - users.users.floppydisk = { - isNormalUser = true; - description = "Frankie B."; - extraGroups = ["networkmanager" "wheel"]; - packages = with pkgs; [ - kate - ]; - initialPassword = "changeme"; - shell = pkgs.zsh; - }; - - # Allow unfree packages - nixpkgs.config.allowUnfree = true; - - # security is for wusses - nixpkgs.config.permittedInsecurePackages = [ - "openssl-1.1.1u" - ]; - - # Fonts - fonts.packages = with pkgs; [ - winePackages.fonts - ]; - - # List packages installed in system profile. To search, run: - # $ nix search wget - environment.systemPackages = with pkgs; [ - # Tools - vim - wget - git - gnupg - pinentry - kitty - ntfs3g - pulseaudioFull - linuxKernel.packages.linux_zen.v4l2loopback - pciutils - usbutils - isoimagewriter - nvtop - screen - pavucontrol - paprefs - gcc - - # Fonts - nerdfonts - jetbrains-mono - - # other shit - libnotify - hyprpaper - networkmanagerapplet - grim - slurp - wl-clipboard - font-awesome - rofi - wlogout - swaynotificationcenter - swaylock - sway - swayidle - helvum - ]; - - environment.sessionVariables = { - WLR_NO_HARDWARE_CURSORS = "1"; - NIXOS_OZONE_WL = "1"; - }; - - xdg.portal.enable = true; - xdg.portal.extraPortals = [pkgs.xdg-desktop-portal-gtk]; - - programs.zsh.enable = true; - - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - # programs.gnupg.agent = { - # enable = true; - # enableSSHSupport = true; - # }; - - # List services that you want to enable: - - # Enable the OpenSSH daemon. - services.openssh.enable = true; - - # Enable printing - services.printing.enable = true; - services.printing.drivers = [pkgs.hplipWithPlugin]; - - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - networking.firewall.enable = false; - - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "22.11"; # Did you read the comment? -} diff --git a/hosts/nixbox/hardware-configuration.nix b/hosts/nixbox/hardware-configuration.nix deleted file mode 100644 index 2be489f..0000000 --- a/hosts/nixbox/hardware-configuration.nix +++ /dev/null @@ -1,44 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ - config, - lib, - pkgs, - modulesPath, - ... -}: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"]; - boot.initrd.kernelModules = []; - boot.kernelModules = ["kvm-intel"]; - boot.extraModulePackages = []; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/c694a72f-2faa-49f3-813f-b9b552143088"; - fsType = "ext4"; - }; - - fileSystems."/boot/efi" = { - device = "/dev/disk/by-uuid/BA8E-DAAA"; - fsType = "vfat"; - }; - - swapDevices = [ - {device = "/dev/disk/by-uuid/f30ab1ac-66a5-4389-b4fe-a52f53255ec6";} - ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/hosts/nixpad/configuration.nix b/hosts/nixpad/configuration.nix index 4b86ea4..68c8c3f 100644 --- a/hosts/nixpad/configuration.nix +++ b/hosts/nixpad/configuration.nix @@ -1,199 +1,156 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). +# This is your system's configuration file. +# Use this to configure your system environment (it replaces /etc/nixos/configuration.nix) { + inputs, + lib, config, pkgs, ... }: { + # You can import other NixOS modules here imports = [ - # Include the results of the hardware scan. ./hardware-configuration.nix ]; - # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - boot.loader.efi.efiSysMountPoint = "/boot/efi"; - - networking.hostName = "nixpad"; # Define your hostname. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Enable networking - networking.networkmanager.enable = true; - - # Set your time zone. - time.timeZone = "Europe/London"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_GB.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "en_GB.UTF-8"; - LC_IDENTIFICATION = "en_GB.UTF-8"; - LC_MEASUREMENT = "en_GB.UTF-8"; - LC_MONETARY = "en_GB.UTF-8"; - LC_NAME = "en_GB.UTF-8"; - LC_NUMERIC = "en_GB.UTF-8"; - LC_PAPER = "en_GB.UTF-8"; - LC_TELEPHONE = "en_GB.UTF-8"; - LC_TIME = "en_GB.UTF-8"; + services.xserver = { + enable = true; + displayManager.sddm.enable = true; + desktopManager.plasma5.enable = true; + xkb.layout = "us"; + libinput.enable = true; }; - # Enable the X11 windowing system. - services.xserver.enable = true; - - # Enable the KDE Plasma Desktop Environment. - services.xserver.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; - - programs.hyprland = { + hardware.opengl = { enable = true; - xwayland.enable = true; + driSupport = true; + driSupport32Bit = true; }; - # Configure keymap in X11 - services.xserver = { - layout = "us"; - xkbVariant = ""; + nixpkgs = { + # Configure your nixpkgs instance + config = { + # Disable if you don't want unfree packages + allowUnfree = true; + }; }; - # Enable experimental features - nix.settings.extra-experimental-features = ["flakes" "nix-command"]; - - # Enable automatic gc - nix.gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 30d"; + nix = { + # This will add each flake input as a registry + # To make nix3 commands consistent with your flake + registry = lib.mapAttrs (_: value: {flake = value;}) inputs; + + # This will additionally add your inputs to the system's legacy channels + # Making legacy nix commands consistent as well, awesome! + nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; + + settings = { + # Enable flakes and new 'nix' command + experimental-features = "nix-command flakes"; + # Deduplicate and optimize nix store + auto-optimise-store = true; + }; }; - # Enable CUPS to print documents. - services.printing.enable = true; + # the configuration (pain) + programs = { + gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; + hyprland = { + enable = true; + xwayland.enable = true; + }; + zsh.enable = true; + }; - # I never want to touch this again security.rtkit.enable = true; services.pipewire = { enable = true; alsa.enable = true; alsa.support32Bit = true; pulse.enable = true; - jack.enable = true; }; - services.xserver.videoDrivers = ["intel"]; - hardware.opengl = { - enable = true; - driSupport = true; - driSupport32Bit = true; - }; - - # Enable touchpad support (enabled default in most desktopManager). - services.xserver.libinput.enable = true; - - # Define a user account. Don't forget to set a password with ‘passwd’. - users.users.floppydisk = { - isNormalUser = true; - description = "Frankie B."; - extraGroups = ["networkmanager" "wheel"]; - packages = with pkgs; [ - kate - ]; - initialPassword = "changeme"; - shell = pkgs.zsh; - }; + environment.systemPackages = with pkgs; [ + gcc + git + grim + lxqt.lxqt-policykit + pavucontrol + pciutils + pulseaudio + screen + slurp + usbutils + wget + wl-clipboard + xdg-utils + swaynotificationcenter + swayidle + wofi + swaylock + ]; - # Allow unfree packages - nixpkgs.config.allowUnfree = true; + services.printing.enable = true; - # Fonts fonts.packages = with pkgs; [ + font-awesome + nerdfonts + jetbrains-mono winePackages.fonts ]; - # List packages installed in system profile. To search, run: - # $ nix search wget - environment.systemPackages = with pkgs; [ - # Tools - vim - wget - git - gnupg - pinentry - kitty - ntfs3g - pulseaudioFull - linuxKernel.packages.linux_zen.v4l2loopback - pciutils - usbutils - isoimagewriter - nvtop - screen - pavucontrol - paprefs - gcc - - - # Fonts - nerdfonts - jetbrains-mono + networking.hostName = "nixpad"; - # other shit - #dunst - libnotify - hyprpaper - networkmanagerapplet - grim - slurp - wl-clipboard - font-awesome - rofi - wlogout - swaynotificationcenter - swaylock - sway - swayidle - helvum - ]; + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + boot.initrd.systemd.enable = true; + boot.kernelPackages = pkgs.linuxPackages_latest; + - environment.sessionVariables = { - WLR_NO_HARDWARE_CURSORS = "1"; - NIXOS_OZONE_WL = "1"; - }; + # Set a time zone, idiot + time.timeZone = "Europe/London"; - xdg.portal.enable = true; - xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; + # Fun internationalisation stuffs (AAAAAAAA) + i18n.defaultLocale = "en_GB.UTF-8"; - programs.zsh.enable = true; + i18n.extraLocaleSettings = { + LC_ADDRESS = "en_GB.UTF-8"; + LC_IDENTIFICATION = "en_GB.UTF-8"; + LC_MEASUREMENT = "en_GB.UTF-8"; + LC_MONETARY = "en_GB.UTF-8"; + LC_NAME = "en_GB.UTF-8"; + LC_NUMERIC = "en_GB.UTF-8"; + LC_PAPER = "en_GB.UTF-8"; + LC_TELEPHONE = "en_GB.UTF-8"; + LC_TIME = "en_GB.UTF-8"; + }; - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; + # define user acc + users.users.floppydisk = { + isNormalUser = true; + description = "Frankie B."; + extraGroups = ["networkmanager" "wheel"]; + openssh.authorizedKeys.keys = [ + # TODO: Add your SSH public key(s) here, if you plan on using SSH to connect + ]; + shell = pkgs.zsh; }; - # List services that you want to enable: + nix.gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 30d"; + }; - # Enable the OpenSSH daemon. - services.openssh.enable = true; + # This setups a SSH server. Very important if you're setting up a headless system. + # Feel free to remove if you don't need it. - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. + services.openssh.enable = true; + networking.firewall.enable = false; - - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "22.11"; # Did you read the comment? + + system.stateVersion = "24.05"; + } diff --git a/hosts/nixpad/hardware-configuration.nix b/hosts/nixpad/hardware-configuration.nix index e326b0c..3588111 100644 --- a/hosts/nixpad/hardware-configuration.nix +++ b/hosts/nixpad/hardware-configuration.nix @@ -1,39 +1,45 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "uas" "sd_mod" "rtsx_usb_sdmmc"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; - boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ata_piix" "usb_storage" "sd_mod" "sdhci_pci" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + fileSystems."/" = { + device = "/dev/disk/by-uuid/81d5eb4d-ed55-446c-8c99-048dfb214f9d"; + fsType = "ext4"; + }; - fileSystems."/" = - { device = "/dev/disk/by-uuid/79fd353d-4e05-44fd-9e10-e57b08c140f0"; - fsType = "ext4"; - }; + boot.initrd.luks.devices."luks-6251bba4-3361-4923-8d83-812cc3162b3e".device = "/dev/disk/by-uuid/6251bba4-3361-4923-8d83-812cc3162b3e"; - fileSystems."/boot/efi" = - { device = "/dev/disk/by-uuid/AA53-B6CE"; - fsType = "vfat"; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/89AE-5193"; + fsType = "vfat"; + }; - swapDevices = - [ { device = "/dev/disk/by-uuid/92e64b37-f558-4333-bfb0-0e4bfe6e91c0"; } - ]; + swapDevices = [ + {device = "/dev/disk/by-uuid/d3f0c084-4a4d-4175-a0e6-94fbe8459614";} + ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's # still possible to use this option, but it's recommended to use it in conjunction # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp0s25.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; + # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/modules/public/home-manager/default.nix b/modules/public/home-manager/default.nix deleted file mode 100644 index 45aae31..0000000 --- a/modules/public/home-manager/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -# Add your reusable home-manager modules to this directory, on their own file (https://nixos.wiki/wiki/Module). -# These should be stuff you would like to share with others, not your personal configurations. -{ - # List your module files here - # my-module = import ./my-module.nix; -} diff --git a/modules/public/nixos/default.nix b/modules/public/nixos/default.nix deleted file mode 100644 index 8605069..0000000 --- a/modules/public/nixos/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -# Add your reusable NixOS modules to this directory, on their own file (https://nixos.wiki/wiki/Module). -# These should be stuff you would like to share with others, not your personal configurations. -{ - # List your module files here - # my-module = import ./my-module.nix; -} diff --git a/nixpkgs.nix b/nixpkgs.nix deleted file mode 100644 index e4d0588..0000000 --- a/nixpkgs.nix +++ /dev/null @@ -1,9 +0,0 @@ -# A nixpkgs instance that is grabbed from the pinned nixpkgs commit in the lock file -# This is useful to avoid using channels when using legacy nix commands -let - lock = (builtins.fromJSON (builtins.readFile ./flake.lock)).nodes.nixpkgs.locked; -in - import (fetchTarball { - url = "https://github.com/nixos/nixpkgs/archive/${lock.rev}.tar.gz"; - sha256 = lock.narHash; - }) diff --git a/pkgs/default.nix b/pkgs/default.nix deleted file mode 100644 index 7403a05..0000000 --- a/pkgs/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -# Custom packages, that can be defined similarly to ones from nixpkgs -# You can build them using 'nix build .#example' or (legacy) 'nix-build -A example' -{pkgs ? (import ../nixpkgs.nix) {}}: { - # example = pkgs.callPackage ./example { }; -} diff --git a/shell.nix b/shell.nix deleted file mode 100644 index 5982048..0000000 --- a/shell.nix +++ /dev/null @@ -1,9 +0,0 @@ -# Shell for bootstrapping flake-enabled nix and home-manager -# You can enter it through 'nix develop' or (legacy) 'nix-shell' -{pkgs ? (import ./nixpkgs.nix) {}}: { - default = pkgs.mkShell { - # Enable experimental features without having to specify the argument - NIX_CONFIG = "experimental-features = nix-command flakes"; - nativeBuildInputs = with pkgs; [nix home-manager git]; - }; -} -- cgit v1.2.3-54-g00ecf