summaryrefslogtreecommitdiff
path: root/hosts/local/master
diff options
context:
space:
mode:
Diffstat (limited to 'hosts/local/master')
-rw-r--r--hosts/local/master/configuration.nix16
-rw-r--r--hosts/local/master/thinkpad.kbd18
2 files changed, 22 insertions, 12 deletions
diff --git a/hosts/local/master/configuration.nix b/hosts/local/master/configuration.nix
index 83de833..2a3cc8a 100644
--- a/hosts/local/master/configuration.nix
+++ b/hosts/local/master/configuration.nix
@@ -1,7 +1,16 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’).
-{pkgs, ...}: {
+{
+ pkgs,
+ inputs,
+ ...
+}: let
+ old-pkgs = import inputs.nixpkgs-old {
+ system = pkgs.system;
+ config.allowUnfree = true;
+ };
+in {
imports = [
# Include the results of the hardware scan.
../../base.nix
@@ -9,9 +18,9 @@
../../unfree.nix
#../../android.nix
../gui.nix
- # ../i3.nix
+ ../i3.nix
# ../gnome.nix
- ../wayland.nix
+ # ../wayland.nix
../nvidia.nix
./keyboard.nix
# ./rgb.nix
@@ -53,6 +62,7 @@
#
#
environment.systemPackages = [
+ old-pkgs.vivaldi
# for AI IDE shit
# pkgs.nodejs
# pkgs.python312
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