added formatter and reformated

This commit is contained in:
ISnortPennies 2023-01-19 18:51:32 -05:00
parent 733eda4798
commit e1987d6461
24 changed files with 286 additions and 284 deletions

View file

@ -16,7 +16,8 @@
inherit system; inherit system;
config = { config = {
allowUnfree = true; allowUnfree = true;
packageOverrides = super: let self = super.pkgs; in { packageOverrides = super:
let self = super.pkgs; in {
nerdfonts-overpass = self.nerdfonts.override { nerdfonts-overpass = self.nerdfonts.override {
fonts = [ "Overpass" ]; fonts = [ "Overpass" ];
}; };
@ -36,7 +37,9 @@
]; ];
}; };
lib = nixpkgs.lib; lib = nixpkgs.lib;
in { in
{
formatter.x86_64-linux = pkgs.nixpkgs-fmt;
nixosConfigurations = { nixosConfigurations = {
gerg-desktop = lib.nixosSystem { gerg-desktop = lib.nixosSystem {
inherit system pkgs; inherit system pkgs;
@ -44,7 +47,8 @@
modules = [ modules = [
./configuration.nix ./configuration.nix
./systems/desktop.nix ./systems/desktop.nix
home-manager.nixosModules.home-manager { home-manager.nixosModules.home-manager
{
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;

View file

@ -22,7 +22,8 @@ in
extraPackages = with pkgs; [ gcc ripgrep fd ]; extraPackages = with pkgs; [ gcc ripgrep fd ];
plugins = with pkgs.vimPlugins; [ plugins = with pkgs.vimPlugins; [
nvim-treesitter.withAllGrammars nvim-treesitter.withAllGrammars
rainbow nvim-ts-rainbow # rainbow for tree-sitter rainbow
nvim-ts-rainbow # rainbow for tree-sitter
nvim-colorizer-lua # colors nvim-colorizer-lua # colors
nvim-tree-lua # file browser nvim-tree-lua # file browser
nvim-web-devicons # for tree-lua nvim-web-devicons # for tree-lua
@ -48,7 +49,8 @@ in
vim-moonfly #color scheme vim-moonfly #color scheme
lightline-vim #bottom bar lightline-vim #bottom bar
]; ];
extraConfig = let extraConfig =
let
luaRequire = module: luaRequire = module:
builtins.readFile (builtins.toString builtins.readFile (builtins.toString
./config ./config
@ -58,7 +60,8 @@ in
"lspconfig" "lspconfig"
"nvim-cmp" "nvim-cmp"
]); ]);
in '' in
''
lua << EOF lua << EOF
${luaConfig} ${luaConfig}
EOF EOF

View file

@ -1,4 +1,3 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
services.polybar = { services.polybar = {

View file

@ -29,7 +29,6 @@
pcmanfm #file manager pcmanfm #file manager
haskellPackages.squeeze #file compression haskellPackages.squeeze #file compression
nix-tree #view packages nix-tree #view packages
docker
]; ];
} }

View file

@ -35,16 +35,10 @@ let
apply-system apply-system
''; '';
polybar-tray = pkgs.writeShellScriptBin "polybar-tray" ''
u=$(xprop -name "Polybar tray window" _NET_WM_PID | awk '{print $3}')
if [ $u -Z ]
then polybar tray &
else kill $u
fi
'';
pastebin = pkgs.writeShellScriptBin "pastebin" '' pastebin = pkgs.writeShellScriptBin "pastebin" ''
curl -F 'clbin=<-' https://clbin.com curl -F 'clbin=<-' https://clbin.com
''; '';
in { in
environment.systemPackages = [ update-system clean-store apply-system polybar-tray full-upgrade pastebin]; {
environment.systemPackages = [ update-system apply-system full-upgrade clean-store pastebin ];
} }

View file

@ -23,7 +23,8 @@
}; };
}; };
environment.systemPackages = with pkgs; [ virt-manager ]; environment.systemPackages = with pkgs; [ virt-manager ];
systemd.services.libvirtd.preStart = let systemd.services.libvirtd.preStart =
let
qemuHook = pkgs.writeScript "qemu-hook" '' qemuHook = pkgs.writeScript "qemu-hook" ''
#!${pkgs.stdenv.shell} #!${pkgs.stdenv.shell}
@ -45,7 +46,8 @@
fi fi
fi fi
''; '';
in '' in
''
mkdir -p /var/lib/libvirt/hooks mkdir -p /var/lib/libvirt/hooks
chmod 755 /var/lib/libvirt/hooks chmod 755 /var/lib/libvirt/hooks

View file

@ -1,5 +1,6 @@
(final: super: rec { (final: super: rec {
st = (super.st.override { extraLibs = with super; [ xorg.libXcursor harfbuzz ]; st = (super.st.override {
extraLibs = with super; [ xorg.libXcursor harfbuzz ];
}).overrideAttrs (oldAttrs: rec { }).overrideAttrs (oldAttrs: rec {
src = ./st; src = ./st;
}); });

View file

@ -55,7 +55,7 @@
path = with pkgs; [ t-rex-miner afk-cmds st zsh dbus xmrig ]; path = with pkgs; [ t-rex-miner afk-cmds st zsh dbus xmrig ];
wantedBy = [ "graphical.target" ]; wantedBy = [ "graphical.target" ];
script = '' script = ''
afk-cmds -c /home/gerg/afk-cmds.json afk-cmds -c /home/${username}/afk-cmds.json
''; '';
environment = { environment = {
# PATH="/run/current-system/sw/bin"; missing something with dbus # PATH="/run/current-system/sw/bin"; missing something with dbus

View file

@ -1,4 +1,4 @@
{ config, pkgs, callPackage, lib, ... }: { config, pkgs, callPackage, lib, username, ... }:
{ {
#important stuff first #important stuff first
imports = imports =
@ -23,7 +23,7 @@
# user managment # user managment
users = { users = {
defaultUserShell = pkgs.zsh; defaultUserShell = pkgs.zsh;
users.gerg = { users."${username}" = {
isNormalUser = true; isNormalUser = true;
extraGroups = [ "wheel" "audio" "networkmanager" ]; extraGroups = [ "wheel" "audio" "networkmanager" ];
}; };