Compare commits
24 Commits
c0af1940a3
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c3f1f0bfb1 | ||
|
|
9eddcb81db | ||
|
|
f475232dd4 | ||
|
|
a60f8e3412 | ||
|
|
170fe3a1dc | ||
|
|
bf25d47f15 | ||
|
|
f14771fe14 | ||
|
|
ef753f2450 | ||
|
|
b4055e9364 | ||
|
|
53f8093cdb | ||
|
|
cef4d8654a | ||
|
|
6fd520839b | ||
|
|
11de4c2054 | ||
|
|
b2b8ee0699 | ||
|
|
748accf147 | ||
|
|
2ee0e60f05 | ||
|
|
a04a60543d | ||
|
|
1702260451 | ||
|
|
a9b49ffbfb | ||
|
|
e48c699eeb | ||
|
|
76ccbfb451 | ||
|
|
a9338cb8b5 | ||
|
|
746f6b6402 | ||
|
|
cd2f9db375 |
@@ -3,12 +3,21 @@ keys:
|
||||
- &admin_alpheratz age1gdtjn3jgvvvspa86q3lnklflnvyf3s75y2rw23l7nk7hwcsfpg7qkq7msr
|
||||
- &diphda age1rxqyz6watg05r3rzlme7grpgfgezhlt535gdl7psqys2ec8eegmqchfk4d
|
||||
- &alpheratz age1cla0k3yffcelphkrmgz5upc0chgtdef25ne833jeqtapceux59rqkmhxf7
|
||||
- &ankaa age15z4s7nts7ls5h3tu5zesghvnm3kj2qk3dsr004g8rwy578mq4q4qew7wl7
|
||||
creation_rules:
|
||||
- path_regex: secrets/[^/]+\.yaml$
|
||||
key_groups:
|
||||
- age:
|
||||
- *admin_ankaa
|
||||
- *admin_alpheratz
|
||||
- path_regex: secrets/shared/[^/]+\.(yaml|otf)$
|
||||
key_groups:
|
||||
- age:
|
||||
- *admin_ankaa
|
||||
- *admin_alpheratz
|
||||
- *alpheratz
|
||||
- *ankaa
|
||||
- *diphda
|
||||
- path_regex: secrets/ankaa/[^/]+\.yaml$
|
||||
key_groups:
|
||||
- age:
|
||||
|
||||
94
flake.lock
generated
94
flake.lock
generated
@@ -1,5 +1,21 @@
|
||||
{
|
||||
"nodes": {
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1747046372,
|
||||
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
@@ -43,11 +59,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743808813,
|
||||
"narHash": "sha256-2lDQBOmlz9ggPxcS7/GvcVdzXMIiT+PpMao6FbLJSr0=",
|
||||
"lastModified": 1747688870,
|
||||
"narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "a9f8b3db211b4609ddd83683f9db89796c7f6ac6",
|
||||
"rev": "d5f1f641b289553927b3801580598d200a501863",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -64,11 +80,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743869639,
|
||||
"narHash": "sha256-Xhe3whfRW/Ay05z9m1EZ1/AkbV1yo0tm1CbgjtCi4rQ=",
|
||||
"lastModified": 1761845621,
|
||||
"narHash": "sha256-d+R4MHsGmdebvSMsYUFWONsZSlUbOo8Zq/wjMdMiIac=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "d094c6763c6ddb860580e7d3b4201f8f496a6836",
|
||||
"rev": "97e3022a8d2c09313fa49847f6da4d76abcfc72d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -83,11 +99,11 @@
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743869043,
|
||||
"narHash": "sha256-dOvdvxR3HHzuuhDWiCk/+Ly0u8WnfjyWfg3eOVfDWmQ=",
|
||||
"lastModified": 1761867267,
|
||||
"narHash": "sha256-b2vU6HzMR26JnHmnkvNZgefyfzAZOi9wLZdA+WOymHU=",
|
||||
"owner": "ggerganov",
|
||||
"repo": "llama.cpp",
|
||||
"rev": "6bf28f0111ff9f21b3c1b1eace20c590281e7ba6",
|
||||
"rev": "6eb208d17ea29bb60295d9a2b5e7122dfb8f4b55",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -96,6 +112,25 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-matlab": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1754476755,
|
||||
"narHash": "sha256-vSF0VMEmPMzwNkrXIZwkhOSYmKES9BaDK/LlEe7/q8E=",
|
||||
"owner": "doronbehar",
|
||||
"repo": "nix-matlab",
|
||||
"rev": "0e9c9fb660f9e1a1e4d59fd083e0212a15b513e2",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
"owner": "doronbehar",
|
||||
"repo": "nix-matlab",
|
||||
"type": "gitlab"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1732014248,
|
||||
@@ -126,11 +161,11 @@
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1743703532,
|
||||
"narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=",
|
||||
"lastModified": 1751274312,
|
||||
"narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "bdb91860de2f719b57eef819b5617762f7120c70",
|
||||
"rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -142,11 +177,11 @@
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1743583204,
|
||||
"narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
|
||||
"lastModified": 1761672384,
|
||||
"narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
|
||||
"rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -158,11 +193,25 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1743441817,
|
||||
"narHash": "sha256-+OE03P3u0FRwhS+Ah6EYiwxdS1rcIYlXheuXGM3wP3Q=",
|
||||
"lastModified": 1754340878,
|
||||
"narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "3eeaa42ef4c19447b48d1c676fe59077dfd0846e",
|
||||
"rev": "cab778239e705082fe97bb4990e0d24c50924c04",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1760596604,
|
||||
"narHash": "sha256-J/i5K6AAz/y5dBePHQOuzC7MbhyTOKsd/GLezSbEFiM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "3cbe716e2346710d6e1f7c559363d14e11c32a43",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -178,6 +227,7 @@
|
||||
"home-manager-stable": "home-manager-stable",
|
||||
"home-manager-unstable": "home-manager-unstable",
|
||||
"llama-cpp": "llama-cpp",
|
||||
"nix-matlab": "nix-matlab",
|
||||
"nixpkgs-stable": "nixpkgs-stable",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"sops-nix": "sops-nix"
|
||||
@@ -185,14 +235,14 @@
|
||||
},
|
||||
"sops-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743756170,
|
||||
"narHash": "sha256-2b11EYa08oqDmF3zEBLkG1AoNn9rB1k39ew/T/mSvbU=",
|
||||
"lastModified": 1760998189,
|
||||
"narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "cff8437c5fe8c68fc3a840a21bf1f4dc801da40d",
|
||||
"rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
29
flake.nix
29
flake.nix
@@ -18,6 +18,8 @@
|
||||
|
||||
llama-cpp.url = "github:ggerganov/llama.cpp";
|
||||
|
||||
nix-matlab.url = "gitlab:doronbehar/nix-matlab";
|
||||
|
||||
};
|
||||
|
||||
outputs = inputs@{ self
|
||||
@@ -28,6 +30,7 @@
|
||||
, flake-utils
|
||||
, sops-nix
|
||||
, llama-cpp
|
||||
, nix-matlab
|
||||
, ...
|
||||
}:
|
||||
let
|
||||
@@ -77,9 +80,15 @@
|
||||
};
|
||||
};
|
||||
|
||||
term = {
|
||||
terminal = "kitty";
|
||||
font = "codelia";
|
||||
};
|
||||
|
||||
gui = {
|
||||
enable = true;
|
||||
protonmail = true;
|
||||
secrets = true;
|
||||
gtk = false;
|
||||
|
||||
sway = {
|
||||
@@ -113,7 +122,7 @@
|
||||
enable = true;
|
||||
lutris.enable = true;
|
||||
minecraft.enable = true;
|
||||
ps4.enable = true;
|
||||
vintagestory.enable = true;
|
||||
};
|
||||
|
||||
common.nil.enable = true;
|
||||
@@ -214,7 +223,7 @@
|
||||
|
||||
networking = {
|
||||
firewall = {
|
||||
allowedTCPPorts = [ 80 443 3000 3843 4533 6600 6722 7474 7878 8000 8080 8081 8083 8089 8096 8120 8181 8443 8787 8889 8902 8989 8998 9000 9091 9696 11112 13378 24454 25565 25600 ];
|
||||
allowedTCPPorts = [ 80 443 3000 3843 4533 5030 6600 6722 7474 7878 8000 8080 8081 8083 8089 8096 8120 8181 8443 8787 8889 8902 8989 8998 9000 9091 9696 11112 13378 24454 25565 25600 50300 ];
|
||||
allowedUDPPorts = [ 3478 10001 ];
|
||||
};
|
||||
};
|
||||
@@ -229,20 +238,32 @@
|
||||
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
overlays = with overlays; [ printrun citrix shadps4 ];
|
||||
overlays = with overlays; [ printrun shadps4 nix-matlab.overlay ];
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
permittedInsecurePackages = [
|
||||
"electron-31.7.7"
|
||||
# TODO: Remove when fixed https://github.com/NixOS/nixpkgs/issues/433004
|
||||
"libsoup-2.74.3"
|
||||
"libxml2-2.13.8"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
# TODO: Remove when Citrix is fixed
|
||||
pkgs_stable_tmp = import nixpkgs-stable {
|
||||
inherit system;
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
};
|
||||
};
|
||||
|
||||
localPackages = pkgs.lib.genAttrs flake-utils.lib.defaultSystems (system: {
|
||||
kickoff-dot-desktop = pkgs.callPackage ./pkgs/kickoff-dot-desktop.nix {};
|
||||
jhelioviewer = pkgs.callPackage ./pkgs/jhelioviewer.nix {};
|
||||
llama-cpp = llama-cpp.packages.${system}.rocm;
|
||||
shadps4 = pkgs.callPackage ./pkgs/shadps4.nix {};
|
||||
gazou = pkgs.callPackage ./pkgs/gazou.nix {};
|
||||
}
|
||||
);
|
||||
|
||||
@@ -262,6 +283,7 @@
|
||||
specialArgs = {
|
||||
inherit localPackages;
|
||||
inherit pkgs;
|
||||
inherit pkgs_stable_tmp;
|
||||
};
|
||||
modules = [
|
||||
{
|
||||
@@ -280,6 +302,7 @@
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = {
|
||||
inherit utils;
|
||||
inherit localPackages;
|
||||
systemConfig = config.options;
|
||||
};
|
||||
|
||||
|
||||
@@ -31,6 +31,13 @@
|
||||
options = [ "subvol=nix" ];
|
||||
};
|
||||
|
||||
# Remove comments for optical drive in wine
|
||||
# fileSystems."/mnt/drive0" =
|
||||
# { device = "/dev/sr0";
|
||||
# fsType = "auto";
|
||||
# options = [ "ro" "user" "noauto" "unhide" ];
|
||||
# };
|
||||
|
||||
swapDevices = [ ];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
|
||||
@@ -32,12 +32,43 @@
|
||||
secrets."borgbase/nix-alpheratz" = {
|
||||
owner = "eesim";
|
||||
};
|
||||
|
||||
secrets."Codelia-Regular.otf" = {
|
||||
format = "binary";
|
||||
sopsFile = ../../secrets/shared/Codelia-Regular;
|
||||
owner = "eesim";
|
||||
path = "/home/eesim/.local/share/fonts/Codelia Regular.otf";
|
||||
};
|
||||
|
||||
secrets."Codelia-Bold.otf" = {
|
||||
format = "binary";
|
||||
sopsFile = ../../secrets/shared/Codelia-Bold;
|
||||
owner = "eesim";
|
||||
path = "/home/eesim/.local/share/fonts/Codelia Bold.otf";
|
||||
};
|
||||
|
||||
secrets."Codelia-Italic.otf" = {
|
||||
format = "binary";
|
||||
sopsFile = ../../secrets/shared/Codelia-Italic;
|
||||
owner = "eesim";
|
||||
path = "/home/eesim/.local/share/fonts/Codelia Italic.otf";
|
||||
};
|
||||
|
||||
secrets."Codelia-BoldItalic.otf" = {
|
||||
format = "binary";
|
||||
sopsFile = ../../secrets/shared/Codelia-BoldItalic;
|
||||
owner = "eesim";
|
||||
path = "/home/eesim/.local/share/fonts/Codelia BoldItalic.ttf";
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
localPackages.x86_64-linux.jhelioviewer
|
||||
bottles
|
||||
quartus-prime-lite
|
||||
matlab
|
||||
discord
|
||||
wine
|
||||
matlab-language-server
|
||||
];
|
||||
|
||||
services.printing.enable = false;
|
||||
@@ -64,18 +95,17 @@
|
||||
|
||||
networking.wg-quick.interfaces = {
|
||||
wg0 = {
|
||||
address = [ "10.0.0.2/32" ];
|
||||
address = [ "10.137.175.3/32" ];
|
||||
listenPort = 51820;
|
||||
privateKeyFile = "/run/secrets/wireguard/private";
|
||||
dns = [ "10.0.0.1" ];
|
||||
dns = [ "10.137.175.1" ];
|
||||
autostart = true;
|
||||
|
||||
peers = [
|
||||
{
|
||||
publicKey = "sWdXHlBqH+tAgSl0Tqr46sfKvgFN/vMDiuN08HjzaSg=";
|
||||
presharedKeyFile = "/run/secrets/wireguard/preshared";
|
||||
allowedIPs = [ "0.0.0.0/0" "::/0" ];
|
||||
endpoint = "jellyfin.simmer505.com:51820";
|
||||
endpoint = "mc.simmer505.com:51820";
|
||||
}
|
||||
];
|
||||
};
|
||||
@@ -90,7 +120,7 @@
|
||||
# Define a user account.
|
||||
users.users.eesim = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" "video" "audio" "networkmanager" ];
|
||||
extraGroups = [ "wheel" "video" "audio" "networkmanager" "cdrom" ];
|
||||
shell = pkgs.fish;
|
||||
};
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" "wl" ];
|
||||
boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/c9d87455-b02f-465d-8d63-1858dc2164fe";
|
||||
|
||||
@@ -16,15 +16,48 @@
|
||||
};
|
||||
};
|
||||
|
||||
sops = {
|
||||
defaultSopsFile = ../../secrets/ankaa/secrets.yaml;
|
||||
age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
|
||||
|
||||
secrets."Codelia-Regular.otf" = {
|
||||
format = "binary";
|
||||
sopsFile = ../../secrets/shared/Codelia-Regular;
|
||||
owner = "eesim";
|
||||
path = "/home/eesim/.local/share/fonts/Codelia Regular.otf";
|
||||
};
|
||||
|
||||
secrets."Codelia-Bold.otf" = {
|
||||
format = "binary";
|
||||
sopsFile = ../../secrets/shared/Codelia-Bold;
|
||||
owner = "eesim";
|
||||
path = "/home/eesim/.local/share/fonts/Codelia Bold.otf";
|
||||
};
|
||||
|
||||
secrets."Codelia-Italic.otf" = {
|
||||
format = "binary";
|
||||
sopsFile = ../../secrets/shared/Codelia-Italic;
|
||||
owner = "eesim";
|
||||
path = "/home/eesim/.local/share/fonts/Codelia Italic.otf";
|
||||
};
|
||||
|
||||
secrets."Codelia-BoldItalic.otf" = {
|
||||
format = "binary";
|
||||
sopsFile = ../../secrets/shared/Codelia-BoldItalic;
|
||||
owner = "eesim";
|
||||
path = "/home/eesim/.local/share/fonts/Codelia BoldItalic.ttf";
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
localPackages.x86_64-linux.jhelioviewer
|
||||
localPackages.x86_64-linux.llama-cpp
|
||||
printrun
|
||||
pciutils
|
||||
bottles
|
||||
inkscape
|
||||
orca-slicer
|
||||
qemu
|
||||
protonvpn-gui
|
||||
anki
|
||||
];
|
||||
|
||||
services.hardware.openrgb.enable = true;
|
||||
@@ -63,8 +96,6 @@
|
||||
# Select internationalisation properties.
|
||||
i18n.defaultLocale = "en_US.UTF-8";
|
||||
|
||||
programs.ssh.startAgent = true;
|
||||
|
||||
# Define a user account.
|
||||
users.users.eesim = {
|
||||
isNormalUser = true;
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
};
|
||||
|
||||
fileSystems."/media" =
|
||||
{ device = "192.168.1.100:/volume1/Media";
|
||||
{ device = "10.137.177.10:/volume1/Media";
|
||||
fsType = "nfs";
|
||||
};
|
||||
|
||||
|
||||
@@ -14,6 +14,14 @@ iron.setup {
|
||||
python = {
|
||||
command = { "python3" }, -- or { "ipython", "--no-autoindent" }
|
||||
format = require("iron.fts.common").bracketed_paste_python
|
||||
},
|
||||
matlab = {
|
||||
command = {
|
||||
"matlab",
|
||||
"-nosplash",
|
||||
"-nodesktop"
|
||||
},
|
||||
|
||||
}
|
||||
},
|
||||
-- How the repl window will be displayed
|
||||
|
||||
@@ -24,6 +24,16 @@ lspconfig.rust_analyzer.setup {
|
||||
},
|
||||
}
|
||||
|
||||
lspconfig.matlab_ls.setup {
|
||||
capabilities = capabilities,
|
||||
settings = {
|
||||
MATLAB = {
|
||||
indexWorkspace = false,
|
||||
installPath = "",
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
lspconfig.omnisharp.setup {
|
||||
cmd = { "dotnet", "/usr/lib/omnisharp-roslyn/OmniSharp.dll"}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{ lib
|
||||
, pkgs
|
||||
, localPackages
|
||||
, config
|
||||
, systemConfig
|
||||
, utils
|
||||
@@ -109,9 +110,11 @@ in
|
||||
"${modifier}+Shift+0" = "move container to workspace 10";
|
||||
"${modifier}+Shift+e" = "exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'";
|
||||
"${modifier}+Shift+c" = "reload";
|
||||
"${modifier}+Shift+s" = "exec ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" \"/home/eesim/Pictures/$(${pkgs.zenity}/bin/zenity --entry).png\"";
|
||||
"${modifier}+Shift+s" = "exec 'TMPFILE=\"$(mktemp)\"; ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" \"$TMPFILE\"; mv \"$TMPFILE\" \"/home/eesim/Pictures/$(${pkgs.zenity}/bin/zenity --entry).png\"'";
|
||||
"${modifier}+Shift+o" = "exec '${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | ${localPackages.x86_64-linux.gazou}/bin/gazou | tail -n +2 | ${pkgs.wl-clipboard}/bin/wl-copy'";
|
||||
"${modifier}+Shift+q" = "kill";
|
||||
"${modifier}+p" = "focus mode_toggle";
|
||||
"${modifier}+Control+b" = "exec bluetoothctl connect 18:3F:70:62:A5:3C";
|
||||
"XF86AudioPause" = "exec playerctl play-pause";
|
||||
"XF86AudioNext" = "exec playerctl next";
|
||||
"XF86AudioPrev" = "exec playerctl previous";
|
||||
@@ -195,7 +198,7 @@ in
|
||||
|
||||
input."type:keyboard" = {
|
||||
xkb_layout = "us,de";
|
||||
xkb_options = "grp:toggle";
|
||||
xkb_options = "grp:lctrl_lalt_toggle,lv3:ralt_switch";
|
||||
};
|
||||
|
||||
output = gui.monitors;
|
||||
|
||||
@@ -15,8 +15,10 @@ in
|
||||
settings = {
|
||||
confirm_os_window_close = 0;
|
||||
};
|
||||
font.name = mkIf (cfg.font == "codelia") "Codelia";
|
||||
};
|
||||
|
||||
|
||||
programs.alacritty = mkIf (cfg.terminal == "alacritty") {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
@@ -12,7 +12,7 @@ in
|
||||
config = {
|
||||
environment.systemPackages = with pkgs; []
|
||||
++ optional cfg.pipewire.enable pulseaudio
|
||||
++ optional cfg.music.enable feishin
|
||||
++ optional cfg.music.enable supersonic
|
||||
++ optional cfg.tools.helvum helvum
|
||||
++ optional cfg.tools.easyeffects easyeffects
|
||||
++ optional cfg.tools.pavucontrol pavucontrol;
|
||||
|
||||
@@ -41,6 +41,11 @@ in
|
||||
main = mkMerge [
|
||||
(mkIf (cfg.caps == "ctrl-esc") { capslock = "overload(control, esc)"; })
|
||||
(mkIf (cfg.caps == "esc") { capslock = "esc"; })
|
||||
{ rightcontrol = "rightcontrol"; }
|
||||
{ rightshift = "rightshift"; }
|
||||
];
|
||||
altgr = mkMerge [
|
||||
{ "-" = "macro(C-S-u 2 0 1 4 space)"; }
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -14,6 +14,7 @@ in
|
||||
++ optional cfg.gamescope.enable gamescope
|
||||
++ optional cfg.discord.enable vesktop
|
||||
++ optional cfg.minecraft.enable prismlauncher
|
||||
++ optional cfg.vintagestory.enable vintagestory
|
||||
++ optional cfg.ps4.enable localPackages.x86_64-linux.shadps4
|
||||
++ optionals cfg.lutris.enable [ lutris wine ];
|
||||
|
||||
|
||||
@@ -53,8 +53,7 @@ in
|
||||
liberation_ttf
|
||||
noto-fonts
|
||||
noto-fonts-cjk-sans
|
||||
noto-fonts-extra
|
||||
ubuntu_font_family
|
||||
ubuntu-classic
|
||||
vazir-fonts
|
||||
font-awesome
|
||||
corefonts
|
||||
|
||||
@@ -1,20 +1,24 @@
|
||||
{ lib
|
||||
, pkgs
|
||||
, config
|
||||
, localPackages
|
||||
, pkgs_stable_tmp
|
||||
, ...
|
||||
}:
|
||||
|
||||
with lib; let
|
||||
cfg = config.simmer.school;
|
||||
extraCerts = [ ./incommon-rsa-ca2.pem ];
|
||||
citrix = pkgs.citrix_workspace_23_09_0.override { inherit extraCerts; };
|
||||
citrix = pkgs_stable_tmp.citrix_workspace_23_09_0.override { inherit extraCerts; };
|
||||
in
|
||||
{
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = with pkgs; [
|
||||
xournalpp
|
||||
libreoffice
|
||||
anki
|
||||
] ++ optional cfg.citrix citrix;
|
||||
]
|
||||
++ optional cfg.citrix citrix
|
||||
++ optional cfg.kicad kicad
|
||||
++ optional cfg.logisim logisim-evolution;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -34,6 +34,12 @@ in
|
||||
default = true;
|
||||
};
|
||||
|
||||
vintagestory.enable = mkOption {
|
||||
description = "Whether to install Vintage Story";
|
||||
type = types.bool;
|
||||
default = false;
|
||||
};
|
||||
|
||||
minecraft.enable = mkOption {
|
||||
description = "Whether to install minecraft launcher";
|
||||
type = types.bool;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{ lib
|
||||
, pkgs
|
||||
, config
|
||||
, ...
|
||||
}:
|
||||
|
||||
@@ -19,5 +20,15 @@ in
|
||||
type = types.bool;
|
||||
default = false;
|
||||
};
|
||||
kicad = mkOption {
|
||||
description = "Whether to install kicad";
|
||||
type = types.bool;
|
||||
default = cfg.enable;
|
||||
};
|
||||
logisim = mkOption {
|
||||
description = "Whether to install logisim";
|
||||
type = types.bool;
|
||||
default = cfg.enable;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -21,6 +21,12 @@ in
|
||||
type = types.enum [ "alacritty" "kitty" ];
|
||||
default = "alacritty";
|
||||
};
|
||||
|
||||
font = mkOption {
|
||||
description = "Which font to use in terminal";
|
||||
type = types.enum [ "default" "codelia" ];
|
||||
default = "codelia";
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
36
pkgs/gazou.nix
Normal file
36
pkgs/gazou.nix
Normal file
@@ -0,0 +1,36 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, tesseract4
|
||||
, leptonica
|
||||
, libsForQt5
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
name = "gazou";
|
||||
version = "0.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kamui-fin";
|
||||
repo = "gazou";
|
||||
rev = "7dd023fc78566f2911250f4b8550b0a33a943bb3";
|
||||
hash = "sha256-6auc5i6b7r4knzen4TCq2mTdbiv+qCD0mWE3LNyh2J4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [
|
||||
pkg-config
|
||||
tesseract4
|
||||
leptonica
|
||||
libsForQt5.qt5.qtbase
|
||||
libsForQt5.qt5.qtdeclarative
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DGUI=OFF"
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
}
|
||||
31
secrets/shared/Codelia-Bold
Normal file
31
secrets/shared/Codelia-Bold
Normal file
File diff suppressed because one or more lines are too long
31
secrets/shared/Codelia-BoldItalic
Normal file
31
secrets/shared/Codelia-BoldItalic
Normal file
File diff suppressed because one or more lines are too long
31
secrets/shared/Codelia-Italic
Normal file
31
secrets/shared/Codelia-Italic
Normal file
File diff suppressed because one or more lines are too long
31
secrets/shared/Codelia-Regular
Normal file
31
secrets/shared/Codelia-Regular
Normal file
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user