nki/nix-home
1
0
Fork 0
Code Issues Pull requests 1 Packages Projects Releases Wiki Activity

Compare commits

base: nki:b4f80b08448cfe9f20005ca8f65415ee8db1f8c6
Branches Tags
nki:master
nki:build-farm
nki:remove-macbook
nki:24.05
nki:peertube
nki:invi
nki:local-net
nki:test
..
compare: nki:ec8467cdd445e5580ff78a4629bcc9e3847d0e91
Branches Tags
nki:master
nki:build-farm
nki:remove-macbook
nki:24.05
nki:peertube
nki:invi
nki:local-net
nki:test

No commits in common. "b4f80b08448cfe9f20005ca8f65415ee8db1f8c6" and "ec8467cdd445e5580ff78a4629bcc9e3847d0e91" have entirely different histories.
b4f80b0844 ... ec8467cdd4

12 changed files with 69 additions and 105 deletions
Show stats Expand all files Collapse all files

13
cachix.nix
View file

@ -1,13 +0,0 @@
# WARN: this file will get overwritten by $ cachix use <name>
{ pkgs, lib, ... }:
let
folder = ./cachix;
toImport = name: value: folder + ("/" + name);
filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key;
imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
in {
inherit imports;
nix.settings.substituters = ["https://cache.nixos.org/"];
}

13
cachix/natsukagami.nix
View file

@ -1,13 +0,0 @@
{
nix = {
settings = {
substituters = [
"https://natsukagami.cachix.org"
];
trusted-public-keys = [
"natsukagami.cachix.org-1:3U6GV8i8gWEaXRUuXd2S4ASfYgdl2QFPWg4BKPbmYiQ="
];
};
};
}

114
flake.lock
View file

