pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
3686 commits 8 branches 1 tag 1 GiB
Commit graph

1861 commits

Author SHA1 Message Date
Evie Litherland-Smith 7fd992b616 Add taskwarrior, add ohmyzsh with plugins 2023-07-19 10:06:00 +01:00
Evie Litherland-Smith e4a9c6d820 Revert hyprland workspaces to numbers instead of names 2023-07-19 09:13:40 +01:00
Evie Litherland-Smith 865e47f0ce Rename workspaces, update clock widget format 2023-07-18 16:24:27 +01:00
Evie Litherland-Smith 7858d73212 Add keybind for neovide 2023-07-18 15:09:07 +01:00
Evie Litherland-Smith e66aeab392 Remove lazygit, move some package definitions around 2023-07-18 15:04:58 +01:00
Evie Litherland-Smith e65675da02 Move some package definitions from system to home 
Remove thunar, effectively replaced by rofi + terminal
Add some alias to quickly update nixos and home-manager
 2023-07-18 14:51:53 +01:00
Evie Litherland-Smith 200e87c37e Add marval helpdesk bookmark 2023-07-18 11:14:55 +01:00
Evie Litherland-Smith 4af7bc7d50 Set default tabbar visibility for firefox 2023-07-18 10:27:18 +01:00
Evie Litherland-Smith cf59ebf97e Rofi tweaks 2023-07-18 10:11:38 +01:00
Evie Litherland-Smith 738f602d78 Rename theme file for future customisation 2023-07-18 09:56:40 +01:00
Evie Litherland-Smith 31a5c61195 Change rofi font, size and add borders 2023-07-18 09:47:11 +01:00
Evie Litherland-Smith ab62c99b7f Add keybinds for all new rofi modes 2023-07-18 09:26:10 +01:00
Evie Litherland-Smith bb2992c784 Enable light/sound control for laptop (hopefully) 
Add extra rofi modes (ssh, power, files)

Add extra XDG settings for hyprland
 2023-07-18 09:15:40 +01:00
Evie Litherland-Smith db9f2240ae Make chat apps not silent on open 2023-07-18 08:34:41 +01:00
Evie Litherland-Smith ca984db42c Add float and pin rule to firefox PIP windows 2023-07-18 08:07:57 +01:00
Evie Litherland-Smith 405b9ae8c6 Change freia node in ssh config 2023-07-17 15:44:51 +01:00
Evie Litherland-Smith b9c31ed2ec Add hyprland bind to launch wezterm directly to neovim 2023-07-17 14:24:04 +01:00
Evie Litherland-Smith 0788da99d8 Add kanshi config for laptop 
Add workspace rule back for teams client
 2023-07-17 14:02:33 +01:00
Evie Litherland-Smith 0d2a38f9a7 Adjust scaling for eDP-1 (Ronin) 2023-07-17 13:23:00 +01:00
Evie Litherland-Smith c6171c45b4 Switch dunst to tokyonight theme 2023-07-17 10:02:10 +01:00
Evie Litherland-Smith 397f8caad8 Change gitui to use tokyonight theme 2023-07-17 09:59:05 +01:00
Evie Litherland-Smith a6733769bd Split tui into separate files again 2023-07-17 09:18:50 +01:00
Evie Litherland-Smith 76b0ce23cb Add gitui with vim-style keybinds and catppuccin theme 2023-07-17 09:12:26 +01:00
Evie Litherland-Smith 1bafd48306 Switch hyprland/waybar back to using firefox as default browser 2023-07-17 06:58:10 +01:00
Evie Litherland-Smith 690d99830b Fix strange hyprland home error, temp disable fish direnv integration 2023-07-16 18:41:00 +01:00
Evie Litherland-Smith 3dde6e968e Move some packages to home/tui, add missing tui import 2023-07-16 17:48:23 +01:00
Evie Litherland-Smith b102f9e209 Major cleanup for files 
Reduce complexity and in flake.nix and be more efficient in re-using
things

Removed some reduandant files in home/ and tidied up the structure
somewhat

Moved things from desktop, gui, etc... to top level

Changed env to shell, indiv shell expressions import relevant others
 2023-07-16 17:35:36 +01:00
Evie Litherland-Smith ccd389caec Remove cava from tui defaults 2023-07-14 13:42:18 +01:00
Evie Litherland-Smith ef6bf14c3c Adjust hyprland gaps 2023-07-13 15:26:35 +01:00
Evie Litherland-Smith fcf04130b5 Remove waybar transparency and blur 2023-07-13 13:52:38 +01:00
Evie Litherland-Smith fa3fb14661 Add hyprland rule for chromium file dialog, update waybar style 2023-07-13 13:49:51 +01:00
Evie Litherland-Smith a8f304b075 Move all host specific things out of flake.nix 
Go back to single, re-designed waybar for all screens
 2023-07-13 12:41:00 +01:00
