Commit graph

278 commits

Author SHA1 Message Date
Evie Litherland-Smith 0889818512 Big reorganise
Move commonModule into system/default.nix
Keep most essential parts (user definition, home-manager init) in
flake.nix but move rest to system/default.nix

Remove some tui expressions from home and add all to home/default.nix,
will always want those so always use

Disable gamescope session unless gamescope.nix imported

Move various home.package definitions to environment.systemPackage in
system/ expressions, located based on appropriate use

Move wallpapers directory due to restructure, no other changes to it
2023-10-09 11:40:25 +01:00
Evie Litherland-Smith 82db77d0ed Fix module definitions for Legion (TODO more on this later) 2023-10-09 08:39:46 +01:00
Evie Litherland-Smith b2f3c13a9b Add rebuild command to replace "nou"
rebuild will also reload hyprland and sync doom after nixos-rebuild switch
2023-10-08 15:29:28 +01:00
Evie Litherland-Smith c89028bdd7 Fix wrong font name for Fira Mono 2023-10-07 10:25:55 +01:00
Evie Litherland-Smith e94a4dde31 Move font confit to flake.nix, add to stylix
Change fonts to all use Fira family, Fira Sans for UI Fira Sans Mono for
monospace and FiraCode still for Emacs
2023-10-07 10:19:56 +01:00
Evie Litherland-Smith 7cbff504e9 Add initial config for work desktop 2023-10-03 13:15:32 +01:00
Evie Litherland-Smith 6d56e9c71d Remove Monarch from devices 2023-10-02 07:31:48 +01:00
Evie Litherland-Smith 84fba650b3 Disable passSecretService 2023-09-30 09:56:44 +01:00
Evie Litherland-Smith 6b7b76e7bc Switch to gnome-keyring for libsecret
email password and git credential helper now use gnome-keyring/secret-service
2023-09-30 09:27:43 +01:00
Evie Litherland-Smith 4c62219dde Add extra stylix theming 2023-09-28 08:27:03 +01:00
Evie Litherland-Smith 3afe79c851 Add stylix, switch to nixpkg hyprland
Add stylix flake and initial config for wallpaper and catppuccin
macchiato scheme. Disabled auto theme to pick each manually

Remove hyprland flake intup to use version in nixpkgs/home-manager for
compat with stylix

Update style of swaylock using stylix
2023-09-26 19:03:50 +01:00
Evie Litherland-Smith f99b8955c7 Move unfree predicate into flake.nix
Add NoMachine to Vanguard for wfh setup
2023-09-26 07:36:57 +01:00
Evie Litherland-Smith f90f22f09f Enable autoUpgrade by default but without reboot 2023-09-24 12:09:08 +01:00
Evie Litherland-Smith 360bebb829 Make upgrade alias refresh repo as standard 2023-09-24 12:05:52 +01:00
Evie Litherland-Smith 2c3fed9df7 Add initial hashed password for users
Make users immutable for server
2023-09-24 12:05:19 +01:00
Evie Litherland-Smith 05f371d459 Revert "Remove 'nou' alias"
This reverts commit 042e621f6c.
2023-09-24 11:45:09 +01:00
Evie Litherland-Smith 579a468d24 Add some extra catppuccin themes to use later 2023-09-24 10:08:25 +01:00
Evie Litherland-Smith 812a8d3669 Add back anyrun with a config to test 2023-09-23 18:31:08 +01:00
Evie Litherland-Smith ea8e055b1f Fix broken wallpaper path 2023-09-23 18:10:39 +01:00
Evie Litherland-Smith 5b2f03257b Set Vanguard up with Hyprland again
Move wallpapers into repo and remove as flake input
2023-09-23 18:05:51 +01:00
Evie Litherland-Smith d66ae00bb7 Move nameserver setting to flake.nix for reuse 2023-09-23 08:07:36 +01:00
Evie Litherland-Smith 039cab92de Move allowUnfree to allowUnfreePredicate
Add ferdium and window rule

