diff options
| author | polwex <polwex@sortug.com> | 2025-05-17 17:11:49 +0700 |
|---|---|---|
| committer | polwex <polwex@sortug.com> | 2025-05-17 17:11:49 +0700 |
| commit | 4be7f81e12d7bc82e86142ee896490f7c39f684f (patch) | |
| tree | 84bbdd6d4e70cdea30082cb9fe17e7d681a91aea | |
| parent | c495e1fe41e36a74fd8d60b479d8bbf1efdbc701 (diff) | |
| parent | e789bd64cc6323dc425da9295fbaa13fb3adac72 (diff) | |
Merge branch 'masterw/misc'
| -rw-r--r-- | flake.nix | 5 | ||||
| -rw-r--r-- | hosts/local/gui.nix | 8 | ||||
| -rw-r--r-- | hosts/local/master/configuration.nix | 4 | ||||
| -rw-r--r-- | hosts/local/master/thinkpad.kbd | 18 | ||||
| -rw-r--r-- | hosts/local/nvidia.nix | 3 |
5 files changed, 25 insertions, 13 deletions
@@ -103,6 +103,11 @@ url = "github:cachix/devenv"; }; + zen-browser = { + url = "github:youwen5/zen-browser-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + # determinate systems patched nix. supposedly for enterprise # determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/*"; }; diff --git a/hosts/local/gui.nix b/hosts/local/gui.nix index d783f28..73b89a3 100644 --- a/hosts/local/gui.nix +++ b/hosts/local/gui.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: { +{ + inputs, + pkgs, + ... +}: { environment.systemPackages = with pkgs; [ obsidian imv @@ -47,5 +51,7 @@ wineWowPackages.staging dosbox siyuan + inputs.zen-browser.packages.${pkgs.system}.default + qimgv ]; } diff --git a/hosts/local/master/configuration.nix b/hosts/local/master/configuration.nix index 83de833..20c25e3 100644 --- a/hosts/local/master/configuration.nix +++ b/hosts/local/master/configuration.nix @@ -9,9 +9,9 @@ ../../unfree.nix #../../android.nix ../gui.nix - # ../i3.nix + ../i3.nix # ../gnome.nix - ../wayland.nix + # ../wayland.nix ../nvidia.nix ./keyboard.nix # ./rgb.nix diff --git a/hosts/local/master/thinkpad.kbd b/hosts/local/master/thinkpad.kbd index 6f9c253..82de2e2 100644 --- a/hosts/local/master/thinkpad.kbd +++ b/hosts/local/master/thinkpad.kbd @@ -18,7 +18,7 @@ output (uinput-sink "My KMonad output") ;; This is the real representation of your actual keyboard. We haven't started ;; customizing layouts yet. (defsrc - esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 del + esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 home end ins del ` 1 2 3 4 5 6 7 8 9 0 - = bspc tab q w e r t y u i o p [ ] \ caps a s d f g h j k l ; ' ret @@ -56,36 +56,36 @@ semi (tap-hold-next-release 280 ; rctl) ;; The first custom layer is the one that gets activated when kmonad is started (deflayer qwerty ;; The default layer that'd be read when you launch kmonad - esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 del + esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 home end ins del ` 1 2 3 4 5 6 7 8 9 0 - = bspc tab q w e r t y u i o p [ ] \ esc a s d f g h j k l ; ' ret - @sym z x c v b n m , . / rsft + lsft z x c v b n m , . / rsft lctl lmet @sym spc @cords @hrt left up right left down right ) (deflayer homerowmods - esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 del + esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 home end ins del ` 1 2 3 4 5 6 7 8 9 0 - = bspc tab q w e r t y u i o p [ ] \ esc @a @s @d @f g h @j @k @l @semi ' ret - @sym z x c v b n m , . / rsft + lsft z x c v b n m , . / rsft lctl lmet @sym spc lalt @back left up right left down right ) (deflayer mods - esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 del + esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 pgup pgdn ins del ` 1 2 3 4 5 6 7 8 9 0 - = bspc tab q w e r t y u i o p [ ] h esc lctl lalt lmet lsft g h rsft rmet ralt rctl ' ret - @sym z x c v b n m , . / rsft + lsft z x c v b n m , . / rsft lctl lmet @sym spc lalt @back left up right left down right ) ;; A layer dedicated to symbols (deflayer syms - _ _ _ _ _ _ _ _ _ _ _ _ _ _ + esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 pgup pgdn ins del _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ up _ _ ! @ # $ % _ _ _ _ _ left down right @sym2 ' ^ & - = _ ret @@ -96,7 +96,7 @@ semi (tap-hold-next-release 280 ; rctl) ;; More symbols (deflayer syms2 - _ _ _ _ _ _ _ _ _ _ _ _ _ _ + esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 pgup pgdn ins del _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ ` ~ * \_ + _ ret diff --git a/hosts/local/nvidia.nix b/hosts/local/nvidia.nix index 40217ac..ed505c6 100644 --- a/hosts/local/nvidia.nix +++ b/hosts/local/nvidia.nix @@ -18,6 +18,7 @@ in { # hardware.graphics = { enable = true; + extraPackages = [pkgs.nvidia-vaapi-driver]; }; # hardware.graphics= { # package = (pkgs.mesa.override { galliumDrivers = [ "i915" "swrast" ]; }).drivers; @@ -52,7 +53,7 @@ in { modesetting.enable = true; powerManagement.enable = false; powerManagement.finegrained = false; - # forceFullCompositionPipeline = true; + forceFullCompositionPipeline = true; # nvidiaSettings = true; open = false; }; |