diff --git a/.bashrc b/.bashrc deleted file mode 100644 index 91fbadb..0000000 --- a/.bashrc +++ /dev/null @@ -1,15 +0,0 @@ -alias v=`which vim` - -git=`which git` -alias g=$git -alias ga="$git add" -alias gc="$git commit -m" -alias gu="ga . && gc" # u for update -alias gs="$git status" -alias gi="$git init" -alias gp="$git push" -alias gf="$git pull" # f for fetch -alias gC="$git clone" -alias goops="$git reset --soft HEAD^" - -alias rm="trash-put" diff --git a/hosts/desktop.nix b/hosts/desktop.nix index d2f007c..ecf178b 100644 --- a/hosts/desktop.nix +++ b/hosts/desktop.nix @@ -7,15 +7,22 @@ xserver = { enable = true; libinput = { - enable = true; - touchpad = { - naturalScrolling = true; + enable = true; touchpad = { naturalScrolling = true; tapping = true; }; }; xkbOptions = "caps:escape"; displayManager = { - lightdm.enable = true; + lightdm = { + enable = true; + greeters.gtk = { + enable = true; + theme = { + name = "Nordic"; + package = pkgs.nordic; + }; + }; + }; autoLogin = { enable = true; user = "elnu"; @@ -29,6 +36,9 @@ }; }; + # To prevent `Unit dconf.service not found.` after theming GTK in HM + programs.dconf.enable = true; + sound.enable = true; hardware.pulseaudio.enable = true; nixpkgs.config.pulseaudio = true; diff --git a/hosts/home.nix b/hosts/home.nix index e92fad9..911a372 100644 --- a/hosts/home.nix +++ b/hosts/home.nix @@ -1,5 +1,9 @@ { config, pkgs, user, ... }: +let + theme = pkgs.nordic; + themeName = "Nordic"; +in { imports = [ ../vim.nix @@ -17,12 +21,12 @@ gtk = { enable = true; iconTheme = { - name = "Nordic"; - package = pkgs.nordic; + name = "${themeName}"; + package = "${theme}"; }; theme = { - name = "Nordic"; - package = pkgs.nordic; + name = "${themeName}"; + package = "${theme}"; }; gtk3.extraConfig = { # Remove minimize, maximize, and close buttons @@ -30,6 +34,17 @@ }; }; + qt = { + enable = true; + platformTheme = "gtk"; + }; + + i18n.inputMethod = { + enabled = "fcitx5"; + # Commented out, not working + # fcitx.engines = with pkgs.fcitx-engines; [ anthy ]; + }; + home = { username = "${user}"; homeDirectory = "/home/${user}"; @@ -47,16 +62,36 @@ firefox discord gnome.nautilus - ]; - file = { - ".bashrc" = { - source = ../.bashrc; - }; - }; + # Configuration applications + fcitx5-configtool + ]; sessionVariables = { EDITOR = "vim"; + GTK_IM_MDOULE = "fcitx"; + QT_IM_MODULE = "fcitx"; + XMODIFIERS = "@im=fcitx"; + GLFW_IM_MODULE = "ibus"; # IME support in anthy + }; + }; + + programs.bash = { + enable = true; + shellAliases = { + g = "git"; + ga = "g add"; + gc = "g commit -m "; + gu = "ga . && gc"; + gs = "g status"; + gi = "g init"; + gp = "g push"; + gf = "g pull"; + gC = "g clone"; + goops = "g reset --soft HEAD^"; + + v = "vim"; + rm = "trash-put"; }; }; }