kasei: add special home-manager-testing system config
parent
bd7980ad97
commit
af345b38fc
GPG Key ID:
9F2F7D8250F35146
75
flake.lock
75
flake.lock
|
|
@ -19,8 +19,8 @@
|
|||
"fonts": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1649003599,
|
||||
"narHash": "sha256-QtT+ansp3ombpdS2+jNWgZKSqpxhVq3cyrpAKkDzA9Y=",
|
||||
"lastModified": 1651945262,
|
||||
"narHash": "sha256-7r0hq5G/HjK6yVOt18VKaxuJcGM6GPu/jmwbkksJ7LE=",
|
||||
"path": "/home/h7x4/git/fonts",
|
||||
"type": "path"
|
||||
},
|
||||
|
|
@ -50,13 +50,34 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager-local": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs-unstable"
|
||||
],
|
||||
"utils": "utils"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1668830718,
|
||||
"narHash": "sha256-p5BRIr3yRqCOMNFUXArkz0/WtbhLAgtJLN5lzN5Tq2o=",
|
||||
"ref": "refs/heads/zellij-kdl-configuration-generator",
|
||||
"rev": "0987fc94313af85fd42a900d3525e9be7f2a89bb",
|
||||
"revCount": 2377,
|
||||
"type": "git",
|
||||
"url": "file:///home/h7x4/git/home-manager"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "file:///home/h7x4/git/home-manager"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1667821506,
|
||||
"narHash": "sha256-u4HKBBfTOPpFsGnM7sjS0+F67Hmf2or3uHKNVxXZtiM=",
|
||||
"lastModified": 1668718654,
|
||||
"narHash": "sha256-4R4hejD1de5K9oVc1WdDeKyQcV0zh0Tk351X+jLR9qM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ebf65554b18ee053311f43e5faa5a3f36626c52e",
|
||||
"rev": "8cc081471e3a25e1f2493a3c02cbfa975443914b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -65,14 +86,30 @@
|
|||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1668765800,
|
||||
"narHash": "sha256-rC40+/W6Hio7b/RsY8SvQPKNx4WqNcTgfYv8cUMAvJk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "52b2ac8ae18bbad4374ff0dd5aeee0fdf1aea739",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"ref": "nixos-unstable",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"dotfiles": "dotfiles",
|
||||
"fonts": "fonts",
|
||||
"home-manager": "home-manager",
|
||||
"home-manager-local": "home-manager-local",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"secrets": "secrets",
|
||||
"unstable-nixpkgs": "unstable-nixpkgs",
|
||||
"vscode-server": "vscode-server",
|
||||
"website": "website"
|
||||
}
|
||||
|
|
@ -84,11 +121,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1667668549,
|
||||
"narHash": "sha256-MRLHIEtZuf1rdUP+Jn/vmRBAzNyEyGxO4RBhsycLHx0=",
|
||||
"lastModified": 1668553695,
|
||||
"narHash": "sha256-j2OsHYtYH+YTM8OOaNVNwoBg2n6NiGMlR2+2q4QmQFc=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "e2429487551c8456d34108647d9869e644c7fa00",
|
||||
"revCount": 42,
|
||||
"rev": "410b348732ca0cd4bc1179d0e1df2290c132dc5b",
|
||||
"revCount": 46,
|
||||
"type": "git",
|
||||
"url": "file:///home/h7x4/git/nix-secrets"
|
||||
},
|
||||
|
|
@ -97,19 +134,19 @@
|
|||
"url": "file:///home/h7x4/git/nix-secrets"
|
||||
}
|
||||
},
|
||||
"unstable-nixpkgs": {
|
||||
"utils": {
|
||||
"locked": {
|
||||
"lastModified": 1667811565,
|
||||
"narHash": "sha256-HYml7RdQPQ7X13VNe2CoDMqmifsXbt4ACTKxHRKQE3Q=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "667e5581d16745bcda791300ae7e2d73f49fff25",
|
||||
"lastModified": 1667395993,
|
||||
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"ref": "nixos-unstable",
|
||||
"type": "indirect"
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"vscode-server": {
|
||||
|
|
|
|||
25
flake.nix
25
flake.nix
|
|
@ -1,16 +1,18 @@
|
|||
{
|
||||
description = "Mmmmmh, Spaghetti™";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "nixpkgs/nixos-22.05";
|
||||
nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
|
||||
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-22.05";
|
||||
# url = "git+file:///home/h7x4/git/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
home-manager-local = {
|
||||
url = "git+file:///home/h7x4/git/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||
};
|
||||
|
||||
dotfiles = {
|
||||
url = "github:h7x4abk3g/dotfiles";
|
||||
flake = false;
|
||||
|
|
@ -48,6 +50,7 @@
|
|||
nixpkgs,
|
||||
nixpkgs-unstable,
|
||||
home-manager,
|
||||
home-manager-local,
|
||||
vscode-server,
|
||||
secrets,
|
||||
fonts,
|
||||
|
|
@ -146,6 +149,22 @@
|
|||
Tsuki = nixSys "tsuki";
|
||||
Eisei = nixSys "eisei";
|
||||
kasei = nixSys "kasei";
|
||||
home-manager-tester = nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
pkgs = unstable-pkgs;
|
||||
inherit (unstable-pkgs) lib;
|
||||
modules = [
|
||||
"${home-manager-local}/nixos"
|
||||
./hosts/special/home-manager-tester/configuration.nix
|
||||
{
|
||||
config._module.args = {
|
||||
pkgs = unstable-pkgs;
|
||||
# inherit (self) extendedLib;
|
||||
# secrets = secrets.outputs.settings;
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,161 @@
|
|||
{ pkgs, lib, config, ... }:
|
||||
# lib.trace lib.version
|
||||
# (lib.trace lib
|
||||
{
|
||||
# KASEI SPECIFIC STUFF
|
||||
|
||||
imports = [
|
||||
../../kasei/hardware-configuration.nix
|
||||
];
|
||||
|
||||
boot = {
|
||||
blacklistedKernelModules = ["nouveau"];
|
||||
kernelParams = ["nomodeset"];
|
||||
loader = {
|
||||
efi.canTouchEfiVariables = false;
|
||||
grub = {
|
||||
enable = true;
|
||||
version = 2;
|
||||
efiSupport = true;
|
||||
fsIdentifier = "label";
|
||||
device = "nodev";
|
||||
efiInstallAsRemovable = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
# HOME-MANAGER MODULE
|
||||
|
||||
home-manager = builtins.trace pkgs.lib.version {
|
||||
# useGlobalPkgs = true;
|
||||
|
||||
users.h7x4 = import ./home.nix {
|
||||
inherit pkgs;
|
||||
};
|
||||
};
|
||||
|
||||
# DEFAULT MACHINE CONFIG
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
nix = {
|
||||
settings = {
|
||||
substituters = [
|
||||
"https://cache.nixos.org/"
|
||||
];
|
||||
|
||||
trusted-users = [ "h7x4" "nix-builder" ];
|
||||
};
|
||||
|
||||
extraOptions = ''
|
||||
experimental-features = nix-command flakes
|
||||
builders-use-substitutes = true
|
||||
allowed-uris = http:// https://
|
||||
'';
|
||||
};
|
||||
|
||||
time.timeZone = "Europe/Oslo";
|
||||
|
||||
console = {
|
||||
font = "Lat2-Terminus16";
|
||||
keyMap = "us";
|
||||
};
|
||||
|
||||
networking = {
|
||||
useDHCP = false;
|
||||
nameservers = [
|
||||
"1.1.1.1"
|
||||
"8.8.8.8"
|
||||
];
|
||||
};
|
||||
|
||||
i18n = {
|
||||
defaultLocale = "en_US.UTF-8";
|
||||
# inputMethod = lib.mkIf (!machineVars.headless) {
|
||||
# enabled = "fcitx";
|
||||
# fcitx.engines = with pkgs.fcitx-engines; [ mozc ];
|
||||
# };
|
||||
|
||||
inputMethod = {
|
||||
enabled = "fcitx5";
|
||||
fcitx5.addons = with pkgs; [
|
||||
fcitx5-mozc
|
||||
fcitx5-gtk
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
environment = {
|
||||
variables = {
|
||||
EDITOR = "nvim";
|
||||
VISUAL = "nvim";
|
||||
};
|
||||
|
||||
systemPackages = with pkgs; [
|
||||
wget
|
||||
nvtop-nvidia
|
||||
];
|
||||
|
||||
shells = with pkgs; [
|
||||
bashInteractive
|
||||
zsh
|
||||
];
|
||||
|
||||
etc = {
|
||||
"resolv.conf".source = let
|
||||
inherit (lib.strings) concatStringsSep;
|
||||
inherit (pkgs) writeText;
|
||||
in writeText "resolv.conf" ''
|
||||
${concatStringsSep "\n" (map (ns: "nameserver ${ns}") config.networking.nameservers)}
|
||||
options edns0
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
fonts.enableDefaultFonts = true;
|
||||
|
||||
users = {
|
||||
users.h7x4 = {
|
||||
isNormalUser = true;
|
||||
shell = pkgs.zsh;
|
||||
|
||||
extraGroups = [
|
||||
"wheel"
|
||||
"networkmanager"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
services = {
|
||||
dbus.enable = true;
|
||||
|
||||
xserver = {
|
||||
enable = true;
|
||||
layout = "us";
|
||||
xkbOptions = "caps:escape";
|
||||
|
||||
desktopManager = {
|
||||
xterm.enable = false;
|
||||
xfce.enable = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
programs = {
|
||||
git.enable = true;
|
||||
neovim = {
|
||||
enable = true;
|
||||
defaultEditor = true;
|
||||
};
|
||||
};
|
||||
|
||||
sound = {
|
||||
enable = true;
|
||||
mediaKeys.enable = true;
|
||||
};
|
||||
|
||||
hardware.pulseaudio.enable = true;
|
||||
|
||||
system.stateVersion = "22.05";
|
||||
}
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
{ pkgs }:
|
||||
{
|
||||
|
||||
home = {
|
||||
stateVersion = "22.05";
|
||||
username = "h7x4";
|
||||
homeDirectory = "/home/h7x4";
|
||||
};
|
||||
|
||||
###################
|
||||
# TESTING GROUNDS #
|
||||
###################
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue