From 4fa766998c19607ce7eaac55694d97440cbab606 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Sun, 24 Dec 2023 22:31:24 -0700 Subject: maybe the end bit matters --- modules/users/defin.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'modules') diff --git a/modules/users/defin.nix b/modules/users/defin.nix index 1469b93..86fe112 100644 --- a/modules/users/defin.nix +++ b/modules/users/defin.nix @@ -14,6 +14,7 @@ openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCmzvB5AfjjioiGywizWdBVsarvOSw4YGhgxhk8w34rZA4DghCXme8ILbkk4x4k+VTC6dPVKkvjPY1nn+qx1BtySSSj30Oez7iIqmMH2DvsQMa4zBPe6W4CUo76HrkqR4+rghto8fYZFCo6JhScUr48TvpGIEqsWRQxIGXvFpAazmu1OlsycWatruYwJby5wg2ZIEL9Ci0OHdwGfU1OTexY1Bl03s5Qr6dodvdwSc0ft6Qtv/ijy7iC3ySB2NhirUfDOtS8ysV3yhyxlcXgdI1vksZ6GIoB7TsfdcnpCMcOPSGvQLnAY4+5IDQElkC2igSBSiuUbqDbzNSRw+ctHsoqKAyjAob51XphVJh7CcgBkFufSTJLsOBhyyZSrEBlNB7AHJrFQSnoYYlFjILx4gfcqBxDMOSFL1CiarOq3oZ+udaX06uhIjVXzZhkggqxrCRRwOtPd6eKbuK+2oa0h93QtKQQhrwXCpbVRBe5V3u3i4I7xFFMpYJ3Kcteiua1qxKhF9RNP4zJPDzYyxfiDOWEbMxnyEwFENvVgkdPIaFSEtjvzmdEfWRJ9RBlS5H/7hr48Q1berhT8dMoB55xNiQhD2GTqWX81kzjSHzeeakXTzwmgJUhfbMP7E3ndSaeY0MW6U8MYF0f1ZfaL0jFMWo1G8bv2ptayMpykHdTWSXfpQ== defin@gpg" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKm9srflwzQ4CECjDj8Il1aRcnt2rFc4w6mSSMOYds3F defin@allseries" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKm9srflwzQ4CECjDj8Il1aRcnt2rFc4w6mSSMOYds3F defin@khad" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBxVpBnkWiukuHNt81K2gRNVjOdz9lFiaw0fhZ4CcB3R gitlab" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQD44/CafgJ4GbSwx1ZUQUTnHEi7SKltggN4k9I6ghiSUv8znYdzxa5nDZIF38DkNPG4YqBY2LX+i5XVfvc68P8hgiwCFISEa5orQhTusRAPxyrI8QC75Ez7so/WnRMCckIj/7JprLzo/v3NBieC1OoXiFUxoUhHwVll2siBhHYItzF6IkytKb0G5ZK3V0B6fetw3TY9pMEE1Tcr4VapFDj9neVJxYh1rKR8zjU24uSOWtW/+d4cZIfzVj2ZUS92IO/lwjtzeZwzr3TEkejSaQYZR/WF1oFUs2ZO4bwBn7cvgqHhXbkIKkLjDU8EdwdaOOyWJyZje5Hw96BSQSHuu214l4/lna1iQJpMzr5qESQ7hJqlUupkEiKbCmL0rjJobE84loENq41TBi8292Ve1jV8DWgQVo90rJ/SCcAJvIWQTYDkdEz2y+5NwhwS2T8Ew9h6vs2iN+pcL9PJxFaYcbiHnBj49Gh4J6ARyZtPMvCeI4n7CuJ8K2qjQV36Tt81krs= defin@doretta" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBrDUymBW+rosSI68sxDKLMfH7cOPPLG5K+CuA6aYcsp defin@bosco" -- cgit v1.2.3 From 9a4772d6cd8917a33e719b6f746b3d2ef416043b Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Fri, 12 Jan 2024 01:49:08 -0700 Subject: add font for waybar --- modules/nixos/hyprland.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix index 3ccc77c..42d061e 100644 --- a/modules/nixos/hyprland.nix +++ b/modules/nixos/hyprland.nix @@ -74,7 +74,10 @@ xfce.thunar # sfce4's file manager ]; + fonts.packages = with pkgs; [ + font-awesome # fixes waybar fonts + ]; # fix https://github.com/ryan4yin/nix-config/issues/10 security.pam.services.swaylock = {}; -} \ No newline at end of file +} -- cgit v1.2.3 From d7048b62427abc75fc540aa189c4bb488342ba2d Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Fri, 12 Jan 2024 03:34:46 -0700 Subject: messing with generating custom themes for helix --- modules/home-manager/helix.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'modules') diff --git a/modules/home-manager/helix.nix b/modules/home-manager/helix.nix index d93a2ea..6eb8895 100644 --- a/modules/home-manager/helix.nix +++ b/modules/home-manager/helix.nix @@ -6,6 +6,12 @@ enable = true; package = pkgs.helix; # defaultEditor = true; + # themes = { + # custom = { + # "inherits" = "catpuccin_mocha"; + # "ui.background" = {}; + # }; + # }; settings = { theme = "catppuccin_mocha"; editor = { -- cgit v1.2.3 From 6fa75a34e7a595908f611e69d6bdd1aee2058686 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Fri, 12 Jan 2024 07:49:13 -0700 Subject: use catppuccin theme for nushell --- modules/home-manager/shell.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/home-manager/shell.nix b/modules/home-manager/shell.nix index cd35607..c1bcab9 100644 --- a/modules/home-manager/shell.nix +++ b/modules/home-manager/shell.nix @@ -1,4 +1,4 @@ -{nushell-scripts, ... }: { +k{nushell-scripts, ... }: { programs.nushell = { enable = true; shellAliases = { @@ -24,6 +24,8 @@ source ${nushell-scripts}/custom-completions/cargo/cargo-completions.nu source ${nushell-scripts}/custom-completions/make/make-completions.nu source ${nushell-scripts}/custom-completions/git/git-completions.nu + source ${nushell-scripts}/themes/nu-themes/catppuccin-mocha.nu + $env.config = ($env.config | merge {color_config: (catppuccin-mocha)}) ''; }; } -- cgit v1.2.3 From bb099942ebb992beb786a01d1107f4b294121583 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Fri, 12 Jan 2024 07:51:37 -0700 Subject: typo --- modules/home-manager/shell.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/home-manager/shell.nix b/modules/home-manager/shell.nix index c1bcab9..2e6a0df 100644 --- a/modules/home-manager/shell.nix +++ b/modules/home-manager/shell.nix @@ -1,4 +1,4 @@ -k{nushell-scripts, ... }: { +{nushell-scripts, ... }: { programs.nushell = { enable = true; shellAliases = { -- cgit v1.2.3 From 54ed0dc9c93fecfe60f9b4feec911ea8b58c32a0 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Fri, 12 Jan 2024 07:57:05 -0700 Subject: bugfix theme --- modules/home-manager/shell.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/home-manager/shell.nix b/modules/home-manager/shell.nix index 2e6a0df..3224f8d 100644 --- a/modules/home-manager/shell.nix +++ b/modules/home-manager/shell.nix @@ -24,7 +24,7 @@ source ${nushell-scripts}/custom-completions/cargo/cargo-completions.nu source ${nushell-scripts}/custom-completions/make/make-completions.nu source ${nushell-scripts}/custom-completions/git/git-completions.nu - source ${nushell-scripts}/themes/nu-themes/catppuccin-mocha.nu + use ${nushell-scripts}/themes/nu-themes/catppuccin-mocha.nu $env.config = ($env.config | merge {color_config: (catppuccin-mocha)}) ''; }; -- cgit v1.2.3 From a277f8c32dd55e7a7f16fcb161a53cd338baf81b Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Fri, 12 Jan 2024 10:34:28 -0700 Subject: unused binding --- modules/nixos/tailscale.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/nixos/tailscale.nix b/modules/nixos/tailscale.nix index e73aec9..774a959 100644 --- a/modules/nixos/tailscale.nix +++ b/modules/nixos/tailscale.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: { +{ config, ... }: { services.tailscale = { enable = true; extraUpFlags = [ -- cgit v1.2.3 From b264393480f0311fc6d6bd45770bce26d204a0b7 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Fri, 12 Jan 2024 11:29:38 -0700 Subject: configuring waybar for first time --- modules/home-manager/waybar.nix | 85 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 modules/home-manager/waybar.nix (limited to 'modules') diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix new file mode 100644 index 0000000..a865499 --- /dev/null +++ b/modules/home-manager/waybar.nix @@ -0,0 +1,85 @@ +{ config, ... }: { + programs.waybar = { + enable = true; + systemd.enable = true; + systemd.target = "hyprland-session.target"; + settings = { + mainBar = { + layer = "top"; + position = "top"; + height = 40; + }; + modules-left = [ "tray" "hyprland/workspaces" ]; + modules-center = [ "clock" ]; + modules-right = [ "wireplumber" "bluetooth" "network" "backlight/slider" "battery" "temperature" "memory" "keyboard_state" ]; + + "tray" = { + icon-size = 21; + spacing = 10; + }; + "wireplumber" = { + format = "{volume}% {icon}"; + format-muted = ""; + on-click = "helvum"; + format-icons = [ "" "" "" ]; + max-volume = 150; + scroll-step = 0.2; + }; + "backlight/slider" = { + min = 1; + max = 100; + orientation = "horizontal"; + # device = "intel_backlight"; + }; + "clock" = { + format = "{:%H:%M}  "; + format-alt = "{:%A, %B %d, %Y (%R)}  "; + timezone = config.time.timeZone; + tooltip-format = "{calendar}"; + calendar = { + mode = "year"; + mode-mon-col = 3; + weeks-pos = "right"; + on-scroll = 1; + on-right-click = "mode"; + format = { + months = "{}"; + days = "{}"; + weeks = "W{}"; + weekdays = "{}"; + today = "{}"; + }; + }; + }; + "battery" = { + interval = 60; + states = { + "warning" = 30; + "critical" = 15; + }; + format = "{capacity}% {icon}"; + format-icons = [ "" "" "" "" "" ]; + max-length = 25; + }; + "memory" = { + format = "{used:0.1f}G/{total:0.1f}G "; + }; + "temperature" = { + format = "{temperatureC}°C "; + }; + "keyboard-state" = { + numlock = true; + capslock = true; + "format" = { + numlock = "N {icon}"; + # capslock = "C {icon}"; + }; + "format-icons" = { + locked = ""; + unlocked = ""; + }; + }; + }; + }; + +} -- cgit v1.2.3 From 6943c98073e292b5056fc593d3cd8ad46d6cf983 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Fri, 12 Jan 2024 11:44:00 -0700 Subject: not sure how to get system variable into home manager module --- modules/home-manager/waybar.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix index a865499..efee997 100644 --- a/modules/home-manager/waybar.nix +++ b/modules/home-manager/waybar.nix @@ -34,7 +34,8 @@ "clock" = { format = "{:%H:%M}  "; format-alt = "{:%A, %B %d, %Y (%R)}  "; - timezone = config.time.timeZone; + # timezone = config.time.timeZone; + timezone = "US/Mountain"; tooltip-format = "{calendar}"; calendar = { mode = "year"; -- cgit v1.2.3 From e315b06f07a9d38eff798fa3ee051a2fed0e1b9e Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Fri, 12 Jan 2024 12:09:37 -0700 Subject: waybar config should be fixed, all settings needed to be in main --- modules/home-manager/waybar.nix | 110 ++++++++++++++++++++-------------------- 1 file changed, 55 insertions(+), 55 deletions(-) (limited to 'modules') diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix index efee997..aad658c 100644 --- a/modules/home-manager/waybar.nix +++ b/modules/home-manager/waybar.nix @@ -8,42 +8,41 @@ layer = "top"; position = "top"; height = 40; - }; - modules-left = [ "tray" "hyprland/workspaces" ]; - modules-center = [ "clock" ]; - modules-right = [ "wireplumber" "bluetooth" "network" "backlight/slider" "battery" "temperature" "memory" "keyboard_state" ]; + modules-left = [ "tray" "hyprland/workspaces" ]; + # modules-center = [ "clock" ]; + modules-right = [ "wireplumber" "bluetooth" "network" "backlight/slider" "battery" "temperature" "memory" "keyboard_state" ]; - "tray" = { - icon-size = 21; - spacing = 10; - }; - "wireplumber" = { - format = "{volume}% {icon}"; - format-muted = ""; - on-click = "helvum"; - format-icons = [ "" "" "" ]; - max-volume = 150; - scroll-step = 0.2; - }; - "backlight/slider" = { - min = 1; - max = 100; - orientation = "horizontal"; - # device = "intel_backlight"; - }; - "clock" = { - format = "{:%H:%M}  "; - format-alt = "{:%A, %B %d, %Y (%R)}  "; - # timezone = config.time.timeZone; - timezone = "US/Mountain"; - tooltip-format = "{calendar}"; - calendar = { + "tray" = { + icon-size = 21; + spacing = 10; + }; + "wireplumber" = { + format = "{volume}% {icon}"; + format-muted = ""; + on-click = "helvum"; + format-icons = [ "" "" "" ]; + max-volume = 150; + scroll-step = 0.2; + }; + "backlight/slider" = { + min = 1; + max = 100; + orientation = "horizontal"; + # device = "intel_backlight"; + }; + "clock" = { + format = "{:%H:%M}  "; + format-alt = "{:%A, %B %d, %Y (%R)}  "; + # timezone = config.time.timeZone; + timezone = "US/Mountain"; + tooltip-format = "{calendar}"; + "calendar" = { mode = "year"; mode-mon-col = 3; weeks-pos = "right"; on-scroll = 1; on-right-click = "mode"; - format = { + "format" = { months = "{}"; days = "{}"; weeks = "W{}"; @@ -51,33 +50,34 @@ today = "{}"; }; }; - }; - "battery" = { - interval = 60; - states = { - "warning" = 30; - "critical" = 15; }; - format = "{capacity}% {icon}"; - format-icons = [ "" "" "" "" "" ]; - max-length = 25; - }; - "memory" = { - format = "{used:0.1f}G/{total:0.1f}G "; - }; - "temperature" = { - format = "{temperatureC}°C "; - }; - "keyboard-state" = { - numlock = true; - capslock = true; - "format" = { - numlock = "N {icon}"; - # capslock = "C {icon}"; + "battery" = { + interval = 60; + states = { + "warning" = 30; + "critical" = 15; + }; + format = "{capacity}% {icon}"; + format-icons = [ "" "" "" "" "" ]; + max-length = 25; }; - "format-icons" = { - locked = ""; - unlocked = ""; + "memory" = { + format = "{used:0.1f}G/{total:0.1f}G "; + }; + "temperature" = { + format = "{temperatureC}°C "; + }; + "keyboard-state" = { + numlock = true; + capslock = true; + "format" = { + numlock = "N {icon}"; + # capslock = "C {icon}"; + }; + "format-icons" = { + locked = ""; + unlocked = ""; + }; }; }; }; -- cgit v1.2.3 From 7d5baf5ccdb64fc1b8009667675dc75bfbde8d4c Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Fri, 12 Jan 2024 12:11:35 -0700 Subject: forget to re-enable clock --- modules/home-manager/waybar.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix index aad658c..d6619cb 100644 --- a/modules/home-manager/waybar.nix +++ b/modules/home-manager/waybar.nix @@ -9,7 +9,7 @@ position = "top"; height = 40; modules-left = [ "tray" "hyprland/workspaces" ]; - # modules-center = [ "clock" ]; + modules-center = [ "clock" ]; modules-right = [ "wireplumber" "bluetooth" "network" "backlight/slider" "battery" "temperature" "memory" "keyboard_state" ]; "tray" = { -- cgit v1.2.3 From b0840aab7d0639e2c41d82b48663e1746fcdd7b6 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Fri, 12 Jan 2024 12:29:16 -0700 Subject: swiped a few more settings from default config --- modules/home-manager/waybar.nix | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) (limited to 'modules') diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix index d6619cb..a965cba 100644 --- a/modules/home-manager/waybar.nix +++ b/modules/home-manager/waybar.nix @@ -8,21 +8,43 @@ layer = "top"; position = "top"; height = 40; - modules-left = [ "tray" "hyprland/workspaces" ]; + modules-left = [ "hyprland/workspaces" ]; modules-center = [ "clock" ]; - modules-right = [ "wireplumber" "bluetooth" "network" "backlight/slider" "battery" "temperature" "memory" "keyboard_state" ]; + modules-right = [ "wireplumber" "bluetooth" "network" "backlight/slider" "battery" "temperature" "memory" "keyboard_state" "tray" ]; "tray" = { icon-size = 21; spacing = 10; }; "wireplumber" = { - format = "{volume}% {icon}"; - format-muted = ""; on-click = "helvum"; - format-icons = [ "" "" "" ]; max-volume = 150; scroll-step = 0.2; + + format = "{volume}% {icon} {format_source}"; + format-bluetooth = "{volume}% {icon} {format_source}"; + format-bluetooth-muted = " {icon} {format_source}"; + format-muted = " {format_source}"; + format-source = "{volume}% "; + format-source-muted = ""; + format-icons = { + headphone = ""; + hands-free = ""; + headset = ""; + phone = ""; + portable = ""; + car = ""; + default = [ "" "" "" ]; + }; + # on-click = "pavucontrol" + }; + "network" = { + format-wifi = "{essid} ({signalStrength}%) "; + format-ethernet = "{ipaddr}/{cidr} "; + tooltip-format = "{ifname} via {gwaddr} "; + format-linked = "{ifname} (No IP) "; + format-disconnected = "Disconnected ⚠"; + format-alt = "{ifname}: {ipaddr}/{cidr}"; }; "backlight/slider" = { min = 1; -- cgit v1.2.3 From 21012fb0f0c6bb90c1be206c10a7e171516f7272 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Fri, 12 Jan 2024 12:50:17 -0700 Subject: wireplumber waybard module has few options, and default pulseaudio options work --- modules/home-manager/waybar.nix | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) (limited to 'modules') diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix index a965cba..c94deef 100644 --- a/modules/home-manager/waybar.nix +++ b/modules/home-manager/waybar.nix @@ -10,17 +10,14 @@ height = 40; modules-left = [ "hyprland/workspaces" ]; modules-center = [ "clock" ]; - modules-right = [ "wireplumber" "bluetooth" "network" "backlight/slider" "battery" "temperature" "memory" "keyboard_state" "tray" ]; + modules-right = [ "pulseaudio" "bluetooth" "network" "backlight/slider" "battery" "temperature" "memory" "keyboard_state" "tray" ]; "tray" = { icon-size = 21; spacing = 10; }; - "wireplumber" = { - on-click = "helvum"; - max-volume = 150; - scroll-step = 0.2; - + "pulseaudio" = { + # // "scroll-step": 1, // %, can be a float format = "{volume}% {icon} {format_source}"; format-bluetooth = "{volume}% {icon} {format_source}"; format-bluetooth-muted = " {icon} {format_source}"; @@ -36,6 +33,27 @@ car = ""; default = [ "" "" "" ]; }; + on-click = "pavucontrol"; + }; + "wireplumber" = { + on-click = "helvum"; + max-volume = 150; + scroll-step = 0.2; + + # format-bluetooth = "{volume}% {icon} {format_source}"; + # format-bluetooth-muted = " {icon} {format_source}"; + format-muted = " "; + format = "{volume}% {icon} "; + # format-source-muted = ""; + format-icons = { + # headphone = ""; + # hands-free = ""; + # headset = ""; + # phone = ""; + # portable = ""; + # car = ""; + default = [ "" "" "" ]; + }; # on-click = "pavucontrol" }; "network" = { -- cgit v1.2.3 From 0b552aa92460acd5dd5357b5101f7d97a4840198 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Fri, 12 Jan 2024 12:53:58 -0700 Subject: add cpu monitor to waybar --- modules/home-manager/waybar.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix index c94deef..83161ce 100644 --- a/modules/home-manager/waybar.nix +++ b/modules/home-manager/waybar.nix @@ -10,7 +10,7 @@ height = 40; modules-left = [ "hyprland/workspaces" ]; modules-center = [ "clock" ]; - modules-right = [ "pulseaudio" "bluetooth" "network" "backlight/slider" "battery" "temperature" "memory" "keyboard_state" "tray" ]; + modules-right = [ "pulseaudio" "bluetooth" "network" "backlight/slider" "battery" "cpu" "temperature" "memory" "keyboard_state" "tray" ]; "tray" = { icon-size = 21; @@ -101,6 +101,10 @@ format-icons = [ "" "" "" "" "" ]; max-length = 25; }; + cpu = { + format = "{usage}% "; + tooltip = false; + }; "memory" = { format = "{used:0.1f}G/{total:0.1f}G "; }; -- cgit v1.2.3 From a70825ffcadd2806f89d3e8042c2ebcfaf85f4eb Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Fri, 12 Jan 2024 13:08:00 -0700 Subject: added idle inhibitor and cleared up formatting --- modules/home-manager/waybar.nix | 52 +++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 23 deletions(-) (limited to 'modules') diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix index 83161ce..c35bc75 100644 --- a/modules/home-manager/waybar.nix +++ b/modules/home-manager/waybar.nix @@ -10,12 +10,19 @@ height = 40; modules-left = [ "hyprland/workspaces" ]; modules-center = [ "clock" ]; - modules-right = [ "pulseaudio" "bluetooth" "network" "backlight/slider" "battery" "cpu" "temperature" "memory" "keyboard_state" "tray" ]; + modules-right = [ "idle_inhibitor" "pulseaudio" "bluetooth" "network" "backlight/slider" "battery" "cpu" "temperature" "memory" "keyboard_state" "tray" ]; "tray" = { icon-size = 21; spacing = 10; }; + "idle_inhibitor" = { + format = "{icon}"; + format-icons = { + activated = ""; + deactivated = ""; + }; + }; "pulseaudio" = { # // "scroll-step": 1, // %, can be a float format = "{volume}% {icon} {format_source}"; @@ -24,7 +31,7 @@ format-muted = " {format_source}"; format-source = "{volume}% "; format-source-muted = ""; - format-icons = { + "format-icons" = { headphone = ""; hands-free = ""; headset = ""; @@ -71,26 +78,26 @@ # device = "intel_backlight"; }; "clock" = { - format = "{:%H:%M}  "; - format-alt = "{:%A, %B %d, %Y (%R)}  "; - # timezone = config.time.timeZone; - timezone = "US/Mountain"; - tooltip-format = "{calendar}"; - "calendar" = { - mode = "year"; - mode-mon-col = 3; - weeks-pos = "right"; - on-scroll = 1; - on-right-click = "mode"; - "format" = { - months = "{}"; - days = "{}"; - weeks = "W{}"; - weekdays = "{}"; - today = "{}"; + format = "{:%H:%M}  "; + format-alt = "{:%A, %B %d, %Y (%R)}  "; + # timezone = config.time.timeZone; + timezone = "US/Mountain"; + tooltip-format = "{calendar}"; + "calendar" = { + mode = "year"; + mode-mon-col = 3; + weeks-pos = "right"; + on-scroll = 1; + on-right-click = "mode"; + "format" = { + months = "{}"; + days = "{}"; + weeks = "W{}"; + weekdays = "{}"; + today = "{}"; + }; }; }; - }; "battery" = { interval = 60; states = { @@ -101,7 +108,7 @@ format-icons = [ "" "" "" "" "" ]; max-length = 25; }; - cpu = { + "cpu" = { format = "{usage}% "; tooltip = false; }; @@ -125,6 +132,5 @@ }; }; }; - }; - + }; } -- cgit v1.2.3 From 5ca074c476dfa4d8e81ebfee257810f61a16d110 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Sat, 13 Jan 2024 09:10:04 -0700 Subject: add file for swaylock config --- modules/home-manager/swaylock.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 modules/home-manager/swaylock.nix (limited to 'modules') diff --git a/modules/home-manager/swaylock.nix b/modules/home-manager/swaylock.nix new file mode 100644 index 0000000..07043ea --- /dev/null +++ b/modules/home-manager/swaylock.nix @@ -0,0 +1,18 @@ +{ ... }: { + programs.swaylock.enable = true; + progrmas.swaylock.settingss = { + indicator-radius = 100; + indicator-thickness = 7; + ring-color = "455a64"; + key-hl-color = "be5046"; + text-color = "ffc107"; + line-color = 00000000; + inside-color = 00000088; + separator-color = 00000000; + fade-in = 4; + effect-blur = "7x3"; + effect-scale = 2; + effect-vignette = "0.5:0.5"; + # effect-compose = [ "0,1.5%;-1x10%;$HOME/.config/sway/lock.svg" "$@" ]; + }; +} -- cgit v1.2.3 From fc14db1e2490cb1d0395f17eb8e8279678202a7b Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Sat, 13 Jan 2024 09:11:49 -0700 Subject: typo --- modules/home-manager/swaylock.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/home-manager/swaylock.nix b/modules/home-manager/swaylock.nix index 07043ea..ccadabc 100644 --- a/modules/home-manager/swaylock.nix +++ b/modules/home-manager/swaylock.nix @@ -1,6 +1,6 @@ { ... }: { programs.swaylock.enable = true; - progrmas.swaylock.settingss = { + programs.swaylock.settingss = { indicator-radius = 100; indicator-thickness = 7; ring-color = "455a64"; -- cgit v1.2.3 From 7b9864af9e84a3809ca8b29e38ec92270559470a Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Sat, 13 Jan 2024 09:12:41 -0700 Subject: another typo --- modules/home-manager/swaylock.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/home-manager/swaylock.nix b/modules/home-manager/swaylock.nix index ccadabc..25b2c48 100644 --- a/modules/home-manager/swaylock.nix +++ b/modules/home-manager/swaylock.nix @@ -1,6 +1,6 @@ { ... }: { programs.swaylock.enable = true; - programs.swaylock.settingss = { + programs.swaylock.settings = { indicator-radius = 100; indicator-thickness = 7; ring-color = "455a64"; -- cgit v1.2.3 From a3aa87695d3b7fb141489cb3eaa137a2f4f6549b Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Sat, 13 Jan 2024 10:02:37 -0700 Subject: added config for swayidle --- modules/home-manager/swayidle.nix | 30 ++++++++++++++++++++++++++++++ modules/nixos/hyprland.nix | 3 ++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 modules/home-manager/swayidle.nix (limited to 'modules') diff --git a/modules/home-manager/swayidle.nix b/modules/home-manager/swayidle.nix new file mode 100644 index 0000000..14c6831 --- /dev/null +++ b/modules/home-manager/swayidle.nix @@ -0,0 +1,30 @@ +{ pkgs, ... }: { + services.swayidle = { + enable = true; + systemdTarget = "hyprland-session.target"; + timeouts = + let + dpmsCommand = "${pkgs.hyprctl}/bin/hyprctl dispatch dpms"; + brightnessCommand = "${pkgs.brightnessctl}/bin/brightnessctl -s %% brightnessctl s"; + in + [ + { #timeout 180 + timeout = 3; + command = "${brightnessCommand} 15%"; + resumeCommand = "brightnessctl -r"; + } + { + #timeout 300 + timeout = 5; + command = "${dpmsCommand} off && swaylock --screenshots --clock --indicator-idle-visible --grace 10"; + resumeCommand = "${dpmsCommand} on"; + } + { #timeout 420 + timeout = 7; + command = "${brightnessCommand} 0%"; + resumeCommand = "brightnessctl -r"; + } + ]; + events.before-sleep.event = "swaylock"; + }; +} diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix index 42d061e..4ab6088 100644 --- a/modules/nixos/hyprland.nix +++ b/modules/nixos/hyprland.nix @@ -51,7 +51,8 @@ waybar # the status bar swaybg # the wallpaper swayidle # the idle timeout - swaylock # locking the screen + swaylock-effects # locking the screen + brightnessctl # control device brightness wlogout # logout menu wl-clipboard # copying and pasting hyprpicker # color picker -- cgit v1.2.3 From 1b73ac2ff1de54e375e38db7c9e904926e8e9198 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Sat, 13 Jan 2024 10:05:35 -0700 Subject: hyprctl is owned by hyprland package --- modules/home-manager/swayidle.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/home-manager/swayidle.nix b/modules/home-manager/swayidle.nix index 14c6831..d2974e1 100644 --- a/modules/home-manager/swayidle.nix +++ b/modules/home-manager/swayidle.nix @@ -4,7 +4,7 @@ systemdTarget = "hyprland-session.target"; timeouts = let - dpmsCommand = "${pkgs.hyprctl}/bin/hyprctl dispatch dpms"; + dpmsCommand = "${pkgs.hyprland}/bin/hyprctl dispatch dpms"; brightnessCommand = "${pkgs.brightnessctl}/bin/brightnessctl -s %% brightnessctl s"; in [ -- cgit v1.2.3 From be2ec73c211a730b2b84de12f3439d03b9e95d75 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Sat, 13 Jan 2024 10:07:31 -0700 Subject: nix search and nix run aliases --- modules/home-manager/shell.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'modules') diff --git a/modules/home-manager/shell.nix b/modules/home-manager/shell.nix index 3224f8d..12d3805 100644 --- a/modules/home-manager/shell.nix +++ b/modules/home-manager/shell.nix @@ -13,6 +13,8 @@ # egpu = "(DRI_PRIME=pci-0000_05_00_0 glxinfo | grep 'OpenGL renderer')"; # checkgpu = "(lspci | grep VGA)"; cat = "bat -f # --paging never"; + search = "nix search nixpkgs#"; + run- = "nix run nixpkgs#"; }; configFile.source = ../../resources/nushell/config.nu; extraConfig = '' -- cgit v1.2.3 From 6c9ff5ce3efcea9f3d20f12cb293e7d6420570b5 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Sat, 13 Jan 2024 10:08:23 -0700 Subject: swayidle effects need to be configured like timers to work --- modules/home-manager/swayidle.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/home-manager/swayidle.nix b/modules/home-manager/swayidle.nix index d2974e1..d9fbc98 100644 --- a/modules/home-manager/swayidle.nix +++ b/modules/home-manager/swayidle.nix @@ -25,6 +25,6 @@ resumeCommand = "brightnessctl -r"; } ]; - events.before-sleep.event = "swaylock"; + # events.before-sleep.event = "swaylock"; }; } -- cgit v1.2.3 From 085b4c42e6dfca8e12ebfa68a421b91feec34986 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Sat, 13 Jan 2024 10:30:35 -0700 Subject: fixing swaylock config --- modules/home-manager/swayidle.nix | 2 +- modules/home-manager/swaylock.nix | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'modules') diff --git a/modules/home-manager/swayidle.nix b/modules/home-manager/swayidle.nix index d9fbc98..19cd171 100644 --- a/modules/home-manager/swayidle.nix +++ b/modules/home-manager/swayidle.nix @@ -16,7 +16,7 @@ { #timeout 300 timeout = 5; - command = "${dpmsCommand} off && swaylock --screenshots --clock --indicator-idle-visible --grace 10"; + command = "${dpmsCommand} off && swaylock"; resumeCommand = "${dpmsCommand} on"; } { #timeout 420 diff --git a/modules/home-manager/swaylock.nix b/modules/home-manager/swaylock.nix index 25b2c48..745d3ef 100644 --- a/modules/home-manager/swaylock.nix +++ b/modules/home-manager/swaylock.nix @@ -1,6 +1,11 @@ -{ ... }: { +{ pkgs, ... }: { programs.swaylock.enable = true; - programs.swaylock.settings = { + programs.swaylock.package = pkgs.swaylock-effects; + programs.swaylock.settings = { + ignore-empty-password = true; + clock = true; + screenshots = true; + grace = 10; indicator-radius = 100; indicator-thickness = 7; ring-color = "455a64"; -- cgit v1.2.3 From f3387c888aba10dc6315a838358303e79a624acd Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Sat, 13 Jan 2024 23:35:00 -0700 Subject: nix run alias doesn't because of missing space --- modules/home-manager/shell.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'modules') diff --git a/modules/home-manager/shell.nix b/modules/home-manager/shell.nix index 12d3805..612c92a 100644 --- a/modules/home-manager/shell.nix +++ b/modules/home-manager/shell.nix @@ -14,7 +14,6 @@ # checkgpu = "(lspci | grep VGA)"; cat = "bat -f # --paging never"; search = "nix search nixpkgs#"; - run- = "nix run nixpkgs#"; }; configFile.source = ../../resources/nushell/config.nu; extraConfig = '' -- cgit v1.2.3 From 48d1d6a12cc7a0dd55aa680ff47c7cb11c334b67 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Mon, 15 Jan 2024 00:17:34 -0700 Subject: disaable root password auth --- modules/users/root.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'modules') diff --git a/modules/users/root.nix b/modules/users/root.nix index 7fb9418..9464651 100644 --- a/modules/users/root.nix +++ b/modules/users/root.nix @@ -6,4 +6,5 @@ hashedPassword = "$6$UljPNAdxZ22lP3Bc$8VaEAacZxtXM3Zji2IA7Jf5fXs9pFnAVQff1d8IbfFOKCvjibceyopOAjRXa8lXtpOSJgPW1OO1dzOspqhWnz0"; }; }; + services.openssh.settings.PasswordAuthentication = false; } -- cgit v1.2.3 From be4e071bd2f412759f4a3d9b1e736e2bc30b1172 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Thu, 18 Jan 2024 12:46:37 -0700 Subject: added gnome-keyring --- modules/nixos/hyprland.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'modules') diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix index 4ab6088..6e9f770 100644 --- a/modules/nixos/hyprland.nix +++ b/modules/nixos/hyprland.nix @@ -74,6 +74,7 @@ networkmanagerapplet # provide GUI app: nm-connection-editor xfce.thunar # sfce4's file manager + gnome-keyring # for remembering wifi passwords ]; fonts.packages = with pkgs; [ font-awesome # fixes waybar fonts -- cgit v1.2.3 From fedc948df7883e41dd88e38e388a6684d312ab84 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Thu, 18 Jan 2024 12:47:22 -0700 Subject: waybar timezone can now update with system --- modules/home-manager/waybar.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules') diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix index c35bc75..0e02ded 100644 --- a/modules/home-manager/waybar.nix +++ b/modules/home-manager/waybar.nix @@ -80,8 +80,8 @@ "clock" = { format = "{:%H:%M}  "; format-alt = "{:%A, %B %d, %Y (%R)}  "; - # timezone = config.time.timeZone; - timezone = "US/Mountain"; + timezone = config.time.timeZone; + # timezone = "US/Mountain"; tooltip-format = "{calendar}"; "calendar" = { mode = "year"; -- cgit v1.2.3 From a92a19d146b11513e5527ab93ecae020045e814f Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Thu, 18 Jan 2024 12:49:17 -0700 Subject: hypaper added but not configured --- modules/nixos/hyprland.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'modules') diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix index 6e9f770..3dc3d54 100644 --- a/modules/nixos/hyprland.nix +++ b/modules/nixos/hyprland.nix @@ -50,6 +50,7 @@ environment.systemPackages = with pkgs; [ waybar # the status bar swaybg # the wallpaper + hyprpaper # hyprland wallpeper swayidle # the idle timeout swaylock-effects # locking the screen brightnessctl # control device brightness -- cgit v1.2.3 From 8cd5c241774d48fb24bda912b4f6f847b8d557b7 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Thu, 18 Jan 2024 13:00:28 -0700 Subject: home-manager can't acces time variable set in nixos config --- modules/home-manager/waybar.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules') diff --git a/modules/home-manager/waybar.nix b/modules/home-manager/waybar.nix index 0e02ded..c35bc75 100644 --- a/modules/home-manager/waybar.nix +++ b/modules/home-manager/waybar.nix @@ -80,8 +80,8 @@ "clock" = { format = "{:%H:%M}  "; format-alt = "{:%A, %B %d, %Y (%R)}  "; - timezone = config.time.timeZone; - # timezone = "US/Mountain"; + # timezone = config.time.timeZone; + timezone = "US/Mountain"; tooltip-format = "{calendar}"; "calendar" = { mode = "year"; -- cgit v1.2.3 From 928a159cbb6c7d1fa4c1262b6ba0c1fa06b73268 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Thu, 18 Jan 2024 13:11:28 -0700 Subject: gnome-keyring --- modules/nixos/hyprland.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix index 3dc3d54..3340dbe 100644 --- a/modules/nixos/hyprland.nix +++ b/modules/nixos/hyprland.nix @@ -75,7 +75,8 @@ networkmanagerapplet # provide GUI app: nm-connection-editor xfce.thunar # sfce4's file manager - gnome-keyring # for remembering wifi passwords + gnome.gnome-keyring # for remembering wifi passwords + gnome.libgnome-keyring ]; fonts.packages = with pkgs; [ font-awesome # fixes waybar fonts -- cgit v1.2.3 From c9a45b4c9509b00de3d480ddd12d55b785974737 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Thu, 18 Jan 2024 22:46:55 -0700 Subject: can't connect to anything with gnome keyring wtf --- modules/nixos/hyprland.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules') diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix index 3340dbe..80098a9 100644 --- a/modules/nixos/hyprland.nix +++ b/modules/nixos/hyprland.nix @@ -75,8 +75,8 @@ networkmanagerapplet # provide GUI app: nm-connection-editor xfce.thunar # sfce4's file manager - gnome.gnome-keyring # for remembering wifi passwords - gnome.libgnome-keyring + # gnome.gnome-keyring # for remembering wifi passwords + # gnome.libgnome-keyring ]; fonts.packages = with pkgs; [ font-awesome # fixes waybar fonts -- cgit v1.2.3 From c87374a069b27569000f4d2e4d99f1852fe7d6a8 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Fri, 19 Jan 2024 07:51:36 -0700 Subject: add program for better screensharing --- modules/nixos/hyprland.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'modules') diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix index 80098a9..e90c307 100644 --- a/modules/nixos/hyprland.nix +++ b/modules/nixos/hyprland.nix @@ -59,6 +59,7 @@ hyprpicker # color picker wf-recorder # screen recording + xwaylandvideobridge # lets xwayland programs see wayland applications for screensharing grim # taking screenshots slurp # selecting a region to screenshot # TODO replace by 'flameshot gui --raw | wl-copy' -- cgit v1.2.3 From d9eb08e0854e500e296829b322166ac8bddcc8ee Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Fri, 19 Jan 2024 07:57:47 -0700 Subject: use xdph over xdpw, as it is more feature complete --- modules/nixos/hyprland.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix index e90c307..af7f8a9 100644 --- a/modules/nixos/hyprland.nix +++ b/modules/nixos/hyprland.nix @@ -3,7 +3,8 @@ enable = true; wlr.enable = true; extraPortals = with pkgs; [ - xdg-desktop-portal-wlr + # xdg-desktop-portal-wlr + xdg-desktop-portal-hyprland ]; }; -- cgit v1.2.3 From 5994480e27da98c03a18c01f5f1beda91be4eec4 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Fri, 19 Jan 2024 09:41:25 -0700 Subject: add polkit-kde-agent for privelidge auth --- modules/nixos/hyprland.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'modules') diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix index af7f8a9..3167314 100644 --- a/modules/nixos/hyprland.nix +++ b/modules/nixos/hyprland.nix @@ -79,6 +79,7 @@ xfce.thunar # sfce4's file manager # gnome.gnome-keyring # for remembering wifi passwords # gnome.libgnome-keyring + polkit-kde-agent ]; fonts.packages = with pkgs; [ font-awesome # fixes waybar fonts -- cgit v1.2.3 From 1a3a567d745e37d16ed0e655fe1b332e0a2d2fb9 Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Fri, 19 Jan 2024 12:35:11 -0700 Subject: i finally fixed the inputs issue: when passing inputs as inputs instead of input-name, you must call inputs.input-name --- modules/home-manager/bat.nix | 4 ++-- modules/home-manager/btop.nix | 4 ++-- modules/home-manager/helix.nix | 4 ++-- modules/home-manager/shell.nix | 4 +++- modules/home-manager/starship.nix | 6 +++--- 5 files changed, 12 insertions(+), 10 deletions(-) (limited to 'modules') diff --git a/modules/home-manager/bat.nix b/modules/home-manager/bat.nix index 5a9802e..3a06076 100644 --- a/modules/home-manager/bat.nix +++ b/modules/home-manager/bat.nix @@ -1,4 +1,4 @@ -{ catppuccin-bat, ...}: { +{ inputs, ...}: { # a cat(1) clone with syntax highlighting and Git integration. programs.bat = { enable = true; @@ -7,7 +7,7 @@ theme = "catppuccin-mocha"; }; themes = { - catppuccin-mocha = builtins.readFile "${catppuccin-bat}/Catppuccin-mocha.tmTheme"; + catppuccin-mocha = builtins.readFile "${inputs.catppuccin-bat}/Catppuccin-mocha.tmTheme"; }; }; } diff --git a/modules/home-manager/btop.nix b/modules/home-manager/btop.nix index 7243a6e..894ff2e 100644 --- a/modules/home-manager/btop.nix +++ b/modules/home-manager/btop.nix @@ -1,5 +1,5 @@ -{ catppuccin-btop, ... }: { - home.file.".config/btop/themes".source = "${catppuccin-btop}/themes"; +{ inputs, ... }: { + home.file.".config/btop/themes".source = "${inputs.catppuccin-btop}/themes"; #replace htop/nmon programs.btop = { diff --git a/modules/home-manager/helix.nix b/modules/home-manager/helix.nix index 6eb8895..1eaebfb 100644 --- a/modules/home-manager/helix.nix +++ b/modules/home-manager/helix.nix @@ -1,6 +1,6 @@ -{ pkgs, catppuccin-helix, ... }: { +{ pkgs, inputs, ... }: { # https://github.com/catppuccin/helix - xdg.configFile."helix/themes".source = "${catppuccin-helix}/themes/default"; + xdg.configFile."helix/themes".source = "${inputs.catppuccin-helix}/themes/default"; programs.helix = { enable = true; diff --git a/modules/home-manager/shell.nix b/modules/home-manager/shell.nix index 612c92a..685cda1 100644 --- a/modules/home-manager/shell.nix +++ b/modules/home-manager/shell.nix @@ -1,4 +1,6 @@ -{nushell-scripts, ... }: { +{inputs, ... }: let + nushell-scripts = inputs.nushell-scripts; +in { programs.nushell = { enable = true; shellAliases = { diff --git a/modules/home-manager/starship.nix b/modules/home-manager/starship.nix index 12d6f6b..eafc03c 100644 --- a/modules/home-manager/starship.nix +++ b/modules/home-manager/starship.nix @@ -1,4 +1,4 @@ -{ catppuccin-starship, ... }: { +{ inputs, ... }: { programs.starship = { enable = true; @@ -6,6 +6,6 @@ command_timeout = 1000; palette = "catppuccin_mocha"; - } // builtins.fromTOML (builtins.readFile "${catppuccin-starship}/palettes/mocha.toml"); + } // builtins.fromTOML (builtins.readFile "${inputs.catppuccin-starship}/palettes/mocha.toml"); }; -} \ No newline at end of file +} -- cgit v1.2.3