Move waybar overlay into hyprland expression
2023-09-21 08:51:07 +01:00
Evie Litherland-Smith e18ac3f354 Combine shell definition expressions
Add emacs vterm package
2023-09-20 09:00:22 +01:00
Evie Litherland-Smith 62c06dae9e Add gitui as non-flake input to bring vim binds back 2023-09-17 08:57:08 +01:00
Evie Litherland-Smith e3fc4db76a Split steam into separate expression 2023-09-16 17:58:43 +01:00
Evie Litherland-Smith 9394a99a4c Move a bunch of default.nix up a level
Loads of expressions were a single default.nix in a directory, instead
just make a single directory
Hyprland is the only directory of expressions left
Move a few things around to fit this a bit better
Add home/default.nix to defer "import all" from flake.nix

Remove work email from default account set up, add to work laptop
specifically and only

Clean up a few unused expressions
2023-09-15 07:13:52 +01:00
Evie Litherland-Smith da9080b423 Fix mu4e installation so I can go back to using mu 2023-09-14 17:09:21 +01:00
Evie Litherland-Smith 7d31bf8b54 Remove Monarch
Slightly rewrite specialArgs and extraSpecialArgs to ensure consistency
and also stop passing input around
2023-09-13 06:45:28 +01:00
Evie Litherland-Smith 4282e34bb2 Remove emacs server, add doom to path 2023-09-12 11:59:27 +01:00
Evie Litherland-Smith 06ed0f1d52 Add doom-emacs using nix directly
Keep config as separate repo for rapid iteration
Restore Makefile
2023-09-12 08:33:05 +01:00
Evie Litherland-Smith 9cdc091141 Wallpaper changes to not be a flake any more 2023-09-12 06:24:56 +01:00
Evie Litherland-Smith 477f65d5d0 Theme update for consistency
Switch back to Macchiato + Lavender based theme for everything
2023-09-11 17:22:14 +01:00
Evie Litherland-Smith b01a5687e3 Fix typo in Ronin systemConfig call 2023-09-11 10:31:55 +01:00
Evie Litherland-Smith 042e621f6c Remove 'nou' alias 2023-09-11 09:26:06 +01:00
Evie Litherland-Smith 0546a98547 Add rofi-calc and qalculate back to replace anyrun
Remove some program keybinds
2023-09-11 08:28:50 +01:00
Evie Litherland-Smith 189a13dbc5 Add media programs (mpd/mpc and mpv) 2023-09-11 07:48:40 +01:00
Evie Litherland-Smith 98353e7141 Add xdg.userDirs to home-manager 2023-09-11 07:37:08 +01:00
Evie Litherland-Smith 353bbf99c4 Add git and neofetch to system packages
Adjust emacs hyprland bind
2023-09-10 18:00:52 +01:00
Evie Litherland-Smith a227840437 Re-enable emacs server now that startup issue should be fixed 2023-09-10 17:36:11 +01:00
Evie Litherland-Smith 938fefdd94 Bring flakeURL back 2023-09-10 17:23:24 +01:00
Evie Litherland-Smith 10a44cbc2d Major re-write to make things more modularised
Move collection expressions from hosts/ into services/ as importable
modules
Remove service/hostname.nix collections
Remove all imports from host/ expressions and include as modules in
flake.nix
Set sensible defaults that propagate to (I think) everything
2023-09-10 17:07:11 +01:00
Evie Litherland-Smith 393c1a7752 Add (new) Northstar config 2023-09-09 22:37:13 +01:00
Evie Litherland-Smith d774fca10c Set hyprland theme directly from flake input
Set GTK env dynamically from config
2023-09-07 09:22:22 +01:00
Evie Litherland-Smith f58fe209d8 Swap tokyonight theme for catppuccin
Move bat expression to separate file to be imported by git (for delta
syntax highlighting)
Move gitui from tui/default.nix to git/default.nix
2023-09-07 08:48:42 +01:00
Evie Litherland-Smith 5a79050d2b User userpackages for home-manager module 2023-09-04 09:09:26 +01:00
Evie Litherland-Smith 09de275af1 Initial setup of mbsync and msmtp in home-manager 2023-09-01 15:18:29 +01:00
Evie Litherland-Smith 10f089d918 Fix typo in user name 2023-08-31 12:33:10 +01:00
Evie Litherland-Smith 8c5ba7f4c3 Major rewrite to system config
Move home-manager setup back into being NixOS module where possible

