Commit graph

1861 commits

Author SHA1 Message Date
Evie Litherland-Smith bb86cd082d Switch back to sway (and all the changes that involved) 2024-07-07 08:47:50 +01:00
Evie Litherland-Smith 7376697711 Merge branch 'main' of https://git.xenia.me.uk/pixelifytica/nixos 2024-07-07 07:17:52 +01:00
Evie Litherland-Smith e04a91b9cf Add Emacs packages back to Nix install 2024-07-07 07:17:05 +01:00
Evie Litherland-Smith 0e3b62dbfe Emacs: switch from installing org-roam to just emacsql-sqlite 2024-07-06 07:09:53 +01:00
Evie Litherland-Smith e9d27ba414 Don't install NYXT by default
Keep config though, will mostly use the flatpak version if testing to
keep up to date with rapid releases
2024-07-06 06:32:00 +01:00
Evie Litherland-Smith af381fb9b8 Don't pin kickoff window 2024-07-05 11:18:35 +01:00
Evie Litherland-Smith e60a43c771 Emacs: install org-roam to ensure sqlite exists 2024-07-05 10:50:18 +01:00
Evie Litherland-Smith 77a77727cf Move teams-for-linux to be installed in desktop/default.nix 2024-07-05 10:49:32 +01:00
Evie Litherland-Smith ae8aaebbe3 Remove systemsettings from pinned to task manager 2024-07-05 10:49:17 +01:00
Evie Litherland-Smith 21991ffc7f Emacs: install mu4e to keep in sync with mu tool 2024-07-05 08:07:30 +01:00
Evie Litherland-Smith ed7165bc8a Remove Emacs packages from being installed by nix
Moved properly into Emacs config to handle packages
2024-07-05 06:14:31 +01:00
Evie Litherland-Smith b3ed259aae Emacs: remove ibuffer-project 2024-07-04 17:53:51 +01:00
Evie Litherland-Smith 3cf6eb9ad0 Merge branch 'main' of https://git.xenia.me.uk/pixelifytica/nixos 2024-07-04 15:52:44 +01:00
Evie Litherland-Smith d5de6cf834 Ruff: don't format docstrings 2024-07-04 15:52:36 +01:00
Evie Litherland-Smith ee5f0f09f5 Update sharepoint URL in bookmarks 2024-07-03 11:21:55 +01:00
Evie Litherland-Smith 1e98e8af61 Fix wrong files... 2024-07-03 07:37:57 +01:00
Evie Litherland-Smith a1d6a789e7 Fix Legion importing desktop programs when it shouldn't be 2024-07-03 07:37:09 +01:00
Evie Litherland-Smith f8782068d2 Remove uses of home-manager repo, merge home-manager README entries
Remove system-update-all script
2024-07-03 07:26:09 +01:00
Evie Litherland-Smith f53fdbad4c Remove home-manager from git-sync-all, add presentations 2024-07-03 07:20:28 +01:00
Evie Litherland-Smith 763a1d2a05 Merge home-manager config back in to nixos config
Place home-manager config under home directory, move system config
under system directory.

Add hostname-specific entries under home directory to be consistent
with how system is configured, update flake accordingly
2024-07-03 07:15:39 +01:00
Evie Litherland-Smith 0682bb8cdb Restructured to a state that things build again
Remove all home-manager config and related files

Slight change of layout that makes more sense with new scope
2024-05-11 15:41:19 +01:00
Evie Litherland-Smith c9b940f43b Prune some packages 2024-05-10 15:12:31 +01:00
Evie Litherland-Smith 3262fdb653 Switch emacs to using base16-theme, add elfeed-tube back
Remove pkgs definition in firefox expression
2024-05-10 14:16:12 +01:00
Evie Litherland-Smith 8c514e017f Don't install JS/TS stuff by default 2024-05-10 06:41:31 +01:00
Evie Litherland-Smith 690ea291d9 Re-enable rofi-pass 2024-05-10 06:35:01 +01:00
Evie Litherland-Smith 09afb377c8 Remove linked jupyter config files 2024-05-09 16:59:03 +01:00
Evie Litherland-Smith d644ea11e2 Adjust sway and waybar sizes 2024-05-07 10:01:09 +01:00
Evie Litherland-Smith 3ce3ede09b Remove reference to now deleted theme.lisp 2024-04-27 08:51:09 +01:00
Evie Litherland-Smith 4a71894eea Remove old bookmarks.org, backup nyxt bookmarks and theme 2024-04-27 08:11:08 +01:00
Evie Litherland-Smith 68397530d8 Add ABRP to bookmarks 2024-04-27 08:10:05 +01:00
Evie Litherland-Smith eb7e6c3b13 Remove ruff, issues with flymake integration
Use flake8 for python flymake linting (along with mypy of course)

