willemml/dotfiles.nix
1
0
Fork 0
mirror of https://github.com/willemml/dotfiles.nix.git synced 2025-04-13 19:57:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

add editorconfig to emacs, add personal nixpkgs fork to flake inputs, add vlc and qbittorrent

Browse source
This commit is contained in:
willemml 2023-01-05 11:16:07 -08:00
parent d9c7a2fab9
commit 319dbe4186
Signed by: willemml
GPG key ID: C3DE5DF6198DACBD
6 changed files with 28 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps.nix
View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, mkIf, ... }: { config, lib, pkgs, ... }:
# see https://github.com/nix-community/home-manager/issues/1341 # see https://github.com/nix-community/home-manager/issues/1341

7
emacs.nix
View file

@ -668,6 +668,13 @@ in {
enable = true; enable = true;
bind = { "C-c '" = "separedit"; }; bind = { "C-c '" = "separedit"; };
}; };
editorconfig = {
enable = true;
config = ''
(editorconfig-mode 1)
'';
};
}; };
}; };
} }

31
flake.lock generated
View file

@ -23,11 +23,11 @@
}, },
"nixpkgs-22_11": { "nixpkgs-22_11": {
"locked": { "locked": {
"lastModified": 1672616430, "lastModified": 1672781980,
"narHash": "sha256-e18rRwDUaW/Uw1tBmtsVueJ2SVI5DLhrEGwhkIo+c50=", "narHash": "sha256-L+yqt2szcp+BFiWoMJCisDsNA5OrpYVW1QSbbS5U8RU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0bf3109eeb61780965c27f4a0a4affdcd0cd4d3d", "rev": "a9eedea7232f5d00f0aca7267efb69a54da1b8a1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -55,26 +55,27 @@
}, },
"nixpkgs-willem": { "nixpkgs-willem": {
"locked": { "locked": {
"lastModified": 1672862269, "lastModified": 1672945252,
"narHash": "sha256-KKCCD9eRNXmnMi/0jBRwUxfbpztZTKjMryzBpbF0Zjw=", "narHash": "sha256-vkZYxDq8Bdt5JhZCcV4nniqaIsiYW3DAiuNXClFWcGA=",
"ref": "refs/heads/master", "owner": "willemml",
"rev": "f47288240ee522859b93035dc13477b67d60bbb8", "repo": "nixpkgs",
"revCount": 439834, "rev": "4d11054d40eeeb77400d8cd71966d1bf3098d449",
"type": "git", "type": "github"
"url": "file:///Users/willem/dev/nixpkgs"
}, },
"original": { "original": {
"type": "git", "owner": "willemml",
"url": "file:///Users/willem/dev/nixpkgs" "ref": "master",
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1672861477, "lastModified": 1672872270,
"narHash": "sha256-vpOFUoEgirvsZmmhKP6S1B7w7/HU68F6vIcMjfzJp0Q=", "narHash": "sha256-c2Al8DUAumXESM/WITWDJKqoWLrDZ9mCSYx5/mzKeZc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "e7f5fc0f765054f51948a933576eddee469c99f4", "rev": "552822b1dc35e48ca3e523026997b21e8b371c10",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
flake.nix
View file

@ -2,8 +2,7 @@
description = "Willem's Home Manager configuration"; description = "Willem's Home Manager configuration";
inputs = { inputs = {
nixpkgs-willem.url = "git+file:///Users/willem/dev/nixpkgs"; nixpkgs-willem.url = "github:willemml/nixpkgs/master";
#nixpkgs-willem.url = "github:willemml/nixpkgs/master";
nixpkgs-22_11.url = "github:NixOS/nixpkgs/nixos-22.11"; nixpkgs-22_11.url = "github:NixOS/nixpkgs/nixos-22.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager = { home-manager = {

12
packages.nix
View file

@ -2,15 +2,9 @@
{ {
home.packages = with pkgs; home.packages = with pkgs;
[ [ coreutils gnused spoof-mac colima pinentry_mac iterm2 ]
coreutils ++ [ discord pkgsCustom.vlc pkgsCustom.qbittorrent ]
gnused ++ [ docker docker-compose ] ++ [
spoof-mac
colima
pinentry_mac
iterm2
(pkgs.callPackage ./spotify-mac.nix { })
] ++ [ discord pkgsCustom.vlc ] ++ [ docker docker-compose ] ++ [
zsh-powerlevel10k zsh-powerlevel10k
comma comma
automake automake

42
spotify-mac.nix
View file

@ -1,42 +0,0 @@
{ stdenv, lib, config, pkgs, ... }:
stdenv.mkDerivation {
name = "spotify-mac-app";
sourceRoot = ".";
nativeBuildInputs = [ pkgs.undmg pkgs.makeWrapper pkgs.perl pkgs.unzip pkgs.zip ];
src = pkgs.fetchurl {
url = "https://download.scdn.co/Spotify.dmg";
hash = "sha256-9Ts6064YaZdjbRN28qkZcrwTH+63drC/jUfTGLvpBNc=";
};
spotxsrc = pkgs.fetchFromGitHub {
name = "spotx-mac-src";
owner = "willemml";
repo = "SpotX-Mac";
rev = "03ea3aa59e135b9e2f68b6c8f4d4debe2b207830";
hash = "sha256-H3QxmM0ALtz58MKaQ6pFcK6wP8oMWufvQ2q2ZjpO5Gs=";
};
installPhase = ''
runHook preInstall
mkdir -p $out/Applications
cp -r "Spotify.app" $out/Applications
# wrap executable to $out/bin
mkdir -p $out/bin
makeWrapper "$out/Applications/Spotify.app/Contents/MacOS/Spotify" "$out/bin/Spotify"
cp "$spotxsrc/install.sh" install.sh
chmod +x install.sh
./install.sh -a "$out/Applications/Spotify.app"
runHook postInstall
'';
}