Nickiel/nicks-nix-config
1
0
Fork 0
mirror of https://github.com/Nickiel12/nicks-nix-config.git synced 2024-11-22 12:49:32 -08:00
Code Issues Projects Releases Packages Wiki Activity

feat!: combined second user into primary user

Browse source
This commit is contained in:
Nickiel12 2023-02-18 08:53:06 -08:00
parent 9c17350593
commit 412f935f1c
5 changed files with 22 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

@ -36,7 +36,6 @@
kmonad.nixosModules.default
./hosts/laptop
./hosts/configuration.nix
./users/nicholix_configuration.nix
./modules/kmonad.nix
home-manager.nixosModules.home-manager {
home-manager = {
@ -44,7 +43,6 @@
useUserPackages = true;
extraSpecialArgs = { inherit user; };
users.${user} = import ./users/${user}.nix;
users.nicholix = import ./users/nicholix.nix;
};
}
];

2
hosts/configuration.nix
View file

@ -19,9 +19,11 @@
xkbOptions = "caps:super";
desktopManager.plasma5.enable = true;
displayManager.defaultSession = "plasma";
windowManager.awesome = {
enable = true;
luaModules = with pkgs.luaPackages; [
vicious
luarocks # is the package manager for Lua modules
];
};

115
users/nicholix.nix
View file

@ -1,115 +0,0 @@
{ config, pkgs, lib, ... }:
let
moz_overlay = import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz);
nixpkgs = import <nixpkgs> {
overlays = [ moz_overlay ];
};
ruststable = (nixpkgs.latest.rustChannels.stable.rust.override {
extensions = [ "rust-src" "rust-analysis" ];}
);
local_user = "nicholix";
awesome-wm-widgets = pkgs.fetchFromGitHub {
owner = "streetturtle";
repo = "awesome-wm-widgets";
rev = "ef70d16c43c2f566a4fe2955b8d6c08f6c185af8";
sha256 = "td9uE+b3DrE+JJ3NCmIkQAuxJLJCGd79J5LZLqBw9KI=";
};
in
{
xsession = {
enable = true;
windowManager.awesome = {
enable = true;
luaModules = [
pkgs.luaPackages.vicious
];
};
};
imports = [
../modules/emacs.nix
../modules/git.nix
../modules/fusuma.nix
../modules/vim.nix
../modules/wezterm.nix
../modules/xdg.nix
../modules/zsh.nix
];
# Let Home Manager install and manage itself.
programs.home-manager.enable = true;
programs.direnv.enable = true;
programs.direnv.nix-direnv.enable = true;
home.file = {
".config/awesome" = {
source = ../rsrcs/awesome;
recursive = true;
};
".config/awesome/cpu-widget.lua".source = "${awesome-wm-widgets}/cpu-widget/cpu-widget.lua";
".config/awesome/ram-widget.lua".source = "${awesome-wm-widgets}/ram-widget/ram-widget.lua";
".config/awesome/batteryarc.lua".source = "${awesome-wm-widgets}/batteryarc-widget/batteryarc.lua";
".config/awesome/awesome-wm-widgets/spaceman.jpg".source = "${awesome-wm-widgets}/batteryarc-widget/spaceman.jpg";
".config/awesome/calendar.lua".source = "${awesome-wm-widgets}/calendar-widget/batteryarc.lua";
};
home = {
# Home Manager needs a bit of information about you and the
# paths it should manage.
username = local_user;
homeDirectory = "/home/${local_user}";
# This value determines the Home Manager release that your
# configuration is compatible with. This helps avoid breakage
# when a new Home Manager release introduces backwards
# incompatible changes.
#
# 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.
stateVersion = "22.11";
packages = with pkgs; [
# utilities
ffmpeg-full
pandoc
fontpreview
texlive.combined.scheme-medium
# commandline utils
pfetch
fortune
rmtrash
ripgrep
fd
exa
xdotool
vhs
nodejs # required for coc-nvim
# Gui application
firefox # Internet access
libreoffice # Office editing
qalculate-gtk # unit-friendly calculator
vscodium # when vim isn't enough
libsForQt5.kate # kate/kwrite
libsForQt5.ark # kde archive manager
# Drawing tablet driver
opentabletdriver
];
sessionVariables = {
NIX_SHELL_PRESERVE_PROMPT = 1;
};
};
}

13
users/nicholix_configuration.nix
View file

@ -1,13 +0,0 @@
{ config, lib, pkgs, ... }:
{
users.users.nicholix = {
isNormalUser = true;
extraGroups = [ "wheel" "video" "audio" "networkmanager" "lp" "scanner" "input" "uinput" ];
shell = pkgs.zsh;
password = "password";
};
}

25
users/nixolas.nix
View file

@ -8,12 +8,15 @@ let
ruststable = (nixpkgs.latest.rustChannels.stable.rust.override {
extensions = [ "rust-src" "rust-analysis" ];}
);
awesome-wm-widgets = pkgs.fetchFromGitHub {
owner = "streetturtle";
repo = "awesome-wm-widgets";
rev = "ef70d16c43c2f566a4fe2955b8d6c08f6c185af8";
sha256 = "td9uE+b3DrE+JJ3NCmIkQAuxJLJCGd79J5LZLqBw9KI=";
};
in
{
xsession = {
enable = true;
windowManager.command = "startplasma-x11";
};
imports = [
../modules/emacs.nix
@ -24,7 +27,19 @@ in
../modules/xdg.nix
../modules/zsh.nix
];
home.file = {
".config/awesome" = {
source = ../rsrcs/awesome;
recursive = true;
};
".config/awesome/cpu-widget.lua".source = "${awesome-wm-widgets}/cpu-widget/cpu-widget.lua";
".config/awesome/ram-widget.lua".source = "${awesome-wm-widgets}/ram-widget/ram-widget.lua";
".config/awesome/batteryarc.lua".source = "${awesome-wm-widgets}/batteryarc-widget/batteryarc.lua";
".config/awesome/awesome-wm-widgets/spaceman.jpg".source = "${awesome-wm-widgets}/batteryarc-widget/spaceman.jpg";
".config/awesome/calendar.lua".source = "${awesome-wm-widgets}/calendar-widget/batteryarc.lua";
};
# Let Home Manager install and manage itself.
programs.home-manager.enable = true;