Evie Litherland-Smith 9362212790 Start restyling waybar, rename laptop to compact 2023-07-12 16:43:18 +01:00
Evie Litherland-Smith c8965eb754 Remove third type of waybar, have only main and compact 2023-07-12 13:29:04 +01:00
Evie Litherland-Smith 310d5f2bb7 Actually import cava module... 2023-07-12 11:56:13 +01:00
Evie Litherland-Smith 5ee64c786d Add cava and default config file 2023-07-12 11:55:08 +01:00
Evie Litherland-Smith c94a89ca23 Waybar clock modules updates 2023-07-12 11:45:48 +01:00
Evie Litherland-Smith 96ecc68434 Switch to chromium 2023-07-12 09:06:33 +01:00
Evie Litherland-Smith 3dafb1aae8 Add waybar back to hyprland startup 2023-07-12 08:37:28 +01:00
Evie Litherland-Smith 5ee9d0867c Add hyprland rule for gamescope, add greetd again 2023-07-11 12:54:19 +01:00
Evie Litherland-Smith 3b75b341e8 Switch hyprland back to dwindle layout 2023-07-11 09:33:27 +01:00
Evie Litherland-Smith b0ea979ed5 Add some example eww widgets for testing 2023-07-11 09:31:51 +01:00
Evie Litherland-Smith 960bba92ff Move desktop configs into separate subdirectories 2023-07-11 09:11:48 +01:00
Evie Litherland-Smith 4a0e3a440e Add some chromium configs 2023-07-11 08:30:29 +01:00
Evie Litherland-Smith 7a52dff9eb Remove nix-index, add hyprland env vars 2023-07-10 21:54:41 +01:00
Evie Litherland-Smith cfef939e7d Add fzf config and integration 2023-07-10 20:58:41 +01:00
Evie Litherland-Smith 64f149532e Add a couple more binds, fix typo in tui/default 2023-07-10 20:38:42 +01:00
Evie Litherland-Smith 1ba2ce2b72 File cleanup 2023-07-10 19:42:58 +01:00
Evie Litherland-Smith 07c6d451e5 Fix key binds, remove legacy waybar files 2023-07-10 17:48:32 +01:00
Evie Litherland-Smith 8cd25b9367 Add keybinds for brightness controller 2023-07-10 17:14:04 +01:00
Evie Litherland-Smith 19ff5aa248 Fix hyprland v2 rule definitions, disable firefox legacy webrtc indicator 2023-07-10 17:08:28 +01:00
Evie Litherland-Smith 733d86c759 Move waybar modules into importable nix expressions 2023-07-10 16:09:25 +01:00
Evie Litherland-Smith 7a3534ee1b Update binds and add compact versions of more waybar modules 2023-07-10 15:51:03 +01:00
Evie Litherland-Smith 488a3b47ee Hyprland flake updates, fix waybar display names 2023-07-10 14:15:30 +01:00
Evie Litherland-Smith 2ea60f205c Nix-ify waybar config 2023-07-10 11:24:42 +01:00
Evie Litherland-Smith 3e33ab3a31 Add networkmanagerapplet and click action to open from waybar 2023-07-10 10:14:24 +01:00
Evie Litherland-Smith 20b1caee59 Rename file used for display config, add default value 2023-07-07 17:41:15 +01:00
Evie Litherland-Smith b414123eb7 Update keybinds and monitor config 2023-07-07 17:38:00 +01:00
Evie Litherland-Smith 040e7286c0 Hyprland updates 2023-07-07 17:25:04 +01:00
Evie Litherland-Smith 782bf9b1eb Change waybar and hyprland workspaces to match new system 2023-07-07 16:25:55 +01:00
Evie Litherland-Smith 12f53dceab Remove ruff-lsp 2023-07-07 13:19:09 +01:00
Evie Litherland-Smith eb50b23465 Slightly increase SSH ControlMaster time, add AddKeysToAgent option 2023-07-05 14:42:46 +01:00
Evie Litherland-Smith 763cfe384a Try switching to Zsh as default shell 2023-07-05 11:08:23 +01:00
Evie Litherland-Smith 1ad38651d3 Make test default for Makefile, add basic nushell config 2023-07-05 11:02:57 +01:00
Evie Litherland-Smith c96812d748 Add key hints to polybar icons 2023-07-04 15:55:25 +01:00
Evie Litherland-Smith fb18c07c68 Add some extra workspaces to bspwm and polybar 2023-07-04 14:45:59 +01:00
Evie Litherland-Smith b3b75744df Misc awesome rc.lua updates for testing 2023-07-04 14:45:32 +01:00
Evie Litherland-Smith dbbaed24f5 Use xfce4-session-logout instead of custom script 2023-07-04 11:36:58 +01:00
Evie Litherland-Smith 0cbed7a97e Add initial configs for awesome and qtile wm for testing 2023-07-04 11:33:39 +01:00
Evie Litherland-Smith b39b1bed9f Tweak some bspwm keybinds 2023-07-04 09:53:46 +01:00
Evie Litherland-Smith d3da11b1b0 Move sxhkd settings into bspwm expression as it's very specific anyway 2023-07-04 09:14:17 +01:00
Evie Litherland-Smith 6cb0d695ee Enable autoUpgrade by default for NixOS hosts 
NoMachine no longer floating
 2023-07-04 07:35:30 +01:00
Evie Litherland-Smith 3d38e32e83 Switch back to wezterm since I figured out how to enable undercurl 
Simplify wezterm config somewhat
 2023-07-03 17:36:55 +01:00
Evie Litherland-Smith 8d6c0cb8b8 Update some references to wezterm 2023-07-03 16:51:38 +01:00
Evie Litherland-Smith 250fa6325f Update tokyonight colourscheme 
Update from storm still being used in some places to night
Add to alacritty, set to use alacritty as main terminal
Add to xfce terminal as well, including transparency
 2023-07-03 16:09:48 +01:00
Evie Litherland-Smith a47d51c709 Make focus follow pointer 2023-07-03 15:10:32 +01:00
Evie Litherland-Smith 5f42675e2e xfce+bspwm make up to date and make workspaces more sensible 2023-07-03 14:26:14 +01:00
Evie Litherland-Smith f0a94b3c5c Update flake.lock, change zsh syntax highlighting definition from update 2023-07-03 08:58:30 +01:00
Evie Litherland-Smith 21cb473f6c Add rounded corners to picom 2023-07-02 17:24:36 +01:00
Evie Litherland-Smith 606670dcb3 Add dex to bspwm for statup programs 2023-07-02 17:12:42 +01:00
Evie Litherland-Smith 1b3c5b0062 Set left_ptr in bspwmrc for cursor config 2023-07-02 17:05:11 +01:00
Evie Litherland-Smith 1851f8fa1b Add powermenu shortcut 2023-07-02 17:00:26 +01:00
Evie Litherland-Smith 6fa2d3992e Polybar updates 
Remove some old scripts
Add bluetooth and brightness modules with ramp icons
Update layout to mirror waybar setup
 2023-07-02 16:51:11 +01:00
Evie Litherland-Smith 322ef70db4 Misc xfce, bspwm and sxhkd update to use them again 2023-07-02 16:50:25 +01:00
Evie Litherland-Smith f324881ef7 Window rule updates 2023-06-30 13:18:59 +01:00
Evie Litherland-Smith a7ac445082 Add libreoffice to default GUI packages 2023-06-30 13:07:21 +01:00
Evie Litherland-Smith 6a1a76097f Use DPMS instead of disabling internal monitor, add some extra numbered workspaces and remove relative movement bind 2023-06-30 11:55:26 +01:00
Evie Litherland-Smith d1f0906fbb Add neovim nightly, fix hyprland/waybar workspace ordering 2023-06-30 10:50:35 +01:00
Evie Litherland-Smith 86c8db45af Missing exec dispatcher in keybind 2023-06-30 09:11:47 +01:00
Evie Litherland-Smith 0cb1cd9b37 Rename terminal workspace to dev, decouple from wezterm 2023-06-30 09:05:19 +01:00
Evie Litherland-Smith 678fc72091 Revert flake.lock, waybar failing to build 2023-06-29 07:50:50 +01:00
Evie Litherland-Smith 9b10cd58e3 Update zsh expression 2023-06-28 19:43:52 +01:00
Evie Litherland-Smith 7364e01d07 Remove users directory and hosts for non-NixOS machines 
Move user account definitions into machine configuration.nix

