Compare commits

..

No commits in common. "46986df271f751a5ee1afc984fd5e753a233e274" and "45df03aec8bb4b2425fa19c95bc9992a9747bea7" have entirely different histories.

11 changed files with 52 additions and 148 deletions

21
flake.lock generated
View file

@ -1,25 +1,5 @@
{ {
"nodes": { "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": { "catppuccin": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
@ -774,7 +754,6 @@
"alejandra": [ "alejandra": [
"nixpkgsUnstable" "nixpkgsUnstable"
], ],
"auto-cpufreq": "auto-cpufreq",
"catppuccin": "catppuccin", "catppuccin": "catppuccin",
"home-manager": "home-manager", "home-manager": "home-manager",
"lix": "lix", "lix": "lix",

View file

@ -64,10 +64,6 @@
url = "github:moonlight-mod/moonlight/develop"; # Add `/develop` to the flake URL to use nightly. url = "github:moonlight-mod/moonlight/develop"; # Add `/develop` to the flake URL to use nightly.
inputs.nixpkgs.follows = "nixpkgsUnstable"; inputs.nixpkgs.follows = "nixpkgsUnstable";
}; };
auto-cpufreq = {
url = "github:AdnanHodzic/auto-cpufreq";
inputs.nixpkgs.follows = "nixpkgsUnstable";
};
}; };
outputs = outputs =
@ -86,7 +82,6 @@
musnix, musnix,
lix-module, lix-module,
moonlight, moonlight,
auto-cpufreq,
... ...
}@inputs: }@inputs:
let let
@ -154,27 +149,21 @@
specialArgs = specialArgs; specialArgs = specialArgs;
modules = [ modules = [
./hosts/buldak/configuration.nix ./hosts/buldak/configuration.nix
# lix-module.nixosModules.default
auto-cpufreq.nixosModules.default
catppuccin.nixosModules.catppuccin catppuccin.nixosModules.catppuccin
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.${username} = { home-manager.users.${username} = {
imports = [ imports = [./home-manager/home.nix catppuccin.homeModules.catppuccin moonlight.homeModules.default];
./home-manager/home.nix
catppuccin.homeModules.catppuccin
moonlight.homeModules.default
];
home.packages = [ home.packages = [
inputs.miovim.packages.${system}.default inputs.miovim.packages.${system}.default
]; ];
}; };
home-manager.extraSpecialArgs = { inherit inputs; }; home-manager.extraSpecialArgs = { inherit inputs; };
} }
]; ];
}; };
@ -280,8 +269,8 @@
packages.fourget = pkgs.callPackage ./packages/4get.nix { }; packages.fourget = pkgs.callPackage ./packages/4get.nix { };
homeManager = home-manager.lib.homeManagerConfiguration { homeManager = home-manager.lib.homeManagerConfiguration {
pkgs = import nixpkgs { }; pkgs = import nixpkgs {};
modules = [ ./home-manager/home.nix ]; modules = [./home-manager/home.nix];
extraSpecialArgs = specialArgs; extraSpecialArgs = specialArgs;
}; };
}; };

View file

@ -1,7 +0,0 @@
/*
* Css Colors
* Generated with Matugen
*/
<* for name, value in colors *>
@define-color {{name}} {{value.default.hex}};
<* endfor *>

View file

@ -579,18 +579,18 @@ environment {
} }
// apps to launch at startup // apps to launch at startup
spawn-at-startup "qutebrowser"
spawn-at-startup "discord" spawn-at-startup "discord"
spawn-at-startup "footclient" "nvim" "~/Documents/Notes" spawn-at-startup "beeper"
spawn-at-startup "cider" spawn-at-startup "cinny"
clipboard { clipboard {
disable-primary disable-primary
} }
workspace "code " workspace "code"
workspace "internet " workspace "internet"
workspace "chat 󱋊" workspace "chat"
workspace "music 󰽱"
window-rule { window-rule {
match at-startup=true app-id=r#"^discord$"# match at-startup=true app-id=r#"^discord$"#
@ -611,11 +611,6 @@ window-rule {
open-on-workspace "internet" open-on-workspace "internet"
} }
window-rule {
match at-startup=true app-id=r#"Cider$"#
open-on-workspace "music"
}
window-rule { window-rule {
match app-id=r#"mpv$"# match app-id=r#"mpv$"#
open-floating true open-floating true

View file

@ -1,3 +1,3 @@
#!/bin/sh #!/bin/sh
~/.config/niri/background.sh ~/.config/niri/wallpapers/ ./background.sh ~/.config/niri/wallpapers/

View file

@ -9,8 +9,7 @@
"network", "network",
"wireplumber", "wireplumber",
"clock", "clock",
"privacy", "privacy"
"battery"
], ],
"clock": { "clock": {
"format-alt": "{:%a, %d. %b %H:%M}" "format-alt": "{:%a, %d. %b %H:%M}"
@ -82,14 +81,5 @@
}, },
"tray": { "tray": {
"spacing": 10 "spacing": 10
},
"battery": {
"bat": "BAT0",
"states": {
"warning": 20,
"critical": 10
},
"format": "{capacity}% {icon}"
"format-icons": ["", "", "", "", ""],
} }
} }