Add fortls FORTRAN language server to default installed packages as well
2024-04-26 13:50:35 +01:00
Evie Litherland-Smith a21ebf586b Add ruff back (to prog and emacs packages)
Cleanup some other emacs packages I'm not using anymore, add
python-docstring and htmlize packages
2024-04-26 10:49:47 +01:00
Evie Litherland-Smith 958ff4572a Nyxt: theme using base16 2024-04-26 06:16:09 +01:00
Evie Litherland-Smith 4a0829de00 Remove ipython, replace ruff with black + pyflakes 2024-04-25 14:00:33 +01:00
Evie Litherland-Smith 69004f7cb3 Temp fix to not show alt waybar on other machines
TODO make this better sometime
2024-04-25 13:47:56 +01:00
Evie Litherland-Smith f2a9c92b20 Add trimmed down alt waybar that only shows workspaces
Set alt waybar for vertical monitor on Vanguard
2024-04-25 07:09:26 +01:00
Evie Litherland-Smith 20882c780b nyxt: re-enable restoring last session on startup 2024-04-25 06:46:02 +01:00
Evie Litherland-Smith 057b40b035 Switch emacs back to socketActivation
emacs: remove elfeed-tube plugins
2024-04-25 06:11:43 +01:00
Evie Litherland-Smith 528b4335fb Update nyxt bookmarks
Keep old bookmarks as backup for now
2024-04-24 14:34:21 +01:00
Evie Litherland-Smith aad478894c Update nyxt theme to use catppuccin mocha
TODO still need to convert to pull from scheme automatically though,
currently hardcoded
2024-04-24 14:17:24 +01:00
Evie Litherland-Smith 7aa0820921 Add nyxt back with temporary (and working) theme
Add teams-for-linux back now that it seems to work with teams v2
2024-04-24 14:02:20 +01:00
Evie Litherland-Smith 8fc1c5d146 Don't install jupyterlab by default 2024-04-23 17:28:52 +01:00
Evie Litherland-Smith 0bdd5d8140 Remove rofi-pass, rofi-power-menu; Restore wlogout 2024-04-23 07:56:36 +01:00
Evie Litherland-Smith bcc8a452e5 More sway workspace binds 2024-04-21 13:13:05 +01:00
Evie Litherland-Smith 643467175b Adjust fonts 2024-04-21 13:08:25 +01:00
Evie Litherland-Smith 1c52f76d61 Add more sway binds 2024-04-21 13:03:33 +01:00
Evie Litherland-Smith a46bdb5073 swaybg set mode to fill, sway set steam windows to tabbed
Vanguard: only show waybar on primary monitor
2024-04-21 06:40:55 +01:00
Evie Litherland-Smith f474fd35cb Remove extra -- in davmail setup script 2024-04-20 13:25:47 +01:00
Evie Litherland-Smith b7b86791bb Revert "Waybar change font size"
This reverts commit eae4e6ae42.
2024-04-20 13:08:33 +01:00
Evie Litherland-Smith 32d9d21408 Add protonmail-bridge setup script to sway packages
Add davmail version as well
2024-04-20 13:07:01 +01:00
Evie Litherland-Smith dad605b593 Install emacs by default
Don't install programming tools with emacs, but do install as part of
desktop config
2024-04-20 12:33:52 +01:00
Evie Litherland-Smith 885fdcd27c Typo in waybar font definition 2024-04-20 12:28:19 +01:00
Evie Litherland-Smith eae4e6ae42 Waybar change font size 2024-04-20 12:23:57 +01:00
Evie Litherland-Smith 49cab23264 waybar: sway workspaces and MPRIS module positions 2024-04-19 11:50:26 +01:00
Evie Litherland-Smith 6b08b57ccc Sway remove workspace assigns
Change waybar workspace icons to use numbered workspaces, rather than
workspaces with specific purposes
2024-04-19 10:53:27 +01:00
Evie Litherland-Smith 0c6bc86e8f Update IP of Legion in SSH config 2024-04-17 17:48:28 +01:00
Evie Litherland-Smith fad37d738a Adjust font sizes 2024-04-17 13:39:18 +01:00
Evie Litherland-Smith 35d7771ce7 Re-order Emacs packages 2024-04-17 13:34:58 +01:00
Evie Litherland-Smith 1446b3abc6 waybar: increase max size of MPRIS module 2024-04-17 10:14:31 +01:00
Evie Litherland-Smith e86c2c5952 Save email signatures to config 2024-04-17 10:14:17 +01:00
Evie Litherland-Smith 37ddaf8a7b Add extra categories to layer_effects 2024-04-16 14:10:34 +01:00
Evie Litherland-Smith fc53a9063f Enable eza aliases again 2024-04-16 11:51:58 +01:00
Evie Litherland-Smith 866865389c Enable FowardX11Trusted for Heimdall and Freia 2024-04-16 11:51:05 +01:00
Evie Litherland-Smith a2fbf4acc9 Remove ~/.diary from git-sync-all 2024-04-16 11:40:22 +01:00
Evie Litherland-Smith a77254401b Move waybar back to top 2024-04-15 17:26:31 +01:00
Evie Litherland-Smith 91a5f4665b sway: add focusedInactive colour, cleanup layout and layer_rules 2024-04-15 14:49:03 +01:00
Evie Litherland-Smith 510476d9ad Sway: reduce border size
Waybar: make tooltips semi-transparent again
2024-04-15 11:18:19 +01:00
Evie Litherland-Smith 6f47c993f1 Add rofi-pass and rofi powermenu keybinds 2024-04-15 10:51:48 +01:00
Evie Litherland-Smith 390883b318 Sway: add urgent theme, add blur to swaync notifications
Add catppuccin theme to Xresources and set HiDPI for Scorch (for
Xwayland applications)
2024-04-15 10:40:04 +01:00
Evie Litherland-Smith d32d1ff574 Got it correct this time 2024-04-15 09:47:55 +01:00
Evie Litherland-Smith fed9c7da5b Got them the wrong way round... 2024-04-15 09:44:47 +01:00
Evie Litherland-Smith 524b6c7f5f Restore gap changes to sway 2024-04-15 09:41:57 +01:00
Evie Litherland-Smith e0ba9d21c4 Style updates
Adjust font sizes to be more sensible