Move per-host user settings into flake.nix directly
 2023-06-28 19:37:23 +01:00
Evie Litherland-Smith f69deb5339 Start firefox and thunar on respective keybinds if not already open 2023-06-28 17:47:20 +01:00
Evie Litherland-Smith c6b90d5e09 Enable sorting of workspaces in waybar 2023-06-28 17:36:16 +01:00
Evie Litherland-Smith 24a712afea Add some window rules for new setup 2023-06-28 17:35:41 +01:00
Evie Litherland-Smith af10a9346e Make hyprland workspaces more program focused 
Change bindings and name convention to decouple workspaces from ID
number and focus more on what the workspace is used for
TODO proper window rules
 2023-06-28 16:20:02 +01:00
Evie Litherland-Smith 151c317845 Add build target to Makefile, reorganise some definitions 2023-06-28 13:33:12 +01:00
Evie Litherland-Smith 7b5fd0570c Update hyprland config 2023-06-28 08:40:34 +01:00
Evie Litherland-Smith f481407aa7 Waybar redesign 2023-06-27 20:57:09 +01:00
Evie Litherland-Smith 3447cef909 Work bookmarks update 2023-06-27 17:03:04 +01:00
Evie Litherland-Smith bbc11f6af2 Add extra Hyprland packages back to flake 2023-06-27 16:10:31 +01:00
Evie Litherland-Smith 121eebc2b2 Update powermenu to use hyprctl 2023-06-27 15:11:01 +01:00
Evie Litherland-Smith 0278f0a7bc Hyprland keybinds now pull workspaces so no need to bind to specific outputs 2023-06-27 15:09:26 +01:00
Evie Litherland-Smith 69dc329f4d SSH config updates 2023-06-27 14:59:50 +01:00
Evie Litherland-Smith ce9fa7c342 Add copy-links arg to rsync command 2023-06-27 14:05:56 +01:00
Evie Litherland-Smith 1ec3a4484c Sync starship config to freia as well as neovim 2023-06-27 14:02:03 +01:00
Evie Litherland-Smith 6cb656747e Add more UKAEA bookmarks 2023-06-27 11:50:04 +01:00
Evie Litherland-Smith 0036b83414 Split firefox bookmarks definition 2023-06-27 11:41:18 +01:00
Evie Litherland-Smith 3a135d9761 Update laptop lid script to use dpms instead of disabling 2023-06-27 10:59:15 +01:00
Evie Litherland-Smith dfd32d66ef Add script to disable internal laptop screen on reload if lid is closed 2023-06-26 16:40:16 +01:00
Evie Litherland-Smith 9e9aa8fcd8 Setup for dwindle layout in Hyprland, add test rebuild to Makefile 2023-06-26 14:15:04 +01:00
Evie Litherland-Smith 3544950bd4 Reinstate Hyprland as default window manager 2023-06-26 13:23:27 +01:00
Evie Litherland-Smith 8a908cd539 Add wallpapers as flake input to remove need for checking out repo locally 2023-06-23 14:14:18 +01:00
Evie Litherland-Smith 522dd651fa Remove foot floating rule for sway 2023-06-22 14:52:17 +01:00
Evie Litherland-Smith 9bf561626f Remove floating window rule for nomachine in sway 2023-06-22 08:35:36 +01:00
Evie Litherland-Smith 63ac5483ea Add powermenu keybind back 2023-06-21 21:59:08 +01:00
Evie Litherland-Smith 9f65943d08 Update sway keymaps and window rules 2023-06-21 14:51:45 +01:00
Evie Litherland-Smith 90a19c482f Remove xsettingsd 2023-06-21 08:25:02 +01:00
Evie Litherland-Smith 7297aba1d5 Fix Northstar config, add requirements for home-manager stand-alone install to Makefile 2023-06-21 08:23:48 +01:00
Evie Litherland-Smith 2e9e40ff36 Move window manager config (sway, hyprland) from desktop to wm directory, add GTK theme handling configs for sway, adjust wezterm theme for rounded corners 2023-06-20 15:26:07 +01:00
Evie Litherland-Smith 2f188f625a Add more sway config, move waybar config for sway to main waybar config 2023-06-20 13:35:45 +01:00
Evie Litherland-Smith 80a5b82038 Add swayfx version of sway, switch to using for consistent setup across devices 2023-06-20 07:05:13 +01:00
Evie Litherland-Smith a482eb86ec More bookmarks 2023-06-19 17:29:04 +01:00
Evie Litherland-Smith 2c51701209 Add more bookmarks, add github as search provider 2023-06-19 17:18:59 +01:00
Evie Litherland-Smith 4e9d6044cc firefox pin wikis, add arch wiki as search provider 2023-06-19 16:59:37 +01:00
Evie Litherland-Smith b18f7d99ae Add fractal matrix client, make rofi keybind toggle state 2023-06-19 16:50:58 +01:00
Evie Litherland-Smith 5156417798 Put GTK2 config back in default location 2023-06-19 15:22:41 +01:00
Evie Litherland-Smith 234e9e131b Add config for new work laptop N0245, add compact pulseaudio waybar module 2023-06-19 14:33:05 +01:00
Evie Litherland-Smith d98ef18f68 Tweak waybar style and config, change colour order for new bar order, add Hyprland env vars 2023-06-19 10:27:05 +01:00
Evie Litherland-Smith da03f96878 Move dconf setup to desktop/default.nix, make some more sway options sensible defaults 2023-06-19 06:53:21 +01:00
Evie Litherland-Smith 7b9d922b29 make makefile more robust 2023-06-19 06:24:21 +01:00
Evie Litherland-Smith de34acca12 Delete current firefox bookmarks, use firefox wayland package on wayland systems 2023-06-18 18:02:41 +01:00
Evie Litherland-Smith 8a9049f479 Remove sddm from hyprland, set terminal back to wezterm, switch vanguard to using sway due to issues starting steam 2023-06-18 13:55:27 +01:00
Evie Litherland-Smith 840bd79369 Don't ask for ssh password on startup 2023-06-18 10:41:59 +01:00
Evie Litherland-Smith 17228c7e73 Restore hyprland config, move separate files into nix expression, trim duplicate lines 2023-06-18 10:40:57 +01:00
Evie Litherland-Smith 4bdbd153f0 Remove all GUI elements from default home configs, using gui/default.nix instead 2023-06-17 10:30:39 +01:00
Evie Litherland-Smith bf81136d18 Move machine nixos and home-manager config into machines directory, update makefile accordingly 2023-06-17 10:27:02 +01:00
Evie Litherland-Smith 3327173d65 Remove cspell 2023-06-16 16:42:57 +01:00
Evie Litherland-Smith 4aed7d2b00 Switch back to pyright for neovim 2023-06-16 16:20:22 +01:00
Evie Litherland-Smith 63d0bb7ede Remove noask flag as plasma wallet can streamline the whole thing 2023-06-16 14:36:37 +01:00
Evie Litherland-Smith 6cbc00f9ec Enable nix-index, add more firefox options, move readline settings into bash config 2023-06-16 14:05:17 +01:00
Evie Litherland-Smith fd6e86339b Add more firefox options for personal preference 2023-06-16 11:38:30 +01:00
Evie Litherland-Smith 495efd6bf5 Add ms teams back to work, switch back to firefox with new config 2023-06-16 09:15:17 +01:00
Evie Litherland-Smith c3260f6a36 Add search engine config to firefox 2023-06-16 08:48:18 +01:00
Evie Litherland-Smith ce8da83e52 Add firefox config for testing, picom tweaks, delete gamescope desktop env 2023-06-16 07:14:07 +01:00
Evie Litherland-Smith eb66cd5c12 Remove libreoffice by default 2023-06-15 17:43:35 +01:00
Evie Litherland-Smith 34b1968d1f Add jedi-language-server 2023-06-14 16:17:26 +01:00
Evie Litherland-Smith a15b3bc84f Add python-lsp-server and magma-nvim packages 2023-06-14 16:09:21 +01:00
Evie Litherland-Smith 8ca60f9c18 Add .local/bin/ path, slightly reduce picom blur strength 2023-06-14 15:47:28 +01:00
Evie Litherland-Smith 3275c179d1 Remove teams client, works better in chromium anyway 2023-06-14 10:01:56 +01:00
Evie Litherland-Smith fd1ae6eb36 Move fontconfig out of home-manager because it messes with plasma, add signal to defaults 2023-06-14 09:57:15 +01:00
Evie Litherland-Smith 6353d21498 Add fish function to start archlinux distrobox quickly 2023-06-13 13:19:50 +01:00
Evie Litherland-Smith 250e3522e2 Merge branch 'main' of https://git.xenia.me.uk/xenia/nixos 2023-06-13 09:23:04 +01:00
Evie Litherland-Smith b38bbdfe5a Switch to using plasma accross devices, add nextcloud-client 2023-06-13 09:22:47 +01:00
Evie Litherland-Smith ffbe19401c Remove sway config from Northstart to use plasma (from Debian repos) instead 2023-06-13 09:16:54 +01:00
Evie Litherland-Smith 506ef32b1f Add openfortivpn to work setup 2023-06-13 08:36:39 +01:00
Evie Litherland-Smith 26c2e7a436 Update plasma dependencies, use for J0162 
Update picom to use dual_kawase blur
 2023-06-13 08:01:43 +01:00
