diff --git a/configuration.nix b/configuration.nix index 8c88642..6f6eed9 100644 --- a/configuration.nix +++ b/configuration.nix @@ -113,6 +113,7 @@ slurp feh chromium + # cli neofetch fastfetch @@ -131,27 +132,11 @@ go nixd - # radio - sdrplay - sdrpp - hackrf - rtl-sdr - gqrx - noaa-apt - rtl_433 - rtl-ais - # misc cava - mumble discord - xwaylandvideobridge - - # hardware & shit - libplist - libimobiledevice - usbmuxd + wezterm ]) ++ (with pkgs-stable; [ wezterm diff --git a/flake.lock b/flake.lock index 1dd3478..8c0eb4c 100644 --- a/flake.lock +++ b/flake.lock @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -61,11 +61,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -91,11 +91,11 @@ ] }, "locked": { - "lastModified": 1730814269, - "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", + "lastModified": 1733318908, + "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "d70155fdc00df4628446352fc58adc640cd705c2", + "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", "type": "github" }, "original": { @@ -155,11 +155,11 @@ ] }, "locked": { - "lastModified": 1731235328, - "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=", + "lastModified": 1733484277, + "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", "owner": "nix-community", "repo": "home-manager", - "rev": "60bb110917844d354f3c18e05450606a435d2d10", + "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", "type": "github" }, "original": { @@ -204,11 +204,11 @@ ] }, "locked": { - "lastModified": 1731153869, - "narHash": "sha256-3Ftf9oqOypcEyyrWJ0baVkRpvQqroK/SVBFLvU3nPuc=", + "lastModified": 1733570843, + "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "5c74ab862c8070cbf6400128a1b56abb213656da", + "rev": "a35b08d09efda83625bef267eb24347b446c80b8", "type": "github" }, "original": { @@ -219,11 +219,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731139594, - "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", + "lastModified": 1733581040, + "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", + "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", "type": "github" }, "original": { @@ -234,16 +234,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1731239293, - "narHash": "sha256-q2yjIWFFcTzp5REWQUOU9L6kHdCDmFDpqeix86SOvDc=", + "lastModified": 1733550349, + "narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9256f7c71a195ebe7a218043d9f93390d49e6884", + "rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "type": "indirect" } }, @@ -262,11 +262,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1731356813, - "narHash": "sha256-w0TJwJwZd9so/chWYFFEtOQdnXTCvmNXIHs1FWJDlMM=", + "lastModified": 1733780592, + "narHash": "sha256-SCEjUwyt6R2+36BS7xQG+rHUrhE8HDpmRwQzKHJkimQ=", "owner": "nix-community", "repo": "nixvim", - "rev": "c892aa20732f982d4cc2b3ef2e2276a2a9a4d45b", + "rev": "cf7e026c8c86c5548d270e20c04f456939591219", "type": "github" }, "original": { @@ -285,11 +285,11 @@ ] }, "locked": { - "lastModified": 1731060242, - "narHash": "sha256-43yLsOm/wxBbfYSNDWVJeVv5Ij+23X3BIjFUfsdx/6M=", + "lastModified": 1733411491, + "narHash": "sha256-315rJ7O9cOllPDaFscnJhcMleORHbxon0Kq9LAKJ5p4=", "owner": "NuschtOS", "repo": "search", - "rev": "ef493352f9e1f051e01a55c062731503a6b36b4e", + "rev": "68e9fad70d95d08156cf10a030bd39487bed8ffe", "type": "github" }, "original": { @@ -329,11 +329,11 @@ ] }, "locked": { - "lastModified": 1730321837, - "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", + "lastModified": 1733440889, + "narHash": "sha256-qKL3vjO+IXFQ0nTinFDqNq/sbbnnS5bMI1y0xX215fU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", + "rev": "50862ba6a8a0255b87377b9d2d4565e96f29b410", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index cdceb9b..1fc29ea 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "My first flake!"; inputs = { - nixpkgs-stable.url = "nixpkgs/nixos-24.05"; + nixpkgs-stable.url = "nixpkgs/nixos-24.11"; nixpkgs.url = "nixpkgs/nixos-unstable"; home-manager.url = "github:nix-community/home-manager/release-24.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; @@ -21,8 +21,8 @@ }: let system = "x86_64-linux"; - pkgs = inputs.nixpkgs.legacyPackages.${system}; - pkgs-stable = inputs.nixpkgs-stable.legacyPackages.${system}; + pkgs = nixpkgs.legacyPackages.${system}; + pkgs-stable = nixpkgs-stable.legacyPackages.${system}; in { nixosConfigurations = { diff --git a/modules/nix/sway/raw/wezterm/wezterm.lua b/modules/nix/sway/raw/wezterm/wezterm.lua index 88e10ae..babb0c0 100755 --- a/modules/nix/sway/raw/wezterm/wezterm.lua +++ b/modules/nix/sway/raw/wezterm/wezterm.lua @@ -1,84 +1,77 @@ -local wezterm = require 'wezterm' +local wezterm = require("wezterm") local act = wezterm.action -mb = { -} +mb = {} -for i = 1,99,1 -do - table.insert(mb, - { - event = { Down = { streak = i, button = 'Middle' } }, - mods = 'NONE', - action = act.PasteFrom("PrimarySelection") +for i = 1, 99, 1 do + table.insert(mb, { + event = { Down = { streak = i, button = "Middle" } }, + mods = "NONE", + action = act.PasteFrom("PrimarySelection"), }) table.insert(mb, { - event = { Down = { streak = i, button = 'Right' } }, - mods = 'NONE', - action = wezterm.action_callback(function(window, pane) - local has_selection = window:get_selection_text_for_pane(pane) ~= '' - if has_selection then - window:perform_action( - act.CopyTo 'ClipboardAndPrimarySelection', - pane - ) - - window:perform_action(act.ClearSelection, pane) - else - window:perform_action(act.PasteFrom("PrimarySelection"), pane) - end - end), - }) + event = { Down = { streak = i, button = "Right" } }, + mods = "NONE", + action = wezterm.action_callback(function(window, pane) + local has_selection = window:get_selection_text_for_pane(pane) ~= "" + if has_selection then + window:perform_action(act.CopyTo("ClipboardAndPrimarySelection"), pane) + + window:perform_action(act.ClearSelection, pane) + else + window:perform_action(act.PasteFrom("PrimarySelection"), pane) + end + end), + }) end return { disable_default_key_bindings = true, pane_focus_follows_mouse = false, mouse_bindings = mb, --- leader = { key = 'VoidSymbol', timeout_milliseconds = 1000 }, + -- leader = { key = 'VoidSymbol', timeout_milliseconds = 1000 }, keys = { --- { --- key = 'c', --- mods = 'CTRL|SHIFT', --- action = wezterm.action.SpawnCommandInNewTab { --- args = { 'zsh' }, --- cwd = '~' --- }, --- }, + -- { + -- key = 'c', + -- mods = 'CTRL|SHIFT', + -- action = wezterm.action.SpawnCommandInNewTab { + -- args = { 'zsh' }, + -- cwd = '~' + -- }, + -- }, { - key = 'v', - mods = 'CTRL|SHIFT', + key = "v", + mods = "CTRL|SHIFT", action = act.PasteFrom("Clipboard"), }, { - key = 'c', - mods = 'CTRL|SHIFT', + key = "c", + mods = "CTRL|SHIFT", action = act.CopyTo("Clipboard"), }, { - key = 't', - mods = 'CTRL|SHIFT', - action = wezterm.action.SpawnCommandInNewTab { - args = { 'fish' }, - cwd = '~' - }, + key = "t", + mods = "CTRL|SHIFT", + action = wezterm.action.SpawnCommandInNewTab({ + args = { "fish" }, + cwd = "~", + }), }, { - key = 'f', - mods = 'CTRL', + key = "f", + mods = "CTRL", action = wezterm.action.TogglePaneZoomState, }, --- { --- key = 'p', --- mods = 'LEADER', --- action = act.ActivateTabRelative(-1), --- }, --- { --- key = 'n', --- mods = 'LEADER', --- action = act.ActivateTabRelative(1), --- }, - + -- { + -- key = 'p', + -- mods = 'LEADER', + -- action = act.ActivateTabRelative(-1), + -- }, + -- { + -- key = 'n', + -- mods = 'LEADER', + -- action = act.ActivateTabRelative(1), + -- }, }, window_padding = { left = 2, @@ -87,8 +80,8 @@ return { bottom = 0, }, window_frame = { - border_left_width = '0.5cell', - border_right_width = '0.5cell', + border_left_width = "0.5cell", + border_right_width = "0.5cell", }, window_background_opacity = 0.50, window_decorations = "NONE", @@ -98,42 +91,43 @@ return { use_fancy_tab_bar = true, scrollback_lines = 999999, enable_scroll_bar = false, - adjust_window_size_when_changing_font_size=false, + adjust_window_size_when_changing_font_size = false, -- font = wezterm.font_with_fallback({"Hack", "Twemoji"}), font_size = 15, force_reverse_video_cursor = false, colors = { ansi = { - '#1d1f21', - '#cc6666', - '#b5bd68', - '#f0c674', - '#81a2be', - '#b294bb', - '#8abeb7', - '#c5c8c6' + "#1d1f21", + "#cc6666", + "#b5bd68", + "#f0c674", + "#81a2be", + "#b294bb", + "#8abeb7", + "#c5c8c6", }, - background = '#010101', + background = "#010101", brights = { - '#969896', - '#cc6666', - '#b5bd68', - '#f0c674', - '#81a2be', - '#b294bb', - '#8abeb7', - '#ffffff' + "#969896", + "#cc6666", + "#b5bd68", + "#f0c674", + "#81a2be", + "#b294bb", + "#8abeb7", + "#ffffff", }, - foreground = '#c5c8c6', - selection_bg = '#373b41', - selection_fg = '#c5c8c6', - cursor_bg = '#c5c8c6', - cursor_border = '#c5c8c6', - cursor_fg = '#1d1f21', + foreground = "#c5c8c6", + selection_bg = "#373b41", + selection_fg = "#c5c8c6", + cursor_bg = "#c5c8c6", + cursor_border = "#c5c8c6", + cursor_fg = "#1d1f21", }, --- color_scheme = 'Catppuccin Macchiato', --- default_cursor_style = 'BlinkingBlock', --- cursor_blink_rate = 500, --- animation_fps = 100, --- front_end = "Software", + -- color_scheme = 'Catppuccin Macchiato', + -- default_cursor_style = 'BlinkingBlock', + -- cursor_blink_rate = 500, + -- animation_fps = 100, + enable_wayland = false, + front_end = "webGpu", } diff --git a/modules/nix/sway/sway.nix b/modules/nix/sway/sway.nix index 4da447e..bf5d18c 100644 --- a/modules/nix/sway/sway.nix +++ b/modules/nix/sway/sway.nix @@ -97,7 +97,7 @@ blur_passes 4 default_dim_inactive 0.2 for_window [app_id="wezterm"] blur enable - for_window [app_id="code"] blur enable + for_window [app_id="kitty"] blur enable for_window [app_id="rofi"] blur enable default_border pixel 0px default_floating_border none