extern/nix-config
1
0
Fork 1
mirror of https://github.com/donovanglover/nix-config.git synced 2025-02-16 09:49:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

nix: Simplify

Browse Source
This commit is contained in:
Donovan Glover 2023-06-11 09:51:26 -04:00
parent 44d296b2c7
commit d06d47f76a
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
11 changed files with 107 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
containers/rar.nix
View File

@ -1,7 +1,4 @@
let
VARIABLES = import ../src/variables.nix;
in
{
let VARIABLES = import ../src/variables.nix; in {
containers.rar = {
privateNetwork = true;
@ -12,51 +9,47 @@ in
};
};
config =
{ pkgs
, lib
, ...
}: {
programs = {
fish.enable = true;
neovim.enable = true;
starship.enable = true;
config = { pkgs, lib, ... }: {
programs = {
fish.enable = true;
neovim.enable = true;
starship.enable = true;
};
users = {
defaultUserShell = pkgs.fish;
mutableUsers = false;
allowNoPasswordLogin = true;
users.user = {
isNormalUser = true;
home = "/home/user";
};
};
environment = {
shells = with pkgs; [ fish ];
variables = {
TERM = "xterm-kitty";
};
users = {
defaultUserShell = pkgs.fish;
mutableUsers = false;
allowNoPasswordLogin = true;
defaultPackages = [ ];
};
users.user = {
isNormalUser = true;
home = "/home/user";
};
};
environment.systemPackages = with pkgs; [
kitty
rar
unrar
];
environment = {
shells = with pkgs; [ fish ];
variables = {
TERM = "xterm-kitty";
};
defaultPackages = [ ];
};
environment.systemPackages = with pkgs; [
kitty
rar
unrar
nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [
"rar"
"unrar"
];
nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [
"rar"
"unrar"
];
system.stateVersion = VARIABLES.stateVersion;
};
system.stateVersion = VARIABLES.stateVersion;
};
};
}

119
containers/wine.nix
View File

@ -1,9 +1,6 @@
{ config, ... }:
let
VARIABLES = import ../src/variables.nix;
hostCfg = config;
in
{
let VARIABLES = import ../src/variables.nix; hostCfg = config; in {
containers.wine = {
privateNetwork = true;
@ -25,64 +22,60 @@ in
};
};
config =
{ pkgs
, lib
, ...
}: {
programs = {
fish.enable = true;
neovim.enable = true;
starship.enable = true;
};
users = {
defaultUserShell = pkgs.fish;
mutableUsers = false;
allowNoPasswordLogin = true;
users.user = {
isNormalUser = true;
home = "/home/user";
};
};
environment = {
shells = with pkgs; [ fish ];
variables = {
TERM = "xterm-kitty";
};
defaultPackages = [ ];
};
environment.systemPackages = with pkgs; [
kitty
wine-staging
winetricks
];
environment.sessionVariables = {
WAYLAND_DISPLAY = "wayland-1";
QT_QPA_PLATFORM = "wayland";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
SDL_VIDEODRIVER = "wayland";
CLUTTER_BACKEND = "wayland";
MOZ_ENABLE_WAYLAND = "1";
XDG_RUNTIME_DIR = "/run/user/1000";
DISPLAY = ":0";
};
services.xserver.enable = true;
hardware.opengl = {
enable = true;
extraPackages = hostCfg.hardware.opengl.extraPackages;
driSupport32Bit = true;
};
system.stateVersion = VARIABLES.stateVersion;
config = { pkgs, lib, ... }: {
programs = {
fish.enable = true;
neovim.enable = true;
starship.enable = true;
};
users = {
defaultUserShell = pkgs.fish;
mutableUsers = false;
allowNoPasswordLogin = true;
users.user = {
isNormalUser = true;
home = "/home/user";
};
};
environment = {
shells = with pkgs; [ fish ];
variables = {
TERM = "xterm-kitty";
};
defaultPackages = [ ];
};
environment.systemPackages = with pkgs; [
kitty
wine-staging
winetricks
];
environment.sessionVariables = {
WAYLAND_DISPLAY = "wayland-1";
QT_QPA_PLATFORM = "wayland";
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
SDL_VIDEODRIVER = "wayland";
CLUTTER_BACKEND = "wayland";
MOZ_ENABLE_WAYLAND = "1";
XDG_RUNTIME_DIR = "/run/user/1000";
DISPLAY = ":0";
};
services.xserver.enable = true;
hardware.opengl = {
enable = true;
extraPackages = hostCfg.hardware.opengl.extraPackages;
driSupport32Bit = true;
};
system.stateVersion = VARIABLES.stateVersion;
};
};
}

6
modules/fish-starship/default.nix
View File

@ -1,8 +1,6 @@
{ pkgs, ... }:
let
VARIABLES = import ../../src/variables.nix;
in
{
let VARIABLES = import ../../src/variables.nix; in {
users.defaultUserShell = pkgs.fish;
environment.shells = [ pkgs.fish ];

6
modules/git/default.nix
View File

@ -1,8 +1,6 @@
{ pkgs, ... }:
let
VARIABLES = import ../../src/variables.nix;
in
{
let VARIABLES = import ../../src/variables.nix; in {
environment.systemPackages = with pkgs; [ tig git ];
home-manager.sharedModules = [

6
modules/hyprland/default.nix
View File

@ -1,8 +1,6 @@
{ pkgs, ... }:
let
VARIABLES = import ../../src/variables.nix;
in
{
let VARIABLES = import ../../src/variables.nix; in {
programs.hyprland.enable = true;
services.udisks2 = {
enable = true;

5
modules/kitty/default.nix
View File

@ -1,7 +1,4 @@
let
VARIABLES = import ../../src/variables.nix;
in
{
let VARIABLES = import ../../src/variables.nix; in {
home-manager.sharedModules = [
{
programs.kitty = {

5
modules/mime-apps/default.nix
View File

@ -1,7 +1,4 @@
let
VARIABLES = import ../../src/variables.nix;
in
{
let VARIABLES = import ../../src/variables.nix; in {
home-manager.sharedModules = [
{
xdg.mimeApps = {

6
modules/ncmpcpp/default.nix
View File

@ -1,8 +1,6 @@
{ pkgs, ... }:
let
VARIABLES = import ../../src/variables.nix;
in
{
let VARIABLES = import ../../src/variables.nix; in {
home-manager.sharedModules = [
{
services.mpd = {

5
modules/xdg-user-dirs/default.nix
View File

@ -1,7 +1,4 @@
let
VARIABLES = import ../../src/variables.nix;
in
{
let VARIABLES = import ../../src/variables.nix; in {
home-manager.sharedModules = [
{
xdg.userDirs = {

2
packages/go-thumbnailer/default.nix
View File

@ -3,8 +3,8 @@
, fetchFromGitHub
, pkg-config
, vips
,
}:
buildGoModule rec {
pname = "go-thumbnailer";
version = "0.1.0";

6
src/main.nix
View File

@ -7,10 +7,8 @@
, nixpkgs-srb2
, ...
}:
let
VARIABLES = import ./variables.nix;
in
{
let VARIABLES = import ./variables.nix; in {
imports = [
"${VARIABLES.hostHardwareConfiguration}"
../overlays