Evie Litherland-Smith 15dbf6242f Fix package definition 2023-06-13 08:00:42 +01:00
Evie Litherland-Smith fd0dcd532c Add cspell to neovim with better configs this time 2023-06-12 12:07:21 +01:00
Evie Litherland-Smith e0c2d59377 Modify local pkg expressions to remove duplicate names when using 2023-06-12 10:39:46 +01:00
Evie Litherland-Smith 7c43d7b8a6 Add configs for alacritty 2023-06-12 10:30:31 +01:00
Evie Litherland-Smith 1bbb00268b Add rot8 package, enable fontconfig in home-manager 2023-06-12 10:06:26 +01:00
Evie Litherland-Smith fdc0bcf7c5 Switch kitty to using tokyonight theme, trying switching to kitty for a bit 2023-06-12 07:57:20 +01:00
Evie Litherland-Smith 0038d39ebb Move CLI packages for neovim to home.packages level 2023-06-10 08:30:50 +01:00
Evie Litherland-Smith c3f2c8d15e Disable syncthing tray 2023-06-10 08:30:14 +01:00
Evie Litherland-Smith cc59ed5664 Add syncthing to Northstar 2023-06-09 19:05:17 +01:00
Evie Litherland-Smith d43337e12d Remove wayland check from chromium, add to Northstar 2023-06-09 18:51:28 +01:00
Evie Litherland-Smith 395c47e31f Update J0162 home config 2023-06-09 14:38:57 +01:00
Evie Litherland-Smith 7dee50295b Switch H0615 to use chromium as well 2023-06-09 10:15:46 +01:00
Evie Litherland-Smith 6a544fb7d4 Move home/common things into respective section/default expressions 2023-06-09 10:15:24 +01:00
Evie Litherland-Smith 68b356d1b4 Switch firefox for chromium with default plugins installed 2023-06-08 10:48:25 +01:00
Evie Litherland-Smith 066464265e Use microsoft-edge on work machine, update hyprland accordingly 2023-06-07 17:35:50 +01:00
Evie Litherland-Smith 9a919ac6e9 Remove autoflake 2023-06-07 17:35:33 +01:00
Evie Litherland-Smith dcc5b92e5f Stop asking for keychain at startup, don't mess with nvim repo state in Makefile 2023-06-07 08:19:17 +01:00
Evie Litherland-Smith 95e1d72932 nvim updates, add sed as requirement for spectre plugin 2023-06-06 15:51:48 +01:00
Evie Litherland-Smith 8470dd12e5 Add grim and slurp to hyprland for screenshots 2023-06-06 15:51:29 +01:00
Evie Litherland-Smith 9a1a5655c9 Add function to sync neovim config to heimdall/freia 2023-06-06 12:33:57 +01:00
Evie Litherland-Smith 879be95abf Move clock module icons after text for consistency 2023-06-06 12:23:58 +01:00
Evie Litherland-Smith b388bdae94 Add gamescope as desktop session, default to no autoUpgrade 
Set autoUpgrade config for Legion as it's on all the time
Remove xrdp
 2023-06-06 08:00:37 +01:00
