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

various fixes, switching to emacs stable instead of git

Browse source
This commit is contained in:
willemml 2023-08-07 16:32:26 -07:00
parent 59092d5f34
commit bd8ad27ab9
Signed by: willemml
GPG key ID: C3DE5DF6198DACBD
7 changed files with 69 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
flake.lock generated
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1691275315, "lastModified": 1687110393,
"narHash": "sha256-9WN0IA0vNZSNxKHpy/bYvPnCw4VH/nr5iBv7c+7KUts=", "narHash": "sha256-SnkdWeZ8PZd3Dc74iFF8xiE7qDp5+z3Yps2mE79tsM0=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "829041cf10c4f6751a53c0a11ca2fd22ff0918d6", "rev": "8a5af0da9d8dab8a188436750489e304ac682085",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -29,11 +29,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1691434551, "lastModified": 1687144148,
"narHash": "sha256-qdrEWDH/W3EARmiEjrpr/UV/AAKKEI1R6nhGRurJnUA=", "narHash": "sha256-mma7NnNyWsREy0S3wW2BBmhYfgKUyAiSpIq9Ij3ID0k=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "b8be67490446e0d90f52b6131ee73c516787a015", "rev": "37ab2cb6a09245809e862dde7ed9adcd5b83d62d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -48,11 +48,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1691389274, "lastModified": 1687140903,
"narHash": "sha256-0lISOvDDoqOfauZctSKb6EvW1Mg1aPI0869Tx3xtEyw=", "narHash": "sha256-GyeqHmNthCQmAj/lRaIG3RoTw1GN7ED/ozAWGUsUKOo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "bd0c7ee0836a814751c3fcf66eaadfbe1a35b715", "rev": "950eeb21cb03d4e4cd312175b801ffda55836b58",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -62,21 +62,6 @@
} }
}, },
"flake-compat": { "flake-compat": {
"locked": {
"lastModified": 1688025799,
"narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=",
"owner": "nix-community",
"repo": "flake-compat",
"rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1673956053, "lastModified": 1673956053,
@ -97,11 +82,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1690933134, "lastModified": 1685662779,
"narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=", "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb", "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -115,11 +100,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1689068808, "lastModified": 1685518550,
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -189,11 +174,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1691312444, "lastModified": 1687098182,
"narHash": "sha256-J9e9dGwAPTX+UlAn8jehoyaEq6fwK+L+gunfx0cYT4E=", "narHash": "sha256-kBys+Cwmcxzh7UNVWTrunOgaR02zl2XN3feA8fSlqVo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "903e06d734bcae48efb79b9afd51b406d2744179", "rev": "0480dabc99e1b669ebe909949180fa2786e733cd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -204,18 +189,17 @@
}, },
"nixos-apple-silicon": { "nixos-apple-silicon": {
"inputs": { "inputs": {
"flake-compat": "flake-compat",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1690427133, "lastModified": 1686889638,
"narHash": "sha256-thRf01XVwX9bYyXHgubUEjQzXloGu0817rPHU0h8X20=", "narHash": "sha256-fmMniETOJoDolXiGJP8NnwZ/rCNftFYjech7E1Yonsw=",
"owner": "tpwrules", "owner": "tpwrules",
"repo": "nixos-apple-silicon", "repo": "nixos-apple-silicon",
"rev": "5567b99acd07e7069fb7e074f19d5ead10409798", "rev": "002d7e27b1de5885b14c2b2ed3be13c9ad862d23",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -226,11 +210,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1691276849, "lastModified": 1686960236,
"narHash": "sha256-RNnrzxhW38SOFIF6TY/WaX7VB3PCkYFEeRE5YZU+wHw=", "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5faab29808a2d72f4ee0c44c8e850e4e6ada972f", "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -243,11 +227,11 @@
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"dir": "lib", "dir": "lib",
"lastModified": 1690881714, "lastModified": 1685564631,
"narHash": "sha256-h/nXluEqdiQHs1oSgkOOWF+j8gcJMWhwnZ9PFabN6q0=", "narHash": "sha256-8ywr3AkblY4++3lIVxmrWZFzac7+f32ZEhH/A8pNscI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9e1960bc196baf6881340d53dccb203a951745a2", "rev": "4f53efe34b3a8877ac923b9350c874e3dcd5dc0a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -260,11 +244,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1691328192, "lastModified": 1686921029,
"narHash": "sha256-w59N1zyDQ7SupfMJLFvtms/SIVbdryqlw5AS4+DiH+Y=", "narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "61676e4dcfeeb058f255294bcb08ea7f3bc3ce56", "rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -292,11 +276,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1691368598, "lastModified": 1686960236,
"narHash": "sha256-ia7li22keBBbj02tEdqjVeLtc7ZlSBuhUk+7XTUFr14=", "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5a8e9243812ba528000995b294292d3b5e120947", "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -324,7 +308,7 @@
}, },
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": [
@ -333,11 +317,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1691397944, "lastModified": 1686668298,
"narHash": "sha256-4fa4bX3kPYKpEssgrFRxRCPVXczidArDeSWaUMSzQAU=", "narHash": "sha256-AADh9NqHh6X2LOem4BvI7oCkMm+JPCSCE7iIw5nn0VA=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "e5588ddffd4c3578547a86ef40ec9a6fbdae2986", "rev": "5b6b54d3f722aa95cbf4ddbe35390a0af8c0015a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -362,11 +346,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1691346609, "lastModified": 1686992290,
"narHash": "sha256-npJ8zOZ/CQoZu+0kN5NU9iC5JbmbsucyK1DayPmHWPs=", "narHash": "sha256-VJ/OYQPULSaMGPqUDaDKJUb3DrI7xMzuiSYMmljtpQo=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "baee6b338b0ea076cd7a9f18d47f175dd2ba0e5d", "rev": "fcfc6afe0526123ff43086990356bf175664fdfa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -405,12 +389,12 @@
"rev": "31b2b8201ad01e9df8aeaa16582f639bcfe90a62", "rev": "31b2b8201ad01e9df8aeaa16582f639bcfe90a62",
"revCount": 2999, "revCount": 2999,
"type": "git", "type": "git",
"url": "https://git.sr.ht/~rycee/nur-expressions?dir=pkgs%2ffirefox-addons" "url": "https://git.sr.ht/~rycee/nur-expressions?dir=pkgs/firefox-addons"
}, },
"original": { "original": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"type": "git", "type": "git",
"url": "https://git.sr.ht/~rycee/nur-expressions?dir=pkgs%2ffirefox-addons" "url": "https://git.sr.ht/~rycee/nur-expressions?dir=pkgs/firefox-addons"
} }
}, },
"systems": { "systems": {

4
home-manager/profiles/willem/darwin/base.nix
View file

@ -25,8 +25,8 @@ in {
programs.zsh.shellAliases = programs.zsh.shellAliases =
{ {
drs = "darwin-rebuild switch --flake ${config.home.homeDirectory}/.config/dotfiles.nix#"; drs = "nix run nix-darwin -- switch --flake ${config.home.homeDirectory}/.config/dotfiles.nix#";
dbs = "darwin-rebuild build --flake ${config.home.homeDirectory}/.config/dotfiles.nix#"; dbs = "nix run nix-darwin -- build --flake ${config.home.homeDirectory}/.config/dotfiles.nix#";
f = "open \"$(${config.programs.fzf.package}/bin/fzf)\""; f = "open \"$(${config.programs.fzf.package}/bin/fzf)\"";
o = "open"; o = "open";
oa = "open -a"; oa = "open -a";

7
home-manager/profiles/willem/linux/base.nix
View file

@ -4,13 +4,6 @@
lib, lib,
... ...
}: { }: {
home.file.".gnupg/gpg-agent.conf" = {
text = ''
default-cache-ttl 30
max-cache-ttl 600
'';
};
programs.zsh.shellAliases = { programs.zsh.shellAliases = {
nrs = "nixos-rebuild switch --flake ${config.home.homeDirectory}/.config/dotfiles.nix#"; nrs = "nixos-rebuild switch --flake ${config.home.homeDirectory}/.config/dotfiles.nix#";
nbs = "nixos-rebuild build --flake ${config.home.homeDirectory}/.config/dotfiles.nix#"; nbs = "nixos-rebuild build --flake ${config.home.homeDirectory}/.config/dotfiles.nix#";

1
home-manager/profiles/willem/linux/services.nix
View file

@ -19,7 +19,6 @@
then config.programs.emacs.finalPackage then config.programs.emacs.finalPackage
else pkgs.emacs; else pkgs.emacs;
client.enable = true; client.enable = true;
defaultEditor = true;
startWithUserSession = true; startWithUserSession = true;
}; };
}; };

2
home-manager/profiles/willem/packages.nix
View file

@ -95,7 +95,7 @@ in {
iaito iaito
jq jq
mu mu
nix-review # nix-review
nix-zsh-completions nix-zsh-completions
nixfmt nixfmt
nixpkgs-fmt nixpkgs-fmt

2
home-manager/profiles/willem/programs/emacs/default.nix
View file

@ -5,7 +5,7 @@
}: let }: let
aspellPackage = pkgs.aspellWithDicts (d: [d.en d.en-science d.en-computers d.fr]); aspellPackage = pkgs.aspellWithDicts (d: [d.en d.en-science d.en-computers d.fr]);
emacsPackage = emacsPackage =
(pkgs.emacsPackagesFor pkgs.emacs-git).emacsWithPackages (pkgs.emacsPackagesFor pkgs.emacs).emacsWithPackages
(epkgs: (epkgs:
(with epkgs; let (with epkgs; let
company-mode = epkgs.trivialBuild { company-mode = epkgs.trivialBuild {

51
home-manager/profiles/willem/programs/zsh.nix
View file

@ -11,7 +11,9 @@
dotDir = ".config/zsh"; dotDir = ".config/zsh";
enableAutosuggestions = true; enableAutosuggestions = true;
enableCompletion = true; enableCompletion = true;
enableSyntaxHighlighting = true; syntaxHighlighting = {
enable = true;
};
enableVteIntegration = true; enableVteIntegration = true;
initExtraBeforeCompInit = '' initExtraBeforeCompInit = ''
@ -79,32 +81,25 @@
RPROMPT = "%B%F{red}%*%f%b"; RPROMPT = "%B%F{red}%*%f%b";
}; };
shellAliases = shellAliases = rec {
rec { cd = "z";
cd = "z"; discord = "${web} https://discord.com/channels/@me";
discord = "${web} https://discord.com/channels/@me"; dotd = "cd ${config.home.sessionVariables.DOTDIR} ";
dotd = "cd ${config.home.sessionVariables.DOTDIR} "; e = "emacsclient -c -nw";
e = "emacsclient -c -nw"; em = "emacs -nw";
em = "emacs -nw"; email = "${ew} -n --eval '(mu4e)'";
email = "${ew} -n --eval '(mu4e)'"; emw = "emacs";
emw = "emacs"; ew = "emacsclient -c -n";
ew = "emacsclient -c -n"; getmail = "${pkgs.offlineimap}/bin/offlineimap -f INBOX";
getmail = "${pkgs.offlineimap}/bin/offlineimap -f INBOX"; l = "ls -1";
l = "ls -1"; np = "nix-shell -p";
np = "nix-shell -p"; org = "cd ${config.home.sessionVariables.ORGDIR} ";
org = "cd ${config.home.sessionVariables.ORGDIR} "; spotify = "${web} https://open.spotify.com/";
spotify = "${web} https://open.spotify.com/"; ubc = "cd ${config.home.sessionVariables.UBCDIR} ";
ubc = "cd ${config.home.sessionVariables.UBCDIR} "; ubcmail = "${web} https://webmail.student.ubc.ca";
ubcmail = "${web} https://webmail.student.ubc.ca"; web = "${config.programs.firefox.package}/bin/firefox";
web = "${config.programs.firefox.package}/bin/firefox"; hmr = "nix run home-manager -- build --flake ${config.home.sessionVariables.DOTDIR}#";
} hms = "nix run home-manager -- switch --flake ${config.home.sessionVariables.DOTDIR}#";
// ( };
if pkgs.stdenv.isLinux
then {
nbs = "sudo nixos-rebuild build --flake ${config.home.sessionVariables.DOTDIR}#";
nrs = "sudo nixos-rebuild switch --flake ${config.home.sessionVariables.DOTDIR}#";
}
else {}
);
}; };
} }