diff --git a/hosts/curve/configuration.nix b/hosts/curve/configuration.nix index 20ef3aa1..728b464c 100644 --- a/hosts/curve/configuration.nix +++ b/hosts/curve/configuration.nix @@ -34,6 +34,7 @@ networking.interfaces.enp0s31f6.useDHCP = true; networking.interfaces.wlp3s0.useDHCP = true; networking.wireless.enable = true; + networking.wireless.interfaces = ["wlp3s0"]; # Select internationalisation properties. i18n.defaultLocale = "en_US.UTF-8"; diff --git a/hosts/curve/default.nix b/hosts/curve/default.nix index de770132..f12fc668 100644 --- a/hosts/curve/default.nix +++ b/hosts/curve/default.nix @@ -7,12 +7,9 @@ #profiles.users.profiles.desktop ] ++ suites.curve; - #home-manager.users.anish = { suites, ... }: { - # imports = [ - # profiles.users.profiles.desktop - # profiles.users.profiles.firefox - # ]; - #}; + home-manager.users.anish = { suites, ... }: { + imports = suites.base; + }; #bud.enable = true; } diff --git a/profiles/core/starship.toml b/profiles/core/starship.toml index 6ed366b5..f08a026f 100644 --- a/profiles/core/starship.toml +++ b/profiles/core/starship.toml @@ -6,9 +6,9 @@ success_symbol = "[❯](bold purple)" vicmd_symbol = "[❮](bold purple)" [battery] -full_symbol = "" -charging_symbol = "" -discharging_symbol = "" +full_symbol = " " +charging_symbol = " " +discharging_symbol = " " [conda] symbol = " " @@ -17,7 +17,7 @@ symbol = " " style = "cyan" read_only = " 🔒" -[docker] +[docker_context] symbol = " " [elixir] @@ -48,9 +48,6 @@ style = "bold bright-white" [golang] symbol = " " -[haskell] -symbol = " " - [hg_branch] symbol = " " diff --git a/profiles/nvim/nvim.nix b/profiles/nvim/nvim.nix index 5719d7dc..4802c8c4 100644 --- a/profiles/nvim/nvim.nix +++ b/profiles/nvim/nvim.nix @@ -103,7 +103,7 @@ in set noexpandtab set autoindent - set foldmethod=indent " fold based on indent + " set foldmethod=indent " fold based on indent set number set nocompatible set relativenumber @@ -114,7 +114,7 @@ in filetype plugin on set termguicolors - let ayucolor="dark" + let ayucolor="mirage" colorscheme ayu " window diff --git a/users/anish/default.nix b/users/anish/default.nix index 83bff457..4ec5f91c 100644 --- a/users/anish/default.nix +++ b/users/anish/default.nix @@ -4,7 +4,7 @@ #home-manager.users = { inherit (hmUsers) anish; }; users.users.anish = { - password = "SuperDuper"; + hashedPassword = "MVHHpy9gbe3ow"; description = "Personal user for Anish"; isNormalUser = true; extraGroups = [ "wheel" "audio" ]; diff --git a/users/profiles/desktop/ayu-Xresources b/users/profiles/desktop/ayu-Xresources new file mode 100644 index 00000000..8e72bc61 --- /dev/null +++ b/users/profiles/desktop/ayu-Xresources @@ -0,0 +1,44 @@ +! +! Generated with : +! XRDB2Xreources.py +! +*.foreground: #e6e1cf +*.background: #0f1419 +*.cursorColor: #f29718 +! +! Black +*.color0: #000000 +*.color8: #323232 +! +! Red +*.color1: #ff3333 +*.color9: #ff6565 +! +! Green +*.color2: #b8cc52 +*.color10: #eafe84 +! +! Yellow +*.color3: #e7c547 +*.color11: #fff779 +! +! Blue +*.color4: #36a3d9 +*.color12: #68d5ff +! +! Magenta +*.color5: #f07178 +*.color13: #ffa3aa +! +! Cyan +*.color6: #95e6cb +*.color14: #c7fffd +! +! White +*.color7: #ffffff +*.color15: #ffffff +! +! Bold, Italic, Underline +*.colorBD: #e6e1cf +!*.colorIT: +!*.colorUL: diff --git a/users/profiles/desktop/ayu-dark-kitty.conf b/users/profiles/desktop/ayu-dark-kitty.conf new file mode 100644 index 00000000..451d8b8b --- /dev/null +++ b/users/profiles/desktop/ayu-dark-kitty.conf @@ -0,0 +1,23 @@ + +background #0A0E14 +foreground #B3B1AD +cursor #E6B450 +selection_background #273747 +color0 #000000 +color8 #4D5566 +color1 #FF3333 +color9 #D96C75 +color2 #C2D94C +color10 #91B362 +color3 #FF8F40 +color11 #F29668 +color4 #59C2FF +color12 #6994BF +color5 #D4BFFF +color13 #A37ACC +color6 #95E6CB +color14 #4CBF99 +color7 #ffffff +color15 #F0F0F0 +selection_foreground #B3B1AD + diff --git a/users/profiles/desktop/background.jpg b/users/profiles/desktop/background.jpg new file mode 100644 index 00000000..c0338112 Binary files /dev/null and b/users/profiles/desktop/background.jpg differ diff --git a/users/profiles/desktop/default.nix b/users/profiles/desktop/default.nix index f5b80d44..c511d133 100644 --- a/users/profiles/desktop/default.nix +++ b/users/profiles/desktop/default.nix @@ -3,65 +3,149 @@ { #imports = [ ./xdg.nix ]; - environment.systemPackages = with pkgs; [ - rofi - lightdm - dunst - libnotify - (polybar.override { - pulseSupport = true; - nlSupport = true; - }) + home-manager.users.anish.xdg.enable = true; # This doesn't seem to do anything so we have below + environment.sessionVariables = rec { + XDG_CACHE_HOME = "\${HOME}/.cache"; + XDG_CONFIG_HOME = "\${HOME}/.config"; + XDG_BIN_HOME = "\${HOME}/.local/bin"; + XDG_DATA_HOME = "\${HOME}/.local/share"; + + PATH = [ + "\${XDG_BIN_HOME}" + ]; + }; + environment.systemPackages = with pkgs; [ + nheko # TODO move somewhere meaningful + xclip + xdotool + rofi + lightdm + dunst + libnotify + (polybar.override { + pulseSupport = true; + nlSupport = true; + }) ]; - services = { - picom.enable = true; - #redshift.enable = true; - xserver = { - enable = true; - displayManager = { - defaultSession = "none+bspwm"; - lightdm.enable = true; - lightdm.greeters.mini.enable = true; - lightdm.greeters.mini.user = "anish"; # TODO hardcoded - lightdm.greeters.mini.extraConfig = '' - text-color = "#ff79c6" - password-background-color = "#1E2029" - window-color = "#181a23" - border-color = "#181a23" - ''; - }; - windowManager.bspwm.enable = true; - #windowManager.bspwm.configFile = "/home/anish/.bspwm/bspwmrc"; - windowManager.bspwm.sxhkd.configFile = "/home/anish/.config/sxhkdrc"; + + location.provider = "geoclue2"; + services = { + redshift = { + enable = true; + temperature = { + day = 5500; + night = 3700; + }; + }; + xserver = { + enable = true; + desktopManager.wallpaper.mode = "fill"; + displayManager = { + defaultSession = "none+bspwm"; + sessionCommands = '' + ${pkgs.xorg.xrdb}/bin/xrdb -merge <