diff --git a/flake.nix b/flake.nix index 8929c19..ab475e9 100644 --- a/flake.nix +++ b/flake.nix @@ -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; }; } ]; diff --git a/hosts/configuration.nix b/hosts/configuration.nix index ed6b0f4..dccbe52 100644 --- a/hosts/configuration.nix +++ b/hosts/configuration.nix @@ -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 ]; }; diff --git a/users/nicholix.nix b/users/nicholix.nix deleted file mode 100644 index 8d3dda5..0000000 --- a/users/nicholix.nix +++ /dev/null @@ -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 { - 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; - }; - }; -} diff --git a/users/nicholix_configuration.nix b/users/nicholix_configuration.nix deleted file mode 100644 index 2ec1f34..0000000 --- a/users/nicholix_configuration.nix +++ /dev/null @@ -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"; - }; - -} - diff --git a/users/nixolas.nix b/users/nixolas.nix index 725cfa3..d5139c7 100644 --- a/users/nixolas.nix +++ b/users/nixolas.nix @@ -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;