@ -80,11 +80,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1697334144, "lastModified": 1693787605,
"narHash": "sha256-gcOxnHEgBcn8mGXgNkTvZ1BLAANZZj+IZzb9QnQt7bc=", "narHash": "sha256-rwq5U8dy+a9JFny/73L0SJu1GfWwATMPMTp7D+mjHy8=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "4dcf584de14beff8dd0c030ac54e185fd3b72023", "rev": "8b4f7a4dab2120cf41e7957a28a853f45016bd9d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -133,11 +133,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1696360011, "lastModified": 1694810318,
"narHash": "sha256-HpPv27qMuPou4acXcZ8Klm7Zt0Elv9dgDvSJaomWb9Y=", "narHash": "sha256-LuvrVj2oj9TzdnnwtQUClqcXjpgwCP01FFVBM7azGV8=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "8b6ea26d5d2e8359d06278364f41fbc4b903b28a", "rev": "80bb201f4925cdda5a7a3c7b1900fb26bb2af2e8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -154,11 +154,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1695052866, "lastModified": 1694513707,
"narHash": "sha256-agn7F9Oww4oU6nPiw+YiYI9Xb4vOOE73w8PAoBRP4AA=", "narHash": "sha256-wE5kHco3+FQjc+MwTPwLVqYz4hM7uno2CgXDXUFMCpc=",
"owner": "Serokell", "owner": "Serokell",
"repo": "deploy-rs", "repo": "deploy-rs",
"rev": "e3f41832680801d0ee9e2ed33eb63af398b090e9", "rev": "31c32fb2959103a796e07bbe47e0a5e287c343a8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -252,11 +252,11 @@
"flake-compat_2": { "flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696267196, "lastModified": 1673956053,
"narHash": "sha256-AAQ/2sD+0D18bb8hKuEEVpHUYD1GmO2Uh/taFamn6XQ=", "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "4f910c9827911b1ec2bf26b5a062cd09f8d89f85", "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -415,11 +415,11 @@
"nixpkgs-lib": "nixpkgs-lib_2" "nixpkgs-lib": "nixpkgs-lib_2"
}, },
"locked": { "locked": {
"lastModified": 1696343447, "lastModified": 1693611461,
"narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -466,11 +466,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1694529238, "lastModified": 1692799911,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -702,11 +702,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1695108154, "lastModified": 1694465129,
"narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=", "narHash": "sha256-8BQiuobMrCfCbGM7w6Snx+OBYdtTIm0+cGVaKwQ5BFg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "07682fff75d41f18327a871088d20af2710d4744", "rev": "9787dffff5d315c9593d3f9fb0f9bf2097e1b57b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -736,11 +736,11 @@
"kakoune": { "kakoune": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696413867, "lastModified": 1694338267,
"narHash": "sha256-HejppBBed5NLPAPUl4LUEGWvRUBacLsui6StBLkGEdw=", "narHash": "sha256-qQEWUPH036AbgtV/5f6k2NaI+oXsRf9BeH/HJV9d8VM=",
"owner": "mawww", "owner": "mawww",
"repo": "kakoune", "repo": "kakoune",
"rev": "5c793a6a1e5bc90c516605a6658a99168a966d9e", "rev": "01fd6552af6b909f533d5cd8bf3a5385d4e35215",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -863,11 +863,11 @@
"nixpkgs": "nixpkgs_9" "nixpkgs": "nixpkgs_9"
}, },
"locked": { "locked": {
"lastModified": 1697332726, "lastModified": 1695063925,
"narHash": "sha256-DCYaENxyQWyaSM/1l8+CweUs6tKxdafqThCeg9U/cqU=", "narHash": "sha256-uJEBdoWy+ixiZytrcw2lZf5aXcL7RL5pgMuVb+v/nfg=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "a6be693f168ebb69b7e090b9a867b694f6031213", "rev": "68d010acc841d9b19fc9fce184acc935cc086ee4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -885,11 +885,11 @@
"rust-overlay": "rust-overlay_5" "rust-overlay": "rust-overlay_5"
}, },
"locked": { "locked": {
"lastModified": 1695000433, "lastModified": 1694226967,
"narHash": "sha256-CYB6YD+NLpmj/ORWlmeS/58PIHONF1G7cQMyXHo9ILo=", "narHash": "sha256-AY0ytoBBVYHKzY8p/8MQQW3hgMAqHBinQxbYPjIKawI=",
"owner": "tpwrules", "owner": "tpwrules",
"repo": "nixos-apple-silicon", "repo": "nixos-apple-silicon",
"rev": "096dc63e5426e17f70b4a8bf7716c3dd3430ba8c", "rev": "d63ab027a49c249f5c0ba85ea988d7bb6db83cd9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -935,11 +935,11 @@
"nixpkgs-lib_2": { "nixpkgs-lib_2": {
"locked": { "locked": {
"dir": "lib", "dir": "lib",
"lastModified": 1696019113, "lastModified": 1693471703,
"narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", "narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", "rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -968,11 +968,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1697009197, "lastModified": 1695806987,
"narHash": "sha256-viVRhBTFT8fPJTb1N3brQIpFZnttmwo3JVKNuWRVc3s=", "narHash": "sha256-fX5kGs66NZIxCMcpAGIpxuftajHL8Hil1vjHmjjl118=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "01441e14af5e29c9d27ace398e6dd0b293e25a54", "rev": "f3dab3509afca932f3f4fd0908957709bb1c1f57",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -984,11 +984,11 @@
}, },
"nixpkgs_10": { "nixpkgs_10": {
"locked": { "locked": {
"lastModified": 1696983906, "lastModified": 1695825837,
"narHash": "sha256-L7GyeErguS7Pg4h8nK0wGlcUTbfUMDu+HMf1UcyP72k=", "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bd1cde45c77891214131cbbea5b1203e485a9d51", "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1048,11 +1048,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1696261572, "lastModified": 1693654884,
"narHash": "sha256-s8TtSYJ1LBpuITXjbPLUPyxzAKw35LhETcajJjCS5f0=", "narHash": "sha256-EqKKEl+IOS8TSjkt+xn1qGpsjnx5/ag33YNQ1+c7OuM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0c7ffbc66e6d78c50c38e717ec91a2a14e0622fb", "rev": "e7f35e03abd06a2faef6684d0de813370e13bda8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1141,11 +1141,11 @@
}, },
"nixpkgs_9": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1697009197, "lastModified": 1694760568,
"narHash": "sha256-viVRhBTFT8fPJTb1N3brQIpFZnttmwo3JVKNuWRVc3s=", "narHash": "sha256-3G07BiXrp2YQKxdcdms22MUx6spc6A++MSePtatCYuI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "01441e14af5e29c9d27ace398e6dd0b293e25a54", "rev": "46688f8eb5cd6f1298d873d4d2b9cf245e09e88e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1157,11 +1157,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1697363080, "lastModified": 1694940290,
"narHash": "sha256-/49Rh5mohp0ZD6HaNbDn9oIsLt+d7Tzbc/BGkb/7o+g=", "narHash": "sha256-uQhe3bxu04kOAo+rPoomC+aEU7nHAIv4QN8BkxIYFnU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "5771ba6f22db037b037a8bdd82acc5467c965c7e", "rev": "6d00e7529bd3825056d9d5e1711eca4c48f6af43",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1304,11 +1304,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1696299134, "lastModified": 1693707092,
"narHash": "sha256-RS77cAa0N+Sfj5EmKbm5IdncNXaBCE1BSSQvUE8exvo=", "narHash": "sha256-HR1EnynBSPqbt+04/yxxqsG1E3n6uXrOl7SPco/UnYo=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "611ccdceed92b4d94ae75328148d84ee4a5b462d", "rev": "98ccb73e6eefc481da6039ee57ad8818d1ca8d56",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1405,11 +1405,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1697339241, "lastModified": 1694495315,
"narHash": "sha256-ITsFtEtRbCBeEH9XrES1dxZBkE1fyNNUfIyQjQ2AYQs=", "narHash": "sha256-sZEYXs9T1NVHZSSbMqBEtEm2PGa7dEDcx0ttQkArORc=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "51186b8012068c417dac7c31fb12861726577898", "rev": "ea208e55f8742fdcc0986b256bdfa8986f5e4415",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1426,11 +1426,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1695260149, "lastModified": 1693974728,
"narHash": "sha256-QlrsFdIFHtDZxprC8oNZBlJtItl3Tae/agqA27Am3g0=", "narHash": "sha256-xDLHBDgDwBIrGUYMxCG1ZZOzJhmmtvjqCXdSGP0qFA0=",
"owner": "WillPower3309", "owner": "WillPower3309",
"repo": "swayfx", "repo": "swayfx",
"rev": "d89c365106b8d58e4a37ad58e9987a7da28c8951", "rev": "6f6991a1b38b03e87fd3f73607ca2393ae62cfea",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
home/kakoune/kak.nix
View file

@ -231,10 +231,10 @@ in
InfoDiagnosticInformation = "@Information"; InfoDiagnosticInformation = "@Information";
InfoDiagnosticWarning = "@DiagnosticWarning"; InfoDiagnosticWarning = "@DiagnosticWarning";
# Extra faces # Extra faces
macro = "+u@function"; macro = "+b@function";
method = "@function"; method = "+i@function";
format_specifier = "+i@string"; format_specifier = "+i@string";
mutable_variable = "+i@variable"; mutable_variable = "+u@variable";
class = "+b@variable"; class = "+b@variable";
}; };
programs.my-kakoune.autoload = [ programs.my-kakoune.autoload = [

4
home/kakoune/kakrc
View file

@ -114,7 +114,7 @@ hook global WinSetOption filetype=(rust|scala|fsharp) %{
lsp-inlay-hints-enable window lsp-inlay-hints-enable window
} }
hook global WinSetOption filetype=(rust|go|fsharp|typst|scala) %{ hook global WinSetOption filetype=(rust|go|fsharp|typst) %{
hook window -group semantic-tokens BufReload .* lsp-semantic-tokens hook window -group semantic-tokens BufReload .* lsp-semantic-tokens
hook window -group semantic-tokens NormalIdle .* lsp-semantic-tokens hook window -group semantic-tokens NormalIdle .* lsp-semantic-tokens
hook window -group semantic-tokens InsertIdle .* lsp-semantic-tokens hook window -group semantic-tokens InsertIdle .* lsp-semantic-tokens
@ -201,7 +201,7 @@ hook global BufCreate .*[.]md %{
add-highlighter buffer/ wrap add-highlighter buffer/ wrap
} }
hook global BufCreate .*[.](sc|sbt) %{ hook global BufCreate .*[.]sc %{
set-option buffer filetype scala set-option buffer filetype scala
} }

8
home/modules/linux/graphical/default.nix
View file

@ -60,6 +60,7 @@ in
xdg-utils # Open stuff xdg-utils # Open stuff
] ++ (if pkgs.stdenv.isAarch64 then [ ] else [ ] ++ (if pkgs.stdenv.isAarch64 then [ ] else [
gnome.cheese # Webcam check, expensive gnome.cheese # Webcam check, expensive
mailspring
# Chat stuff # Chat stuff
unstable.slack unstable.slack
])); ]));
@ -77,10 +78,9 @@ in
# Cursor # Cursor
home.pointerCursor = { home.pointerCursor = {
package = pkgs.suwako-cursors; package = pkgs.numix-cursor-theme;
gtk.enable = true; name = "Numix-Cursor";
name = "Suwako"; size = 24;
size = 32;
}; };
# MIME set ups # MIME set ups

4
home/modules/programs/my-kakoune/kak-lsp.nix
View file

@ -169,8 +169,8 @@ let
{ face = "string"; token = "string"; } { face = "string"; token = "string"; }
{ face = "format_specifier"; token = "formatSpecifier"; } { face = "format_specifier"; token = "formatSpecifier"; }
# Variables # Variables
{ face = "variable"; token = "variable"; modifiers = [ "readonly" ]; } { face = "mutable_variable"; token = "variable"; modifiers = [ "mutable" ]; }
{ face = "mutable_variable"; token = "variable"; } { face = "variable"; token = "variable"; }
{ face = "module"; token = "namespace"; } { face = "module"; token = "namespace"; }
{ face = "variable"; token = "type_parameter"; } { face = "variable"; token = "type_parameter"; }
{ face = "class"; token = "enum"; } { face = "class"; token = "enum"; }

2
nki-yoga-g8/configuration.nix
View file

@ -39,7 +39,7 @@
CPU_MIN_PERF_ON_BAT = 0; CPU_MIN_PERF_ON_BAT = 0;
CPU_MAX_PERF_ON_BAT = 30; CPU_MAX_PERF_ON_BAT = 30;
PLATFORM_PROFILE_ON_AC = "performance"; PLATFORM_PROFILE_ON_AC = "balanced";
PLATFORM_PROFILE_ON_BAT = "low-power"; PLATFORM_PROFILE_ON_BAT = "low-power";
USB_AUTOSUSPEND = 0; USB_AUTOSUSPEND = 0;

1
packages/common/default.nix
View file

@ -1,5 +1,4 @@
final: prev: { final: prev: {
epfl-cups-drivers = final.callPackage ./epfl-cups-drivers { }; epfl-cups-drivers = final.callPackage ./epfl-cups-drivers { };
ttaenc = final.callPackage ./ttaenc.nix { }; ttaenc = final.callPackage ./ttaenc.nix { };
suwako-cursors = final.callPackage ./suwako-cursors { };
} }

3
packages/common/suwako-cursors/README.md
View file

@ -1,3 +0,0 @@
## Suwako Cursors
From https://www.gnome-look.org/p/1937763/. All rights belong to the creator.

BIN
packages/common/suwako-cursors/Suwako.zip
View file

Binary file not shown.

6
packages/common/suwako-cursors/default.nix
View file

@ -1,6 +0,0 @@
{ runCommandLocal, unzip }:
runCommandLocal "suwako-cursors" { } ''
mkdir -p $out/share/icons
${unzip}/bin/unzip ${./Suwako.zip} -d $out/share/icons
''