View file

@ -112,31 +112,12 @@
".config/hyfetch.json".source = dotfiles/hyfetch/hyfetch.json; ".config/hyfetch.json".source = dotfiles/hyfetch/hyfetch.json;
".config/niri".source = dotfiles/niri; ".config/niri".source = dotfiles/niri;
".config/mako".source = dotfiles/mako; ".config/mako".source = dotfiles/mako;
};
programs.matugen = { # # You can also set the file content immediately.
enable = true; # ".gradle/gradle.properties".text = ''
variant = "dark"; # org.gradle.console=verbose
# org.gradle.daemon.idletimeout=3600000
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 = { programs.direnv = {
@ -217,7 +198,7 @@
}; };
programs.git = { programs.git = {
userName = "misschloe777"; userName = "chloe";
userEmail = "harryh@ik.me"; userEmail = "harryh@ik.me";
enable = true; enable = true;
extraConfig = { extraConfig = {
@ -374,7 +355,6 @@
search_mode = "fuzzy"; search_mode = "fuzzy";
}; };
}; };
# programs.moonlight = { # programs.moonlight = {
# enable = true; # enable = true;
# configs.stable = { # configs.stable = {

View file

@ -11,6 +11,7 @@
{ {
imports = [ imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
../../shared/client/tailscale.nix ../../shared/client/tailscale.nix
../../shared/client/niri.nix ../../shared/client/niri.nix
@ -20,40 +21,18 @@
]; ];
# Bootloader. # Bootloader.
boot.loader.systemd-boot.enable = true;
boot = { boot.loader.efi.canTouchEfiVariables = true;
plymouth = {
enable = true;
theme = "blahaj";
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 = boot.initrd.luks.devices."luks-d265e9b2-2ef5-445a-83f2-ec022e0eec7b".device =
"/dev/disk/by-uuid/d265e9b2-2ef5-445a-83f2-ec022e0eec7b"; "/dev/disk/by-uuid/d265e9b2-2ef5-445a-83f2-ec022e0eec7b";
networking.hostName = "buldak"; # Define your hostname. networking.hostName = "buldak"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # 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 # Enable networking
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
@ -110,30 +89,32 @@
# List packages installed in system profile. To search, run: # List packages installed in system profile. To search, run:
# $ nix search wget # $ nix search wget
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
poweralertd # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
matugen # wget
]; ];
nixpkgs.config.permittedInsecurePackages = [ nixpkgs.config.permittedInsecurePackages = [
"libsoup-2.74.3" "libsoup-2.74.3"
]; ];
nix.package = pkgs.lixPackageSets.stable.lix; # 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;
# };
# laptop stuff # List services that you want to enable:
services.thermald.enable = true;
programs.auto-cpufreq.enable = true; # Enable the OpenSSH daemon.
programs.auto-cpufreq.settings = { # services.openssh.enable = true;
battery = {
governor = "powersave"; # Open ports in the firewall.
turbo = "auto"; # networking.firewall.allowedTCPPorts = [ ... ];
}; # networking.firewall.allowedUDPPorts = [ ... ];
charger = { # Or disable the firewall altogether.
governor = "performance"; # networking.firewall.enable = false;
turbo = "auto";
};
};
# This value determines the NixOS release from which the default # This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions # settings for stateful data, like file locations and database versions

View file

@ -8,7 +8,6 @@
osu-lazer-bin osu-lazer-bin
signal-desktop signal-desktop
cider-2 cider-2
iamb
]; ];
virtualisation.containers.enable = true; virtualisation.containers.enable = true;

View file

@ -42,8 +42,6 @@ in
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA8sdToNavEQv7PTMJ97HIGM6UlChwGS3x9O8hFilzui harryh@ik.me" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA8sdToNavEQv7PTMJ97HIGM6UlChwGS3x9O8hFilzui harryh@ik.me"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHjz5MUSmc1ahtUJWuvzG7PHH432nx6a0Nj2zfxt3oTP geekcat@protonmail.com" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHjz5MUSmc1ahtUJWuvzG7PHH432nx6a0Nj2zfxt3oTP geekcat@protonmail.com"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP9Yp7TbDhYJ27Sh+LcPXT569bMVwbFrkE4zksfU84l+ harry123@goober" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP9Yp7TbDhYJ27Sh+LcPXT569bMVwbFrkE4zksfU84l+ harry123@goober"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILIKvsv6BM1CxcJ7bmKrq9BZATxtALcOABWJpBfou3HN misschloe777@buldak
"
]; ];
}; };

View file

@ -1,7 +1,7 @@
{ config, ... }: { config, ... }:
{ {
imports = [ imports = [
# ./akkoma.nix ./akkoma.nix
# ./archivebox.nix # ./archivebox.nix
./homelab-dashboard.nix ./homelab-dashboard.nix
# ./nextcloud.nix # ./nextcloud.nix