Evie Litherland-Smith 3614eb1353 Add middlelayer to select corrent logout method per desktop environment 2023-06-06 07:19:17 +01:00
Evie Litherland-Smith 5d17437fc9 Add waybar modules 
Add compact network module for Northstar, use backlight module
 2023-06-06 07:12:27 +01:00
Evie Litherland-Smith 9682d09156 Add machine specific waybar ws icons and hyprland window rules 2023-06-05 17:12:26 +01:00
Evie Litherland-Smith a6b85272f5 Move NoMachine to workspace 4 2023-06-05 10:15:52 +01:00
Evie Litherland-Smith 80aa61c325 Reduce programs that launch on startup 2023-06-05 07:00:07 +01:00
Evie Litherland-Smith 2a3abf408a Add home config for Legion users 
Disable flatpak as default, doesn't work on a non-desktop system
Disable syncthing and vpn on Legion for now
 2023-06-04 16:58:15 +01:00
Evie Litherland-Smith 444abc0d0d Add address for legion, remove vanguard server expressions 2023-06-04 16:51:06 +01:00
Evie Litherland-Smith 8166c47e88 Revert change to specialworkspace controls 2023-06-04 11:49:35 +01:00
Evie Litherland-Smith 20a7d6ee69 Delete old sway config, fix thunar package definition 2023-06-04 11:48:52 +01:00
Evie Litherland-Smith 995ac0854c Fix typo in keybind 2023-06-04 11:43:57 +01:00
Evie Litherland-Smith 07190e3132 Add some more keybinds to sway to be like hyprland 2023-06-04 11:39:46 +01:00
Evie Litherland-Smith 8a0d241ac2 Add some custom keybinds for sway 2023-06-04 11:33:21 +01:00
Evie Litherland-Smith 8c28246e0b Merge branch 'main' of https://git.xenia.me.uk/xenia/nixos 2023-06-04 10:45:22 +01:00
Evie Litherland-Smith 80aaec012e Set nvim config fully within nvim submodule 2023-06-04 10:45:20 +01:00
Evie Litherland-Smith 91e5629a83 Delete hypr and waybar submodules, move back into nix expressions 2023-06-04 10:41:56 +01:00
Evie Litherland-Smith b28050df9d Remove touch gestures (broken), add wallpaper to sway 2023-06-04 10:36:12 +01:00
Evie Litherland-Smith 6453d5bfe0 Add example multi-touch bindings for swau 2023-06-04 10:20:58 +01:00
Evie Litherland-Smith a95eb44f52 Output must be set of strings... 2023-06-04 10:02:05 +01:00
Evie Litherland-Smith d7de7d9bd6 Merge branch 'main' of https://git.xenia.me.uk/xenia/nixos 2023-06-04 10:01:08 +01:00
Evie Litherland-Smith 34236ae28c Move sway config fully into nix expressions 2023-06-04 10:01:07 +01:00
Evie Litherland-Smith 2bc0ed7661 Fix bar definition 2023-06-04 09:46:07 +01:00
Evie Litherland-Smith 39d3f746de Update sway gaps and bar config 2023-06-04 09:44:36 +01:00
Evie Litherland-Smith 52595e99bc Initial tweak to get sway working on Northstar 2023-06-04 09:38:51 +01:00
Evie Litherland-Smith 38066dfc89 Remove some waybar modules for Northstar, use sway workspaces and compact clock modules 2023-06-03 16:48:13 +01:00
Evie Litherland-Smith 13d17e3bad Add some nix neovim specific config to init.lua via nix 2023-06-03 07:58:50 +01:00
Evie Litherland-Smith 055b557c33 Misc tidying, set zsh as default shell for root user 2023-06-03 07:46:37 +01:00
Evie Litherland-Smith 2a628143bd Move indiviual hypr config into local directory 2023-06-02 12:21:51 +01:00
Evie Litherland-Smith c5ba62a30e Add initial sway config from old config files 2023-06-02 12:21:33 +01:00
Evie Litherland-Smith ef04c11550 Add extra sway packages like hyprland, remove config directory 2023-06-02 12:21:19 +01:00
Evie Litherland-Smith f15606f6ab Add more common home packages 2023-06-02 11:53:59 +01:00
Evie Litherland-Smith 5a31ce3e1c Change tokyonight flavoru 2023-06-02 11:51:19 +01:00
Evie Litherland-Smith 523dd728f6 Add sweet/candy icon+folder themes, change Vanguard wallpaper 2023-06-02 11:51:08 +01:00
Evie Litherland-Smith 6769e7ced0 Bind ws5 to main monitor so all named workspaces are together 2023-06-01 16:47:14 +01:00
Evie Litherland-Smith 80eb48acfb Adjust alt waybar modules 2023-06-01 16:14:43 +01:00
Evie Litherland-Smith 8e24950af9 Fix wezterm navigation keys 2023-06-01 15:09:04 +01:00
Evie Litherland-Smith 252ce7d5c1 Include waybar extras on alt bar 2023-06-01 13:59:16 +01:00
Evie Litherland-Smith fba214d3e3 Add distrobox and podman, don't sync submodules to /etc/nixos/config 2023-06-01 13:37:15 +01:00
Evie Litherland-Smith c15b3a05d6 Add some more vscode settings 2023-05-31 17:15:38 +01:00
Evie Litherland-Smith 9f8e868f09 Add vscode with extensions to enable neovim mode 2023-05-31 16:44:03 +01:00
Evie Litherland-Smith 825c809fa0 Enable nix-direnv integration to cache direnv builds 2023-05-31 11:18:45 +01:00
Evie Litherland-Smith f2c490e3ca Remove nix-index as it's getting annoying... 2023-05-31 11:09:32 +01:00
Evie Litherland-Smith 52ff1c36a3 Delete root user config per machine as it's common to all 
Move root user home-config into home/default.nix so that it's used by all
Removed personal/work specific things from root user
 2023-05-31 10:54:57 +01:00
