Compare commits

..

No commits in common. "0a3b54242479ef8139629ac738e5b527ce32e9b7" and "d0cd6c100a755057185c641114ea2c37528afcdc" have entirely different histories.

5 changed files with 26 additions and 56 deletions

View file

@ -218,11 +218,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1725555506, "lastModified": 1725440322,
"narHash": "sha256-9HIRqIPSHNMu9dfNrSkmatRtXKxmiddm/VXFvFFhSz4=", "narHash": "sha256-vRl/KT12yahy35wMw+yEvtSBtwTMZvWNfMMN9vs3w7A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "302264062ca73851e9306b70daeed6d9f1ae3ff9", "rev": "caa979438d279b0daf0e0aee38e5102f5d40ace2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -700,11 +700,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1725477728, "lastModified": 1725436345,
"narHash": "sha256-ahej1VRqKmWbG7gewty+GlrSBEeGY/J2Zy8Nt8+3fdg=", "narHash": "sha256-sWfTgSJ3Wq/L7jEZHiU82NaBjpMMmBR1y+MSvx88WeE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "880be1ab837e1e9fe0449dae41ac4d034694d4ce", "rev": "ba7bb3761c960793001ed153a333e543345f34cf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -759,11 +759,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1725407940, "lastModified": 1725001927,
"narHash": "sha256-tiN5Rlg/jiY0tyky+soJZoRzLKbPyIdlQ77xVgREDNM=", "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6f6c45b5134a8ee2e465164811e451dcb5ad86e3", "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -807,11 +807,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1725432240, "lastModified": 1725103162,
"narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ad416d066ca1222956472ab7d0555a6946746a80", "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -859,11 +859,11 @@
"nixpkgs-stable": "nixpkgs-stable_3" "nixpkgs-stable": "nixpkgs-stable_3"
}, },
"locked": { "locked": {
"lastModified": 1725513492, "lastModified": 1724857454,
"narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=", "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "7570de7b9b504cfe92025dd1be797bf546f66528", "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -923,11 +923,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725503082, "lastModified": 1725416653,
"narHash": "sha256-sgIkegun2+PwJEDHlvmADhSbxgjVR+8pYSMuXmB3/do=", "narHash": "sha256-iNBv7ILlZI6ubhW0ExYy8YgiLKUerudxY7n8R5UQK2E=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "17d3930e54a50df2afe52a2d1d1f506edb262bbe", "rev": "e5d3f9c2f24d852cddc79716daf0f65ce8468b28",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -944,11 +944,11 @@
"nixpkgs-stable": "nixpkgs-stable_4" "nixpkgs-stable": "nixpkgs-stable_4"
}, },
"locked": { "locked": {
"lastModified": 1725540166, "lastModified": 1725201042,
"narHash": "sha256-htc9rsTMSAY5ek+DB3tpntdD/es0eam2hJgO92bWSys=", "narHash": "sha256-lj5pxOwidP0W//E7IvyhbhXrnEUW99I07+QpERnzTS4=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "d9d781523a1463965cd1e1333a306e70d9feff07", "rev": "5db5921e40ae382d6716dce591ea23b0a39d96f7",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -232,7 +232,10 @@
pre-commit = { pre-commit = {
settings = { settings = {
hooks = { hooks = {
nixfmt-rfc-style.enable = true; nixfmt = {
enable = true;
package = pkgs.nixfmt-rfc-style;
};
deadnix.enable = true; deadnix.enable = true;
black.enable = true; black.enable = true;
shellcheck = { shellcheck = {
@ -267,7 +270,6 @@
git-repo-go = pkgs.callPackage ./pkgs/git-repo-go { }; git-repo-go = pkgs.callPackage ./pkgs/git-repo-go { };
hassbridge = pkgs.callPackage ./pkgs/hassbridge { }; hassbridge = pkgs.callPackage ./pkgs/hassbridge { };
tinyows = pkgs.callPackage ./pkgs/tinyows { }; tinyows = pkgs.callPackage ./pkgs/tinyows { };
tsui = pkgs.callPackage ./pkgs/tsui { };
}; };
devShells.default = devShells.default =

View file

@ -16,7 +16,7 @@ in
gnomeExtensions.appindicator gnomeExtensions.appindicator
papirus-icon-theme papirus-icon-theme
]; ];
services.udev.packages = with pkgs; [ gnome-settings-daemon ]; services.udev.packages = with pkgs; [ gnome.gnome-settings-daemon ];
services.gnome = { services.gnome = {
gnome-keyring.enable = true; gnome-keyring.enable = true;
at-spi2-core.enable = true; at-spi2-core.enable = true;

View file

@ -1,31 +0,0 @@
{
buildGoModule,
fetchFromGitHub,
xorg,
}:
let
version = "0.2.0";
in
buildGoModule {
pname = "tsui";
inherit version;
src = fetchFromGitHub {
owner = "neuralinkcorp";
repo = "tsui";
rev = "v${version}";
hash = "sha256-DVkiZc+7XNgj47T1uZg6bnfoMw+0dP4+72AxfCYKcL4=";
};
buildInputs = [
xorg.libX11.dev
];
vendorHash = "sha256-FIbkPE5KQ4w7Tc7kISQ7ZYFZAoMNGiVlFWzt8BPCf+A=";
# Inject the version info in the binary.
ldflags = [
"-X main.Version=${version}"
];
}

View file

@ -200,7 +200,6 @@ in
kicad kicad
kubectl kubectl
kubernetes-helm kubernetes-helm
ladybird
libnotify libnotify
libreoffice-fresh libreoffice-fresh
minio-client minio-client