#8 Add unfree software

This commit is contained in:
Tibo De Peuter 2023-03-07 23:12:34 +01:00 committed by Tibo De Peuter
parent 0c395f2cf7
commit d2b67505ce
7 changed files with 111 additions and 49 deletions

View file

@ -1,4 +1,4 @@
#!/bin/sh
#!/usr/bin/env bash
pushd ~/projects/sisyphus/nixos
sudo nixos-rebuild switch --flake .#
popd

View file

@ -1,4 +1,4 @@
#!/bin/sh
#!/usr/bin/env bash
pushd ~/projects/sisyphus/nixos
nix build .#homeManagerConfigurations.tdpeuter.activationPackage
./result/activate

View file

@ -37,10 +37,26 @@
"type": "indirect"
}
},
"nur": {
"locked": {
"lastModified": 1678221928,
"narHash": "sha256-m1pwayWF9O/pK7iiX4UQBrflvdLtmbDpjwmRMPvlniA=",
"owner": "nix-community",
"repo": "NUR",
"rev": "15e2403d7288984b9e53bf9a92483574f1aafe42",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "NUR",
"type": "github"
}
},
"root": {
"inputs": {
"home-manager": "home-manager",
"nixpkgs": "nixpkgs"
"nixpkgs": "nixpkgs",
"nur": "nur"
}
},
"utils": {

View file

@ -2,9 +2,10 @@
description = "System configuration";
inputs = {
nixpkgs.url = "nixpkgs/nixos-22.11";
home-manager.url = "github:nix-community/home-manager/release-22.11";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
nixpkgs.url = "nixpkgs/nixos-22.11";
nur.url = "github:nix-community/NUR";
};
outputs = { nixpkgs, home-manager, ... }:
@ -13,14 +14,17 @@
pkgs = import nixpkgs {
inherit system;
config = { allowUnfree = true; };
config.allowUnfree = true;
};
lib = nixpkgs.lib;
in {
in rec {
homeManagerConfigurations = {
tdpeuter = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.${system};
pkgs = import nixpkgs {
inherit system;
config.allowUnfree = true;
};
modules = [
./users/tdpeuter/home.nix
{
@ -36,7 +40,7 @@
nixosConfigurations = {
Tibo-NixTest = lib.nixosSystem { # Use hostname
inherit system;
modules = [
modules = (builtins.attrValues) ++ [
./system/configuration.nix
];
};

View file

@ -46,15 +46,6 @@
# useXkbConfig = true; # use xkbOptions in tty.
# };
# Enable the X11 windowing system.
services.xserver.enable = true;
# Enable the Plasma 5 Desktop Environment.
services.xserver.displayManager.sddm.enable = true;
services.xserver.desktopManager.plasma5.enable = true;
# Configure keymap in X11
# services.xserver.layout = "us";
# services.xserver.xkbOptions = {
@ -62,6 +53,28 @@
# "caps:escape" # map caps to escape.
# };
services.xserver = {
# Enable the X11 windowing system.
enable = true;
# Enable the Plasma 5 Desktop Environment.
displayManager.sddm.enable = true;
displayManager.defaultSession = "plasmawayland";
desktopManager.plasma5 = {
enable = true;
excludePackages = with pkgs.libsForQt5; [
elisa
okular
plasma-browser-integration
khelpcenter
oxygen
];
};
};
# Enable CUPS to print documents.
# services.printing.enable = true;

View file

@ -1,2 +1,2 @@
#!/bin/sh
#!/usr/bin/env bash
nix flake update

View file

@ -1,10 +1,15 @@
{ config, pkgs, ... }:
{ inputs, lib, config, pkgs, ... }:
{
imports = [
];
# Home manager
home = {
# Home Manager needs a bit of information about you and the
# paths it should manage.
home.username = "tdpeuter";
home.homeDirectory = "/home/tdpeuter";
username = "tdpeuter";
homeDirectory = "/home/tdpeuter";
# This value determines the Home Manager release that your
# configuration is compatible with. This helps avoid breakage
@ -14,25 +19,49 @@
# You can update Home Manager without changing this value. See
# the Home Manager release notes for a list of state version
# changes in each release.
home.stateVersion = "22.11";
stateVersion = "22.11";
# Let Home Manager install and manage itself.
programs.home-manager.enable = true;
programs.gpg.enable = true;
services.gpg-agent = {
enable = true;
pinentryFlavor = "qt";
};
home.packages = with pkgs; [
packages = with pkgs; [
alacritty
duf
git-crypt
gnupg
pinentry_qt
vifm
zellij
zenith
jetbrains.webstorm
];
};
programs = {
# Let Home Manager install and manage itself.
home-manager.enable = true;
git = {
enable = true;
userName = "tdpeuter";
userEmail = "tibo.depeuter@gmail.com";
extraConfig = {
core.editor = "vim";
};
};
gpg.enable = true;
};
services = {
gpg-agent = {
enable = true;
pinentryFlavor = "qt";
};
nextcloud-client = {
enable = true;
startInBackground = true;
};
};
}