Compare commits

..

No commits in common. "370e2e29ffaa761a83183a7d65b375bdf857f0c6" and "506dfa7006ca596ccdea1cb076040b390b7e406d" have entirely different histories.

9 changed files with 40 additions and 59 deletions

8
flake.lock generated
View File

@ -248,16 +248,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1736200483, "lastModified": 1735834308,
"narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", "rev": "6df24922a1400241dae323af55f30e4318a6ca65",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-24.11", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

View File

@ -4,7 +4,7 @@
inputs = { inputs = {
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
stylix.url = "github:danth/stylix"; stylix.url = "github:danth/stylix";
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";

View File

@ -16,7 +16,7 @@
userName = "k"; userName = "k";
userEmail = "markers711@gmail.com"; userEmail = "markers711@gmail.com";
}; };
tmux.enable = true; tmux = {enable = true;};
starship.enable = true; starship.enable = true;
zsh = { zsh = {
enable = true; enable = true;

View File

@ -5,7 +5,7 @@
... ...
}: { }: {
imports = [./waybar.nix ./tile.nix]; imports = [./waybar.nix ./tile.nix];
programs = {hyprlock = {enable=true;};};
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
systemd.variables = ["--all"]; systemd.variables = ["--all"];
@ -37,6 +37,7 @@
noise = 0.3; noise = 0.3;
new_optimizations = true; new_optimizations = true;
}; };
drop_shadow = true;
}; };
misc = { misc = {
@ -82,7 +83,7 @@
"$mainMod, 0, workspace, 10" "$mainMod, 0, workspace, 10"
# same as above, but switch to the workspace # same as above, but switch to the workspace
"$mainMod SHIFT, 1, movetoworkspacesilent, 1" "$mainMod SHIFT, 1, movetoworkspacesilent, 1" # movetoworkspacesilent
"$mainMod SHIFT, 2, movetoworkspacesilent, 2" "$mainMod SHIFT, 2, movetoworkspacesilent, 2"
"$mainMod SHIFT, 3, movetoworkspacesilent, 3" "$mainMod SHIFT, 3, movetoworkspacesilent, 3"
"$mainMod SHIFT, 4, movetoworkspacesilent, 4" "$mainMod SHIFT, 4, movetoworkspacesilent, 4"

View File

@ -7,9 +7,9 @@
services = {mako = {enable = true;};}; services = {mako = {enable = true;};};
programs = { programs = {
alacritty = {enable = true;}; alacritty = {enable = true;};
swaylock = {enable = true;};
wofi = {enable = true;}; wofi = {enable = true;};
zathura = {enable = true;}; zathura = {enable = true;};
mpv = {enable = true;}; mpv = {enable = true;};
}; };
stylix.targets.wofi.enable = true; #this dosnt follow auto enable for some reson
} }

View File

