diff --git a/.index b/.index new file mode 100644 index 0000000..e77938c --- /dev/null +++ b/.index @@ -0,0 +1,7 @@ +flake.lock +flake.nix +home-manager +hosts +nixos +pkgs +README.md diff --git a/home-manager/dots/bash.nix b/home-manager/dots/bash.nix index 9c8715d..3a0e5ec 100644 --- a/home-manager/dots/bash.nix +++ b/home-manager/dots/bash.nix @@ -55,7 +55,7 @@ # Environmental Variables # Uncomment the following line if you don't like systemctl's auto-paging feature: export SYSTEMD_PAGER= - export PS1='\n\u@\h:\w \j $?\n\$ ' + export PS1='\n\u@\h:\w\n\j $? \$ ' export BEMENU_OPTS="--tb '#03'\ --tf '#${config.colorScheme.colors.base07}'\ --fb '#${config.colorScheme.colors.base00}'\ diff --git a/home-manager/dots/mako.nix b/home-manager/dots/mako.nix index 971303a..5792d19 100644 --- a/home-manager/dots/mako.nix +++ b/home-manager/dots/mako.nix @@ -3,7 +3,7 @@ services.mako = { enable = true; backgroundColor = "#${config.colorScheme.colors.base01}"; - borderColor = "#${config.colorScheme.colors.base0E}"; + borderColor = "#${config.colorScheme.colors.base0D}"; borderRadius = 5; borderSize = 2; textColor = "#${config.colorScheme.colors.base07}"; @@ -14,15 +14,15 @@ defaultTimeout = 10000; extraConfig = '' [urgency=low] - border-color=#${config.colorScheme.colors.base01} + border-color=#${config.colorScheme.colors.base00} text-color=#${config.colorScheme.colors.base07} [urgency=normal] border-color=#${config.colorScheme.colors.base0D} - text-color=#${config.colorScheme.colors.base04} + text-color=#${config.colorScheme.colors.base07} [urgency=high] - background-color=#${config.colorScheme.colors.base0E} - border-color=#${config.colorScheme.colors.base0E} - text-color=#${config.colorScheme.colors.base04} + background-color=#${config.colorScheme.colors.base0D} + border-color=#${config.colorScheme.colors.base0D} + text-color=#${config.colorScheme.colors.base07} ''; }; } diff --git a/home-manager/dots/river.nix b/home-manager/dots/river.nix index c5a88ee..e490cf3 100644 --- a/home-manager/dots/river.nix +++ b/home-manager/dots/river.nix @@ -24,7 +24,7 @@ # Theme riverctl background-color 0x${config.colorScheme.colors.base00} - riverctl border-color-focused 0x${config.colorScheme.colors.base0A} + riverctl border-color-focused 0x${config.colorScheme.colors.base0D} riverctl border-color-unfocused 0x${config.colorScheme.colors.base00} # Launch Shortcuts diff --git a/home-manager/dots/tmux.nix b/home-manager/dots/tmux.nix index 053b262..691edda 100644 --- a/home-manager/dots/tmux.nix +++ b/home-manager/dots/tmux.nix @@ -53,7 +53,6 @@ ''; plugins = with pkgs; [ tmuxPlugins.urlview - tmuxPlugins.yank ]; }; } diff --git a/home-manager/wayland.nix b/home-manager/wayland.nix index 5331fa5..f8a684d 100644 --- a/home-manager/wayland.nix +++ b/home-manager/wayland.nix @@ -13,6 +13,6 @@ ./dots/way-displays.nix ]; # themes can be found here: https://github.com/tinted-theming/base16-schemes - colorScheme = inputs.nix-colors.colorSchemes.darcula; + colorScheme = inputs.nix-colors.colorSchemes.dracula; gtkNix.enable = true; } diff --git a/nixos/base.nix b/nixos/base.nix index a0dc300..841b40f 100644 --- a/nixos/base.nix +++ b/nixos/base.nix @@ -111,17 +111,16 @@ ]; }; system = { - #autoUpgrade = { - # enable = true; - # allowReboot = false; - # channel = "https://channels.nixos.org/nixos-unstable"; - # flake = ""; - # flags = [ - # "--update-input" - # "nixpkgs" - # "--commit-lockfile" - # ]; - #}; + autoUpgrade = { + enable = true; + allowReboot = false; + flake = "https://git.sdf.org/${user.long}/confix.git"; + flags = [ + "--update-input" + "nixpkgs" + "--commit-lockfile" + ]; + }; stateVersion = "22.11"; }; } diff --git a/todo.md b/todo.md deleted file mode 100644 index e9d773b..0000000 --- a/todo.md +++ /dev/null @@ -1,42 +0,0 @@ -- [ ] Create additional host configurations -- [ ] Implement the Impermanence module - - [Erase your darlings](https://grahamc.com/blog/erase-your-darlings/) - - [tmpfs as home](https://elis.nu/blog/2020/06/nixos-tmpfs-as-home/) - - [tmpfs as root](https://elis.nu/blog/2020/05/nixos-tmpfs-as-root/) - - [Impermanence - NixOS Wiki](https://nixos.wiki/wiki/Impermanence) -- [ ] Implement [Agenix](https://nixos.wiki/wiki/Agenix) or Sopsnix - - [Agenix Git Repo](https://github.com/ryantm/agenix) - - [Homeage Git Repo](https://github.com/jordanisaacs/homeage) - - [Handling Secrets in NixOS](https://lgug2z.com/articles/handling-secrets-in-nixos-an-overview/) - - [NixOS Secrets Management](https://onion.tube/watch?v=G5f6GC7SnhU) -- [ ] Implement [MicroVM.nix](https://github.com/astro/microvm.nix) -- [ ] Figure out urlview and yank conflict with tmux plugins -- [ ] Fix autoupdate with remote flake repo -- [ ] Wayland monitors swap positions after turning off and turning back on -- [ ] GPG unlock prompt not happening on Wayland anymore - - -https://github.com/alex-courtis/way-displays - -Configure - -Restart the compositor and run way-displays -g or look at /tmp/way-displays.1.me.log. - -Tweak cfg.yaml to your liking and save it. Changes will be immediately applied. - -Alternatively, use the command line to make your changes then persist them with way-displays -w. - -You might want to tail -f /tmp/way-displays.1.me.log whilst you are tweaking. -Usage - -See Configuration for details on cfg.yaml and the command line. - -Start the way-displays server by running once with no arguments after your wayland compositor has been started. - -It will remain in the background, responding to changes, such as plugging in a display, and will terminate when you exit the compositor. - -It will print messages to inform you of everything that is going on. - -You can interact with the server via the command line - -The server responds to IPC requests to fetch and mutate state.