From 232072aa5fd4eaeb2a24350568ecf2817a3d56e8 Mon Sep 17 00:00:00 2001 From: RGBCube Date: Thu, 14 Dec 2023 00:00:17 +0300 Subject: [PATCH] Delete greetd and disable kmscon temporarily --- .gitignore | 1 - hosts/enka/default.nix | 3 +-- modules/greetd/default.nix | 17 --------------- modules/nushell/environment.nix.nu | 34 +++++++++++++++++------------- 4 files changed, 20 insertions(+), 35 deletions(-) delete mode 100644 modules/greetd/default.nix diff --git a/.gitignore b/.gitignore index 5f7c905..f34869f 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,6 @@ !modules/fuzzel/ !modules/ghostty/ !modules/git/ -!modules/greetd/ !modules/gtk/ !modules/helix/ !modules/hyprland/ diff --git a/hosts/enka/default.nix b/hosts/enka/default.nix index 99f1df9..2840e09 100644 --- a/hosts/enka/default.nix +++ b/hosts/enka/default.nix @@ -27,12 +27,11 @@ "fuzzel" "ghostty" "git" - "greetd" "gtk" "helix" "hyprland" "kitty" - "kmscon" + # "kmscon" "localisation" "logind" "networkmanager" diff --git a/modules/greetd/default.nix b/modules/greetd/default.nix deleted file mode 100644 index d4614a5..0000000 --- a/modules/greetd/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ ulib, pkgs, ... }: with ulib; - -systemConfiguration { - services.greetd = enabled { - settings.default_session = { - command = "${pkgs.cage}/bin/cage -sd ${pkgs.greetd.gtkgreet}/bin/gtkgreet"; - user = "nixos"; - }; - }; - - environment.etc."greetd/environments".text = '' - Hyprland - bash - nu - sh - ''; -} diff --git a/modules/nushell/environment.nix.nu b/modules/nushell/environment.nix.nu index 397561f..1f44bb8 100644 --- a/modules/nushell/environment.nix.nu +++ b/modules/nushell/environment.nix.nu @@ -1,33 +1,37 @@ { nuScripts, theme }: '' +if (tty) == /dev/tty1 { + Hyprland +} + $env.PROMPT_INDICATOR = ""; $env.PROMPT_INDICATOR_VI_INSERT = ""; $env.PROMPT_INDICATOR_VI_NORMAL = ""; $env.PROMPT_MULTILINE_INDICATOR = ""; $env.ENV_CONVERSIONS.PATH = { - from_string: {|string| - $string | split row (char esep) | path expand --no-symlink - } - to_string: {|value| - $value | path expand --no-symlink | str join (char esep) - } + from_string: {|string| + $string | split row (char esep) | path expand --no-symlink + } + to_string: {|value| + $value | path expand --no-symlink | str join (char esep) + } } def --env mc [path: path] { - mkdir $path - cd $path + mkdir $path + cd $path } def --wrapped hx [...arguments] { - if ($env.TERM | str contains "kitty") { - kitty @ set-spacing padding=0 - } + if ($env.TERM | str contains "kitty") { + kitty @ set-spacing padding=0 + } - ^hx $arguments + ^hx $arguments - if ($env.TERM | str contains "kitty") { - kitty @ set-spacing padding=${toString theme.padding} - } + if ($env.TERM | str contains "kitty") { + kitty @ set-spacing padding=${toString theme.padding} + } } use ${nuScripts}/modules/background_task/task.nu