From 2016bc4319412a6454be072bf51eb4a4b5a08c49 Mon Sep 17 00:00:00 2001 From: misschloe777 Date: Sun, 28 Sep 2025 09:42:52 +0200 Subject: [PATCH 1/8] added matugen --- flake.nix | 36 ++++++++++++------- .../dotfiles/matugen/templates/colors.css | 7 ++++ 2 files changed, 31 insertions(+), 12 deletions(-) create mode 100644 home-manager/dotfiles/matugen/templates/colors.css diff --git a/flake.nix b/flake.nix index 224d4da..868d163 100644 --- a/flake.nix +++ b/flake.nix @@ -64,6 +64,11 @@ url = "github:moonlight-mod/moonlight/develop"; # Add `/develop` to the flake URL to use nightly. inputs.nixpkgs.follows = "nixpkgsUnstable"; }; + + matugen = { + url = "github:/InioX/Matugen"; + inputs.nixpkgs.follows = "nixpkgsUnstable"; + }; }; outputs = @@ -149,21 +154,28 @@ specialArgs = specialArgs; modules = [ ./hosts/buldak/configuration.nix + + lix-module.nixosModules.default catppuccin.nixosModules.catppuccin home-manager.nixosModules.home-manager { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.${username} = { - imports = [./home-manager/home.nix catppuccin.homeModules.catppuccin moonlight.homeModules.default]; - - home.packages = [ - inputs.miovim.packages.${system}.default - ]; + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.${username} = { + imports = [ + ./home-manager/home.nix + catppuccin.homeModules.catppuccin + moonlight.homeModules.default + ]; - }; + home.packages = [ + inputs.miovim.packages.${system}.default + inputs.matugen.nixosModules.default + ]; - home-manager.extraSpecialArgs = { inherit inputs; }; + }; + + home-manager.extraSpecialArgs = { inherit inputs; }; } ]; }; @@ -269,8 +281,8 @@ packages.fourget = pkgs.callPackage ./packages/4get.nix { }; homeManager = home-manager.lib.homeManagerConfiguration { - pkgs = import nixpkgs {}; - modules = [./home-manager/home.nix]; + pkgs = import nixpkgs { }; + modules = [ ./home-manager/home.nix ]; extraSpecialArgs = specialArgs; }; }; diff --git a/home-manager/dotfiles/matugen/templates/colors.css b/home-manager/dotfiles/matugen/templates/colors.css new file mode 100644 index 0000000..f246856 --- /dev/null +++ b/home-manager/dotfiles/matugen/templates/colors.css @@ -0,0 +1,7 @@ +/* +* Css Colors +* Generated with Matugen +*/ +<* for name, value in colors *> + @define-color {{name}} {{value.default.hex}}; +<* endfor *> From 9293a8e81333e57b3ea08683a32130474d136885 Mon Sep 17 00:00:00 2001 From: misschloe777 Date: Sun, 28 Sep 2025 09:43:51 +0200 Subject: [PATCH 2/8] more stuff for buldak --- home-manager/dotfiles/niri/config.kdl | 17 +++++++----- home-manager/dotfiles/waybar/config.jsonc | 12 ++++++++- home-manager/home.nix | 32 ++++++++++++++++++----- hosts/buldak/features/software.nix | 1 + 4 files changed, 49 insertions(+), 13 deletions(-) diff --git a/home-manager/dotfiles/niri/config.kdl b/home-manager/dotfiles/niri/config.kdl index 166259b..fa82ce4 100644 --- a/home-manager/dotfiles/niri/config.kdl +++ b/home-manager/dotfiles/niri/config.kdl @@ -579,18 +579,18 @@ environment { } // apps to launch at startup -spawn-at-startup "qutebrowser" spawn-at-startup "discord" -spawn-at-startup "beeper" -spawn-at-startup "cinny" +spawn-at-startup "footclient" "nvim" "~/Documents/Notes" +spawn-at-startup "cider" clipboard { disable-primary } -workspace "code" -workspace "internet" -workspace "chat" +workspace "code " +workspace "internet " +workspace "chat 󱋊" +workspace "music 󰽱" window-rule { match at-startup=true app-id=r#"^discord$"# @@ -611,6 +611,11 @@ window-rule { open-on-workspace "internet" } +window-rule { + match at-startup=true app-id=r#"Cider$"# + open-on-workspace "music" +} + window-rule { match app-id=r#"mpv$"# open-floating true diff --git a/home-manager/dotfiles/waybar/config.jsonc b/home-manager/dotfiles/waybar/config.jsonc index ba68370..f1a063b 100644 --- a/home-manager/dotfiles/waybar/config.jsonc +++ b/home-manager/dotfiles/waybar/config.jsonc @@ -9,7 +9,8 @@ "network", "wireplumber", "clock", - "privacy" + "privacy", + "battery" ], "clock": { "format-alt": "{:%a, %d. %b %H:%M}" @@ -81,5 +82,14 @@ }, "tray": { "spacing": 10 + }, + "battery": { + "bat": "BAT0", + "states": { + "warning": 20, + "critical": 10 + }, + "format": "{capacity}% {icon}" + "format-icons": ["", "", "", "", ""], } } diff --git a/home-manager/home.nix b/home-manager/home.nix index 65912d2..909ec27 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -112,12 +112,31 @@ ".config/hyfetch.json".source = dotfiles/hyfetch/hyfetch.json; ".config/niri".source = dotfiles/niri; ".config/mako".source = dotfiles/mako; + }; - # # You can also set the file content immediately. - # ".gradle/gradle.properties".text = '' - # org.gradle.console=verbose - # org.gradle.daemon.idletimeout=3600000 - # ''; + programs.matugen = { + enable = true; + variant = "dark"; + + config = { + wallpaper = { + command = "swww"; + arguments = [ + "img" + "--transition-type" + "center" + ]; + set = true; + }; + }; + + templates = { + waybar = { + input_path = "./templates/colors.css"; + output_path = "~/.config/waybar/colors.css"; + post_hook = "pkill -SIGUSR2 waybar"; + }; + }; }; programs.direnv = { @@ -198,7 +217,7 @@ }; programs.git = { - userName = "chloe"; + userName = "misschloe777"; userEmail = "harryh@ik.me"; enable = true; extraConfig = { @@ -355,6 +374,7 @@ search_mode = "fuzzy"; }; }; + # programs.moonlight = { # enable = true; # configs.stable = { diff --git a/hosts/buldak/features/software.nix b/hosts/buldak/features/software.nix index dbe233f..24b833c 100644 --- a/hosts/buldak/features/software.nix +++ b/hosts/buldak/features/software.nix @@ -8,6 +8,7 @@ osu-lazer-bin signal-desktop cider-2 + iamb ]; virtualisation.containers.enable = true; From 2e9dab5f24193996f5de6c1800160023685593c3 Mon Sep 17 00:00:00 2001 From: misschloe777 Date: Sun, 28 Sep 2025 09:48:14 +0200 Subject: [PATCH 3/8] disabled akkoma --- hosts/sisyphe/features/services/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/sisyphe/features/services/default.nix b/hosts/sisyphe/features/services/default.nix index 9837998..aa5c677 100644 --- a/hosts/sisyphe/features/services/default.nix +++ b/hosts/sisyphe/features/services/default.nix @@ -1,7 +1,7 @@ { config, ... }: { imports = [ - ./akkoma.nix + # ./akkoma.nix # ./archivebox.nix ./homelab-dashboard.nix # ./nextcloud.nix From fa43c4678628756dbdcf910fa6b40735e88836af Mon Sep 17 00:00:00 2001 From: misschloe777 Date: Sun, 28 Sep 2025 09:50:02 +0200 Subject: [PATCH 4/8] buldak should access to homelab --- hosts/sisyphe/configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/sisyphe/configuration.nix b/hosts/sisyphe/configuration.nix index 34f999a..9bc6395 100644 --- a/hosts/sisyphe/configuration.nix +++ b/hosts/sisyphe/configuration.nix @@ -42,6 +42,8 @@ in "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA8sdToNavEQv7PTMJ97HIGM6UlChwGS3x9O8hFilzui harryh@ik.me" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHjz5MUSmc1ahtUJWuvzG7PHH432nx6a0Nj2zfxt3oTP geekcat@protonmail.com" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP9Yp7TbDhYJ27Sh+LcPXT569bMVwbFrkE4zksfU84l+ harry123@goober" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILIKvsv6BM1CxcJ7bmKrq9BZATxtALcOABWJpBfou3HN misschloe777@buldak +" ]; }; From 768b4846b02ae219ca3b1bfa58fbdb0e30325779 Mon Sep 17 00:00:00 2001 From: misschloe777 Date: Sun, 28 Sep 2025 11:53:38 +0200 Subject: [PATCH 5/8] added `auto-cpufreq` and blahaj plymouth --- flake.nix | 11 +++--- hosts/buldak/configuration.nix | 69 ++++++++++++++++++++++------------ 2 files changed, 49 insertions(+), 31 deletions(-) diff --git a/flake.nix b/flake.nix index 868d163..1aee8ed 100644 --- a/flake.nix +++ b/flake.nix @@ -64,9 +64,8 @@ url = "github:moonlight-mod/moonlight/develop"; # Add `/develop` to the flake URL to use nightly. inputs.nixpkgs.follows = "nixpkgsUnstable"; }; - - matugen = { - url = "github:/InioX/Matugen"; + auto-cpufreq = { + url = "github:AdnanHodzic/auto-cpufreq"; inputs.nixpkgs.follows = "nixpkgsUnstable"; }; }; @@ -87,6 +86,7 @@ musnix, lix-module, moonlight, + auto-cpufreq, ... }@inputs: let @@ -154,8 +154,8 @@ specialArgs = specialArgs; modules = [ ./hosts/buldak/configuration.nix - - lix-module.nixosModules.default + # lix-module.nixosModules.default + auto-cpufreq.nixosModules.default catppuccin.nixosModules.catppuccin home-manager.nixosModules.home-manager { @@ -170,7 +170,6 @@ home.packages = [ inputs.miovim.packages.${system}.default - inputs.matugen.nixosModules.default ]; }; diff --git a/hosts/buldak/configuration.nix b/hosts/buldak/configuration.nix index de2540a..ce8ee06 100644 --- a/hosts/buldak/configuration.nix +++ b/hosts/buldak/configuration.nix @@ -11,7 +11,6 @@ { imports = [ - # Include the results of the hardware scan. ./hardware-configuration.nix ../../shared/client/tailscale.nix ../../shared/client/niri.nix @@ -21,18 +20,40 @@ ]; # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; + + boot = { + plymouth = { + enable = true; + theme = "rings"; + themePackages = with pkgs; [ + # By default we would install all themes + plymouth-blahaj-theme + ]; + }; + + # Enable "Silent boot" + consoleLogLevel = 3; + initrd.verbose = false; + kernelParams = [ + "quiet" + "splash" + "boot.shell_on_fail" + "udev.log_priority=3" + "rd.systemd.show_status=auto" + ]; + # Hide the OS choice for bootloaders. + # It's still possible to open the bootloader list by pressing any key + # It will just not appear on screen unless a key is pressed + loader.timeout = 0; + loader.systemd-boot.enable = true; + loader.efi.canTouchEfiVariables = true; + }; boot.initrd.luks.devices."luks-d265e9b2-2ef5-445a-83f2-ec022e0eec7b".device = "/dev/disk/by-uuid/d265e9b2-2ef5-445a-83f2-ec022e0eec7b"; networking.hostName = "buldak"; # Define your hostname. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - # Enable networking networking.networkmanager.enable = true; @@ -89,32 +110,30 @@ # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ - # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. - # wget + poweralertd + matugen ]; nixpkgs.config.permittedInsecurePackages = [ "libsoup-2.74.3" ]; - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - # programs.gnupg.agent = { - # enable = true; - # enableSSHSupport = true; - # }; + nix.package = pkgs.lixPackageSets.stable.lix; - # List services that you want to enable: + # laptop stuff + services.thermald.enable = true; - # Enable the OpenSSH daemon. - # services.openssh.enable = true; - - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; + programs.auto-cpufreq.enable = true; + programs.auto-cpufreq.settings = { + battery = { + governor = "powersave"; + turbo = "auto"; + }; + charger = { + governor = "performance"; + turbo = "auto"; + }; + }; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions From b8cd7adbe1ef802bac23cf13868472856fafd822 Mon Sep 17 00:00:00 2001 From: misschloe777 Date: Sun, 28 Sep 2025 11:53:53 +0200 Subject: [PATCH 6/8] fix: use correct relative path --- home-manager/dotfiles/niri/start-bg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/dotfiles/niri/start-bg.sh b/home-manager/dotfiles/niri/start-bg.sh index a2ab43a..6bfe74a 100755 --- a/home-manager/dotfiles/niri/start-bg.sh +++ b/home-manager/dotfiles/niri/start-bg.sh @@ -1,3 +1,3 @@ #!/bin/sh -./background.sh ~/.config/niri/wallpapers/ +~/.config/niri/background.sh ~/.config/niri/wallpapers/ From 220f5457120ecad17d52e18afd3fa61265b915af Mon Sep 17 00:00:00 2001 From: misschloe777 Date: Sun, 28 Sep 2025 11:54:00 +0200 Subject: [PATCH 7/8] bumped lock --- flake.lock | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/flake.lock b/flake.lock index 8c800ce..f2474ed 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,25 @@ { "nodes": { + "auto-cpufreq": { + "inputs": { + "nixpkgs": [ + "nixpkgsUnstable" + ] + }, + "locked": { + "lastModified": 1758887019, + "narHash": "sha256-5QDHaIKbmremgFh8Pc9ess59K4HJ5APM8pNgnYzAMno=", + "owner": "AdnanHodzic", + "repo": "auto-cpufreq", + "rev": "52194f4db364347626985fed5372eba2b6109cf4", + "type": "github" + }, + "original": { + "owner": "AdnanHodzic", + "repo": "auto-cpufreq", + "type": "github" + } + }, "catppuccin": { "inputs": { "nixpkgs": "nixpkgs" @@ -754,6 +774,7 @@ "alejandra": [ "nixpkgsUnstable" ], + "auto-cpufreq": "auto-cpufreq", "catppuccin": "catppuccin", "home-manager": "home-manager", "lix": "lix", From 46986df271f751a5ee1afc984fd5e753a233e274 Mon Sep 17 00:00:00 2001 From: misschloe777 Date: Sun, 28 Sep 2025 11:55:39 +0200 Subject: [PATCH 8/8] specified correct theme name --- hosts/buldak/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/buldak/configuration.nix b/hosts/buldak/configuration.nix index ce8ee06..3b89372 100644 --- a/hosts/buldak/configuration.nix +++ b/hosts/buldak/configuration.nix @@ -24,7 +24,7 @@ boot = { plymouth = { enable = true; - theme = "rings"; + theme = "blahaj"; themePackages = with pkgs; [ # By default we would install all themes plymouth-blahaj-theme