Tweak sway gaps, and blur layer effects

Set waybar and swaync font sizes in rem instead of px, move waybar to
bottom and adjust spacing accordingly
2024-04-15 07:58:33 +01:00
Evie Litherland-Smith 27a4e820f7 emacs: switch to start with user session again 2024-04-15 07:57:18 +01:00
Evie Litherland-Smith af498308ac Waybar: remove window module and enable systemd again
Add output movement binds from Hyprland
2024-04-14 21:43:37 +01:00
Evie Litherland-Smith 950e23aa0b Remove program shortcuts that conflict with sway binds 2024-04-14 21:31:09 +01:00
Evie Litherland-Smith 30df2bfc4b Add extra binds for function keys, add cursor config
Add monitor config for Vanguard in sway
2024-04-13 07:29:06 +01:00
Evie Litherland-Smith 0d3a037ef8 Enable tap and natural scrolling for touchpads 2024-04-12 21:25:48 +01:00
Evie Litherland-Smith 6dd70aa58e Fixed a couple of sway issues
Made swayfx the standard, added nixos system-level module to enable
and autostart with greetd; Includes fix for missing session that
should be fixed in later nixpkgs versions

Fixed formatting for waybar workspaces module, wasn't showing active
or empty workspaces correctly
2024-04-12 21:17:54 +01:00
Evie Litherland-Smith a4ab3c7288 Change most things over to use sway
Added most config, at least enough to get by for now

Update waybar config to remove hyprland-specific things

Misc updates to rofi, swaylock

