Compare commits

..

3 Commits

Author SHA1 Message Date
marc
f7afbe6973 Other changes 2025-02-16 22:51:35 +01:00
marc
e917ea97c6 Add zen browser 2025-02-16 22:51:22 +01:00
marc
8378eec1e0 Configure kanata for voyager (disable it) 2025-02-16 22:50:51 +01:00
9 changed files with 79 additions and 17 deletions

View File

@@ -1,3 +1,12 @@
(defcfg
linux-dev-names-exclude (
"ZSA Technology Labs Voyager"
"ZSA Technology Labs Voyager Consumer Control"
"ZSA Technology Labs Voyager Keyboard"
)
)
(deflocalkeys-linux (deflocalkeys-linux
ImpPt 99 ImpPt 99
º 41 º 41

View File

@@ -38,7 +38,7 @@ job "gitea" {
resources { resources {
cpu = 1000 cpu = 1000
memory = 256 memory = 400
} }
service { service {

37
flake.lock generated
View File

@@ -240,6 +240,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": {
"locked": {
"lastModified": 1727348695,
"narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1733136078, "lastModified": 1733136078,
@@ -263,7 +279,8 @@
"hyprcursor-rose-pine": "hyprcursor-rose-pine", "hyprcursor-rose-pine": "hyprcursor-rose-pine",
"nix-colors": "nix-colors", "nix-colors": "nix-colors",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"nur": "nur" "nur": "nur",
"zen-browser": "zen-browser"
} }
}, },
"systems": { "systems": {
@@ -328,6 +345,24 @@
"repo": "flake-utils", "repo": "flake-utils",
"type": "github" "type": "github"
} }
},
"zen-browser": {
"inputs": {
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1739222645,
"narHash": "sha256-6FsTAjrO0TN5+gVxx3hmWqEJWs1sJ1p3E8DKWHdlN6M=",
"owner": "youwen5",
"repo": "zen-browser-flake",
"rev": "7e60ade066a54797b376ebaf554bc2efa255ff8a",
"type": "github"
},
"original": {
"owner": "youwen5",
"repo": "zen-browser-flake",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View File

@@ -27,6 +27,10 @@
# - Hyprland --------------------------------- # - Hyprland ---------------------------------
hyprcursor-rose-pine.url = "github:ndom91/rose-pine-hyprcursor"; hyprcursor-rose-pine.url = "github:ndom91/rose-pine-hyprcursor";
# - More stuff -------------------------------
zen-browser.url = "github:youwen5/zen-browser-flake";
}; };
outputs = inputs @ { self, nixpkgs, home-manager, ... }: outputs = inputs @ { self, nixpkgs, home-manager, ... }:

View File

@@ -66,14 +66,7 @@ in
server.vatnajokull.enable = true; server.vatnajokull.enable = true;
# - Keyboards - # - Keyboards -
system.kanata = { system.kanata.enable = true;
enable = true;
devices = [
"/dev/input/by-path/platform-i8042-serio-0-event-kbd"
"/dev/input/by-path/pci-0000:00:14.0-usb-0:9:1.0-event-kbd"
"/dev/input/by-path/pci-0000:00:14.0-usbv2-0:9:1.0-event-kbd"
];
};
system.devices.voyager.enable = true; system.devices.voyager.enable = true;
# - Desktop ---------------------------------- # - Desktop ----------------------------------

View File

@@ -10,6 +10,7 @@
}; };
kernelModules = [ "kvm-intel" ]; kernelModules = [ "kvm-intel" ];
extraModulePackages = [ ]; extraModulePackages = [ ];
supportedFilesystems = [ "ntfs" ];
}; };
fileSystems = { fileSystems = {

View File

@@ -0,0 +1,26 @@
{ config, lib, pkgs, inputs, system, ... }:
let
cfg = config.samfelag.modules.app.zen-browser;
i3Cfg = config.samfelag.modules.desktop.wm.i3;
hyprCfg = config.samfelag.modules.desktop.wm.hyprland;
zen-pkg = inputs.zen-browser.packages."${system}".default;
in
{
options.samfelag.modules.app.zen-browser = {
enable = lib.mkEnableOption "zen-browser";
};
config = lib.mkIf cfg.enable {
environment.systemPackages = with pkgs; [
zen-pkg
];
samfelag.modules.desktop.wm.i3.extraKeybindings = lib.mkIf i3Cfg.enable {
"${i3Cfg.mod}+Shift+i" = "exec ${zen-pkg}/bin/zen";
};
samfelag.modules.desktop.wm.hyprland.extraKeybindings = lib.mkIf hyprCfg.enable [
"${hyprCfg.mod} SHIFT, i, exec, ${zen-pkg}/bin/zen"
];
};
}

View File

@@ -118,7 +118,7 @@ in
app = { app = {
alacritty.enable = true; alacritty.enable = true;
firefox.enable = true; zen-browser.enable = true;
}; };
}; };

View File

@@ -6,11 +6,6 @@ in
{ {
options.samfelag.modules.system.kanata = { options.samfelag.modules.system.kanata = {
enable = lib.mkEnableOption "kanata"; enable = lib.mkEnableOption "kanata";
devices = lib.mkOption {
type = lib.types.listOf lib.types.str;
default = [];
description = "Devices to use for kanata";
};
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
@@ -22,7 +17,6 @@ in
enable = true; enable = true;
keyboards = { keyboards = {
internalKeyboard = { internalKeyboard = {
devices = cfg.devices;
extraDefCfg = "process-unmapped-keys yes"; extraDefCfg = "process-unmapped-keys yes";
configFile = ../../config/kanata/kanata.kbd; configFile = ../../config/kanata/kanata.kbd;
}; };