Evie Litherland-Smith fc02c96394 Remove bluetooth from waybar on H0615 as it doesn't exist 2023-05-31 10:41:32 +01:00
Evie Litherland-Smith 467be4f12a Remove batch entry from ssh config 2023-05-31 10:38:57 +01:00
Evie Litherland-Smith 1db5364696 Add services expression for H0615, update waybar and switch to hyprland 2023-05-31 09:46:34 +01:00
Evie Litherland-Smith 7e69d6a9cf Increase command timeout for starship 2023-05-29 08:33:49 +01:00
Evie Litherland-Smith fedcda2b6a Use git credential store method 2023-05-28 19:18:03 +01:00
Evie Litherland-Smith 763e42fda9 Add home-manager update shell abbr for fish 2023-05-28 19:05:55 +01:00
Evie Litherland-Smith 36f2f5a102 Add tokyonight theme 
Add tokyonight theme to fish and bat (and by extension delta)
Add extra zsh features
 2023-05-28 15:12:46 +01:00
Evie Litherland-Smith d83dd577bc Add ionos vps ssh config 2023-05-27 15:24:05 +01:00
Evie Litherland-Smith 87a6c0cd55 Tweak wezterm config 2023-05-26 12:45:19 +01:00
Evie Litherland-Smith 5941740ee4 Update ssh config to reflect new port config 2023-05-26 08:55:48 +01:00
Evie Litherland-Smith afb64c2c8c Add shell abbreviation to start Hyprland session 2023-05-26 08:02:20 +01:00
Evie Litherland-Smith c73d69cce5 Update ports used and relevant traefik configs 2023-05-25 17:05:25 +01:00
Evie Litherland-Smith 7370df89ef Further swaylock colour updates 2023-05-25 13:08:29 +01:00
Evie Litherland-Smith b99ae728e1 Update colours for swaylock 2023-05-25 13:05:31 +01:00
Evie Litherland-Smith 1ba480707e Auto start signal 2023-05-25 12:28:36 +01:00
Evie Litherland-Smith 8bf5cbccb6 Export CC variable for Neorg 2023-05-25 10:36:28 +01:00
Evie Litherland-Smith ef21892fce Remove duplicate clock module 2023-05-25 09:46:06 +01:00
Evie Litherland-Smith 4cade0e18c Change order of waybar modules 2023-05-25 09:45:03 +01:00
Evie Litherland-Smith 497b9d13f8 Move waybar to separate repo, add to Makefile 2023-05-25 09:31:56 +01:00
Evie Litherland-Smith b503bbccc8 Start extra programs on Vanguard startup 2023-05-25 09:06:56 +01:00
Evie Litherland-Smith 1196b778ba Update workspace 1 icon 2023-05-25 08:57:24 +01:00
Evie Litherland-Smith a23427c2d4 Update workspace symbols and format 2023-05-25 08:40:57 +01:00
Evie Litherland-Smith fa6f1ce7db Add update hyprland config to H0615 
Remove hyprland config files now that they've moved
 2023-05-24 08:44:46 +01:00
Evie Litherland-Smith f02977208a Change hyprpaper config from pointing to file 2023-05-24 08:37:09 +01:00
Evie Litherland-Smith 679145dd52 Use delta icons for rofi 2023-05-24 08:30:30 +01:00
Evie Litherland-Smith 90b57f3c95 Reduce wezterm opacity 2023-05-24 08:27:52 +01:00
Evie Litherland-Smith dd31a09996 Remove hyprland config linking 2023-05-24 08:23:26 +01:00
Evie Litherland-Smith 411e511bfd Add kdeconnect as standalone service, add qbittorrent 2023-05-24 08:21:51 +01:00
Evie Litherland-Smith c106758702 Add hyprland home imports, set icons to delta icons 2023-05-24 07:31:31 +01:00
Evie Litherland-Smith c1dfa4de99 Re-enable hyprland alongside plasma 2023-05-24 07:25:31 +01:00
Evie Litherland-Smith 16a81879ce Remove cpell 2023-05-20 12:46:15 +01:00
Evie Litherland-Smith 2ff77ebe3b Add gcc to Mac 2023-05-20 10:13:59 +01:00
Evie Litherland-Smith 71ad1cae2f Move common from default.nix to common.nix 2023-05-19 14:52:20 +01:00
Evie Litherland-Smith f4fea206ab Move libreoffice and otpclient to default 2023-05-19 14:50:00 +01:00
Evie Litherland-Smith 541551fee6 Remove neovide due to wayland issues 2023-05-19 13:44:18 +01:00
Evie Litherland-Smith aa0352526c Remove librewolf from default packages 2023-05-19 10:31:28 +01:00
Evie Litherland-Smith 3060abea6b Remove navigator from wezterm 2023-05-17 19:37:24 +01:00
Evie Litherland-Smith 3a282dbee5 Formatting pass with alejandra 2023-05-17 17:10:18 +01:00
Evie Litherland-Smith bd8711db77 Add extra neovim packages as needed by recent additions to null-ls 
sources
 2023-05-17 17:07:13 +01:00
Evie Litherland-Smith fd52ad19dd Add md lock icon for starship read only 2023-05-17 14:25:39 +01:00
Evie Litherland-Smith fea48688d3 Switch wezterm to tokyonight theme 2023-05-17 14:17:07 +01:00
Evie Litherland-Smith e21b93f758 Increase opacity of wezterm 2023-05-17 11:43:29 +01:00
Evie Litherland-Smith 4a14d522d9 Add extra packages for neovim 
Add python packages for magma-nvim plugin
Add more language servers, replace python and fortran with pyright/ruff
and fortls respectively
 2023-05-17 11:42:45 +01:00
