diff --git a/nixosConfigurations/common/hm/nu/asd.nu b/nixosConfigurations/common/hm/nu/asd.nu new file mode 100644 index 0000000..a9d262b --- /dev/null +++ b/nixosConfigurations/common/hm/nu/asd.nu @@ -0,0 +1 @@ +print $env.FILE_PWD diff --git a/nixosConfigurations/common/hm/nu/mod.nu b/nixosConfigurations/common/hm/nu/mod.nu new file mode 100644 index 0000000..b464c01 --- /dev/null +++ b/nixosConfigurations/common/hm/nu/mod.nu @@ -0,0 +1 @@ +export use nurofi; diff --git a/nixosConfigurations/common/hm/nu/nurofi/apps.rasi b/nixosConfigurations/common/hm/nu/nurofi/apps.rasi index a20fdd5..62be5f3 100755 --- a/nixosConfigurations/common/hm/nu/nurofi/apps.rasi +++ b/nixosConfigurations/common/hm/nu/nurofi/apps.rasi @@ -50,7 +50,7 @@ mainbox { imagebox { padding: 20px; background-color: transparent; - background-image: url("assets/knight.gif", width); + background-image: url("~/.config/nushell/modules/nurofi/assets/knight.gif", width); orientation: vertical; children: [ "inputbar", "dummy", "mode-switcher" ]; } diff --git a/nixosConfigurations/common/hm/nu/nurofi/mod.nu b/nixosConfigurations/common/hm/nu/nurofi/mod.nu index 19a220f..e3c6b57 100644 --- a/nixosConfigurations/common/hm/nu/nurofi/mod.nu +++ b/nixosConfigurations/common/hm/nu/nurofi/mod.nu @@ -1,3 +1,4 @@ +const base_directory = "~/.config/nushell/modules/nurofi"; def is-installed [ app: string ] { ((which $app | length) > 0) @@ -19,7 +20,7 @@ export def powermenu []: nothing -> nothing { let action = [lock suspend logout reboot shutdown]; mut selected = null; - $selected = $action | to text | rofi -dmenu -p (date now | format date "%Y-%m-%d %H:%M:%S") -mesg $"Uptime: ($uptime)" -theme powermenu.rasi; + $selected = $action | to text | rofi -dmenu -p (date now | format date "%Y-%m-%d %H:%M:%S") -mesg $"Uptime: ($uptime)" -theme ($base_directory | path join powermenu.rasi); match $selected { "lock" => { hyprlock --immediate; } @@ -32,5 +33,5 @@ export def powermenu []: nothing -> nothing { } export def apps []: nothing -> nothing { - rofi -show drun window -theme apps.rasi; + rofi -show drun window -theme ($base_directory | path join apps.rasi); } diff --git a/nixosConfigurations/common/hm/nu/nurofi/powermenu.rasi b/nixosConfigurations/common/hm/nu/nurofi/powermenu.rasi index 73c1316..6e7786e 100755 --- a/nixosConfigurations/common/hm/nu/nurofi/powermenu.rasi +++ b/nixosConfigurations/common/hm/nu/nurofi/powermenu.rasi @@ -44,7 +44,7 @@ mainbox { border-radius: 0px; border-color: @selected; background-color: transparent; - background-image: url("assets/solair.gif", width); + background-image: url("~/.config/nushell/modules/nurofi/assets/solair.gif", width); children: [ "inputbar", "message", "listview", dummy ]; } diff --git a/nixosConfigurations/common/hm/nushell.nix b/nixosConfigurations/common/hm/nushell.nix index a3fd254..f8fc65f 100644 --- a/nixosConfigurations/common/hm/nushell.nix +++ b/nixosConfigurations/common/hm/nushell.nix @@ -29,6 +29,10 @@ } } } + + $env.NU_LIB_DIRS = ["${./nu}"]; + + # use nurofi; ''; environmentVariables = { @@ -36,7 +40,6 @@ SSH_AUTH_SOCK = "/run/user/1000/ssh-agent"; EDITOR = "${lib.getExe' hmConfig.programs.helix.package "hx"}"; SHELL = "${lib.getExe' hmConfig.programs.nushell.package "nu"}"; - NU_LIB_DIRS = "${lib.hm.nushell.toNushell (lib.concatStringsSep ":" [./nu])}"; }; }; diff --git a/nixosConfigurations/vinheim/hardware.nix b/nixosConfigurations/vinheim/hardware.nix index e640260..01fc2f1 100644 --- a/nixosConfigurations/vinheim/hardware.nix +++ b/nixosConfigurations/vinheim/hardware.nix @@ -100,8 +100,11 @@ networkmanager-l2tp ]; }; - hostName = "nixos"; - extraHosts = ''192.168.130.211 gitlab''; + hostName = "vinheim"; + hosts = { + "192.168.130.211" = ["gitlab"]; + "192.168.130.210" = ["vault.local" "youtrack.local"]; + }; }; time.timeZone = "Asia/Yekaterinburg"; diff --git a/nixosConfigurations/vinheim/users.nix b/nixosConfigurations/vinheim/users.nix index 6f70943..f8761e0 100644 --- a/nixosConfigurations/vinheim/users.nix +++ b/nixosConfigurations/vinheim/users.nix @@ -106,8 +106,17 @@ in { rainfrog networkmanagerapplet + + rofi-wayland ]; + home.file = { + ".config/nushell/modules" = { + source = "${../common/hm/nu}"; + recursive = true; + }; + }; + xdg.portal = { enable = true; configPackages = with pkgs; [ @@ -311,7 +320,8 @@ in { bind = [ "SUPER, Q, exec, $terminal" "SUPER, N, exec, $fileManager" - "SUPER, R, exec, $menu" + "SUPER, R, exec, nu -c 'use ~/.config/nushell/modules/mod.nu *; nurofi apps'" + "SUPER, P, exec, nu -c 'use ~/.config/nushell/modules/mod.nu *; nurofi powermenu'" # "SUPER, X, exec, ags -t clock" # "SUPER, X, exec, ags -t control" # "SUPER, X, exec, ags -t systray"