Set greetd to start sway on machines by default now
2024-04-12 17:56:13 +01:00
Evie Litherland-Smith 2ce32bad4c Add back some kind of initial sway config 2024-04-12 11:43:34 +01:00
Evie Litherland-Smith 5db0b3feff Add guard for git-sync-all for non-main branch
Only pull/push non-syncing repos (currently nixos and emacs) if on the
"main" branch, echo warning message and skip otherwise.
2024-04-12 11:24:39 +01:00
Evie Litherland-Smith f0405343fc Add initial (and untested) river example config 2024-04-12 11:24:39 +01:00
Evie Litherland-Smith 97e8a62ece home-manager: move anything not hyprland-specific into desktop.nix 2024-04-12 11:24:39 +01:00
Evie Litherland-Smith 7e54e9f76e Change workspace 2 to be a music workspace
Update bind and waybar module accordingly
2024-04-12 11:23:23 +01:00
Evie Litherland-Smith 6e6e50d2b5 waybar: remove pipe from hyprland/window module format 2024-04-11 13:29:42 +01:00
Evie Litherland-Smith 89c7dfed5d waybar: move hyprland/window back to left module group 2024-04-11 11:19:52 +01:00
Evie Litherland-Smith f15cfde53c Add remmina remote desktop client (with hyprland rules) 2024-04-11 09:58:39 +01:00
Evie Litherland-Smith 3355b07587 Add nixos-shutdown, fix nixos-reboot to do what it says on the tin 2024-04-10 21:03:29 +01:00
Evie Litherland-Smith 64a781e531 Remove updown, add nixos-reboot alias
nixos-reboot basically does the same thing but without calling
git-sync-all
2024-04-10 19:18:04 +01:00
Evie Litherland-Smith 43a6169ca6 Update hyprland binds
Add firefox and thunar, add separate emacs bind to open on workspace 1
2024-04-10 19:16:14 +01:00
Evie Litherland-Smith 5525c6584e ruff: remove docstring-code-format from config, error in current version 2024-04-10 11:59:22 +01:00
Evie Litherland-Smith 17f9b5d32c Fix typo 2024-04-10 11:59:14 +01:00
Evie Litherland-Smith 456b9a475c Add jupyterlab back to being installed by default
Change jupyterlab/default.nix to just return a package set which is
then integrated with other python packages in default.nix
2024-04-10 11:58:23 +01:00
Evie Litherland-Smith 07a9f01f60 Add waybar rewrite for swayimg 2024-04-10 09:48:09 +01:00
Evie Litherland-Smith 2d2a166dd0 Add initial zathura config and example emacs binds 2024-04-09 14:30:30 +01:00
Evie Litherland-Smith 898685db83 Add zathura as default PDF program
Remove mupdf as emacs seems to handle PDFs just fine with gs and/or
poppler_utils
2024-04-09 14:29:42 +01:00
Evie Litherland-Smith 5750a31713 Remove whatsapp-for-linux 2024-04-08 14:31:37 +01:00
Evie Litherland-Smith 4c7cdbeb8e Add bookmarks.org and export steps to nix config
Move bookmarks.org into this repo and use runCommand to call emacs
org-html-export-to-html, set output file as firefox homepage

Remove bookmarks from git-sync-all.sh

Disable firefox SanitizeOnShutdown so that I can keep pinned tabs
between sessions
2024-04-08 14:25:04 +01:00
Evie Litherland-Smith b2378517d8 Restore whatsapp-for-linux
Move OBSStudio to workspace 2 by default instead
2024-04-06 17:03:10 +01:00
Evie Litherland-Smith 6305161e7c Add floating rule for thunar file progress window 2024-04-06 16:28:52 +01:00
Evie Litherland-Smith b1460ddc05 Add diary directory and repo to git-sync-all.sh 2024-04-06 13:49:08 +01:00
Evie Litherland-Smith 58f0e5237d Switch default browser back to firefox 2024-04-04 13:09:53 +01:00
Evie Litherland-Smith d1e0ee95ea Switch workspace 3 back to being a files workspace 2024-04-04 09:18:36 +01:00
Evie Litherland-Smith cd9441bde4 Add bookmarks repo to git-sync-all, remove from chromium config 2024-04-03 14:14:30 +01:00
Evie Litherland-Smith dee84e10bb Remove waybar rewrite for whatsapp-for-linux and teams-for-linux 2024-04-03 11:22:04 +01:00
Evie Litherland-Smith 077b04ca73 Remove teams-for-linux, update chromium config and add package
teams-for-linux seems to have support issues with new teams updates,
so switching to just using chromium as my browser as that should work
better

