colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Ivan Malison 2021-07-12 23:25:31 +00:00
commit 880d8bee1b
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/base.nix
View File

@ -2,7 +2,7 @@
{ {
imports = [ imports = [
./users.nix ./users.nix
# ./fonts.nix ./fonts.nix
./essential.nix ./essential.nix
./flakes.nix ./flakes.nix
]; ];

16
nixos/flake.lock
View File

@ -74,10 +74,8 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1625977875, "narHash": "sha256-gwxwBk2lHoNEXXh/318n57jVLIGjrXxAhMrYaPkIdsM=",
"narHash": "sha256-rI9IhR2aKTQoknUXAa13/OlVzmthN3Ai7YNYzVvslO4=", "path": "/home/imalison/Projects/nixpkgs",
"path": "/nix/store/hw96qq9d96lj003rg6vqy2w8p6ycr2jn-source",
"rev": "b6eeca1e7322e74520eb518cebda8c9596dd55b9",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -87,10 +85,8 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1625977875, "narHash": "sha256-gwxwBk2lHoNEXXh/318n57jVLIGjrXxAhMrYaPkIdsM=",
"narHash": "sha256-rI9IhR2aKTQoknUXAa13/OlVzmthN3Ai7YNYzVvslO4=", "path": "/home/imalison/Projects/nixpkgs",
"path": "/nix/store/hw96qq9d96lj003rg6vqy2w8p6ycr2jn-source",
"rev": "b6eeca1e7322e74520eb518cebda8c9596dd55b9",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -113,7 +109,7 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"narHash": "sha256-ZqfLW/FYY3XpvfOR18Tmu/TxqZLjkUQ4n2yuTB9zhkw=", "narHash": "sha256-ulmlBKbUqYhFz7CDFrZAEjP677bpwTVXkYcPBo4rzIs=",
"path": "../dotfiles/config/taffybar/taffybar", "path": "../dotfiles/config/taffybar/taffybar",
"type": "path" "type": "path"
}, },
@ -141,7 +137,7 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"narHash": "sha256-zFAhbrj7kW5oEY6EhZAAcic9b8biSezTQEb3F3m0afA=", "narHash": "sha256-U+FcJ5c1EDc1ce0gbHyhiK5XFI1e9+HTwfRqxktPJts=",
"path": "../dotfiles/config/xmonad/xmonad-contrib", "path": "../dotfiles/config/xmonad/xmonad-contrib",
"type": "path" "type": "path"
}, },

3
nixos/fonts.nix
View File

@ -14,7 +14,8 @@
source-code-pro source-code-pro
source-sans-pro source-sans-pro
source-serif-pro source-serif-pro
# twemoji-color-font twemoji-color-font
emacs-all-the-icons-fonts
]; ];
fontconfig = { fontconfig = {
allowBitmaps = true; allowBitmaps = true;