diff --git a/flake.lock b/flake.lock index 254aab5..95b734f 100644 --- a/flake.lock +++ b/flake.lock @@ -1036,6 +1036,22 @@ "type": "github" } }, + "nixpkgs-stable_4": { + "locked": { + "lastModified": 1738843498, + "narHash": "sha256-7x+Q4xgFj9UxZZO9aUDCR8h4vyYut4zPUvfj3i+jBHE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "f5a32fa27df91dfc4b762671a0e0a859a8a0058f", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1708118438, @@ -1223,6 +1239,7 @@ "nix-rice": "nix-rice", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_6", + "nixpkgs-stable": "nixpkgs-stable_4", "paperwm": "paperwm", "shikane": "shikane", "sops-nix": "sops-nix", diff --git a/flake.nix b/flake.nix index a2ec9a4..31c09b8 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,8 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; + home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -133,11 +135,15 @@ specialArgs = { inherit inputs; nix-config = self; + pkgs-stable = inputs.nixpkgs-stable { + config.allowUnfree = true; + }; }; modules = [ inputs.kmonad.nixosModules.default inputs.musnix.nixosModules.musnix inputs.niri.nixosModules.niri + ./hosts/eddie/configuration.nix home-manager.nixosModules.home-manager @@ -146,6 +152,7 @@ home-manager = { useGlobalPkgs = true; useUserPackages = true; + backupFileExtension = "bak"; sharedModules = [ inputs.nix-flatpak.homeManagerModules.nix-flatpak inputs.sops-nix.homeManagerModules.sops @@ -160,22 +167,5 @@ ]; }; }; - - # homeConfigurations = { - # "emenel" = home-manager.lib.homeManagerConfiguration { - # pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance - # extraSpecialArgs = { - # inherit inputs; - # nix-config = self; - # }; - - # modules = [ - # inputs.nix-flatpak.homeManagerModules.nix-flatpak - # inputs.sops-nix.homeManagerModules.sops - # inputs.niri.homeModules.niri - # ./homes/emenel/default.nix - # ]; - # }; - # }; }; } diff --git a/homes/emenel/default.nix b/homes/emenel/default.nix index bb6aa1e..29a05fa 100644 --- a/homes/emenel/default.nix +++ b/homes/emenel/default.nix @@ -11,6 +11,7 @@ email gnome niri + waybar # shikane ]; @@ -321,7 +322,10 @@ programs = { home-manager.enable = true; - + eww = { + enable = true; + configDir = ../../homes/emenel/dotfiles/dot_config/eww; + }; emacs = { enable = true; package = ((pkgs.emacsPackagesFor pkgs.emacs29-pgtk).emacsWithPackages ( @@ -405,8 +409,6 @@ "/home/emenel/.local/share/applications/wine/Programs" "/home/emenel/.local/share/applications" "/var/lib/flatpak/exports/share" - "/home/emenel/.local/share/flatpak/exports/share" - "/home/emenel/.nix-profile/share/applications" ]; services.flatpak = { @@ -428,7 +430,6 @@ # moving files! xdg.configFile."halloy/config.toml".source = ./dotfiles/dot_config/halloy/config.toml; - xdg.configFile."waybar".source = ./dotfiles/dot_config/waybar; home.file.".npmrc".source = ./dotfiles/dot_npmrc; home.file.".vst3/yabridge/yabridge.toml".source = ./dotfiles/dot_vst3/yabridge.toml; diff --git a/homes/emenel/dotfiles/dot_config/wezterm/wezterm.lua b/homes/emenel/dotfiles/dot_config/wezterm/wezterm.lua index 3aee66f..f6bba4a 100644 --- a/homes/emenel/dotfiles/dot_config/wezterm/wezterm.lua +++ b/homes/emenel/dotfiles/dot_config/wezterm/wezterm.lua @@ -51,17 +51,19 @@ config.font = wezterm.font { -- config.enable_scroll_bar = true +-- config.color_scheme = 'Tomorrow Night Bright' config.color_scheme = 'Adventure' --- config.color_scheme = 'Molokai' +-- config.color_scheme = 'Moonfly' +-- config.color_scheme = 'Afterglow' config.colors = { - background = "#111111", - -- tab_bar = { - -- background = "#111111", - -- inactive_tab = { - -- fg_color = "#444444", - -- bg_color = "#111111" - -- } - -- } + -- background = "#111111", + tab_bar = { + background = "#111111", + inactive_tab = { + fg_color = "#444444", + bg_color = "#111111" + } + } } config.background = { diff --git a/homes/emenel/dotfiles/dot_config/yazi/theme.toml b/homes/emenel/dotfiles/dot_config/yazi/theme.toml index e69de29..5625c57 100644 --- a/homes/emenel/dotfiles/dot_config/yazi/theme.toml +++ b/homes/emenel/dotfiles/dot_config/yazi/theme.toml @@ -0,0 +1,2 @@ +[flavor] +dark = "moonfly" diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index 686b6fe..d255086 100644 --- a/hosts/eddie/configuration.nix +++ b/hosts/eddie/configuration.nix @@ -23,6 +23,7 @@ inputs.niri.overlays.niri inputs.emacs-overlay.overlays.default inputs.audio.overlays.default + inputs.nix-rice.overlays.default ]; }; diff --git a/modules/home/niri.nix b/modules/home/niri.nix index ac7f153..d8d2b95 100644 --- a/modules/home/niri.nix +++ b/modules/home/niri.nix @@ -1,16 +1,9 @@ { config, pkgs, ... }: +with pkgs.lib.nix-rice; +let strPalette = palette.toRGBHex pkgs.rice.colorPalette; +in { -{ programs = { - waybar = { - enable = true; - package = pkgs.waybar; - }; - eww = { - enable = true; - configDir = ../../homes/emenel/dotfiles/dot_config/eww; - }; - niri = { # package = pkgs.niri-unstable; # enable = true; @@ -59,13 +52,13 @@ width = 2560; height = 1600; }; - background-color = "#000000"; + background-color = strPalette.normal.background; scale = 1; variable-refresh-rate = true; }; "HDMI-A-1" = { - background-color = "#000000"; + background-color = strPalette.normal.background; scale = 1; }; @@ -74,7 +67,7 @@ width = 3840; height = 2160; }; - background-color = "#000000"; + background-color = strPalette.normal.background; scale = 1; }; }; @@ -117,8 +110,8 @@ focus-ring = { enable = true; active.gradient = { - from = "#d8bfffdd"; - to = "#BD93FF99"; + from = strPalette.normal.magenta; + to = strPalette.bright.magenta; angle = 180; in' = "srgb-linear"; }; diff --git a/homes/emenel/dotfiles/dot_config/waybar/style.css b/modules/home/waybar.nix similarity index 80% rename from homes/emenel/dotfiles/dot_config/waybar/style.css rename to modules/home/waybar.nix index 245108e..7c1588d 100644 --- a/homes/emenel/dotfiles/dot_config/waybar/style.css +++ b/modules/home/waybar.nix @@ -1,3 +1,12 @@ +{ pkgs, ... }: +with pkgs.lib.nix-rice; +let strPalette = palette.toRGBHex pkgs.rice.colorPalette; +in { + + programs.waybar = { + enable = true; + package = pkgs.waybar; + style = '' * { border: none; font-size: 12pt; @@ -6,7 +15,7 @@ } window#waybar { - background: transparent; + background: ${strPalette.normal.background}; margin: 5px; } @@ -71,7 +80,7 @@ window#waybar { } #clock{ - color: #d8bfff; + color: ${strPalette.normal.magenta}; } #battery.charging { @@ -124,4 +133,10 @@ window#waybar { background-color: #ffffff; color: #000000; } +} + ''; + }; + + xdg.configFile."waybar/config".source = ../../homes/emenel/dotfiles/dot_config/waybar/config; + } diff --git a/overlays/rice.nix b/overlays/rice.nix index 413c287..b622ab7 100644 --- a/overlays/rice.nix +++ b/overlays/rice.nix @@ -1,10 +1,16 @@ self: super: -with super.lib.nix-rice; -let theme = kitty-themes.getThemeByName "Molokai"; +with super.pkgs.lib.nix-rice; +let theme = kitty-themes.getThemeByName "Monokai_Pro"; in { rice = { colorPalette = rec { normal = palette.defaultPalette // { + background = { + a = 1.0; + r = 17; + g = 17; + b = 17; + }; black = theme.color0; red = theme.color1; green = theme.color2; @@ -15,6 +21,12 @@ in { white = theme.color7; }; bright = palette.brighten 10 normal // { + background = { + a = 1.0; + r = 17; + g = 17; + b = 17; + }; black = theme.color8; red = theme.color9; green = theme.color10; @@ -25,24 +37,18 @@ in { white = theme.color15; }; dark = palette.darken 10 normal; - primary = { - inherit (theme) background foreground; - bright_foreground = color.brighten 10 theme.foreground; - dim_foreground = color.darken 10 theme.foreground; - }; } // theme; font = { - normal = { - name = "Cantarell"; - package = self.cantarell-fonts; - size = 10; - }; monospace = { - name = "FiraCode Nerd Font Mono"; - package = self.nerdfonts.override { fonts = [ "FiraCode" ]; }; - size = 10; + name = "JetBrainsMono Nerd Font"; + package = self.nerdfonts.override { fonts = [ "Jetbrains-Mono" ]; }; + size = 12; + }; + normal = { + name = "JetBrainsMono Nerd Font"; + package = self.nerdfonts.override { fonts = [ "Jetbrains-Mono" ]; }; + size = 12; }; }; - opacity = 0.95; }; }