Add chromium package back, also waybar rewrite and window rules, set
as default browser for mimeapps

Update chromium configs; Add ManagedBookmarks and alphabetise the
other config options. Add ublock-origin, simplelogin and catppuccin
theme plugins
2024-04-03 11:02:26 +01:00
Evie Litherland-Smith d000b0f502 Starship: add custom status symbols back
Default values aren't good for vertical spacing
2024-04-03 09:08:58 +01:00
Evie Litherland-Smith 14837ed9d8 Remove whatsapp-for-linux, add firefox bookmark for WhatsApp Web 2024-04-02 17:44:33 +01:00
Evie Litherland-Smith 07be39befd Lots of starship config updates
Remove language and OS custom icons, also some misc things like sudo,
version, read-only dir, etc... to use defaults instead. Keep custom
for git information and container indicator

Add jobs with custom icon because the default has weird spacing

Update zsh transient function so that transient prompt matches
starship prompt

Switch Emoji font back to Noto, some of starship config didn't display
properly with EmojiOne
2024-04-02 17:32:56 +01:00
Evie Litherland-Smith 0667438150 Add back scripting languages commonly used
Restore python (with pylsp) and JS, remove gfortran from default
installed programming languages. Figured I would want scripting
languages on the fly but compiled languages will be focussed on a
project, so no issue having a nix-shell env.
2024-04-02 17:27:56 +01:00
Evie Litherland-Smith e8d9643f87 waybar: mpris swap player and status icon orders 2024-04-02 16:08:31 +01:00
Evie Litherland-Smith ba5c738313 Add waybar rewrites for X2Go and NoMachine 2024-04-02 15:38:06 +01:00
Evie Litherland-Smith 2e83f46738 Change workspace 3 to be a music workspace
Remove workspace rule for libreoffice, add a rule for x2go and
nomachine
2024-04-02 15:30:24 +01:00
Evie Litherland-Smith fdba59544c Add bind for rofi-emoji, update title matching for NoMachine window rules 2024-04-02 11:14:33 +01:00
Evie Litherland-Smith bbbe86735a Remove zellij from rsync-local-config 2024-04-02 11:05:36 +01:00
Evie Litherland-Smith def3b8b267 rofi: add rofi-emoji plugin
Try setting application-fallback-icon by MIME name, think that's what
I was doing wrong before
2024-04-01 10:55:57 +01:00
Evie Litherland-Smith 107e7bf688 Add "updown" alias to zsh.
Basically just do all the stuff I usually do before shutting down, and
then shutdown.
2024-04-01 09:19:19 +01:00
Evie Litherland-Smith 7dbf3982b6 Fix bind to call swaylock 2024-03-31 13:19:33 +01:00
Evie Litherland-Smith ecc9fae75a Major changes: switch to tracking nixos-23.11 and remove stylix.
Motivated by the xz backdoor bug, switch NixOS system to track 23.11
instead of unstable, and will bump version numbers as they come along
rather than do rolling release.
Reverted a couple of changes that were introduced in recent nixpkgs
versions, only major one was switching back to swaylock as hyprlock
isn't in nixpkgs 23.11

Remove stylix and replace with lower-level base16.nix, partly because
stylix was doing something strange pulling in extra flakes (and
breaking on 23.11), partly because I was most of the way there anyway.
Remove last references to stylix in config, mostly just changing
stylix.colors to scheme (from base16) and defining fonts in
specialArgs to be used in the same way as before.
2024-03-31 12:59:24 +01:00
Evie Litherland-Smith 6c9a91ded9 Remove remote workspace, replace with web browser workspace
Move waybar window and MPRIS modules to centre

Change Vanguard window rules to workspace rules to bind to specific
monitors
2024-03-31 08:23:29 +01:00
Evie Litherland-Smith 92a3951148 hyprland: change obs rule to workspace 3 2024-03-30 07:51:51 +00:00
Evie Litherland-Smith 096d63efbf waybar: sort workspaces by number 2024-03-29 07:52:27 +00:00
Evie Litherland-Smith bf5a8f7d28 waybar: add max title length to MPRIS module 2024-03-29 07:49:16 +00:00
Evie Litherland-Smith c923221b79 Add bookmark for the jargon file 2024-03-29 07:14:52 +00:00
Evie Litherland-Smith 7af353e182 Reduce to 5 main and 5 backup workspaces
Removed email workspace
2024-03-28 09:06:04 +00:00
Evie Litherland-Smith 8312e0d328 Update nixpkgs, home-manager
Remove pass-audit for now as it's failing to build, to add back later

