From bee4b013626b7a631a216d14b95753ef64bab08e Mon Sep 17 00:00:00 2001 From: foglar Date: Wed, 19 Feb 2025 08:16:30 +0100 Subject: [PATCH] Cleanup and fixes, ginoza update --- TODO.md | 6 ++++++ flake.nix | 4 ++-- ginoza/home.nix | 20 +++++++++++-------- kogami/configuration.nix | 10 ---------- .../home/desktop/hyprland/clipboard-rofi.nix | 10 ++++++---- nixos/system/settings/style.nix | 10 +++++----- 6 files changed, 31 insertions(+), 29 deletions(-) diff --git a/TODO.md b/TODO.md index b3ada2c..ff164dc 100644 --- a/TODO.md +++ b/TODO.md @@ -39,6 +39,12 @@ - [ ] add syncthing configuration - [x] qutebrowser configuration - [ ] script dir set environment variable +- [ ] eww configuration +- [ ] fix notifications +- [ ] add multiple themes +- [ ] customization of bg better +- [ ] fastfetch customization +- [ ] sddm theme - [ ] update my home page and create new web - [ ] fix kde theme in stylix diff --git a/flake.nix b/flake.nix index 308b49c..57d8324 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,7 @@ editor = "neovim"; # neovim, vscode # List all themes: $ nix build nixpkgs#base16-schemes && ls result/share/themes - theme = "catppuccin-mocha"; # catppuccin-mocha, tokyo-night-dark, one-dark + theme = "evangelion-blood"; # catppuccin-mocha, tokyo-night-dark, one-dark background = if userSettings.theme == "catppuccin-mocha" then "aurora_borealis.png" @@ -29,7 +29,7 @@ height = 1080; }; - configuration_path = "/home/${username}/.dotfiles"; + configuration_path = "/home/${username}/.dotfiles"; # Does nothing for now plasma = false; gnome = false; diff --git a/ginoza/home.nix b/ginoza/home.nix index 40f3dee..e78098c 100644 --- a/ginoza/home.nix +++ b/ginoza/home.nix @@ -1,4 +1,5 @@ { + pkgs, pkgs-stable, userSettings, ... @@ -58,14 +59,17 @@ }; # User defined packages - home.packages = with pkgs-stable; [ - libreoffice - inkscape - gimp - mpv - loupe - distrobox - ]; + home.packages = + (with pkgs-stable; [ + libreoffice + inkscape + gimp + mpv + loupe + ]) + ++ ( + with pkgs; [harmony-music] + ); programs.home-manager.enable = true; } diff --git a/kogami/configuration.nix b/kogami/configuration.nix index 5767672..d7a9dc7 100644 --- a/kogami/configuration.nix +++ b/kogami/configuration.nix @@ -86,8 +86,6 @@ }; environment.systemPackages = [ - pkgs.gcc - inputs.install-script.packages.${system}.default inputs.shinya-nvf.packages.${system}.nvf ]; @@ -97,14 +95,6 @@ # Allow unfree packages nixpkgs.config.allowUnfree = true; - # List packages installed in system profile. To search, run: - # $ nix search wget - - # List services that you want to enable: - - # Enable the OpenSSH daemon. - # services.openssh.enable = true; - # Open ports in the firewall. # networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; diff --git a/nixos/home/desktop/hyprland/clipboard-rofi.nix b/nixos/home/desktop/hyprland/clipboard-rofi.nix index 5ca20b3..2baffc8 100644 --- a/nixos/home/desktop/hyprland/clipboard-rofi.nix +++ b/nixos/home/desktop/hyprland/clipboard-rofi.nix @@ -2,6 +2,7 @@ lib, config, pkgs, + userSettings, ... }: { options = { @@ -10,17 +11,18 @@ config = lib.mkIf config.desktop.hyprland.rofi.clipboard.enable { home.file = { + ".config/rofi/clip_bg.png".source = ../../../../config/backgrounds/${userSettings.background}; ".config/rofi/cliboard.rasi".text = let main-bg = config.lib.stylix.colors.base01; main-fg = config.lib.stylix.colors.base02; main-br = config.lib.stylix.colors.base05; main-ex = config.lib.stylix.colors.base09; - select-bg = config.lib.stylix.colors.base05; # Selected background color + select-bg = config.lib.stylix.colors.base05; # Selected background color select-fg = config.lib.stylix.colors.base11; # Selected text color separatorcolor = "transparent"; border-color = "transparent"; in '' - // Config // + // Config // configuration { modi: "drun"; show-icons: false; @@ -64,7 +66,7 @@ expand: false; orientation: horizontal; background-color: transparent; - background-image: url("~/Pictures/backgrounds/aurora_borealis.png", width); + //background-image: url("~/.config/rofi/clip_bg.png", width); children: [ "wallframe" , "inputbar" ]; } wallframe { @@ -73,7 +75,7 @@ padding: 0em; expand: false; background-color: @main-bg; - background-image: url("~/Pictures/backgrounds/aurora_borealis.png", height); + //background-image: url("~/Pictures/backgrounds/cli_bg.png", height); } diff --git a/nixos/system/settings/style.nix b/nixos/system/settings/style.nix index ac23a00..a45fe91 100644 --- a/nixos/system/settings/style.nix +++ b/nixos/system/settings/style.nix @@ -80,11 +80,11 @@ targets = { plymouth = { - logo = - if userSettings.theme == "evangelion-blood" - then ../../../config/nerv.png - else ""; - logoAnimated = if "evangelion-blood" == userSettings.theme then false else true; + logo = lib.mkIf (userSettings.theme == "evangelion-blood") ../../../config/nerv.png; + logoAnimated = + if "evangelion-blood" == userSettings.theme + then false + else true; }; }; };