Evie Litherland-Smith f0a34f5a65 Add root user config for work machines 2023-05-17 08:41:16 +01:00
Evie Litherland-Smith 654676a809 Temp disable nextcloud (broken), comment out hyprland config for now 2023-05-16 19:59:31 +01:00
Evie Litherland-Smith 9a9aeaf8dd Switch back to plasma 2023-05-16 19:52:00 +01:00
Evie Litherland-Smith 9fefa8c380 Fix typo, lower-case -c... 2023-05-16 15:59:49 +01:00
Evie Litherland-Smith 6131cefaf3 Add shell shortcut to pull and update nixos config 2023-05-16 15:58:12 +01:00
Evie Litherland-Smith 4dc6f8c245 Fix hyprpaper config location, remove systemd integration for waybar, use sddm 2023-05-16 14:36:05 +01:00
Evie Litherland-Smith b804c0997d Update hyprland window rules 2023-05-16 14:34:44 +01:00
Evie Litherland-Smith ba33f5f6cb Fix ordering of ssh config file 2023-05-16 13:08:57 +01:00
Evie Litherland-Smith 26382d8d20 Fix Monarch new environment setup 2023-05-16 13:05:40 +01:00
Evie Litherland-Smith 43cefa3995 Setup wezterm config using nix + recursive linking like others 2023-05-16 13:05:26 +01:00
Evie Litherland-Smith fbc8315be8 Set gitea SSH port correctly, setup ssh config definition for SSH 2023-05-16 12:06:49 +01:00
Evie Litherland-Smith 6f3b12de82 Update port in ssh config file 2023-05-16 11:48:52 +01:00
Evie Litherland-Smith 62868f9906 Start adding fail2ban to server config 2023-05-16 11:04:48 +01:00
Evie Litherland-Smith 0c59117518 Move powermenu definitions into rofi expression 2023-05-16 10:06:23 +01:00
Evie Litherland-Smith 61d7f404d8 Set powermenu and power-profiles scripts using nix 2023-05-16 09:59:04 +01:00
Evie Litherland-Smith 38c18601b7 Move nvim related things to separate repo 2023-05-16 09:58:47 +01:00
Evie Litherland-Smith 25c5382905 Don't set neovim config in nix, just enable program, get config from separate repo 2023-05-16 09:29:53 +01:00
Evie Litherland-Smith 97abceef12 Re-enable catppuccin transparency for hyprland blur 2023-05-16 09:14:51 +01:00
Evie Litherland-Smith 5a18c254ac Move home-manager config into separate directories 
Add platform specific hyprland/hyprpaper/waybar config into platform
specific home-manager files, better integration with nix and no
conflicing links
 2023-05-16 09:13:59 +01:00
Evie Litherland-Smith 2db705ad25 Use noask argument for keychain to stop prompting at startup 2023-05-16 09:12:03 +01:00
Evie Litherland-Smith b4d45ba6bb Flatten home/desktop structure 2023-05-16 09:11:39 +01:00
Evie Litherland-Smith 9e8849ad08 Add neotree shortcut to alpha, return to left panel 2023-05-15 11:16:19 +01:00
Evie Litherland-Smith 8c7f8dba52 Rearrange again to reduce complexity 
Move collections to use default.nix in relevant directories
Combine GUI elements into gui directory
 2023-05-15 11:12:17 +01:00
Evie Litherland-Smith 7719862a6f Add nix-ld and nix-index, update python venv template accordingly 2023-05-12 15:27:21 +01:00
Evie Litherland-Smith 5d78d93081 Add tree-sitter cli, ensure all languages installed automatically 2023-05-12 11:51:04 +01:00
Evie Litherland-Smith 0bdae5f583 Return to using tab and split for neogit 2023-05-12 08:39:10 +01:00
Evie Litherland-Smith 58ed61d485 Add neovide alias without using multigrid (for noice) 2023-05-12 08:38:50 +01:00
Evie Litherland-Smith 172d094b56 Disable catppuccin transparency (again), reduce floating window 
transparency
 2023-05-11 21:46:07 +01:00
Evie Litherland-Smith f94daf819c Reduce wezterm opacity 2023-05-11 19:18:02 +01:00
Evie Litherland-Smith 621ed60516 Add alpha 
Update catppuccin integrations
Fix lsp hover from noice filter
Fix broken treesitter config
 2023-05-11 18:03:39 +01:00
Evie Litherland-Smith f43ff1c472 Add noice as lualine dependency 2023-05-11 12:19:36 +01:00
Evie Litherland-Smith 3aa74091ea Add custom lsp progress to status bar using noice api 2023-05-11 11:53:58 +01:00
Evie Litherland-Smith dc65ffb590 Add noice telescope extension 2023-05-11 11:23:14 +01:00
Evie Litherland-Smith c6ed66af9c Update lsp progress popup, disable commit confirmation in neogit 2023-05-11 10:54:29 +01:00
Evie Litherland-Smith 6b90efb5bb Remove separate config files by merging with plugin definition 
Add noice.nvim for fancier ui
 2023-05-11 10:44:22 +01:00
Evie Litherland-Smith be5bdb332c Move navic and navbuddy config into own files 2023-05-11 09:01:21 +01:00
Evie Litherland-Smith 9567908cb7 Rewrite keymap definition, add nvim-navbuddy 
Move plugin-specific keymaps into init section of plugin definition
Add nvim-navbuddy for breadcrumbs navigation
Remove aerial as replaced by navbuddy
 2023-05-11 08:51:35 +01:00
Evie Litherland-Smith d0ce2d2005 Start nvim lsp on BufEnter 
LSP needed by lualine now due to nvim-navic, so needs to start on buf
enter to avoid weirdness
 2023-05-11 08:03:56 +01:00
Evie Litherland-Smith 8b7289a321 Add material design git icon for lualine branch module 2023-05-11 08:00:37 +01:00
Evie Litherland-Smith ed663b9674 Configure lualine 
Setup lualine modules, remove some old plugins
 2023-05-10 22:13:59 +01:00
Evie Litherland-Smith 6afbb00ca6 Add lualine as feline replacement 2023-05-10 19:25:15 +01:00
Evie Litherland-Smith 518e59446a Log in as root to servers by default, add lazygit for root user 2023-05-09 17:56:18 +01:00
Evie Litherland-Smith 99afa66c88 Add shortcut to start hardware specific Hyprland config 2023-05-07 06:27:04 +01:00
Evie Litherland-Smith 3ed62602f2 Setup specific syncthing config for Vanguard 2023-05-06 15:24:31 +01:00
Evie Litherland-Smith 8fd5491f57 Remove sddm from steam, add update fish abbreviation 2023-05-06 14:02:35 +01:00
Evie Litherland-Smith 2acbcf0d60 Add syncthing service 2023-05-06 14:00:45 +01:00
Evie Litherland-Smith bc2e8d2166 Add platform specific update alias 2023-05-06 06:55:45 +01:00
Evie Litherland-Smith b9ae841286 Fix paths for rofi scripts 2023-05-05 18:37:23 +01:00
Evie Litherland-Smith cfca522e76 Move home-manager bootstrapping into common importable file 2023-05-05 15:02:31 +01:00
Evie Litherland-Smith 44117ddedf Fix paths for hyprpaper config 2023-05-05 14:39:56 +01:00
Evie Litherland-Smith 5018fbbee5 Restructure SSH config similar to Git for personal/work separation 2023-05-05 13:29:39 +01:00
Evie Litherland-Smith 5002cf9d48 Move SSH configs into specific collections 2023-05-05 13:20:32 +01:00
Evie Litherland-Smith 00dfa03827 Add spacing to starship prompt 2023-05-05 10:34:42 +01:00
Evie Litherland-Smith 850e374904 Update some font symbols used 
Remove extra workspace bindings for H0615
 2023-05-05 10:08:41 +01:00
