diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8ed425a --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/hardware-configuration.nix diff --git a/configuration.nix b/configuration.nix index 686e7e9..724f408 100644 --- a/configuration.nix +++ b/configuration.nix @@ -34,7 +34,6 @@ in #}; }; }; - boot = { loader = { systemd-boot = { @@ -58,6 +57,8 @@ in 80 1337 8080 + 3000 + 8000 ]; }; }; @@ -83,10 +84,14 @@ in xserver = { enable = true; displayManager.startx.enable = true; - windowManager.bspwm.enable = true; + windowManager = { + bspwm.enable = true; + dwm.enable = false; + i3.enable = true; + }; }; pipewire = { - enable = false; + enable = true; pulse.enable = true; wireplumber.enable = true; }; @@ -108,9 +113,6 @@ in rtl-sdr = { enable = true; }; - pulseaudio = { - enable = true; - }; }; programs = { @@ -209,6 +211,7 @@ in # libs python312Packages.pyserial + python312Packages.meshtastic # SDR noaa-apt @@ -223,7 +226,7 @@ in # misc cava - discord + vesktop pacman ]; diff --git a/modules/home.nix b/modules/home.nix index e27d16e..79c3553 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -15,6 +15,7 @@ ".wp/skull_purple.png".source = ./raw/wp/skull_purple.png; ".wp/gruvbox-dark-blue.png".source = ./raw/wp/gruvbox-dark-blue.png; ".wp/anime_blue.png".source = ./raw/wp/anime_blue.png; + ".wp/fuji.png".source = ./raw/wp/fuji.png; }; }; } diff --git a/modules/nix/bspwm/alacritty.nix b/modules/nix/bspwm/alacritty.nix deleted file mode 100644 index 4488926..0000000 --- a/modules/nix/bspwm/alacritty.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ config, pkgs, ... }: -{ - programs = { - alacritty = { - enable = true; - settings = { - #terminal.shell = { - # program = "tmux"; - #}; - colors = { - primary = { - background = "#161616"; - foreground = "#ffffff"; - }; - normal = { - black = "#262626"; - magenta = "#ff7eb6"; - green = "#42be65"; - yellow = "#ffe97b"; - blue = "#33b1ff"; - red = "#ee5396"; - cyan = "#3ddbd9"; - white = "#dde1e6"; - }; - bright = { - black = "#393939"; - magenta = "#ff7eb6"; - green = "#42be65"; - yellow = "#ffe97b"; - blue = "#33b1ff"; - red = "#ee5396"; - cyan = "#3ddbd9"; - white = "#ffffff"; - }; - }; - font = { - size = 15; - normal = { - family = "FantasqueSansMNerdFont"; - }; - }; - }; - }; - }; -} diff --git a/modules/nix/bspwm/bspwm.nix b/modules/nix/bspwm/bspwm.nix deleted file mode 100644 index ffae748..0000000 --- a/modules/nix/bspwm/bspwm.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - config, - pkgs, - pkgs-stable, - ... -}: -{ - services = { - sxhkd = { - enable = true; - keybindings = { - "super + Return" = "${pkgs.alacritty}/bin/alacritty"; - "super + space" = "${pkgs.rofi}/bin/rofi -show drun"; - "super + q" = "bspc node -k"; - - "super + shift + r" = "bspc wm -r"; - "super + shift + space" = "bspc node focused -t \~floating"; - "super + {1,2,3,4,5,6,7,8,9,0}" = "bspc desktop -f {1,2,3,4,5,6,7,8,9,0}"; - "super + shift + {1-9,0}" = "bspc node -d '^{1-9,10}'"; - "super + Escape" = "pkill -USR1 -x sxhkd"; - }; - }; - }; - xsession.windowManager.bspwm = { - enable = true; - settings = { - border_width = 2; - gapless_monocle = false; - split_ratio = 0.52; - window_gap = "10"; - focus_follows_pointer = true; - borderless_monocle = true; - }; - extraConfig = '' - sxhkd -c ~/.config/sxhkd/sxhkdrc & - ${pkgs.feh}/bin/feh --bg-fill ~/.wp/anime_blue.png & - bspc monitor -d 1 2 3 4 5 6 7 8 9 0 - - - ''; - rules = { - "kupfer.py" = { - focus = true; - }; - "screenkey" = { - manage = false; - }; - }; - }; -} diff --git a/modules/nix/bspwm/default.nix b/modules/nix/bspwm/default.nix deleted file mode 100644 index 547d964..0000000 --- a/modules/nix/bspwm/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ config, pkgs, ... }: -{ - imports = [ - ./bspwm.nix - ./alacritty.nix - ]; - #home.file = { - - #}; -} diff --git a/modules/nix/default.nix b/modules/nix/default.nix index 5fd897c..1e64473 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -2,8 +2,7 @@ { imports = [ ./nvim/default.nix - ./bspwm/default.nix - ./hypr/default.nix + ./sway/default.nix ./bash.nix ./git.nix ./tmux.nix diff --git a/modules/nix/hypr/default.nix b/modules/nix/hypr/default.nix deleted file mode 100644 index 700db3d..0000000 --- a/modules/nix/hypr/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ config, pkgs, ... }: -{ - imports = [ - ./hypr.nix - ./kitty.nix - ]; - home.file = { - # WAYBAR - ".config/waybar/style.css".source = ./raw/waybar/style.css; - ".config/waybar/config".source = ./raw/waybar/config; - }; -} diff --git a/modules/nix/hypr/hypr.nix b/modules/nix/hypr/hypr.nix deleted file mode 100644 index 8e507cf..0000000 --- a/modules/nix/hypr/hypr.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ config, pkgs, ... }: -{ - wayland.windowManager.hyprland = { - enable = true; - xwayland.enable = true; - systemd.enable = true; - extraConfig = '' - bindel = , XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ - bindel = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- - bindl = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle - bindl = , XF86AudioPlay, exec, ${pkgs.playerctl}/bin/playerctl play-pause - bindl = , XF86AudioPrev, exec, ${pkgs.playerctl}/bin/playerctl previous - bindl = , XF86AudioNext, exec, ${pkgs.playerctl}/bin/playerctl next - ''; - settings = { - "monitor" = ",2560x1440@144, 0x0, 1, bitdepth,10"; - "$mod" = "SUPER"; - exec-once = [ - "waybar &" - "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" - "${pkgs.swaybg}/bin/swaybg -i ~/.wp/anime_blue.png" - ]; - bind = [ - "$mod, RETURN, exec, ${pkgs.kitty}/bin/kitty" - "$mod, space, exec, ${pkgs.wofi}/bin/wofi --show drun" - "$mod, Q, killactive" - "$mod SHIFT, space, togglefloating" - - "$mod, 1, workspace, 1" - "$mod, 2, workspace, 2" - "$mod, 3, workspace, 3" - "$mod, 4, workspace, 4" - "$mod, 5, workspace, 5" - "$mod, 6, workspace, 6" - "$mod, 7, workspace, 7" - "$mod, 8, workspace, 8" - "$mod, 9, workspace, 9" - - "$mod SHIFT, 1, movetoworkspace, 1" - "$mod SHIFT, 2, movetoworkspace, 2" - "$mod SHIFT, 3, movetoworkspace, 3" - "$mod SHIFT, 4, movetoworkspace, 4" - "$mod SHIFT, 5, movetoworkspace, 5" - "$mod SHIFT, 6, movetoworkspace, 6" - "$mod SHIFT, 7, movetoworkspace, 7" - "$mod SHIFT, 8, movetoworkspace, 8" - "$mod SHIFT, 9, movetoworkspace, 9" - - #"bind = ,XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+" - #"bind = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" - #"bind = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" - #"bind = ,XF86AudioPlay, exec, playerctl play-pause" - #"bind = ,XF86AudioPrev, exec, playerctl previous" - #"bind = ,XF86AudioNext, exec, playerctl next" - ]; - - bindm = [ - "$mod, mouse:272, movewindow" - "$mod, mouse:273, resizewindow" - "$mod ALT, mouse:272, resizewindow" - ]; - - decoration = { - rounding = 2; - }; - general = { - gaps_in = 8; - gaps_out = 8; - border_size = 1; - resize_on_border = true; - }; - input = { - kb_layout = "us"; - natural_scroll = false; - }; - gestures = { - workspace_swipe = true; - workspace_swipe_forever = true; - }; - }; - }; -} diff --git a/modules/nix/hypr/kitty.nix b/modules/nix/hypr/kitty.nix deleted file mode 100644 index bfa294c..0000000 --- a/modules/nix/hypr/kitty.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ config, pkgs, ... }: -{ - programs = { - kitty = { - enable = true; - extraConfig = '' - font_size 15.0 - cursor_shape beam - close_window true - confirm_os_window_close 0 - font_family FantasqueSansMNerdFont - foreground #dde1e6 - background #161616 - selection_foreground #f2f4f8 - selection_background #525252 - - cursor #f2f4f8 - cursor_text_color #393939 - - url_color #ee5396 - url_style single - - active_border_color #ee5396 - inactive_border_color #ff7eb6 - - bell_border_color #ee5396 - - wayland_titlebar_color system - macos_titlebar_color system - - active_tab_foreground #161616 - active_tab_background #ee5396 - inactive_tab_foreground #dde1e6 - inactive_tab_background #393939 - tab_bar_background #161616 - - color0 #262626 - color8 #393939 - - color1 #ff7eb6 - color9 #ff7eb6 - - color2 #42be65 - color10 #42be65 - - color3 #82cfff - color11 #82cfff - - color4 #33b1ff - color12 #33b1ff - - color5 #ee5396 - color13 #ee5396 - - color6 #3ddbd9 - color14 #3ddbd9 - - color7 #dde1e6 - color15 #ffffff - - - ''; - }; - tmux = { - enable = true; - }; - }; -} diff --git a/modules/nix/hypr/raw/waybar/config b/modules/nix/hypr/raw/waybar/config deleted file mode 100755 index 6e3c0e4..0000000 --- a/modules/nix/hypr/raw/waybar/config +++ /dev/null @@ -1,192 +0,0 @@ -[ - { - "battery": { - "format": "{icon} {capacity}%", - "format-alt": "{icon} {time}", - "format-charging": " {capacity}%", - "format-icons": [ - "", - "", - "", - "", - "" - ], - "format-plugged": " {capacity}% ", - "states": { - "critical": 15, - "good": 95, - "warning": 30 - } - }, - "cava#left": { - "autosens": 1, - "bar_delimiter": 0, - "bars": 18, - "format-icons": [ - "", - "", - "", - "", - "", - "", - "", - "" - ], - "framerate": 60, - "higher_cutoff_freq": 10000, - "input_delay": 2, - "lower_cutoff_freq": 50, - "method": "pulse", - "monstercat": false, - "reverse": false, - "source": "auto", - "stereo": true, - "waves": false - }, - "cava#right": { - "autosens": 1, - "bar_delimiter": 0, - "bars": 18, - "format-icons": [ - "", - "", - "", - "", - "", - "", - "", - "" - ], - "framerate": 60, - "higher_cutoff_freq": 10000, - "input_delay": 2, - "lower_cutoff_freq": 50, - "method": "pulse", - "monstercat": false, - "reverse": false, - "source": "auto", - "stereo": true, - "waves": false - }, - "clock": { - "format": " {:%a, %d %b, %I:%M %p}", - "format-alt": " {:%d/%m}", - "tooltip": "true", - "tooltip-format": "{:%Y %B}\n{calendar}" - }, - "cpu": { - "format": "󰻠 {usage}%", - "format-alt": "󰻠 {avg_frequency} GHz", - "interval": 5 - }, - "custom/launcher": { - "format": "", - "tooltip": "false" - }, - "custom/playerctl#backward": { - "format": "󰙣 ", - "on-click": "playerctl previous", - "on-scroll-down": "playerctl volume .05-", - "on-scroll-up": "playerctl volume .05+" - }, - "custom/playerctl#foward": { - "format": "󰙡 ", - "on-click": "playerctl next", - "on-scroll-down": "playerctl volume .05-", - "on-scroll-up": "playerctl volume .05+" - }, - "custom/playerctl#play": { - "exec": "playerctl -a metadata --format '{\"text\": \"{{artist}} - {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F", - "format": "{icon}", - "format-icons": { - "Paused": "", - "Playing": "󰏥 ", - "Stopped": "" - }, - "on-click": "playerctl play-pause", - "on-scroll-down": "playerctl volume .05-", - "on-scroll-up": "playerctl volume .05+", - "return-type": "json" - }, - "custom/playerlabel": { - "exec": "playerctl -a metadata --format '{\"text\": \"{{artist}} - {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F", - "format": "󰎈 {} 󰎈", - "max-length": 40, - "on-click": "", - "return-type": "json" - }, - "custom/randwall": { - "format": "󰏘" - }, - "height": 35, - "layer": "top", - "margin-bottom": 0, - "margin-left": 0, - "margin-right": 0, - "margin-top": 0, - "memory": { - "format": "󰍛 {}%", - "format-alt": "󰍛 {used}/{total} GiB", - "interval": 5 - }, - "modules-center": [ - "wlr/workspaces", - ], - "modules-left": [ - "cava#left", - "custom/playerctl#backward", - "custom/playerctl#play", - "custom/playerctl#foward", - ], - "modules-right": [ - "tray", - "memory", - "cpu", - "battery", - "pulseaudio", - "network", - "clock", - ], - - "network": { - "format-disconnected": "󰖪 0% ", - "format-ethernet": "󰈀 100% ", - "format-linked": "{ifname} (No IP)", - "format-wifi": " {signalStrength}%", - "tooltip-format": "Connected to {essid} {ifname} via {gwaddr}" - }, - "position": "top", - "pulseaudio": { - "format": "{icon} {volume}%", - "format-icons": { - "default": [ - "󰕿", - "󰖀", - "󰕾" - ] - }, - "format-muted": "󰝟", - "on-click": "pavucontrol", - "scroll-step": 5 - }, - "tray": { - "icon-size": 20, - "spacing": 8 - }, - "wlr/workspaces": { - "active-only": true, - "all-outputs": false, - "disable-scroll": false, - "format": "{name}", - "format-icons": { - "active": "", - "default": "", - "sort-by-number": true, - "urgent": "" - }, - "on-click": "activate", - "on-scroll-down": "hyprctl dispatch workspace e+1", - "on-scroll-up": "hyprctl dispatch workspace e-1" - } - } -] diff --git a/modules/nix/hypr/raw/waybar/style.css b/modules/nix/hypr/raw/waybar/style.css deleted file mode 100644 index 86f21fa..0000000 --- a/modules/nix/hypr/raw/waybar/style.css +++ /dev/null @@ -1,147 +0,0 @@ -* { - border: none; - border-radius: 0px; - font-family: Terminus Nerd Font; - font-size: 15px; - min-height: 0; -} - -window#waybar { - /* background: rgba(17,17,27,1); */ - background: transparent; -} - -#cava.left, -#cava.right { - /* background: #25253a; */ - - /*background: #25253a;*/ - background: #010101; - margin: 5px; - padding: 8px 16px; - color: #cba6f7; -} -#cava.left { - border-radius: 24px 24px 24px 24px; -} -#cava.right { - border-radius: 10px 24px 10px 24px; -} -#workspaces { - background: #11111b; - margin: 5px 5px; - padding: 8px 5px; - border-radius: 16px; - color: #cba6f7; -} -#workspaces button { - padding: 0px 5px; - margin: 0px 3px; - border-radius: 16px; - color: transparent; - background: rgba(17, 17, 27, 1); - transition: all 0.3s ease-in-out; -} - -#workspaces button.active { - background-color: #89b4fa; - color: #11111b; - border-radius: 16px; - min-width: 50px; - background-size: 400% 400%; - transition: all 0.3s ease-in-out; -} - -#workspaces button:hover { - background-color: #f5f5f5; - color: #11111b; - border-radius: 16px; - min-width: 50px; - background-size: 400% 400%; -} - -#tray, -#pulseaudio, -#network, -#battery, -#custom-playerctl.backward, -#custom-playerctl.play, -#custom-playerctl.foward { - background: #010101; - font-weight: bold; - margin: 5px 0px; - opacity: 1; -} -#tray, -#pulseaudio, -#network, -#battery { - color: #f5f5f5; - border-radius: 24px 24px 24px 24px; - padding: 0 20px; - margin-left: 7px; -} -#clock { - color: #f5f5f5; - background: #010101; - border-radius: 0px 0px 0px 40px; - padding: 10px 10px 15px 25px; - margin-left: 7px; - font-weight: bold; - font-size: 16px; -} -#custom-launcher { - color: #89b4fa; - background: #010101; - border-radius: 0px 0px 40px 0px; - margin: 0px; - padding: 0px 35px 0px 15px; - font-size: 28px; -} - -#custom-playerctl.backward, -#custom-playerctl.play, -#custom-playerctl.foward { - background: #010101; - font-size: 22px; -} -#custom-playerctl.backward:hover, -#custom-playerctl.play:hover, -#custom-playerctl.foward:hover { - color: #f5f5f5; -} -#custom-playerctl.backward { - color: #cba6f7; - border-radius: 24px 0px 0px 24px; - padding-left: 16px; - margin-left: 7px; -} -#custom-playerctl.play { - color: #89b4fa; - padding: 0 5px; -} -#custom-playerctl.foward { - color: #cba6f7; - border-radius: 0px 24px 24px 0px; - padding-right: 12px; - margin-right: 7px; -} -#custom-playerlabel { - background: #010101; - color: #f5f5f5; - padding: 0 20px; - border-radius: 24px 24px 24px 24px; - margin: 5px 0; - font-weight: bold; -} -#window { - /*background: #25253a; */ - padding-left: 15px; - padding-right: 15px; - border-radius: 16px; - margin-top: 5px; - margin-bottom: 5px; - font-weight: normal; - font-style: normal; - opacity: 0.1; -} diff --git a/modules/nix/nvim/alpha.nix b/modules/nix/nvim/alpha.nix index 49f76eb..44f9821 100644 --- a/modules/nix/nvim/alpha.nix +++ b/modules/nix/nvim/alpha.nix @@ -35,6 +35,7 @@ " ⠄⠁⠕⢝⡢⠈⠻⣿⣿⣿⣿⣿⣿⣿⣷⣕⣑⣑⣑⣵⣿⣿⣿⡿⢋⢔⢕⣿⠠⠈ " " ⠨⡂⡀⢑⢕⡅⠂⠄⠉⠛⠻⠿⢿⣿⣿⣿⣿⣿⣿⣿⣿⡿⢋⢔⢕⢕⣿⣿⠠⠈ " " ⠄⠪⣂⠁⢕⠆⠄⠂⠄⠁⡀⠂⡀⠄⢈⠉⢍⢛⢛⢛⢋⢔⢕⢕⢕⣽⣿⣿⠠⠈ " + " i hate niggas " ]; } { diff --git a/modules/nix/nvim/default.nix b/modules/nix/nvim/default.nix index 462f328..c7f2bb2 100644 --- a/modules/nix/nvim/default.nix +++ b/modules/nix/nvim/default.nix @@ -8,7 +8,6 @@ let nixvim = import ( builtins.fetchGit { url = "https://github.com/nix-community/nixvim"; - ref = "nixos-24.11"; } ); in @@ -27,8 +26,31 @@ in ]; programs.nixvim = { enable = true; - colorschemes.oxocarbon.enable = true; plugins = { + transparent = { + enable = true; + settings = { + groups = [ + "Normal" + "NormalNC" + "CursorLine" + "StatusLine" + "StatusLineNC" + "EndOfBuffer" + + ]; + exclude_groups = [ ]; + extra_groups = [ + "BufferLineTabClose" + "BufferLineBufferSelected" + "BufferLineFill" + "BufferLineBackground" + "BufferLineSeparator" + "BufferLineIndicatorSelected" + ]; + }; + }; + neocord = { enable = true; settings = { diff --git a/modules/nix/nvim/lsp.nix b/modules/nix/nvim/lsp.nix index fa65c9d..98370e6 100644 --- a/modules/nix/nvim/lsp.nix +++ b/modules/nix/nvim/lsp.nix @@ -7,7 +7,7 @@ { programs.nixvim.plugins = { clangd-extensions.enable = true; - crates-nvim.enable = true; + crates.enable = true; lsp-format = { enable = true; }; diff --git a/modules/nix/nvim/lualine.nix b/modules/nix/nvim/lualine.nix index c66ecef..167ab92 100644 --- a/modules/nix/nvim/lualine.nix +++ b/modules/nix/nvim/lualine.nix @@ -8,7 +8,12 @@ programs.nixvim = { plugins = { lualine = { - enable = true; + enable = false; + settings = { + options = { + theme = "horizon"; + }; + }; }; }; }; diff --git a/modules/nix/nvim/opts.nix b/modules/nix/nvim/opts.nix index 54f4583..7d5eac1 100644 --- a/modules/nix/nvim/opts.nix +++ b/modules/nix/nvim/opts.nix @@ -8,8 +8,7 @@ programs.nixvim = { extraConfigLua = '' local map = vim.api.nvim_set_keymap - local opts = { noremap = true, silent = true } - + local opts = { noremap = true, silent = true } vim.g.mapleader = " " map('n', '', ":ToggleTerm size=40 direction=float", opts) map('n', '', ":Neotree filesystem reveal right toggle", opts) @@ -17,6 +16,14 @@ map('v', '', '>gv', opts) map('v', '', '