Parameterise common elements of system config to minimise rewriting and
pass as function to all places needed
2023-08-31 12:22:29 +01:00
Evie Litherland-Smith 5beae89ae1 Add anyrun, new hypr binds and kanshi fixes
Stop disabling laptop screen due to know Hyprland bug,
just move around with kanshi
2023-08-08 09:51:14 +01:00
Evie Litherland-Smith 55e72cb9cc Move doom flake contents back in
Doom emacs config is still separate repo, but flake contents are back

Remove work firefox profile, switched to chromium instead for Teams fix
2023-07-26 15:45:24 +01:00
Evie Litherland-Smith 272669bcbc Remove some hyprland workspaces, add emacs bind 2023-07-26 11:04:41 +01:00
Evie Litherland-Smith f3e8b1a38e Update doom-emacs flake url
Switch to using chromium instead of firefox for teams support
Remove neovim flake from inputs
2023-07-25 16:14:50 +01:00
Evie Litherland-Smith 292c5b98e1 Move doom config into separate flake
Remove doom config from this repo

Set firefox UA to chrome to make teams calls work...
2023-07-25 13:57:55 +01:00
Evie Litherland-Smith b85bdcec10 Add doom-emacs and template config 2023-07-24 16:45:19 +01:00
Evie Litherland-Smith e2c9d8eba7 Use custom neovim flake, centralise tokyonight source
nvim repo has been converted to flake for easier inclusion but still
stand-alone for non-nix systems

