patrick/nix-dotfiles
1
0
Fork 0
mirror of https://github.com/Smaug123/nix-dotfiles synced 2025-10-08 16:08:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update (#29)

Browse Source
This commit is contained in:
Patrick Stevens
2024-01-29 00:42:13 +00:00
committed by GitHub
parent 02c87e8ea4
commit 6af765d032
5 changed files with 135 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

150
flake.lock generated
View File

@@ -7,11 +7,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1695000433, "lastModified": 1705557527,
"narHash": "sha256-CYB6YD+NLpmj/ORWlmeS/58PIHONF1G7cQMyXHo9ILo=", "narHash": "sha256-DuxxHTQ/W5KToFLWG4FUF8hLldNo9eXlbt7JgvhrMnY=",
"owner": "tpwrules", "owner": "tpwrules",
"repo": "nixos-apple-silicon", "repo": "nixos-apple-silicon",
"rev": "096dc63e5426e17f70b4a8bf7716c3dd3430ba8c", "rev": "6e324ab06cb27a19409ebc1dc2664bf1e585490a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -27,11 +27,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1695686713, "lastModified": 1705915768,
"narHash": "sha256-rJATx5B/nwlBpt7CJUf85LV27qWPbul5UVV8fu6ABPg=", "narHash": "sha256-+Jlz8OAqkOwJlioac9wtpsCnjgGYUhvLpgJR/5tP9po=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "e236a1e598a9a59265897948ac9874c364b9555f", "rev": "1e706ef323de76236eb183d7784f3bd57255ec0b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -50,11 +50,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1696012364, "lastModified": 1706170797,
"narHash": "sha256-UvVsjzwYvsDmiXijFA6VPzhyI92KC7ALXtgOBuNuUSc=", "narHash": "sha256-oGuFylWYU9OY5DaEJEK+Z7EL81Ln27xz01LN9+8U0P0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "a3807ae37389f6effb13e30cc12933cfdd325d80", "rev": "dd5d758f69dd1ae6d0399763aa73ca34974ce9e3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -83,11 +83,29 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1694529238, "lastModified": 1705309234,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1701680307,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -103,11 +121,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1695984718, "lastModified": 1706134977,
"narHash": "sha256-LQwKgaaaFOkIcxarf0xQXeDJFwZ5BZWcgmPeo3xp2CM=", "narHash": "sha256-KwNb1Li3K6vuVwZ77tFjZ89AWBo7AiCs9t0Cens4BsM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "4f02e35f9d150573e1a710afa338846c2f6d850c", "rev": "6359d40f6ec0b72a38e02b333f343c3d4929ec10",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -116,45 +134,57 @@
"type": "github" "type": "github"
} }
}, },
"model": {
"flake": false,
"locked": {
"narHash": "sha256-aMuDhcvEaioTWn+LUcnxfAgs2VFbM8xBVVfdzx2Cu8I=",
"type": "file",
"url": "https://huggingface.co/ggerganov/whisper.cpp/resolve/main/ggml-large-v3.bin?download=true"
},
"original": {
"type": "file",
"url": "https://huggingface.co/ggerganov/whisper.cpp/resolve/main/ggml-large-v3.bin?download=true"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1694767346, "lastModified": 1705316053,
"narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=", "narHash": "sha256-J2Ey5mPFT8gdfL2XC0JTZvKaBw/b2pnyudEXFvl+dQM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ace5093e36ab1e95cb9463863491bee90d5a4183", "rev": "c3e128f3c0ecc1fb04aef9f72b3dcc2f6cecf370",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ace5093e36ab1e95cb9463863491bee90d5a4183", "rev": "c3e128f3c0ecc1fb04aef9f72b3dcc2f6cecf370",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1695825837, "lastModified": 1705916986,
"narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=", "narHash": "sha256-iBpfltu6QvN4xMpen6jGGEb6jOqmmVQKUrXdOJ32u8w=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e", "rev": "d7f206b723e42edb09d9d753020a84b3061a79d8",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-23.05", "ref": "nixos-23.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1694908564, "lastModified": 1705033721,
"narHash": "sha256-ducA98AuWWJu5oUElIzN24Q22WlO8bOfixGzBgzYdVc=", "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "596611941a74be176b98aeba9328aa9d01b8b322", "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -166,16 +196,31 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1695830400, "lastModified": 1706006310,
"narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=", "narHash": "sha256-nDPz0fj0IFcDhSTlXBU2aixcnGs2Jm4Zcuoj0QtmiXQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2", "rev": "b43bb235efeab5324c5e486882ef46749188eee2",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1695033101,
"narHash": "sha256-RQ4m+ycjdLdass7Hr4+Lzwnjw7wGhcUkKqWiJS3YxPM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "d941d9491804e0ca01e03468dbf6f8d3a7919a16",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@@ -187,7 +232,8 @@
"emacs": "emacs", "emacs": "emacs",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"sops-nix": "sops-nix" "sops-nix": "sops-nix",
"whisper": "whisper"
} }
}, },
"rust-overlay": { "rust-overlay": {
@@ -214,11 +260,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1695284550, "lastModified": 1706130372,
"narHash": "sha256-z9fz/wz9qo9XePEvdduf+sBNeoI9QG8NJKl5ssA8Xl4=", "narHash": "sha256-fHZxKH1DhsXPP36a2vJ91Zy6S+q6+QRIFlpLr9fZHU8=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "2f375ed8702b0d8ee2430885059d5e7975e38f78", "rev": "4606d9b1595e42ffd9b75b9e69667708c70b1d68",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -241,6 +287,42 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"whisper": {
"inputs": {
"flake-utils": "flake-utils_2",
"model": "model",
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1704121968,
"narHash": "sha256-N8FJb+ohJ4Qt/m5RoAbwm3RP4VRjl+hA6PUCfjPhZo8=",
"owner": "Smaug123",
"repo": "whisper.cpp",
"rev": "04f8e0cdc73abe7c593b2c9405f0f590c51de95a",
"type": "github"
},
"original": {
"owner": "Smaug123",
"ref": "nix",
"repo": "whisper.cpp",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

11
flake.nix
View File

@@ -3,7 +3,7 @@
inputs = { inputs = {
nixpkgs = { nixpkgs = {
url = "github:NixOS/nixpkgs/nixos-unstable"; url = "github:NixOS/nixpkgs/nixpkgs-unstable";
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
@@ -25,6 +25,9 @@
apple-silicon = { apple-silicon = {
url = "github:tpwrules/nixos-apple-silicon"; url = "github:tpwrules/nixos-apple-silicon";
}; };
whisper = {
url = "github:Smaug123/whisper.cpp/nix";
};
}; };
outputs = { outputs = {
@@ -35,6 +38,7 @@
home-manager, home-manager,
sops-nix, sops-nix,
apple-silicon, apple-silicon,
whisper,
... ...
} @ inputs: let } @ inputs: let
config = { config = {
@@ -69,7 +73,7 @@
args = { args = {
nixpkgs = pkgs; nixpkgs = pkgs;
username = "patrick"; username = "patrick";
dotnet = pkgs.dotnet-sdk_7; dotnet = pkgs.dotnet-sdk_8;
}; };
in [ in [
./home-manager/earthworm-config.nix ./home-manager/earthworm-config.nix
@@ -95,7 +99,8 @@
args = { args = {
nixpkgs = pkgs; nixpkgs = pkgs;
username = "patrick"; username = "patrick";
dotnet = pkgs.dotnet-sdk_7; dotnet = pkgs.dotnet-sdk_8;
whisper = whisper.packages.${system};
}; };
in [ in [
./darwin-configuration.nix ./darwin-configuration.nix

3
home-manager/darwin.nix
View File

@@ -2,6 +2,7 @@
nixpkgs, nixpkgs,
username, username,
dotnet, dotnet,
whisper,
... ...
}: { }: {
imports = [./rider]; imports = [./rider];
@@ -13,6 +14,8 @@
}; };
home.packages = [ home.packages = [
whisper.default
whisper.normalize
# "Damaged and can't be opened" # "Damaged and can't be opened"
#nixpkgs.bcompare #nixpkgs.bcompare
#nixpkgs.gdb #nixpkgs.gdb

10
home-manager/home.nix
View File

@@ -131,7 +131,6 @@
}; };
"git.path" = "${nixpkgs.git}/bin/git"; "git.path" = "${nixpkgs.git}/bin/git";
"update.mode" = "none"; "update.mode" = "none";
"docker.dockerPath" = "${nixpkgs.docker}/bin/docker";
"explorer.confirmDelete" = false; "explorer.confirmDelete" = false;
}; };
}; };
@@ -159,7 +158,7 @@
let g:syntastic_check_on_wq = 0''; let g:syntastic_check_on_wq = 0'';
} }
YouCompleteMe # YouCompleteMe
tagbar tagbar
]; ];
programs.neovim.viAlias = true; programs.neovim.viAlias = true;
@@ -169,6 +168,12 @@
programs.neovim.extraConfig = builtins.readFile ./init.vim; programs.neovim.extraConfig = builtins.readFile ./init.vim;
programs.direnv = {
enable = true;
enableZshIntegration = true;
nix-direnv.enable = true;
};
home.packages = [ home.packages = [
nixpkgs.keepassxc nixpkgs.keepassxc
nixpkgs.rust-analyzer nixpkgs.rust-analyzer
@@ -182,7 +187,6 @@
nixpkgs.hledger nixpkgs.hledger
nixpkgs.hledger-web nixpkgs.hledger-web
dotnet dotnet
nixpkgs.docker
nixpkgs.jitsi-meet nixpkgs.jitsi-meet
nixpkgs.ripgrep nixpkgs.ripgrep
nixpkgs.elan nixpkgs.elan

2
home-manager/init.vim
View File

@@ -148,7 +148,7 @@ endif
set encoding=utf8 set encoding=utf8
" Use Unix as the standard file type " Use Unix as the standard file type
set ffs=unix,dos,mac set ffs=unix,mac
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""