From 799398de332adb1872de6ab72f5072f7a39c67e3 Mon Sep 17 00:00:00 2001 From: k Date: Fri, 10 Jan 2025 16:13:42 -0500 Subject: [PATCH 1/5] Set to stable release --- flake.lock | 8 ++++---- flake.nix | 2 +- hosts/laptop/configuration.nix | 14 +++++++------- overlays/ollama.nix | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 19cc352..df8d4de 100644 --- a/flake.lock +++ b/flake.lock @@ -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" } diff --git a/flake.nix b/flake.nix index 6230256..a653dfc 100644 --- a/flake.nix +++ b/flake.nix @@ -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"; diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index 8d5a2ad..4029385 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -88,24 +88,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"; +# }; }; }; diff --git a/overlays/ollama.nix b/overlays/ollama.nix index ddba088..55f68ef 100644 --- a/overlays/ollama.nix +++ b/overlays/ollama.nix @@ -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" From bba9c8494e9134cd5a1e2fb4bdc797b65ecda723 Mon Sep 17 00:00:00 2001 From: k Date: Fri, 10 Jan 2025 18:10:17 -0500 Subject: [PATCH 2/5] move to hyprland --- hosts/home/home_common.nix | 2 +- hosts/home/hyprland.nix | 3 +- hosts/home/tile.nix | 2 +- hosts/home/waybar.nix | 8 +++--- hosts/laptop/configuration.nix | 50 ++++++++++++++++++++-------------- hosts/laptop/home.nix | 5 ++-- 6 files changed, 40 insertions(+), 30 deletions(-) diff --git a/hosts/home/home_common.nix b/hosts/home/home_common.nix index b51a07d..e0707b3 100644 --- a/hosts/home/home_common.nix +++ b/hosts/home/home_common.nix @@ -16,7 +16,7 @@ userName = "k"; userEmail = "markers711@gmail.com"; }; - tmux = {enable = true;}; + tmux.enable = true; starship.enable = true; zsh = { enable = true; diff --git a/hosts/home/hyprland.nix b/hosts/home/hyprland.nix index c61735c..692462a 100644 --- a/hosts/home/hyprland.nix +++ b/hosts/home/hyprland.nix @@ -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" diff --git a/hosts/home/tile.nix b/hosts/home/tile.nix index 2984ac4..038d735 100644 --- a/hosts/home/tile.nix +++ b/hosts/home/tile.nix @@ -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 } diff --git a/hosts/home/waybar.nix b/hosts/home/waybar.nix index 269e0ce..3a9daef 100644 --- a/hosts/home/waybar.nix +++ b/hosts/home/waybar.nix @@ -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 = { diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index 4029385..58a258f 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -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,17 @@ 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"; + }; + }; blueman.enable = true; - xserver.enable = true; - displayManager.sddm.enable = true; - desktopManager.plasma6.enable = true; fwupd.enable = true; printing.enable = true; fprintd.enable = true; @@ -102,10 +114,10 @@ name = "Iosevka NFM"; }; -# emoji = { -# package = pkgs.notofonts; -# name = "Noto Color Emoji"; -# }; + # emoji = { + # package = pkgs.notofonts; + # name = "Noto Color Emoji"; + # }; }; }; @@ -126,6 +138,12 @@ programs = { zsh.enable = true; + regreet.enable = true; + hyprlock.enable = true; + hyprland = { + enable = true; + withUWSM = true; + }; }; users.users.k = { @@ -143,15 +161,7 @@ environment = { sessionVariables = {MOZ_USE_XINPUT2 = "1";}; - plasma6.excludePackages = with pkgs; [ - kate - oxygen - xterm - ]; systemPackages = with pkgs; [ - maliit-keyboard - maliit-framework - alacritty ]; }; diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index 90212fc..b4d59e7 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -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 = { From ca7c336ff99fb2bca6ca7f7e61fabd3361bf269b Mon Sep 17 00:00:00 2001 From: k Date: Fri, 10 Jan 2025 18:14:48 -0500 Subject: [PATCH 3/5] Change sleep settings --- hosts/laptop/configuration.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index 58a258f..a5fd9ba 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -75,6 +75,10 @@ CPU_ENERGY_PERF_POLICY_ON_AC = "performance"; }; }; + logind = { + lidSwitch = "suspend-then-hibernate"; + lidSwitchExternalPower = "suspend"; + } blueman.enable = true; fwupd.enable = true; printing.enable = true; @@ -165,6 +169,11 @@ ]; }; + systemd.sleep.extraConfig = '' + HibernateDelaySec=30m + SuspendState=mem + ''; + boot = { plymouth = {enable = true;}; From d379c6c40680ea76dc701dcef4570a51214fb785 Mon Sep 17 00:00:00 2001 From: k Date: Fri, 10 Jan 2025 18:15:30 -0500 Subject: [PATCH 4/5] fix typo --- hosts/laptop/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index a5fd9ba..78c556f 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -78,7 +78,7 @@ logind = { lidSwitch = "suspend-then-hibernate"; lidSwitchExternalPower = "suspend"; - } + }; blueman.enable = true; fwupd.enable = true; printing.enable = true; From 370e2e29ffaa761a83183a7d65b375bdf857f0c6 Mon Sep 17 00:00:00 2001 From: k Date: Fri, 10 Jan 2025 18:18:40 -0500 Subject: [PATCH 5/5] added missing hyprlock --- hosts/home/hyprland.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/home/hyprland.nix b/hosts/home/hyprland.nix index 692462a..06ab1cc 100644 --- a/hosts/home/hyprland.nix +++ b/hosts/home/hyprland.nix @@ -5,7 +5,7 @@ ... }: { imports = [./waybar.nix ./tile.nix]; - + programs = {hyprlock = {enable=true;};}; wayland.windowManager.hyprland = { enable = true; systemd.variables = ["--all"];