Skip to content

Commit

Permalink
add virtualbox packages and more
Browse files Browse the repository at this point in the history
  • Loading branch information
gvolpe committed Sep 13, 2023
1 parent 6f83578 commit 999dec7
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 36 deletions.
13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ The `home.nix` file contains details about all the software I use, but here's a
| Terminal | [Alacritty](https://github.com/alacritty/alacritty) |
| Window Manager | [XMonad](https://xmonad.org/) |

If you're interested in using `taffybar` or `xmobar`, browse the commit history and you will find the configuration files I used. Here's a [screenshot](imgs/taffybar.png) showcasing the former.

## Themes

| Type | Name |
Expand All @@ -45,15 +43,16 @@ If you're interested in using `taffybar` or `xmobar`, browse the commit history

## Structure

Here is an overview of the folders' structure:
Here is an overview of the directories' structure:

```
.
├── build
├── flake.nix
├── flake.lock
├── switch
├── home
│ ├── config.nix
│ ├── daemon.conf
│ ├── home.nix
│ ├── modules
│ ├── overlays
Expand All @@ -63,13 +62,13 @@ Here is an overview of the folders' structure:
│ ├── services
│ └── themes
├── imgs
├── lib
├── notes
├── outputs
│ ├── ci.nix
│ ├── home-conf.nix
│ └── nixos-conf.nix
└── system
├── cachix
├── cachix.nix
├── configuration.nix
├── fonts
├── machine
Expand All @@ -79,8 +78,10 @@ Here is an overview of the folders' structure:

- `build`: the build and installation script.
- `flake.nix`: home and system configurations.
- `switch`: helper script to switch home and system configurations.
- `home`: all the user programs, services and dotfiles.
- `imgs`: screenshots and other images.
- `lib`: custom nix library functions.
- `notes`: cheat-sheets, docs, etc.
- `outputs`: the Home Manager and NixOS flake outputs.
- `system`: the NixOS configuration, settings for different laptops and window managers.
Expand Down
7 changes: 6 additions & 1 deletion home/home.nix
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ let
haskellPackages.nix-tree # visualize nix dependencies
];

vboxPkgs = with pkgs.linuxPackages; [
virtualbox
virtualboxGuestAdditions
];

gnomePkgs = with pkgs.gnome; [
eog # image viewer
evince # pdf reader
Expand Down Expand Up @@ -100,7 +105,7 @@ in
inherit username homeDirectory;
stateVersion = "21.03";

packages = defaultPkgs ++ gnomePkgs;
packages = defaultPkgs ++ gnomePkgs ++ vboxPkgs;

sessionVariables = {
DISPLAY = ":0";
Expand Down
3 changes: 1 addition & 2 deletions home/programs/xmonad/config.hs
Original file line number Diff line number Diff line change
Expand Up @@ -501,8 +501,7 @@ projects =
}
, Project { projectName = comWs
, projectDirectory = "~/"
, projectStartHook = Just $ do spawn "telegram-desktop"
spawn "signal-desktop"
, projectStartHook = Just $ spawn "telegram-desktop"
}
, Project { projectName = wrkWs
, projectDirectory = "~/"
Expand Down
13 changes: 0 additions & 13 deletions system/cachix.nix

This file was deleted.

12 changes: 0 additions & 12 deletions system/cachix/gvolpe-nixos.nix

This file was deleted.

14 changes: 12 additions & 2 deletions system/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ in
[
# Window manager
./wm/xmonad.nix
# Binary cache
./cachix.nix
];

networking = {
Expand Down Expand Up @@ -213,6 +211,18 @@ in
experimental-features = [ "nix-command" "flakes" ];
warn-dirty = false;

# Binary caches
substituters = [
"https://cache.nixos.org"
"https://cache.garnix.io"
"https://gvolpe-nixos.cachix.org"
];
trusted-public-keys = [
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
"gvolpe-nixos.cachix.org-1:0MPlBIMwYmrNqoEaYTox15Ds2t1+3R+6Ycj0hZWMcL0="
];

# Avoid unwanted garbage collection when using nix-direnv
keep-outputs = true;
keep-derivations = true;
Expand Down

0 comments on commit 999dec7

Please sign in to comment.