Compare commits
No commits in common. "4ef432d78d2f06f9e138fd0295865eb0723035d6" and "90e14b438051396c486f7ace016b4b96823a5828" have entirely different histories.
4ef432d78d
...
90e14b4380
|
@ -33,9 +33,11 @@
|
||||||
|
|
||||||
outputs = { self, nixpkgs, home-manager, nix-darwin, kak, unispect, ansi-utils, unambig-path }:
|
outputs = { self, nixpkgs, home-manager, nix-darwin, kak, unispect, ansi-utils, unambig-path }:
|
||||||
let
|
let
|
||||||
|
xdg-runtime-dir = "/tmp/xdg-rt";
|
||||||
|
|
||||||
mkPkgs = system: import nixpkgs { system = system; config.allowUnfree = true; };
|
mkPkgs = system: import nixpkgs { system = system; config.allowUnfree = true; };
|
||||||
mkHome = {username, home-dir, prompt-color, system, pkgs} : import ./home/common.nix {
|
mkHome = {username, home-dir, prompt-color, system, pkgs} : import ./home/common.nix {
|
||||||
inherit username home-dir prompt-color pkgs;
|
inherit username home-dir prompt-color pkgs xdg-runtime-dir;
|
||||||
|
|
||||||
kak-pkg = kak.packages.${system}.kak;
|
kak-pkg = kak.packages.${system}.kak;
|
||||||
unispect = unispect.packages.${system}.unispect;
|
unispect = unispect.packages.${system}.unispect;
|
||||||
|
@ -43,10 +45,10 @@
|
||||||
unambig-path = unambig-path.packages.${system}.unambig-path;
|
unambig-path = unambig-path.packages.${system}.unambig-path;
|
||||||
};
|
};
|
||||||
mkPC = {system, pkgs} : import ./home/graphical.nix {
|
mkPC = {system, pkgs} : import ./home/graphical.nix {
|
||||||
inherit pkgs;
|
inherit pkgs xdg-runtime-dir;
|
||||||
};
|
};
|
||||||
mkLaptop = {system, pkgs} : import ./home/apps.nix {
|
mkLaptop = {system, pkgs} : import ./home/apps.nix {
|
||||||
inherit pkgs;
|
inherit pkgs xdg-runtime-dir;
|
||||||
};
|
};
|
||||||
|
|
||||||
mkDarwin = {system, pkgs}: import ./darwin.nix {
|
mkDarwin = {system, pkgs}: import ./darwin.nix {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ pkgs }:
|
{ pkgs, xdg-runtime-dir }:
|
||||||
{
|
{
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
discord-canary
|
discord-canary
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ pkgs, username, home-dir, prompt-color, kak-pkg, unispect, ansi-utils, unambig-path }:
|
{ pkgs, username, home-dir, prompt-color, xdg-runtime-dir, kak-pkg, unispect, ansi-utils, unambig-path }:
|
||||||
|
|
||||||
let
|
let
|
||||||
kak = import ./kak.nix { kak = kak-pkg; inherit pkgs; };
|
kak = import ./kak.nix { kak = kak-pkg; inherit pkgs; };
|
||||||
|
@ -49,6 +49,10 @@ in rec {
|
||||||
# (extras.challtools python311Packages)
|
# (extras.challtools python311Packages)
|
||||||
];
|
];
|
||||||
|
|
||||||
|
home.sessionVariables = {
|
||||||
|
XDG_RUNTIME_DIR = xdg-runtime-dir;
|
||||||
|
};
|
||||||
|
|
||||||
# Let Home Manager install and manage itself.
|
# Let Home Manager install and manage itself.
|
||||||
programs.home-manager.enable = true;
|
programs.home-manager.enable = true;
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ pkgs }:
|
{ pkgs, xdg-runtime-dir }:
|
||||||
|
|
||||||
let
|
let
|
||||||
alacritty = import ./alacritty/alacritty.nix pkgs;
|
alacritty = import ./alacritty/alacritty.nix pkgs;
|
||||||
|
|
|
@ -8,23 +8,32 @@
|
||||||
|
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
enable = true;
|
enable = true;
|
||||||
displayManager.lightdm.enable = true;
|
# desktopManager.xfce.enable = true;
|
||||||
|
# displayManager.lightdm = {
|
||||||
|
# background = ../backgrounds/${background-image};
|
||||||
|
# greeters.slick.enable = true;
|
||||||
|
# };
|
||||||
|
displayManager.gdm = {
|
||||||
|
enable = true;
|
||||||
|
autoSuspend = false;
|
||||||
|
};
|
||||||
|
desktopManager.gnome.enable = true;
|
||||||
|
|
||||||
|
# displayManager.sddm.enable = true;
|
||||||
|
# desktopManager.plasma6.enable = true;
|
||||||
|
|
||||||
xkb = {
|
xkb = {
|
||||||
layout = "fox";
|
layout = "fox";
|
||||||
|
|
||||||
options = "caps:escape";
|
options = "caps:escape";
|
||||||
extraLayouts.fox = {
|
extraLayouts.fox = {
|
||||||
description = "Layout suitable to be used by a fox";
|
description = "Layout suitable to be used by a fox";
|
||||||
languages = ["se"];
|
languages = ["se"];
|
||||||
symbolsFile = ./kblayouts/fox-symbols.xkb;
|
symbolsFile = ./kblayouts/fox-symbols.xkb;
|
||||||
|
typesFile = ./kblayouts/fox-types.xkb;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
services.desktopManager.plasma6.enable = true;
|
|
||||||
services.displayManager.defaultSession = "plasma";
|
|
||||||
|
|
||||||
console.useXkbConfig = true;
|
console.useXkbConfig = true;
|
||||||
|
|
||||||
# Enable sound.
|
# Enable sound.
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
default
|
|
||||||
xkb_symbols "fox" {
|
xkb_symbols "fox" {
|
||||||
key <TLDE> {[ U1F408, U1F431, U1F408, U1F431 ]};
|
key <TLDE> {[ U1F408, U1F431, U1F408, U1F431 ]};
|
||||||
key <AE01> {[ 1, ampersand, VoidSymbol, VoidSymbol ]};
|
key <AE01> {[ 1, ampersand, VoidSymbol, VoidSymbol ]};
|
||||||
|
@ -53,7 +52,4 @@ xkb_symbols "fox" {
|
||||||
key <AB10> {[ z, Z, VoidSymbol, VoidSymbol ]};
|
key <AB10> {[ z, Z, VoidSymbol, VoidSymbol ]};
|
||||||
|
|
||||||
key <SPCE> {[ space, space, space, space ]};
|
key <SPCE> {[ space, space, space, space ]};
|
||||||
|
|
||||||
include "level3(lalt_switch)"
|
|
||||||
key <RTSH> { [ Alt_R ] };
|
|
||||||
};
|
};
|
||||||
|
|
16
nixos/kblayouts/fox-types.xkb
Normal file
16
nixos/kblayouts/fox-types.xkb
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
xkb_types "noaltgr" {
|
||||||
|
virtual_modifiers Shift, Alt;
|
||||||
|
|
||||||
|
type "CTRL+ALT" {
|
||||||
|
modifiers = Shift + Alt;
|
||||||
|
map[None] = Level1;
|
||||||
|
map[Shift] = Level2;
|
||||||
|
map[Alt] = Level3;
|
||||||
|
map[Shift+Alt] = Level4;
|
||||||
|
level_name[Level1] = "Base";
|
||||||
|
level_name[Level2] = "Shift";
|
||||||
|
level_name[Level3] = "Alt";
|
||||||
|
level_name[Level4] = "Shift Alt";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
Loading…
Reference in New Issue
Block a user