Move tokyonight repo fetch to flake input to keep consistent and reduce
multiple fetch calls
2023-07-24 13:27:05 +01:00
Evie Litherland-Smith a317ac6f05 Switch to zsh, use specialArgs to pass shell name around to update everywhere at the same time 2023-07-19 08:55:53 +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 56c8320fe4 Add home config for Legion 2023-07-16 18:51:45 +01:00
Evie Litherland-Smith 648072665d Let home-manager self-manage 2023-07-16 18:45:41 +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 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 90e7435e1f Fix home config 2023-07-14 11:39:48 +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 96ecc68434 Switch to chromium 2023-07-12 09:06:33 +01:00
Evie Litherland-Smith 590e69098a Start gamescope using FSR upscaling 2023-07-11 13:32:35 +01:00
Evie Litherland-Smith eeb9cc2658 gamescope startup issues 2023-07-11 13:11:07 +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 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 c4897c3532 Clean up and move Vanguard back to using hyprland 2023-07-10 16:40:46 +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 c8470a1b10 Adjust waybar config 2023-07-07 17:52:12 +01:00
Evie Litherland-Smith b01e9c5f18 Rename file for display config 2023-07-07 17:41:22 +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 ed01431115 Switch back to fish, update monitor names/config for new dock 2023-07-07 11:37:58 +01:00
Evie Litherland-Smith 763cfe384a Try switching to Zsh as default shell 2023-07-05 11:08:23 +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 0cbed7a97e Add initial configs for awesome and qtile wm for testing 2023-07-04 11:33:39 +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 6e65439c0b Move wallpaper config into bspwm extraConfig, add monitor setup 2023-07-03 08:48:15 +01:00
Evie Litherland-Smith 38ca1c1148 Typos again... 2023-07-02 17:18:32 +01:00
Evie Litherland-Smith d46295368c Typo in autologin definition 2023-07-02 17:17:45 +01:00
Evie Litherland-Smith 82644d724d Switch Vanguard to using bspwm as well, enable sddm autologin 2023-07-02 17:17:13 +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 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 7539e4677c Rename overlays for new convention 2023-06-30 09:16:30 +01:00
Evie Litherland-Smith cc75a74d52 Enable xserver and xwayland for Vanguard 2023-06-29 10:59:36 +01:00
Evie Litherland-Smith dac07a1229 Change vanguard to use steam gamescope by default 2023-06-29 09:41:52 +01:00
Evie Litherland-Smith a407658e0f Start steam on startup 2023-06-29 07:29:47 +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 f29e4608c9 Fix nixpkgs for home-manager 2023-06-28 18:26:37 +01:00
Evie Litherland-Smith e97d94c79e Add workspace for steam, update syncthing for Vanguard 2023-06-28 18:03:45 +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 9359fd9981 Add newm as flake input for testing 2023-06-27 22:03:15 +01:00
Evie Litherland-Smith bbc11f6af2 Add extra Hyprland packages back to flake 2023-06-27 16:10:31 +01:00
Evie Litherland-Smith 24ecf210d5 Rename work laptop to fit theme, capitalise names in syncthing config for consistency 2023-06-27 13:46:28 +01:00
Evie Litherland-Smith 21d52f6ee1 Add Vanguard syncthing to flake.nix 2023-06-27 07:39:29 +01:00
Evie Litherland-Smith bd5039992c Move things into abstacted sections to maximuse reuse 2023-06-26 15:08:44 +01:00
Evie Litherland-Smith 3544950bd4 Reinstate Hyprland as default window manager 2023-06-26 13:23:27 +01:00
Evie Litherland-Smith b8c4d845f5 Fix typo in wallpaper definition 2023-06-26 09:25:01 +01:00
Evie Litherland-Smith a40b8d38d8 Move wallpaper setting into flake.nix to make it easier and drop requirement for specialArgs 2023-06-24 09:10:26 +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 389df6c760 Update flake URI from merging branch into main 2023-06-22 14:42:25 +01:00
Evie Litherland-Smith 897302b568 Add Vanguard config to flake 2023-06-22 14:31:35 +01:00
Evie Litherland-Smith 4852bfe01b Move common into flake.nix (working this time) 2023-06-22 12:48:11 +01:00
Evie Litherland-Smith 7e397ba226 Make locales device specific 2023-06-22 12:33:17 +01:00
Evie Litherland-Smith 41b4f0d987 Move hardware and locales into flake.nix 2023-06-22 12:30:36 +01:00
Evie Litherland-Smith 834b00c89f Restore to state when unfree packages worked 2023-06-22 10:59:58 +01:00
Evie Litherland-Smith 29ba7fb662 Merge branch 'flake-conversion' of https://git.xenia.me.uk/xenia/nixos into flake-conversion 2023-06-22 10:00:22 +01:00
Evie Litherland-Smith 4d08f9df54 Allow unfree packages in nixplgs 2023-06-22 10:00:21 +01:00
Evie Litherland-Smith 38a71a1e55 Remove dangling import 2023-06-22 09:56:32 +01:00
Evie Litherland-Smith c241b30e6b Move some extra bits into flake expression 2023-06-22 09:54:46 +01:00
Evie Litherland-Smith 51eebdd748 Move more machines into hosts system, set Legion to auto update from flake URI 2023-06-22 09:34:05 +01:00
Evie Litherland-Smith 2b5a31d1bf Move machines config into relevant hosts section 2023-06-22 09:27:39 +01:00
Evie Litherland-Smith cb9ff03a5b Standise config for N0245 (like Legion) 2023-06-22 09:13:05 +01:00
Evie Litherland-Smith ffbcb9053f Add Legion config to flake 2023-06-22 09:03:42 +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 697c8129f2 Update N0245 config, currently still relies on /etc/nixos 2023-06-21 21:43:45 +01:00
Evie Litherland-Smith 51ad3c8141 Add more configs to flake.nix 2023-06-21 21:23:51 +01:00
Evie Litherland-Smith da57432029 Add extra stateful info 2023-06-21 20:55:16 +01:00
Evie Litherland-Smith dcb22ebac5 Add home-manager config for Monarch to flake.nix 2023-06-21 20:49:28 +01:00
Evie Litherland-Smith 4a68237d43 Add initial flake.nix 2023-06-21 17:41:35 +01:00