Compare commits
No commits in common. "f98b995b803ab3fcbd59265170a1de9a9ac996c9" and "3ae7a5e8d4a9270b0c1cb3f1b5d0c7a893cb2896" have entirely different histories.
f98b995b80
...
3ae7a5e8d4
102
flake.lock
generated
102
flake.lock
generated
@ -53,17 +53,16 @@
|
|||||||
"base16-vim": {
|
"base16-vim": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732806396,
|
"lastModified": 1735953590,
|
||||||
"narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=",
|
"narHash": "sha256-YbQwaApLFJobn/0lbpMKcJ8N5axKlW2QIGkDS5+xoSU=",
|
||||||
"owner": "tinted-theming",
|
"owner": "tinted-theming",
|
||||||
"repo": "base16-vim",
|
"repo": "base16-vim",
|
||||||
"rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
|
"rev": "c2a1232aa2c0ed27dcbf005779bcfe0e0ab5e85d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "tinted-theming",
|
"owner": "tinted-theming",
|
||||||
"repo": "base16-vim",
|
"repo": "base16-vim",
|
||||||
"rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -158,11 +157,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738453229,
|
"lastModified": 1736143030,
|
||||||
"narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
|
"narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
|
"rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -385,11 +384,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739314552,
|
"lastModified": 1737762889,
|
||||||
"narHash": "sha256-ggVf2BclyIW3jexc/uvgsgJH4e2cuG6Nyg54NeXgbFI=",
|
"narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "83bd3a26ac0526ae04fa74df46738bb44b89dcdd",
|
"rev": "daf04c5950b676f47a794300657f1d3d14c1a120",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -406,11 +405,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738878603,
|
"lastModified": 1737762889,
|
||||||
"narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=",
|
"narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "433799271274c9f2ab520a49527ebfe2992dcfbd",
|
"rev": "daf04c5950b676f47a794300657f1d3d14c1a120",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -427,11 +426,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1737630279,
|
"lastModified": 1736785676,
|
||||||
"narHash": "sha256-wJQCxyMRc4P26zDrHmZiRD5bbfcJpqPG3e2djdGG3pk=",
|
"narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "0db5c8bfcce78583ebbde0b2abbc95ad93445f7c",
|
"rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -476,11 +475,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738743987,
|
"lastModified": 1737504076,
|
||||||
"narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=",
|
"narHash": "sha256-/B4XJnzYU/6K1ZZOBIgsa3K4pqDJrnC2579c44c+4rI=",
|
||||||
"owner": "lnl7",
|
"owner": "lnl7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "ae406c04577ff9a64087018c79b4fdc02468c87c",
|
"rev": "65cc1fa8e36ceff067daf6cfb142331f02f524d3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -497,11 +496,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739286116,
|
"lastModified": 1737840943,
|
||||||
"narHash": "sha256-618wom6GTRr8bNStidWo8y39NJfpX530pOThWALmDuw=",
|
"narHash": "sha256-64j4mytkcPjd+k8KwDRzti/mc5cOJgY/LeOxbAykoag=",
|
||||||
"owner": "doronbehar",
|
"owner": "doronbehar",
|
||||||
"repo": "nix-matlab",
|
"repo": "nix-matlab",
|
||||||
"rev": "d3590698a626e135e8dc6e350089a308a72ef539",
|
"rev": "4151ee1768ae1842f3505c0927eefbc977fcf046",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -512,11 +511,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739214665,
|
"lastModified": 1737746512,
|
||||||
"narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=",
|
"narHash": "sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a",
|
"rev": "825479c345a7f806485b7f00dbe3abb50641b083",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -528,11 +527,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738797219,
|
"lastModified": 1737717945,
|
||||||
"narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=",
|
"narHash": "sha256-ET91TMkab3PmOZnqiJQYOtSGvSTvGeHoegAv4zcTefM=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "1da52dd49a127ad74486b135898da2cef8c62665",
|
"rev": "ecd26a469ac56357fd333946a99086e992452b6a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -571,11 +570,11 @@
|
|||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739121491,
|
"lastModified": 1737832569,
|
||||||
"narHash": "sha256-BEmyAozR3Pc2qwPtC4rgUglzi3cw4nv4fXEY23NxOrQ=",
|
"narHash": "sha256-VkK73VRVgvSQOPw9qx9HzvbulvUM9Ae4nNd3xNP+pkI=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"rev": "13341a4c1238b7974e7bad9c7a6d5c51ca3cf81a",
|
"rev": "d7df58321110d3b0e12a829bbd110db31ccd34b1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -593,11 +592,11 @@
|
|||||||
"treefmt-nix": "treefmt-nix_2"
|
"treefmt-nix": "treefmt-nix_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739229047,
|
"lastModified": 1737897819,
|
||||||
"narHash": "sha256-sSTgA86wdk8d544c2+gzrfvVPHQF4mbsomvLOW2thn0=",
|
"narHash": "sha256-oVr0st3IHSgIPLDCoDtbI/TiLcMqs85KGBfLqFV3xQU=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "8348d89f30598a73fee7efb4b5d34c3de201e71b",
|
"rev": "ee6e560d3cbfdbb2d92d1d95c83aaa434ed42dc5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -616,11 +615,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738508923,
|
"lastModified": 1737372689,
|
||||||
"narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=",
|
"narHash": "sha256-nH3zK2ki0fd5o5qvbGHxukE4qnOLJa1uCzoDObG5vrE=",
|
||||||
"owner": "NuschtOS",
|
"owner": "NuschtOS",
|
||||||
"repo": "search",
|
"repo": "search",
|
||||||
"rev": "86e2038290859006e05ca7201425ea5b5de4aecb",
|
"rev": "570cc17bbc25650eb7d69e4fcda8cfd2f1656922",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -656,16 +655,15 @@
|
|||||||
"systems": "systems_3",
|
"systems": "systems_3",
|
||||||
"tinted-foot": "tinted-foot",
|
"tinted-foot": "tinted-foot",
|
||||||
"tinted-kitty": "tinted-kitty",
|
"tinted-kitty": "tinted-kitty",
|
||||||
"tinted-schemes": "tinted-schemes",
|
|
||||||
"tinted-tmux": "tinted-tmux",
|
"tinted-tmux": "tinted-tmux",
|
||||||
"tinted-zed": "tinted-zed"
|
"tinted-zed": "tinted-zed"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739309576,
|
"lastModified": 1737861120,
|
||||||
"narHash": "sha256-IMK19j1b2VH44lUad2/3BSski9T4ecrCHFlkjKWQV2o=",
|
"narHash": "sha256-V/GWU1BQwbxyZif9RBvwn10S1KX+86uPkkI41KQEcQQ=",
|
||||||
"owner": "danth",
|
"owner": "danth",
|
||||||
"repo": "stylix",
|
"repo": "stylix",
|
||||||
"rev": "d8289c3f0e5995863921ea207392c122f5d59f6d",
|
"rev": "d6951d0b2ffe74e4779a180e9b6a0e17627756e1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -753,22 +751,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"tinted-schemes": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1737565458,
|
|
||||||
"narHash": "sha256-y+9cvOA6BLKT0WfebDsyUpUa/YxKow9hTjBp6HpQv68=",
|
|
||||||
"owner": "tinted-theming",
|
|
||||||
"repo": "schemes",
|
|
||||||
"rev": "ae31625ba47aeaa4bf6a98cf11a8d4886f9463d9",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "tinted-theming",
|
|
||||||
"repo": "schemes",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"tinted-tmux": {
|
"tinted-tmux": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
@ -809,11 +791,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738680491,
|
"lastModified": 1737483750,
|
||||||
"narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=",
|
"narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "64dbb922d51a42c0ced6a7668ca008dded61c483",
|
"rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@ -36,7 +36,6 @@ in
|
|||||||
# usbutils
|
# usbutils
|
||||||
# udiskie
|
# udiskie
|
||||||
# udisks
|
# udisks
|
||||||
brightnessctl
|
|
||||||
];
|
];
|
||||||
|
|
||||||
security.krb5 = {
|
security.krb5 = {
|
||||||
@ -61,7 +60,7 @@ in
|
|||||||
fontconfig.enable = true;
|
fontconfig.enable = true;
|
||||||
neovim.enable = true;
|
neovim.enable = true;
|
||||||
systemd-boot.enable = true;
|
systemd-boot.enable = true;
|
||||||
ly.enable = true;
|
tuigreet.enable = true; # TODO: Re-enable
|
||||||
};
|
};
|
||||||
|
|
||||||
# TODO: Remove everything below, it is here out of convenience and should be elsewhere
|
# TODO: Remove everything below, it is here out of convenience and should be elsewhere
|
||||||
@ -101,11 +100,38 @@ in
|
|||||||
# services.gvfs.enable = true;
|
# services.gvfs.enable = true;
|
||||||
services.udisks2.enable = true;
|
services.udisks2.enable = true;
|
||||||
|
|
||||||
console.packages = [
|
# TODO: Remove?
|
||||||
pkgs.dina-psf
|
# Temporarily disable nvidia dgpu
|
||||||
];
|
# boot.extraModprobeConfig = ''
|
||||||
console.font = "dina";
|
# blacklist nouveau
|
||||||
console.earlySetup = true;
|
# options nouveau modeset=0
|
||||||
boot.loader.timeout = 0;
|
# '';
|
||||||
|
# services.udev.extraRules = ''
|
||||||
|
# # Remove NVIDIA USB xHCI Host Controller devices, if present
|
||||||
|
# ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c0330", ATTR{power/control}="auto", ATTR{remove}="1"
|
||||||
|
|
||||||
|
# # Remove NVIDIA USB Type-C UCSI devices, if present
|
||||||
|
# ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c8000", ATTR{power/control}="auto", ATTR{remove}="1"
|
||||||
|
|
||||||
|
# # Remove NVIDIA Audio devices, if present
|
||||||
|
# ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x040300", ATTR{power/control}="auto", ATTR{remove}="1"
|
||||||
|
|
||||||
|
# # Remove NVIDIA VGA/3D controller devices
|
||||||
|
# ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x03[0-9]*", ATTR{power/control}="auto", ATTR{remove}="1"
|
||||||
|
# '';
|
||||||
|
# boot.blacklistedKernelModules = [
|
||||||
|
# "nouveau"
|
||||||
|
# "nvidia"
|
||||||
|
# ];
|
||||||
|
|
||||||
|
# TODO: Move to module
|
||||||
|
# Adds gnome as DE
|
||||||
|
# modules.greetd.enable = lib.mkForce false;
|
||||||
|
# modules.tuigreet.enable = lib.mkForce false;
|
||||||
|
# services.xserver = {
|
||||||
|
# enable = true;
|
||||||
|
# displayManager.gdm.enable = true;
|
||||||
|
# desktopManager.gnome.enable = true;
|
||||||
|
# };
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -19,7 +19,6 @@ with lib;
|
|||||||
./graphics/default.nix
|
./graphics/default.nix
|
||||||
./greeter/greetd/default.nix
|
./greeter/greetd/default.nix
|
||||||
./greeter/greetd/tuigreet.nix
|
./greeter/greetd/tuigreet.nix
|
||||||
./greeter/ly/default.nix
|
|
||||||
./locale/default.nix
|
./locale/default.nix
|
||||||
./neovim/default.nix
|
./neovim/default.nix
|
||||||
./networkmanager/default.nix
|
./networkmanager/default.nix
|
||||||
|
|||||||
@ -1,29 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
let
|
|
||||||
cfg = config.modules.ly;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
options.modules.ly = {
|
|
||||||
enable = mkEnableOption "ly";
|
|
||||||
};
|
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
|
||||||
services.displayManager.ly = {
|
|
||||||
enable = true;
|
|
||||||
settings = {
|
|
||||||
animation = "matrix";
|
|
||||||
animation_refresh_ms = 32;
|
|
||||||
box_title = "Hewwo! >_< :3";
|
|
||||||
clear_password = true;
|
|
||||||
load = true;
|
|
||||||
save = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -2,17 +2,13 @@
|
|||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
|
||||||
overlay = final: prev: {
|
|
||||||
dina-psf = prev.callPackage ./fonts/dina-psf.nix { };
|
|
||||||
ttf2psf = prev.callPackage ./fonts/ttf2psf.nix { };
|
|
||||||
wqy-zenhei = prev.callPackage ./fonts/wqy-zenhei.nix { };
|
|
||||||
wqy-microhei = prev.callPackage ./fonts/wqy-microhei.nix { };
|
|
||||||
wqy-bitmapsong = prev.callPackage ./fonts/wqy-bitmapsong.nix { };
|
|
||||||
|
|
||||||
# ly = prev.callPackage ./programs/ly/default.nix { };
|
|
||||||
};
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
nixpkgs.overlays = [ overlay ];
|
nixpkgs.config = {
|
||||||
|
packageOverrides = pkgs: {
|
||||||
|
dina-vector = pkgs.callPackage ./fonts/dina-vector.nix { };
|
||||||
|
wqy-zenhei = pkgs.callPackage ./fonts/wqy-zenhei.nix { };
|
||||||
|
wqy-microhei = pkgs.callPackage ./fonts/wqy-microhei.nix { };
|
||||||
|
wqy-bitmapsong = pkgs.callPackage ./fonts/wqy-bitmapsong.nix { };
|
||||||
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,75 +0,0 @@
|
|||||||
{
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
|
|
||||||
pkgs.stdenv.mkDerivation {
|
|
||||||
pname = "dina-psfu";
|
|
||||||
version = "1.0.0";
|
|
||||||
|
|
||||||
src = pkgs.fetchzip {
|
|
||||||
url = "https://www.dcmembers.com/jibsen/download/61/?wpdmdl=61";
|
|
||||||
hash = "sha256-JK+vnOyhAbwT825S+WKbQuWgRrfZZHfyhaMQ/6ljO8s=";
|
|
||||||
extension = "zip";
|
|
||||||
stripRoot = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs = with pkgs; [
|
|
||||||
bdf2psf
|
|
||||||
fontforge
|
|
||||||
];
|
|
||||||
|
|
||||||
buildPhase = ''
|
|
||||||
# Get the base Dina font
|
|
||||||
cp BDF/Dina_r400-9.bdf ./dina.bdf
|
|
||||||
|
|
||||||
# Set the AVERAGE_WIDTH property on the font
|
|
||||||
sed 's/STARTPROPERTIES 16/STARTPROPERTIES 17\
|
|
||||||
AVERAGE_WIDTH 70/' ./dina.bdf > ./dina-mod.bdf
|
|
||||||
|
|
||||||
# Reencode the font from code page CP1252 (Windows) to unicode
|
|
||||||
fontforge -lang=ff -c "Open(\"dina-mod.bdf\"); Reencode(\"win\", 1); Reencode(\"iso10646-1\"); Generate(\"dina-enc.bdf\")"
|
|
||||||
mv dina-enc-*.bdf dina-enc.bdf
|
|
||||||
|
|
||||||
# Move the artsy characters around
|
|
||||||
sed -i 's/STARTCHAR uni000E$/STARTCHAR uni2518/' ./dina-enc.bdf
|
|
||||||
sed -i 's/ENCODING 14$/ENCODING 9496/' ./dina-enc.bdf
|
|
||||||
sed -i 's/STARTCHAR uni000F$/STARTCHAR uni2514/' ./dina-enc.bdf
|
|
||||||
sed -i 's/ENCODING 15$/ENCODING 9492/' ./dina-enc.bdf
|
|
||||||
sed -i 's/STARTCHAR uni0010$/STARTCHAR uni250C/' ./dina-enc.bdf
|
|
||||||
sed -i 's/ENCODING 16$/ENCODING 9484/' ./dina-enc.bdf
|
|
||||||
sed -i 's/STARTCHAR uni0011$/STARTCHAR uni2510/' ./dina-enc.bdf
|
|
||||||
sed -i 's/ENCODING 17$/ENCODING 9488/' ./dina-enc.bdf
|
|
||||||
sed -i 's/STARTCHAR uni0012$/STARTCHAR uni2500/' ./dina-enc.bdf
|
|
||||||
sed -i 's/ENCODING 18$/ENCODING 9472/' ./dina-enc.bdf
|
|
||||||
sed -i 's/STARTCHAR uni0013$/STARTCHAR uni2502/' ./dina-enc.bdf
|
|
||||||
sed -i 's/ENCODING 19$/ENCODING 9474/' ./dina-enc.bdf
|
|
||||||
sed -i 's/STARTCHAR uni0014$/STARTCHAR uni2524/' ./dina-enc.bdf
|
|
||||||
sed -i 's/ENCODING 20$/ENCODING 9508/' ./dina-enc.bdf
|
|
||||||
sed -i 's/STARTCHAR uni0015$/STARTCHAR uni2534/' ./dina-enc.bdf
|
|
||||||
sed -i 's/ENCODING 21$/ENCODING 9524/' ./dina-enc.bdf
|
|
||||||
sed -i 's/STARTCHAR uni0016$/STARTCHAR uni251C/' ./dina-enc.bdf
|
|
||||||
sed -i 's/ENCODING 22$/ENCODING 9500/' ./dina-enc.bdf
|
|
||||||
sed -i 's/STARTCHAR uni0017$/STARTCHAR uni252C/' ./dina-enc.bdf
|
|
||||||
sed -i 's/ENCODING 23$/ENCODING 9516/' ./dina-enc.bdf
|
|
||||||
sed -i 's/STARTCHAR uni0018$/STARTCHAR uni253C/' ./dina-enc.bdf
|
|
||||||
sed -i 's/ENCODING 24$/ENCODING 9532/' ./dina-enc.bdf
|
|
||||||
sed -i 's/STARTCHAR uni0019$/STARTCHAR uni2592/' ./dina-enc.bdf
|
|
||||||
sed -i 's/ENCODING 25$/ENCODING 9618/' ./dina-enc.bdf
|
|
||||||
|
|
||||||
# Create the equivalents file
|
|
||||||
touch empty.equivalents
|
|
||||||
|
|
||||||
# Convert the bdf to psf
|
|
||||||
bdf2psf --fb ./dina-enc.bdf \
|
|
||||||
./empty.equivalents \
|
|
||||||
${pkgs.bdf2psf}/share/bdf2psf/fontsets/Uni2.512 \
|
|
||||||
512 ./dina.psfu ./dina.sfm
|
|
||||||
'';
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
install -Dm644 -t $out/debug ./*.*
|
|
||||||
install -Dm644 -t $out/debug/BDF ./BDF/*.*
|
|
||||||
install -Dm644 -t $out/share/consolefonts dina.psfu
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
30
pkgs/fonts/dina-vector.nix
Normal file
30
pkgs/fonts/dina-vector.nix
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
|
pkgs.stdenv.mkDerivation {
|
||||||
|
pname = "dina-font";
|
||||||
|
version = "1.0.0";
|
||||||
|
|
||||||
|
# src = pkgs.fetchurl {
|
||||||
|
# url = "mirror://sourceforge/wqy/${pname}-${version}.tar.gz";
|
||||||
|
# # hash = "sha256-r2Vf7ftJCqu7jOc2AqCKaoR/r8eNw2P/OQGqbDOEyl0=";
|
||||||
|
# hash = "sha256-0uvwkRUbvJ0remTnlP8dElRjaBVd6iukNYBTE/CTO7s=";
|
||||||
|
# };
|
||||||
|
|
||||||
|
unpackPhase = "true";
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
pkgs.fontforge
|
||||||
|
pkgs.dina-font
|
||||||
|
pkgs.wqy-bitmapsong
|
||||||
|
pkgs.tree
|
||||||
|
];
|
||||||
|
buildPhase = ''
|
||||||
|
tree > debug.txt
|
||||||
|
'';
|
||||||
|
installPhase = ''
|
||||||
|
install -Dm644 $out/debug.txt
|
||||||
|
'';
|
||||||
|
}
|
||||||
@ -1,31 +0,0 @@
|
|||||||
{
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
|
|
||||||
pkgs.stdenv.mkDerivation {
|
|
||||||
pname = "ttf2psf";
|
|
||||||
version = "1.0.0";
|
|
||||||
|
|
||||||
src = pkgs.fetchFromGitHub {
|
|
||||||
owner = "NateChoe1";
|
|
||||||
repo = "ttf2psf";
|
|
||||||
rev = "8db09d05385f595c320eccae4c48ff4393ca5bde";
|
|
||||||
sha256 = "v52TZp+GyXHBAMsIoHFA8ZIMPsDVls13WW29vpesCig=";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs = with pkgs; [
|
|
||||||
pkg-config
|
|
||||||
freetype
|
|
||||||
];
|
|
||||||
|
|
||||||
buildPhase = ''
|
|
||||||
make build/ttf2psf
|
|
||||||
'';
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
install -Dm 755 -t $out/bin build/ttf2psf
|
|
||||||
install -Dm 644 -t $out/share/ttf2psf data/*.*
|
|
||||||
install -Dm 644 -t $out/share/ttf2psf/fontsets data/fontsets/*
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
@ -1,47 +0,0 @@
|
|||||||
{
|
|
||||||
stdenv,
|
|
||||||
lib,
|
|
||||||
fetchFromGitHub,
|
|
||||||
linux-pam,
|
|
||||||
libxcb,
|
|
||||||
makeBinaryWrapper,
|
|
||||||
zig_0_12,
|
|
||||||
callPackage,
|
|
||||||
nixosTests,
|
|
||||||
}:
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
pname = "ly";
|
|
||||||
version = "1.0.2";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "peterc-s";
|
|
||||||
repo = "ly";
|
|
||||||
rev = "e6d8bea236dd0097adb1c22e9a23d95102ebe9d9";
|
|
||||||
sha256 = "w9YdNVD+8UhrEbPJ7xqsd/WoxU2rlo2GXFtc9JpWHxo=";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
|
||||||
makeBinaryWrapper
|
|
||||||
zig_0_12.hook
|
|
||||||
];
|
|
||||||
buildInputs = [
|
|
||||||
libxcb
|
|
||||||
linux-pam
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
|
|
||||||
'';
|
|
||||||
|
|
||||||
passthru.tests = { inherit (nixosTests) ly; };
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "TUI display manager";
|
|
||||||
license = licenses.wtfpl;
|
|
||||||
homepage = "https://github.com/fairyglade/ly";
|
|
||||||
maintainers = [ maintainers.vidister ];
|
|
||||||
platforms = platforms.linux;
|
|
||||||
mainProgram = "ly";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,110 +0,0 @@
|
|||||||
# generated by zon2nix (https://github.com/Cloudef/zig2nix)
|
|
||||||
|
|
||||||
{
|
|
||||||
lib,
|
|
||||||
linkFarm,
|
|
||||||
fetchurl,
|
|
||||||
fetchgit,
|
|
||||||
runCommandLocal,
|
|
||||||
zig,
|
|
||||||
name ? "zig-packages",
|
|
||||||
}:
|
|
||||||
|
|
||||||
let
|
|
||||||
unpackZigArtifact =
|
|
||||||
{ name, artifact }:
|
|
||||||
runCommandLocal name { nativeBuildInputs = [ zig ]; } ''
|
|
||||||
hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})"
|
|
||||||
mv "$TMPDIR/p/$hash" "$out"
|
|
||||||
chmod 755 "$out"
|
|
||||||
'';
|
|
||||||
|
|
||||||
fetchZig =
|
|
||||||
{
|
|
||||||
name,
|
|
||||||
url,
|
|
||||||
hash,
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
artifact = fetchurl { inherit url hash; };
|
|
||||||
in
|
|
||||||
unpackZigArtifact { inherit name artifact; };
|
|
||||||
|
|
||||||
fetchGitZig =
|
|
||||||
{
|
|
||||||
name,
|
|
||||||
url,
|
|
||||||
hash,
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
parts = lib.splitString "#" url;
|
|
||||||
base = lib.elemAt parts 0;
|
|
||||||
rev = lib.elemAt parts 1;
|
|
||||||
in
|
|
||||||
fetchgit {
|
|
||||||
inherit name rev hash;
|
|
||||||
url = base;
|
|
||||||
deepClone = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
fetchZigArtifact =
|
|
||||||
{
|
|
||||||
name,
|
|
||||||
url,
|
|
||||||
hash,
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
parts = lib.splitString "://" url;
|
|
||||||
proto = lib.elemAt parts 0;
|
|
||||||
path = lib.elemAt parts 1;
|
|
||||||
fetcher = {
|
|
||||||
"git+http" = fetchGitZig {
|
|
||||||
inherit name hash;
|
|
||||||
url = "http://${path}";
|
|
||||||
};
|
|
||||||
"git+https" = fetchGitZig {
|
|
||||||
inherit name hash;
|
|
||||||
url = "https://${path}";
|
|
||||||
};
|
|
||||||
http = fetchZig {
|
|
||||||
inherit name hash;
|
|
||||||
url = "http://${path}";
|
|
||||||
};
|
|
||||||
https = fetchZig {
|
|
||||||
inherit name hash;
|
|
||||||
url = "https://${path}";
|
|
||||||
};
|
|
||||||
file = unpackZigArtifact {
|
|
||||||
inherit name;
|
|
||||||
artifact = /. + path;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
in
|
|
||||||
fetcher.${proto};
|
|
||||||
in
|
|
||||||
linkFarm name [
|
|
||||||
{
|
|
||||||
name = "122062d301a203d003547b414237229b09a7980095061697349f8bef41be9c30266b";
|
|
||||||
path = fetchZigArtifact {
|
|
||||||
name = "clap";
|
|
||||||
url = "https://github.com/Hejsil/zig-clap/archive/refs/tags/0.9.1.tar.gz";
|
|
||||||
hash = "sha256-7qxm/4xb+58MGG+iUzssUtR97OG2dRjAqyS0BAet4HY=";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "12209b971367b4066d40ecad4728e6fdffc4cc4f19356d424c2de57f5b69ac7a619a";
|
|
||||||
path = fetchZigArtifact {
|
|
||||||
name = "zigini";
|
|
||||||
url = "https://github.com/Kawaii-Ash/zigini/archive/0bba97a12582928e097f4074cc746c43351ba4c8.tar.gz";
|
|
||||||
hash = "sha256-OdaJ5tqmk2MPwaAbpK4HRD/CcQCN+Cjj8U63BqUcFMs=";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
{
|
|
||||||
name = "1220b0979ea9891fa4aeb85748fc42bc4b24039d9c99a4d65d893fb1c83e921efad8";
|
|
||||||
path = fetchZigArtifact {
|
|
||||||
name = "ini";
|
|
||||||
url = "https://github.com/ziglibs/ini/archive/e18d36665905c1e7ba0c1ce3e8780076b33e3002.tar.gz";
|
|
||||||
hash = "sha256-RQ6OPJBqqH7PCL+xiI58JT7vnIo6zbwpLWn+byZO5iM=";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
]
|
|
||||||
@ -23,7 +23,7 @@ in
|
|||||||
|
|
||||||
policies = {
|
policies = {
|
||||||
AppAutoUpdate = false;
|
AppAutoUpdate = false;
|
||||||
BlockAboutAddons = false;
|
BlockAboutAddons = true;
|
||||||
BlockAboutConfig = true;
|
BlockAboutConfig = true;
|
||||||
BlockAboutProfiles = true;
|
BlockAboutProfiles = true;
|
||||||
DisableAppUpdate = true;
|
DisableAppUpdate = true;
|
||||||
@ -50,7 +50,6 @@ in
|
|||||||
|
|
||||||
extensions = with pkgs.nur.repos.rycee.firefox-addons; [
|
extensions = with pkgs.nur.repos.rycee.firefox-addons; [
|
||||||
ublock-origin
|
ublock-origin
|
||||||
tridactyl # TODO: Add toggle for this extension?
|
|
||||||
];
|
];
|
||||||
|
|
||||||
# Theming
|
# Theming
|
||||||
|
|||||||
@ -23,7 +23,7 @@ in
|
|||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
config.set("completion.web_history.max_items", 256)
|
# config.set("completion.web_history.max_items", 30)
|
||||||
config.set("colors.webpage.darkmode.enabled", False)
|
config.set("colors.webpage.darkmode.enabled", False)
|
||||||
config.set("colors.webpage.preferred_color_scheme", "${if theme.darkMode then "dark" else "light"}")
|
config.set("colors.webpage.preferred_color_scheme", "${if theme.darkMode then "dark" else "light"}")
|
||||||
config.set("fonts.default_family", "${theme.fonts.interface.name}")
|
config.set("fonts.default_family", "${theme.fonts.interface.name}")
|
||||||
|
|||||||
@ -65,7 +65,7 @@ in
|
|||||||
settings =
|
settings =
|
||||||
let
|
let
|
||||||
layout = "filtile";
|
layout = "filtile";
|
||||||
layoutOptions = "-outer-padding ${toString config.theming.layout.windowPadding} -view-padding ${toString config.theming.layout.windowPadding} -main-ratio 0.5";
|
layoutOptions = "-outer-padding ${toString config.theming.layout.windowPadding} -view-padding ${toString config.theming.layout.windowPadding}";
|
||||||
modes = [
|
modes = [
|
||||||
"normal"
|
"normal"
|
||||||
"locked"
|
"locked"
|
||||||
@ -119,54 +119,36 @@ in
|
|||||||
map = (
|
map = (
|
||||||
lib.attrsets.recursiveUpdate
|
lib.attrsets.recursiveUpdate
|
||||||
{
|
{
|
||||||
"-repeat".normal = {
|
|
||||||
# Basic utilities
|
|
||||||
"${main} Q" = "close";
|
|
||||||
"${ssm} Return" = "spawn foot";
|
|
||||||
|
|
||||||
# Window focus
|
|
||||||
"${main} J" = "focus-view next";
|
|
||||||
"${main} K" = "focus-view previous";
|
|
||||||
|
|
||||||
# Swap windows
|
|
||||||
"${ssm} J" = "swap next";
|
|
||||||
"${ssm} K" = "swap previous";
|
|
||||||
"${main} Return" = "zoom";
|
|
||||||
|
|
||||||
# Main ratio
|
|
||||||
"${main} H" = "send-layout-cmd ${layout} 'main-ratio -0.05'";
|
|
||||||
"${main} L" = "send-layout-cmd ${layout} 'main-ratio +0.05'";
|
|
||||||
|
|
||||||
# Main count
|
|
||||||
"${ssm} H" = "send-layout-cmd ${layout} 'main-count +1'";
|
|
||||||
"${ssm} L" = "send-layout-cmd ${layout} 'main-count -1'";
|
|
||||||
|
|
||||||
# Move floating windows
|
|
||||||
"${sam} H" = "move left 100";
|
|
||||||
"${sam} J" = "move down 100";
|
|
||||||
"${sam} K" = "move up 100";
|
|
||||||
"${sam} L" = "move right 100";
|
|
||||||
|
|
||||||
# Resize floating windows
|
|
||||||
"${sas} H" = "resize horizontal -100";
|
|
||||||
"${sas} J" = "resize vertical 100";
|
|
||||||
"${sas} K" = "resize vertical -100";
|
|
||||||
"${sas} L" = "resize horizontal 100";
|
|
||||||
|
|
||||||
# Toggle modes
|
|
||||||
"${main} Space" = "toggle-float";
|
|
||||||
"${main} F" = "toggle-fullscreen";
|
|
||||||
};
|
|
||||||
normal =
|
normal =
|
||||||
{
|
{
|
||||||
# Basic utilities
|
"${main} Q" = "close";
|
||||||
"${ssm} E" = "exit";
|
"${ssm} E" = "exit";
|
||||||
|
|
||||||
|
# Basic utilities
|
||||||
"${main} X " = "spawn \"waylock -fork-on-lock ${waylockOptions}\"";
|
"${main} X " = "spawn \"waylock -fork-on-lock ${waylockOptions}\"";
|
||||||
|
"${ssm} Return" = "spawn foot";
|
||||||
"${main} P" = "spawn \"rofi -show drun\"";
|
"${main} P" = "spawn \"rofi -show drun\"";
|
||||||
"${ssm} P" = "spawn rofi-rbw";
|
"${ssm} P" = "spawn rofi-rbw";
|
||||||
"${main} S" =
|
"${main} S" =
|
||||||
"spawn \"grim -g \\\"\\\$(slurp)\\\" ~/Images/Screenshots/\\\$(date +'%s_grim.png')\"";
|
"spawn \"grim -g \\\"\\\$(slurp)\\\" ~/Images/Screenshots/\\\$(date +'%s_grim.png')\"";
|
||||||
|
|
||||||
|
# Window focus
|
||||||
|
"${main} J" = "focus-view next";
|
||||||
|
"${main} K" = "focus-view previous";
|
||||||
|
|
||||||
|
# Swap windows
|
||||||
|
"${ssm} J" = "swap next";
|
||||||
|
"${ssm} K" = "swap previous";
|
||||||
|
"${main} Return" = "zoom";
|
||||||
|
|
||||||
|
# Main ratio
|
||||||
|
"${main} H" = "send-layout-cmd ${layout} 'main-ratio -0.05'";
|
||||||
|
"${main} L" = "send-layout-cmd ${layout} 'main-ratio +0.05'";
|
||||||
|
|
||||||
|
# Main count
|
||||||
|
"${ssm} H" = "send-layout-cmd ${layout} 'main-count +1'";
|
||||||
|
"${ssm} L" = "send-layout-cmd ${layout} 'main-count -1'";
|
||||||
|
|
||||||
# Tags
|
# Tags
|
||||||
"${main} 0" = "set-focused-tags ${toString (pow2 32 - 1)}";
|
"${main} 0" = "set-focused-tags ${toString (pow2 32 - 1)}";
|
||||||
"${ssm} 0" = "set-view-tags ${toString (pow2 32 - 1)}";
|
"${ssm} 0" = "set-view-tags ${toString (pow2 32 - 1)}";
|
||||||
@ -177,11 +159,27 @@ in
|
|||||||
"${main} Down" = "send-layout-cmd ${layout} \"main-location bottom\"";
|
"${main} Down" = "send-layout-cmd ${layout} \"main-location bottom\"";
|
||||||
"${main} Left" = "send-layout-cmd ${layout} \"main-location left\"";
|
"${main} Left" = "send-layout-cmd ${layout} \"main-location left\"";
|
||||||
|
|
||||||
|
# Move floating windows
|
||||||
|
"${sam} H" = "move left 100";
|
||||||
|
"${sam} J" = "move down 100";
|
||||||
|
"${sam} K" = "move up 100";
|
||||||
|
"${sam} L" = "move right 100";
|
||||||
|
|
||||||
# Snap floating windows
|
# Snap floating windows
|
||||||
"${scam} H" = "snap left";
|
"${scam} H" = "snap left";
|
||||||
"${scam} J" = "snap down";
|
"${scam} J" = "snap down";
|
||||||
"${scam} K" = "snap up";
|
"${scam} K" = "snap up";
|
||||||
"${scam} L" = "snap right";
|
"${scam} L" = "snap right";
|
||||||
|
|
||||||
|
# Resize floating windows
|
||||||
|
"${sas} H" = "resize horizontal -100";
|
||||||
|
"${sas} J" = "resize vertical 100";
|
||||||
|
"${sas} K" = "resize vertical -100";
|
||||||
|
"${sas} L" = "resize horizontal 100";
|
||||||
|
|
||||||
|
# Toggle modes
|
||||||
|
"${main} Space" = "toggle-float";
|
||||||
|
"${main} F" = "toggle-fullscreen";
|
||||||
}
|
}
|
||||||
// builtins.listToAttrs (
|
// builtins.listToAttrs (
|
||||||
builtins.concatLists (
|
builtins.concatLists (
|
||||||
|
|||||||
@ -41,7 +41,7 @@
|
|||||||
theming.enable = true;
|
theming.enable = true;
|
||||||
|
|
||||||
# Window manager
|
# Window manager
|
||||||
i3.enable = false;
|
i3.enable = true;
|
||||||
river.enable = true;
|
river.enable = true;
|
||||||
waylock.enable = true;
|
waylock.enable = true;
|
||||||
waybar.enable = true;
|
waybar.enable = true;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user