diff --git a/users/blake/dots/.default.nix b/users/blake/dots/.default.nix index 38af7d8..1485ab7 100644 --- a/users/blake/dots/.default.nix +++ b/users/blake/dots/.default.nix @@ -1,8 +1,17 @@ { pkgs, + lib, config, ... -}: { - +}: let + program = ""; + cfg = config.dots.${program}; + #sec = sops.secrets; +in { + config = lib.mkIf cfg.enable { + programs.${program} = { + enable = true; + }; + }; } diff --git a/users/blake/dots/dunst/default.nix b/users/blake/dots/dunst/default.nix new file mode 100644 index 0000000..b3352a4 --- /dev/null +++ b/users/blake/dots/dunst/default.nix @@ -0,0 +1,15 @@ +{ + pkgs, + lib, + config, + ... +}: let + program = "dunst"; + cfg = config.dots.${program}; + #sec = sops.secrets; +in { + config = lib.mkIf cfg.enable { + programs.${program} = { + }; + }; +} diff --git a/users/blake/dots/git/default.nix b/users/blake/dots/git/default.nix index f779385..916160d 100644 --- a/users/blake/dots/git/default.nix +++ b/users/blake/dots/git/default.nix @@ -4,20 +4,16 @@ lib, inputs, ... -}: -let +}: let program = "git"; cfg = config.dots.${program}; #sec = sops.secrets; in { - options.dots.${program} = { enable = lib.mkEnableOption "enables ${program}"; }; config = lib.mkIf cfg.enable { - - # configure git programs.${program} = { enable = true; diff --git a/users/blake/dots/gpg/default.nix b/users/blake/dots/gpg/default.nix index 4088ae3..b14b096 100644 --- a/users/blake/dots/gpg/default.nix +++ b/users/blake/dots/gpg/default.nix @@ -3,19 +3,16 @@ lib, config, ... -}: -let +}: let program = "gpg"; cfg = config.dots.${program}; #sec = sops.secrets; in { - options.dots.${program} = { enable = lib.mkEnableOption "enables ${program}"; }; config = lib.mkIf cfg.enable { - programs.${program} = { enable = true; }; diff --git a/users/blake/dots/hypr/default.nix b/users/blake/dots/hypr/default.nix index 294e318..141e6b2 100644 --- a/users/blake/dots/hypr/default.nix +++ b/users/blake/dots/hypr/default.nix @@ -3,20 +3,16 @@ lib, config, ... -}: - -let +}: let program = "hypr"; cfg = config.dots.${program}; #sec = sops.secrets; in { - options.dots.${program} = { enable = lib.mkEnableOption "enables ${program}"; }; config = lib.mkIf cfg.enable { - home.packages = with pkgs; [ nwg-displays posy-cursors @@ -221,8 +217,8 @@ in { services.hyprpaper = { enable = true; settings = { - preload = [ "~/.nix/users/blake/assets/wallpapers/antartica.png" ]; - wallpaper = [ ",~/.nix/users/blake/assets/wallpapers/antartica.png" ]; + preload = ["~/.nix/users/blake/assets/wallpapers/antartica.png"]; + wallpaper = [",~/.nix/users/blake/assets/wallpapers/antartica.png"]; ipc = "off"; splash = false; }; @@ -306,8 +302,7 @@ in { inner_color = "$surface0"; font_color = "$text"; fade_on_empty = false; - placeholder_text = - "# 󰌾 Logged in as $USER"; + placeholder_text = "# 󰌾 Logged in as $USER"; hide_input = false; check_color = "rgb(0047ab)"; fail_color = "rgb(ff0000)"; @@ -322,43 +317,42 @@ in { }; }; - # idle daemon services.hypridle = { enable = true; settings = { # --- general settings --- general = { - lock_cmd = "pidof hyprlock || hyprlock"; # avoid multiple instances - before_sleep_cmd = "loginctl lock-session"; # lock before suspend - after_sleep_cmd = "hyprctl dispatch dpms on"; # wake display properly + lock_cmd = "pidof hyprlock || hyprlock"; # avoid multiple instances + before_sleep_cmd = "loginctl lock-session"; # lock before suspend + after_sleep_cmd = "hyprctl dispatch dpms on"; # wake display properly }; # --- dim screen --- listener = [ { - timeout = 150; # 2.5 min - on-timeout = "brightnessctl -s set 1"; # dim monitor (avoid 0 on OLED) - on-resume = "brightnessctl -r"; # restore brightness + timeout = 150; # 2.5 min + on-timeout = "brightnessctl -s set 1"; # dim monitor (avoid 0 on OLED) + on-resume = "brightnessctl -r"; # restore brightness } # --- blank screen --- { - timeout = 330; # 5.5 min - on-timeout = "hyprctl dispatch dpms off"; # turn off screen - on-resume = "hyprctl dispatch dpms on"; # restore screen + timeout = 330; # 5.5 min + on-timeout = "hyprctl dispatch dpms off"; # turn off screen + on-resume = "hyprctl dispatch dpms on"; # restore screen } # --- lock screen --- { - timeout = 900; # 15 min - on-timeout = "loginctl lock-session"; # lock screen + timeout = 900; # 15 min + on-timeout = "loginctl lock-session"; # lock screen } # --- suspend timeout --- { - timeout = 1800; # 30 min - on-timeout = "systemctl suspend"; # suspend computer + timeout = 1800; # 30 min + on-timeout = "systemctl suspend"; # suspend computer } # --- keyboard backlight (optional) --- diff --git a/users/blake/dots/lf/default.nix b/users/blake/dots/lf/default.nix index 0de999d..9ee9032 100644 --- a/users/blake/dots/lf/default.nix +++ b/users/blake/dots/lf/default.nix @@ -3,19 +3,17 @@ lib, config, ... -}: -let +}: let program = "lf"; cfg = config.dots.${program}; #sec = sops.secrets; in { - options.dots.${program} = { enable = lib.mkEnableOption "enables ${program}"; }; config = lib.mkIf cfg.enable { - # just using the normal lfrc + # just using the normal lfrc programs.${program} = { enable = false; }; diff --git a/users/blake/dots/librewolf/default.nix b/users/blake/dots/librewolf/default.nix index e8a384b..68a8501 100644 --- a/users/blake/dots/librewolf/default.nix +++ b/users/blake/dots/librewolf/default.nix @@ -3,13 +3,11 @@ lib, config, ... -}: -let +}: let program = "librewolf"; cfg = config.dots.${program}; #sec = sops.secrets; in { - options.dots.${program} = { enable = lib.mkEnableOption "enables ${program}"; }; diff --git a/users/blake/dots/nvf/default.nix b/users/blake/dots/nvf/default.nix index 51a885b..c537736 100644 --- a/users/blake/dots/nvf/default.nix +++ b/users/blake/dots/nvf/default.nix @@ -4,14 +4,11 @@ lib, inputs, ... -}: - -let +}: let program = "nvf"; cfg = config.dots.${program}; #sec = sops.secrets; in { - options.dots.${program} = { enable = lib.mkEnableOption "enables ${program}"; }; @@ -21,8 +18,6 @@ in { ]; config = lib.mkIf cfg.enable { - - programs.${program} = { enable = true; settings = { @@ -44,13 +39,13 @@ in { # visual line movement (insert mode) { key = ""; - mode = [ "i" ]; + mode = ["i"]; action = "gk"; desc = "Visual Line Up (Insert)"; } { key = ""; - mode = [ "i" ]; + mode = ["i"]; action = "gj"; desc = "Visual Line Down (Insert)"; } @@ -82,7 +77,7 @@ in { { key = "gd"; - mode = [ "n" ]; + mode = ["n"]; silent = true; action = "lua vim.lsp.buf.definition()"; desc = "Go to definition"; @@ -90,7 +85,7 @@ in { # Hover info { key = "K"; - mode = [ "n" ]; + mode = ["n"]; silent = true; action = "lua vim.lsp.buf.hover()"; desc = "Hover info"; @@ -98,7 +93,7 @@ in { # Format buffer (Alejandra for Nix) { key = "F"; - mode = [ "n" ]; + mode = ["n"]; silent = true; action = "lua vim.lsp.buf.format({ async = true })"; desc = "Format buffer"; @@ -106,7 +101,7 @@ in { # Code actions / quickfix { key = "a"; - mode = [ "n" ]; + mode = ["n"]; silent = true; action = "lua vim.lsp.buf.code_action()"; desc = "Code action"; @@ -114,7 +109,7 @@ in { # Rename symbol { key = "r"; - mode = [ "n" ]; + mode = ["n"]; silent = true; action = "lua vim.lsp.buf.rename()"; desc = "Rename symbol"; @@ -122,21 +117,21 @@ in { # Diagnostics { key = "e"; - mode = [ "n" ]; + mode = ["n"]; silent = true; action = "lua vim.diagnostic.open_float()"; desc = "Show diagnostic"; } { key = "[d"; - mode = [ "n" ]; + mode = ["n"]; silent = true; action = "lua vim.diagnostic.goto_prev()"; desc = "Previous diagnostic"; } { key = "]d"; - mode = [ "n" ]; + mode = ["n"]; silent = true; action = "lua vim.diagnostic.goto_next()"; desc = "Next diagnostic"; @@ -193,7 +188,6 @@ in { markdown.enable = true; rust.enable = true; lua.enable = true; - }; }; }; diff --git a/users/blake/dots/ssh/default.nix b/users/blake/dots/ssh/default.nix index a8971a2..16be66e 100644 --- a/users/blake/dots/ssh/default.nix +++ b/users/blake/dots/ssh/default.nix @@ -3,13 +3,11 @@ lib, config, ... -}: -let +}: let program = "ssh"; cfg = config.dots.${program}; #sec = sops.secrets; in { - options.dots.${program} = { enable = lib.mkEnableOption "enables ${program}"; }; @@ -39,7 +37,6 @@ in { #home.file.".ssh/id_snowbelle".source = config.lib.file.mkOutOfStoreSymlink /home/blake/.nix/.keyring/ssh/id_snowbelle; #home.file.".ssh/id_snowbelle.pub".source = config.lib.file.mkOutOfStoreSymlink /home/blake/.nix/.keyring/ssh/id_snowbelle.pub; - # manage secrets with sops sops.secrets = { "id_snowbelle" = { diff --git a/users/blake/dots/stylix/default.nix b/users/blake/dots/stylix/default.nix index 60a734b..6b03b2d 100644 --- a/users/blake/dots/stylix/default.nix +++ b/users/blake/dots/stylix/default.nix @@ -4,21 +4,16 @@ lib, inputs, ... -}: - -let +}: let program = "stylix"; cfg = config.dots.${program}; #sec = sops.secrets; in { - options.dots.${program} = { enable = lib.mkEnableOption "enables ${program}"; }; config = lib.mkIf cfg.enable { - imports = [inputs.stylix.homeManagerModules.default]; - }; } diff --git a/users/blake/dots/tofi/default.nix b/users/blake/dots/tofi/default.nix new file mode 100644 index 0000000..ad85c89 --- /dev/null +++ b/users/blake/dots/tofi/default.nix @@ -0,0 +1,36 @@ +{ + pkgs, + lib, + config, + ... +}: let + program = "tofi"; + cfg = config.dots.${program}; + #sec = sops.secrets; +in { + config = lib.mkIf cfg.enable { + programs.${program} = { + enable = true; + settings = { + anchor = "top"; + width = "100%"; + height = 25; + horizontal = true; + font-size = 12; + prompt-text = " select: "; + outline-width = 0; + border-width = 0; + corner-radius = 9; + background-color = "#2f1730"; + selection-color = "#ffffff"; + text-color = "#888888"; + min-input-width = 120; + result-spacing = 15; + padding-top = 0; + padding-bottom = 0; + padding-left = 0; + padding-right = 0; + }; + }; + }; +} diff --git a/users/blake/dots/waybar/default.nix b/users/blake/dots/waybar/default.nix index 256e113..09c1b28 100644 --- a/users/blake/dots/waybar/default.nix +++ b/users/blake/dots/waybar/default.nix @@ -3,20 +3,16 @@ lib, config, ... -}: -let +}: let program = "waybar"; cfg = config.dots.${program}; #sec = sops.secrets; in { - options.dots.${program} = { enable = lib.mkEnableOption "enables ${program}"; }; config = lib.mkIf cfg.enable { - - # just using the normal lfrc programs.${program} = { enable = true; @@ -29,8 +25,8 @@ in { height = 25; margin-top = 0; - modules-left = [ "hyprland/workspaces" ]; - modules-center = [ "hyprland/window" ]; + modules-left = ["hyprland/workspaces"]; + modules-center = ["hyprland/window"]; modules-right = [ "tray" "temperature" @@ -92,12 +88,12 @@ in { backlight = { device = "intel_backlight"; format = "{icon} {percent}%"; - "format-icons" = [ "☼" "☼" "☀" "☀" ]; + "format-icons" = ["☼" "☼" "☀" "☀"]; interval = 60; }; temperature = { - "hwmon-path" = [ "/sys/class/hwmon/hwmon3/temp1_input" ]; + "hwmon-path" = ["/sys/class/hwmon/hwmon3/temp1_input"]; "critical-threshold" = 70; format = ""; "format-critical" = " {temperatureC}°C"; @@ -114,7 +110,7 @@ in { }; format = "{icon} {capacity}%"; "format-charging" = " {capacity}%"; - "format-icons" = [ "" "" "" "" "" ]; + "format-icons" = ["" "" "" "" ""]; interval = 30; }; @@ -122,10 +118,8 @@ in { "format-wifi" = ""; "format-ethernet" = "󰈀"; "format-disconnected" = "󰖪"; - "tooltip-format-wifi" = - "{ifname} / {essid}\n\n {ipaddr}\n\n 󰘊 {signalStrength}% / 󰥛 {frequency}\n\n 󰕒 {bandwidthUpBits} / 󰇚 {bandwidthDownBits}"; - "tooltip-format-ethernet" = - "{ifname} / {gwaddr}\n\n {ipaddr}\n\n 󰕒 {bandwidthUpBits} / 󰇚 {bandwidthDownBits}"; + "tooltip-format-wifi" = "{ifname} / {essid}\n\n {ipaddr}\n\n 󰘊 {signalStrength}% / 󰥛 {frequency}\n\n 󰕒 {bandwidthUpBits} / 󰇚 {bandwidthDownBits}"; + "tooltip-format-ethernet" = "{ifname} / {gwaddr}\n\n {ipaddr}\n\n 󰕒 {bandwidthUpBits} / 󰇚 {bandwidthDownBits}"; "tooltip-format-disconnected" = "Disconnected"; interval = 5; "on-click" = "kitty nmtui"; @@ -147,17 +141,12 @@ in { "format-connected" = "󰂯 {device_alias}"; "format-connected-battery" = "󰥉 {device_alias} ({device_battery_percentage}%)"; "tooltip-format-off" = "Controller Powered Off"; - "tooltip-format" = - "{controller_alias}\t{controller_address}\n\n{num_connections} connected"; - "tooltip-format-connected" = - "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}"; - "tooltip-format-enumerate-connected" = - "{device_alias}\t{device_address}"; - "tooltip-format-enumerate-connected-battery" = - "{device_alias}\t{device_address}\t{device_battery_percentage}%"; + "tooltip-format" = "{controller_alias}\t{controller_address}\n\n{num_connections} connected"; + "tooltip-format-connected" = "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}"; + "tooltip-format-enumerate-connected" = "{device_alias}\t{device_address}"; + "tooltip-format-enumerate-connected-battery" = "{device_alias}\t{device_address}\t{device_battery_percentage}%"; "on-click" = "kitty bluetuith --no-warning"; - "on-click-right" = - "if bluetoothctl show|grep -q 'Powered: yes';then bluetoothctl power off;else bluetoothctl power on;fi"; + "on-click-right" = "if bluetoothctl show|grep -q 'Powered: yes';then bluetoothctl power off;else bluetoothctl power on;fi"; }; idle_inhibitor = { diff --git a/users/blake/dots/xdg/default.nix b/users/blake/dots/xdg/default.nix index 5a909f6..48a3818 100644 --- a/users/blake/dots/xdg/default.nix +++ b/users/blake/dots/xdg/default.nix @@ -3,47 +3,49 @@ lib, config, ... -}: -let +}: let program = "xdg"; cfg = config.dots.${program}; #sec = sops.secrets; in { - options.dots.${program} = { enable = lib.mkEnableOption "enables ${program}"; }; config = lib.mkIf cfg.enable { - home.packages = with pkgs; [xdg-ninja]; - xdg = if pkgs.system == "x86_64-darwin" then {} else { - enable = true; - configHome = "/home/blake/.config"; - cacheHome = "/home/blake/.cache"; - dataHome = "/home/blake/.local/share"; - stateHome = "/home/blake/.local/state"; - - userDirs = { + xdg = + if pkgs.system == "x86_64-darwin" + then {} + else { enable = true; - # writes ~/.config/user-dirs.dirs - desktop = "/home/blake/desktop"; - download = "/home/blake/downloads"; - documents = "/home/blake/documents"; - pictures = "/home/blake/pictures"; - videos = "/home/blake/videos"; - music = "/home/blake/music"; - publicShare = "/home/blake/public"; - templates = "/home/blake/templates"; + configHome = "/home/blake/.config"; + cacheHome = "/home/blake/.cache"; + dataHome = "/home/blake/.local/share"; + stateHome = "/home/blake/.local/state"; + + userDirs = { + enable = true; + # writes ~/.config/user-dirs.dirs + desktop = "/home/blake/desktop"; + download = "/home/blake/downloads"; + documents = "/home/blake/documents"; + pictures = "/home/blake/pictures"; + videos = "/home/blake/videos"; + music = "/home/blake/music"; + publicShare = "/home/blake/public"; + templates = "/home/blake/templates"; + }; }; - }; # misc env variables to get things out of ~ (<3 xdg-ninja) - home.sessionVariables = if pkgs.system == "x86_64-darwin" then {} else { - GOPATH="$XDG_DATA_HOME/go"; - _JAVA_OPTIONS=''-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java''; - }; - + home.sessionVariables = + if pkgs.system == "x86_64-darwin" + then {} + else { + GOPATH = "$XDG_DATA_HOME/go"; + _JAVA_OPTIONS = ''-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java''; + }; }; } diff --git a/users/blake/dots/zsh/default.nix b/users/blake/dots/zsh/default.nix index 2216392..b3fc5a5 100644 --- a/users/blake/dots/zsh/default.nix +++ b/users/blake/dots/zsh/default.nix @@ -3,19 +3,16 @@ lib, config, ... -}: -let +}: let program = "zsh"; cfg = config.dots.${program}; #sec = sops.secrets; in { - options.dots.${program} = { enable = lib.mkEnableOption "enables ${program}"; }; config = lib.mkIf cfg.enable { - # export some defaults home.sessionVariables = { EDITOR = "nvim"; diff --git a/users/blake/hosts/yveltal.nix b/users/blake/hosts/yveltal.nix index 87603c3..e35d8a8 100644 --- a/users/blake/hosts/yveltal.nix +++ b/users/blake/hosts/yveltal.nix @@ -17,6 +17,7 @@ librewolf.enable = true; waybar.enable = true; hypr.enable = true; + tofi.enable = true; nvf.enable = true; zsh.enable = true; ssh.enable = true;