Move jupyter config into separate file since I don't need it on my
personal PC

Move home/config directory contents to home/prog since it's (currently
at least) all programming related things, attach to relevant files
2024-03-28 07:30:50 +00:00
Evie Litherland-Smith 1a10a39900 Clean out some packages from prog/default.nix
Remove default install of rustc and JS, trim python packages down to
jupyter with plugins. Move back to a nix-shell focused workflow
2024-03-27 14:52:02 +00:00
Evie Litherland-Smith 01dbdd0259 Add nixos-repl alias 2024-03-27 14:37:11 +00:00
Evie Litherland-Smith 01694083d0 Remove isort, replaced by ruff 2024-03-27 05:50:59 +00:00
Evie Litherland-Smith dfbaa2c708 waybar: add artist and track info to MPRIS module, remove pipe from
window module
2024-03-26 17:16:45 +00:00
Evie Litherland-Smith dca956ccdc Add separator bars to left waybar modules 2024-03-26 16:31:11 +00:00
Evie Litherland-Smith 55c7f64bdf Switch hyprland bind from firefox back to nyxt 2024-03-26 14:15:37 +00:00
Evie Litherland-Smith d2fc55993d Nyxt: add microsoft365 to bookmarks 2024-03-26 14:09:30 +00:00
Evie Litherland-Smith ac7a6d37ca Switch another reference to foot term back to alacritty 2024-03-26 08:16:22 +00:00
Evie Litherland-Smith c2d64eaa23 Add (back) bind for opening firefox 2024-03-26 06:33:23 +00:00
Evie Litherland-Smith 1bd6c8af57 Disable systemd services for waybar and hyprpaper
Start with Hyprland instead
2024-03-26 06:14:38 +00:00
Evie Litherland-Smith 7eacc47e17 Switch foot back to alacritty 2024-03-26 06:13:44 +00:00
Evie Litherland-Smith bc46af61a6 Install jupyterlab + extensions by default with python 2024-03-25 17:07:37 +00:00
Evie Litherland-Smith 39a8e48ba5 Workspace updates
Rearrange some workspaces, now have: home, files, chat, email, remote,
games - with associate icons and rules updates
2024-03-25 13:43:16 +00:00
Evie Litherland-Smith dc30a3559d Add title to NoMachine window rules
Stop rules from applying to things like popups on mouse hover
2024-03-25 10:14:33 +00:00
Evie Litherland-Smith 9a19e4fc98 Add zsh aliases to common nixos commands 2024-03-25 10:13:37 +00:00
Evie Litherland-Smith f5708e31cb Remove workspaces 5 & 6 from persistent-workspaces 2024-03-25 09:43:24 +00:00
Evie Litherland-Smith a330e7f183 Revert "Switch to pyright for better venv / nix-shell support"
This reverts commit bc4f969f00.
2024-03-25 07:21:33 +00:00
Evie Litherland-Smith b49e54b688 Restore mypy (didn't mean to remove) 2024-03-24 11:40:43 +00:00
Evie Litherland-Smith bc4f969f00 Switch to pyright for better venv / nix-shell support
Settings in emacs to hopefully make it work nicely in a single file
environment as well as a project
2024-03-24 11:33:18 +00:00
Evie Litherland-Smith e59297c801 hyprland: restart foot/waybar/hyprpaper on startup
Add bind to pull emacs config before starting

Set steam workspace rule back to silent to avoid popups stealing focus
all the time...
2024-03-24 08:31:26 +00:00
Evie Litherland-Smith e6fb581ac8 foot: disable dpi aware, too small on some screens 2024-03-24 08:31:11 +00:00
Evie Litherland-Smith 52c7547539 Hyprland workspaces binds: remove silent 2024-03-24 05:48:25 +00:00
Evie Litherland-Smith 03f2fbe2fc ssh config: update IPs for local machines (new router) 2024-03-23 21:03:37 +00:00