diff --git a/home.nix b/home.nix index 9a36638..fa9a9d6 100644 --- a/home.nix +++ b/home.nix @@ -66,10 +66,12 @@ in # audacity authy # blender + catgirl # IRC ckan discord evolution firefox + foliate # ebook reader gallery-dl gnome.dconf-editor gnome.eog @@ -128,7 +130,6 @@ in hunspellDicts.en_GB-large hunspellDicts.en_US-large - blender ( dwarf-fortress-packages.dwarf-fortress-full.override { @@ -150,6 +151,7 @@ in ] ++ ( with nixos; [ tdesktop + ] ); }; @@ -181,6 +183,7 @@ in ./modules/keychain.nix # ./modules/kitty.nix ./modules/lf.nix + ./modules/libinput-gestures.nix ./modules/lorri.nix ./modules/man.nix # ./modules/nix-index.nix @@ -193,6 +196,7 @@ in ./modules/rofi.nix ./modules/screen_locker.nix ./modules/ssh.nix + ./modules/starship.nix ./modules/sxhkd.nix ./modules/syncthing.nix ./modules/terminator.nix @@ -203,6 +207,7 @@ in ./modules/zoxide.nix ./modules/zsh.nix + ./modules/shell_aliases.nix ]; programs.home-manager.enable = true; diff --git a/modules/libinput-gestures.nix b/modules/libinput-gestures.nix new file mode 100644 index 0000000..4a6f522 --- /dev/null +++ b/modules/libinput-gestures.nix @@ -0,0 +1,26 @@ +{ pkgs, config, ... }: +let + libinputGesturesCmd = "${pkgs.libinput-gestures}/bin/libinput-gestures"; + xdotool = "${pkgs.xdotool}/bin/xdotool"; +in +{ + systemd.user.services."libinput-gestures" = { + Unit = { + Description = "Touchpad gestures"; + After = [ "graphical-session-pre.target" ]; + PartOf = [ "graphical-session.target" ]; + }; + Install = { + WantedBy = [ "graphical-session.target" ]; + }; + Service = { + Type = "simple"; + ExecStart = libinputGesturesCmd; + }; + }; + + xdg.configFile."libinput-gestures.conf".text = '' + gesture swipe left ${xdotool} key alt+Right + gesture swipe right ${xdotool} key alt+Left + ''; +} diff --git a/modules/shell_aliases.nix b/modules/shell_aliases.nix new file mode 100644 index 0000000..37410c1 --- /dev/null +++ b/modules/shell_aliases.nix @@ -0,0 +1,11 @@ +{ pkgs, ... }: +let + shellAliases = { + "sc" = "systemctl"; + "scu" = "systemctl --user"; + }; +in +{ + programs.bash = { inherit shellAliases; }; + programs.zsh = { inherit shellAliases; }; +} diff --git a/modules/starship.nix b/modules/starship.nix new file mode 100644 index 0000000..61309ae --- /dev/null +++ b/modules/starship.nix @@ -0,0 +1,19 @@ +{ + programs.starship = { + enable = true; + enableBashIntegration = true; + enableZshIntegration = true; + settings = { + directory.truncation_symbol = "…/"; + hostname.format = "[$hostname]($style) "; + line_break.disabled = true; + nix_shell.symbol = "❄️ "; + python.python_binary = "python3"; + status = { + disabled = false; + format = "[$symbol $status]($style) "; + }; + username.format = "[$user]($style)@"; + }; + }; +} diff --git a/modules/zsh.nix b/modules/zsh.nix index d4c95ca..7909130 100644 --- a/modules/zsh.nix +++ b/modules/zsh.nix @@ -45,22 +45,4 @@ }; }; - - programs.starship = { - enable = true; - enableBashIntegration = true; - enableZshIntegration = true; - settings = { - directory.truncation_symbol = "…/"; - hostname.format = "[$hostname]($style) "; - line_break.disabled = true; - nix_shell.symbol = "❄️ "; - python.python_binary = "python3"; - status = { - disabled = false; - format = "[$symbol $status]($style) "; - }; - username.format = "[$user]($style)@"; - }; - }; } diff --git a/nixos/base.nix b/nixos/base.nix index 5f41a02..5c0aadf 100644 --- a/nixos/base.nix +++ b/nixos/base.nix @@ -93,6 +93,12 @@ # }; # }; + # # Tablet + # hardware.opentabletdriver = { + # enable = true; + # daemon.enable = true; + # }; + # Enable touchpad support (enabled default in most desktopManager). services.xserver.libinput.enable = true;