Evie Litherland-Smith 120f08772e Add freia ssh config 2023-05-05 10:08:27 +01:00
Evie Litherland-Smith 23c50c3b10 Add keybind to raise floating window, add sshfs package 2023-05-05 08:53:59 +01:00
Evie Litherland-Smith 3018b57334 Move nix config up to top level of directory 2023-05-04 12:37:53 +01:00
Evie Litherland-Smith 6193f366de Start another restructure 
Move home config back into nixos, too annoying to
maintain as separate when not needed

Regoup nix expressions logically, make use of defaults and
create GUI collections to minimise code needed for common
machine definitions
 2023-04-25 14:27:28 +01:00
Evie Litherland-Smith 303bcc7df9 Add otpclient and x2go, remove teams 2023-04-24 17:17:34 +01:00
Evie Litherland-Smith 5750f1a9ca Add some fish abbreviations, update ssh config 2023-04-24 13:27:55 +01:00
Evie Litherland-Smith a3c55ceede Use new system for defining home vars and git email 2023-04-24 10:02:12 +01:00
Evie Litherland-Smith 13de5a2bba Add specific configs for different git emails 2023-04-24 09:55:29 +01:00
Evie Litherland-Smith 46f9a593ff Fix structure levels 2023-04-23 14:53:55 +01:00
Evie Litherland-Smith e35a926cb6 Reorganise common directory with env for less duplication 2023-04-23 14:46:59 +01:00
Evie Litherland-Smith e6251069f4 Move urxvt into gui section 2023-04-22 15:18:40 +01:00
Evie Litherland-Smith 76da387eb3 Add updated bash aliases 2023-04-22 15:18:27 +01:00
Evie Litherland-Smith ede87d1ccb Merge branch 'nixos' of gitlab.com:elitherl/dotfiles into nixos 2023-04-22 09:10:23 +01:00
Evie Litherland-Smith 95100163c3 Add wezterm and configs 
Restore wezterm configs and link using nix.
Add homebrew support to zsh for Monarch.
 2023-04-22 09:09:23 +01:00
Evie Litherland-Smith 0203b73757 Add wayland clipboard, remove X11 forwarding from SSH 2023-04-21 14:24:53 +01:00
Evie Litherland-Smith e2cf9ae2dd Add extra configs for Monarch 2023-04-21 07:35:58 +01:00
Evie Litherland-Smith 54ca515cb6 Add zsh completions, fix neovide typo 2023-04-21 07:35:29 +01:00
Evie Litherland-Smith ecd1a5f29b Add starter config for macbook 2023-04-21 07:28:18 +01:00
Evie Litherland-Smith 07b1bff3a2 Set kitty initial size to be sensible 2023-04-19 16:45:30 +01:00
Evie Litherland-Smith bf89896aff Typo in neovide call... 2023-04-19 16:38:40 +01:00
Evie Litherland-Smith 52b1d96bb6 Split browser into explicit firefox and chromium 2023-04-19 15:23:29 +01:00
Evie Litherland-Smith 6807a2db35 Add shortcut to run neovide under X11 (wayland temp fix) 2023-04-19 15:17:40 +01:00
Evie Litherland-Smith 277413469f Fix broken links to common.nix 2023-04-19 09:34:18 +01:00
Evie Litherland-Smith 9d07fe0e7e Update files for new restructure 2023-04-19 09:27:55 +01:00
Evie Litherland-Smith d8adc37780 Restructure to flatten directory more 2023-04-19 09:22:42 +01:00
Evie Litherland-Smith 1ace62070f Move env directory to desktop for restructure 2023-04-19 09:19:15 +01:00
Evie Litherland-Smith f9d328f9eb Add neovide and libreoffice, consolidate some options to common files 2023-04-18 12:00:56 +01:00
Evie Litherland-Smith da65f25865 Move home-manager configs into top level of dotfiles for better separation 2023-04-18 08:44:08 +01:00
Evie Litherland-Smith 704ba0da49 Remove zsh files 2023-02-25 09:49:34 +00:00
Evie Litherland-Smith cd7898ef94 Remove pyenv setup from zprofile, add check for is_rsa as well as ed25519 2023-02-23 13:49:06 +00:00
Evie Litherland-Smith 52bec5865d Used rounded form of p10k and make wezterm status match 2023-02-14 22:44:32 +00:00
Evie Litherland-Smith eabcb6f615 Redo p10k, add zsh syntax highlighting 2023-02-14 22:38:38 +00:00
Evie Litherland-Smith 4633fbe83d Start moving to new colourscheme (Catpuccin), WIP 2023-02-14 18:00:43 +00:00
Evie Litherland-Smith d3ed6bae04 Add explicit control over wezterm keyboard shortcuts 2023-02-13 12:38:19 +00:00
Evie Litherland-Smith 1920de4a66 Check for pyenv before initialising 2023-02-11 10:05:00 +00:00
Evie Litherland-Smith cc104dc58f Remove autostart of TMUX 2023-02-09 16:55:45 +00:00
Evie Litherland-Smith 86c11e0fce Start new tmux session per window 2023-02-09 16:49:43 +00:00
Evie Litherland-Smith b01daaceaa Move zsh setup back into separate files for ohmyzsh custom 2023-02-09 16:26:31 +00:00
Evie Litherland-Smith 3be9aa5a10 Add TPM for tmux plugin management + plugins 2023-02-09 15:47:44 +00:00
Evie Litherland-Smith 6eacf0124c Move tmux config into config dir 2023-02-09 13:18:52 +00:00
Evie Litherland-Smith d6671a1bca Stop forcing prompt to bottom of screen 2023-02-09 12:53:54 +00:00
Evie Litherland-Smith 8383f7d019 Move dotfiles from HOME into sub directory, make discovery automatic 
like config
 2023-02-09 08:53:40 +00:00