Compare commits

...

5 Commits

Author SHA1 Message Date
k
370e2e29ff added missing hyprlock 2025-01-10 18:21:03 -05:00
k
d379c6c406 fix typo 2025-01-10 18:21:03 -05:00
k
ca7c336ff9 Change sleep settings 2025-01-10 18:21:03 -05:00
k
bba9c8494e move to hyprland 2025-01-10 18:21:03 -05:00
k
799398de33 Set to stable release 2025-01-10 18:21:03 -05:00
9 changed files with 59 additions and 40 deletions

8
flake.lock generated
View File

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

View File

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

View File

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

View File

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

View File

@ -7,9 +7,9 @@
services = {mako = {enable = true;};};
programs = {
alacritty = {enable = true;};
swaylock = {enable = true;};
wofi = {enable = true;};
zathura = {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 = " ";
default = [" " " "];
};
scroll-step = 1;
on-click = "pavucontrol";
#scroll-step = 1;
#on-click = "pavucontrol";
};
backlight = {
tooltip = false;
format = " {}%";
interval = 1;
on-scroll-up = "brightnessctl s 1515";
on-scroll-down = "brightnessctl s 1";
on-scroll-up = "${pkgs.brightnessctl}/bin/brightnessctl s 5%+";
on-scroll-down = "${pkgs.brightnessctl}/bin/brightnessctl s 5%+";
};
network = {

View File

@ -10,11 +10,16 @@
system.autoUpgrade.enable = true;
time.timeZone = "America/New_York";
powerManagement.enable = true;
hardware.bluetooth.enable = true;
hardware.bluetooth.powerOnBoot = true;
hardware.bluetooth.settings = {
General = {
Enable = "Source,Sink,Media,Socket";
hardware = {
bluetooth = {
enable = true;
powerOnBoot = true;
settings = {
General = {
Enable = "Source,Sink,Media,Socket";
};
};
};
};
@ -60,10 +65,21 @@
enable = true;
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;
xserver.enable = true;
displayManager.sddm.enable = true;
desktopManager.plasma6.enable = true;
fwupd.enable = true;
printing.enable = true;
fprintd.enable = true;
@ -88,24 +104,24 @@
};
fonts = {
serif = {
package = pkgs.nerd-fonts.iosevka;
package = pkgs.nerdfonts;
name = "Iosevka NF";
};
sansSerif = {
package = pkgs.nerd-fonts.iosevka;
package = pkgs.nerdfonts;
name = "Iosevka NF";
};
monospace = {
package = pkgs.nerd-fonts.iosevka;
package = pkgs.nerdfonts;
name = "Iosevka NFM";
};
emoji = {
package = pkgs.noto-fonts-emoji;
name = "Noto Color Emoji";
};
# emoji = {
# package = pkgs.notofonts;
# name = "Noto Color Emoji";
# };
};
};
@ -126,6 +142,12 @@
programs = {
zsh.enable = true;
regreet.enable = true;
hyprlock.enable = true;
hyprland = {
enable = true;
withUWSM = true;
};
};
users.users.k = {
@ -143,18 +165,15 @@
environment = {
sessionVariables = {MOZ_USE_XINPUT2 = "1";};
plasma6.excludePackages = with pkgs; [
kate
oxygen
xterm
];
systemPackages = with pkgs; [
maliit-keyboard
maliit-framework
alacritty
];
};
systemd.sleep.extraConfig = ''
HibernateDelaySec=30m
SuspendState=mem
'';
boot = {
plymouth = {enable = true;};

View File

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

View File

@ -34,7 +34,7 @@
cat << EOF > "$out/bin/ollama-wrapped"
#!/bin/sh
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" "\$@"
EOF
chmod +x "$out/bin/ollama-wrapped"