@ -44,16 +44,16 @@
car = " "; car = " ";
default = [" " " "]; default = [" " " "];
}; };
#scroll-step = 1; scroll-step = 1;
#on-click = "pavucontrol"; on-click = "pavucontrol";
}; };
backlight = { backlight = {
tooltip = false; tooltip = false;
format = " {}%"; format = " {}%";
interval = 1; interval = 1;
on-scroll-up = "${pkgs.brightnessctl}/bin/brightnessctl s 5%+"; on-scroll-up = "brightnessctl s 1515";
on-scroll-down = "${pkgs.brightnessctl}/bin/brightnessctl s 5%+"; on-scroll-down = "brightnessctl s 1";
}; };
network = { network = {

View File

@ -10,18 +10,13 @@
system.autoUpgrade.enable = true; system.autoUpgrade.enable = true;
time.timeZone = "America/New_York"; time.timeZone = "America/New_York";
powerManagement.enable = true; powerManagement.enable = true;
hardware.bluetooth.enable = true;
hardware = { hardware.bluetooth.powerOnBoot = true;
bluetooth = { hardware.bluetooth.settings = {
enable = true;
powerOnBoot = true;
settings = {
General = { General = {
Enable = "Source,Sink,Media,Socket"; Enable = "Source,Sink,Media,Socket";
}; };
}; };
};
};
nix = { nix = {
gc.automatic = true; gc.automatic = true;
@ -65,21 +60,10 @@
enable = true; enable = true;
package = pkgs.ollama-intel; package = pkgs.ollama-intel;
}; };
tlp = {
enable = true;
settings = {
CPU_SCALING_GOVERNOR_ON_AC = "performance";
CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
};
};
logind = {
lidSwitch = "suspend-then-hibernate";
lidSwitchExternalPower = "suspend";
};
blueman.enable = true; blueman.enable = true;
xserver.enable = true;
displayManager.sddm.enable = true;
desktopManager.plasma6.enable = true;
fwupd.enable = true; fwupd.enable = true;
printing.enable = true; printing.enable = true;
fprintd.enable = true; fprintd.enable = true;
@ -104,24 +88,24 @@
}; };
fonts = { fonts = {
serif = { serif = {
package = pkgs.nerdfonts; package = pkgs.nerd-fonts.iosevka;
name = "Iosevka NF"; name = "Iosevka NF";
}; };
sansSerif = { sansSerif = {
package = pkgs.nerdfonts; package = pkgs.nerd-fonts.iosevka;
name = "Iosevka NF"; name = "Iosevka NF";
}; };
monospace = { monospace = {
package = pkgs.nerdfonts; package = pkgs.nerd-fonts.iosevka;
name = "Iosevka NFM"; name = "Iosevka NFM";
}; };
# emoji = { emoji = {
# package = pkgs.notofonts; package = pkgs.noto-fonts-emoji;
# name = "Noto Color Emoji"; name = "Noto Color Emoji";
# }; };
}; };
}; };
@ -142,12 +126,6 @@
programs = { programs = {
zsh.enable = true; zsh.enable = true;
regreet.enable = true;
hyprlock.enable = true;
hyprland = {
enable = true;
withUWSM = true;
};
}; };
users.users.k = { users.users.k = {
@ -165,15 +143,18 @@
environment = { environment = {
sessionVariables = {MOZ_USE_XINPUT2 = "1";}; sessionVariables = {MOZ_USE_XINPUT2 = "1";};
plasma6.excludePackages = with pkgs; [
kate
oxygen
xterm
];
systemPackages = with pkgs; [ systemPackages = with pkgs; [
maliit-keyboard
maliit-framework
alacritty
]; ];
}; };
systemd.sleep.extraConfig = ''
HibernateDelaySec=30m
SuspendState=mem
'';
boot = { boot = {
plymouth = {enable = true;}; plymouth = {enable = true;};

View File

@ -6,7 +6,6 @@
}: { }: {
imports = [ imports = [
../home/home_common.nix ../home/home_common.nix
../home/hyprland.nix
]; ];
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
@ -22,7 +21,7 @@
btop btop
zip zip
emacs-gtk emacs30-pgtk
direnv direnv
texliveFull texliveFull
@ -49,7 +48,7 @@
emacs = { emacs = {
enable = true; enable = true;
defaultEditor = true; defaultEditor = true;
package = pkgs.emacs-gtk; package = pkgs.emacs30-pgtk;
}; };
}; };
stylix = { stylix = {

View File

@ -34,7 +34,7 @@
cat << EOF > "$out/bin/ollama-wrapped" cat << EOF > "$out/bin/ollama-wrapped"
#!/bin/sh #!/bin/sh
export LD_LIBRARY_PATH="${prev.intel-compute-runtime.drivers}/lib" export LD_LIBRARY_PATH="${prev.intel-compute-runtime.drivers}/lib"
export OLLAMA_INTEL_GPU=1 export OLLAMA_INTEL_GPU=-1
exec "$out/bin/ollama-base" "\$@" exec "$out/bin/ollama-base" "\$@"
EOF EOF
chmod +x "$out/bin/ollama-wrapped" chmod +x "$out/bin/ollama-wrapped"