diff --git a/flake.lock b/flake.lock index 861817e..56d8018 100644 --- a/flake.lock +++ b/flake.lock @@ -48,11 +48,11 @@ ] }, "locked": { - "lastModified": 1708442136, - "narHash": "sha256-JVaRVCbzYJFJXFToC9/zEKd4jLIpzTliFzjppopJB7k=", + "lastModified": 1708950325, + "narHash": "sha256-3dNPq8oFhIo7LlRhsnq6cuXNIbmwawLQkU8Aw/m0tro=", "owner": "nix-community", "repo": "flake-firefox-nightly", - "rev": "5b57d5f5566e04f71406db0643d4a3ba116d9589", + "rev": "5c5191909658996597eeb54d59294df1a3f7dab5", "type": "github" }, "original": { @@ -198,11 +198,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1708258113, - "narHash": "sha256-SYqkbLHSe4UxgcNwUHrMPnRmX/oJFzRILrpyn5dsJVE=", + "lastModified": 1708862933, + "narHash": "sha256-WMZ97AfnqJGZTzQ0Ovh8GoNdjSERqmp1qsBTpvdb1y8=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "42e4c0c8b04cecec07e796ce8efcb5378e93a319", + "rev": "4b00c6e0995270afe27f5ea590a6ed25622963e2", "type": "github" }, "original": { @@ -229,11 +229,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1708161998, - "narHash": "sha256-6KnemmUorCvlcAvGziFosAVkrlWZGIc6UNT9GUYr0jQ=", + "lastModified": 1708831307, + "narHash": "sha256-0iL/DuGjiUeck1zEaL+aIe2WvA3/cVhp/SlmTcOZXH4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "84d981bae8b5e783b3b548de505b22880559515f", + "rev": "5bf1cadb72ab4e77cb0b700dab76bcdaf88f706b", "type": "github" }, "original": { @@ -245,11 +245,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1708217146, - "narHash": "sha256-nGfEv7k78slqIR5E0zzWSx214d/4/ZPKDkObLJqVLVw=", + "lastModified": 1708821942, + "narHash": "sha256-jd+E1SD59qty65pwqad2mftzkT6vW5nNFWVuvayh4Zw=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "e623008d8a46517470e6365505f1a3ce171fa46a", + "rev": "479831ed8b3c9c7b80533999f880c7d0bf6a491b", "type": "github" }, "original": { @@ -260,11 +260,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1708118438, - "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", + "lastModified": 1708807242, + "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", + "rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index fcfc3c5..dfd2c99 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,7 @@ }; outputs = inputs @ { nixpkgs, nixpkgs-unstable, home-manager, home-manager-unstable, firefox, anyrun, ... }: { - nixosConfigurations.dlaptop = nixpkgs.lib.nixosSystem { + nixosConfigurations.dlaptop = nixpkgs-unstable.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; @@ -28,7 +28,7 @@ ./hosts/generic.nix ./hosts/dlaptop/configuration.nix ./hosts/dlaptop/hardware-configuration.nix - home-manager.nixosModules.home-manager + home-manager-unstable.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; diff --git a/home/home.nix b/home/home.nix index 6885233..78692f0 100644 --- a/home/home.nix +++ b/home/home.nix @@ -17,11 +17,9 @@ services.blueman-applet.enable = true; services.network-manager-applet.enable = true; - programs.tmux.enable = true; - programs.vscode = { enable = true; - package = unstable.vscodium; + package = pkgs.vscodium; extensions = with pkgs.vscode-extensions; [ bbenoist.nix brettm12345.nixfmt-vscode @@ -69,6 +67,7 @@ swayidle nom vesktop + localsend ]) ++ ([ inputs.firefox.packages.${pkgs.system}.firefox-nightly-bin ]); diff --git a/home/programs/hypr/default.nix b/home/programs/hypr/default.nix index 2f55752..51583b0 100644 --- a/home/programs/hypr/default.nix +++ b/home/programs/hypr/default.nix @@ -15,7 +15,7 @@ # See https://wiki.hyprland.org/Configuring/Monitors/ #monitor=,preferred,auto,1.066667 #monitor=,preferred,90,1.066667 - monitor=eDP-1,preferred,auto,1.5 + monitor=eDP-1,preferred,auto,1.333333 #monitor=eDP-1,preferred,auto,1.066667 #source = ~/.config/hypr/monitors.conf #source = ~/.config/hypr/workspaces.conf diff --git a/hosts/dlaptop/configuration.nix b/hosts/dlaptop/configuration.nix index 30d3833..d70b912 100644 --- a/hosts/dlaptop/configuration.nix +++ b/hosts/dlaptop/configuration.nix @@ -69,21 +69,17 @@ CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; CPU_ENERGY_PERF_POLICY_ON_AC = "balance_performance"; - CPU_MIN_PERF_ON_AC = 0; - CPU_MAX_PERF_ON_AC = 100; - CPU_MIN_PERF_ON_BAT = 0; - #CPU_MAX_PERF_ON_BAT = 20; CPU_SCALING_MAX_FREQ_ON_AC = 6600000; CPU_SCALING_MAX_FREQ_ON_BAT = 1600000; PLATFORM_PROFILE_ON_AC = "balanced"; PLATFORM_PROFILE_ON_BAT = "low-power"; - #Trubo boost disable + #Trubo boost control CPU_BOOST_ON_AC = 1; - CPU_BOOST_ON_BAT = 1; + CPU_BOOST_ON_BAT = 0; CPU_HWP_DYN_BOOST_ON_AC = 1; - CPU_HWP_DYN_BOOST_ON_BAT = 1; + CPU_HWP_DYN_BOOST_ON_BAT = 0; #Optional helps save long term battery health #START_CHARGE_THRESH_BAT0 = 40; # 40 and bellow it starts to charge @@ -215,6 +211,7 @@ unstable.curl #firefox_nightly #inputs.anyrun.packages.${pkgs.system}.anyrun + inputs.telegram-desktop-patched.packages.${pkgs.system}.default ]; users.users.socks = { diff --git a/hosts/generic.nix b/hosts/generic.nix index 3e56ba2..50a4055 100644 --- a/hosts/generic.nix +++ b/hosts/generic.nix @@ -57,4 +57,7 @@ in { any-nix-shell fish --info-right | source ''; users.defaultUserShell = pkgs.fish; + + programs.tmux.enable = true; + }