william/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nixfmt everything

Browse source
This commit is contained in:
rotterdam 2023-04-03 11:01:56 -03:00
parent dbf843d70f
commit d92420451d
30 changed files with 383 additions and 330 deletions
Download patch file Download diff file Expand all files Collapse all files

5
users/common/default.nix
View file

@ -1,8 +1,5 @@
{ ... }:
{
imports = [
./home.nix
./programs.nix
];
imports = [ ./home.nix ./programs.nix ];
}

13
users/common/home.nix
View file

@ -5,13 +5,14 @@
username = "user";
homeDirectory = "/home/user";
stateVersion = "22.05";
sessionVariables = {
EDITOR = "micro";
};
sessionVariables = { EDITOR = "micro"; };
file = {
".config/btop/themes/catppuccin_mocha.theme".source = "${inputs.dotfiles}/.config/btop/themes/catppuccin_mocha.theme";
".config/fish/themes/Catppuccin Mocha.theme".source = "${inputs.dotfiles}/.config/fish/themes/Catppuccin Mocha.theme";
".config/starship.toml".source = "${inputs.dotfiles}/.config/starship.toml";
".config/btop/themes/catppuccin_mocha.theme".source =
"${inputs.dotfiles}/.config/btop/themes/catppuccin_mocha.theme";
".config/fish/themes/Catppuccin Mocha.theme".source =
"${inputs.dotfiles}/.config/fish/themes/Catppuccin Mocha.theme";
".config/starship.toml".source =
"${inputs.dotfiles}/.config/starship.toml";
};
};
}

8
users/common/programs.nix
View file

@ -4,8 +4,8 @@
programs = {
password-store.enable = true;
bash = {
enable = true;
historyFile = "~/.cache/bash_history";
enable = true;
historyFile = "~/.cache/bash_history";
};
nix-index = {
enable = true;
@ -43,7 +43,7 @@
# loginShellInit = "nix-your-shell fish | source";
shellAliases = {
nano = "micro";
wget = "wget --hsts-file=\"$XDG_DATA_HOME/wget-hsts\"";
wget = ''wget --hsts-file="$XDG_DATA_HOME/wget-hsts"'';
};
functions = {
fish_greeting = "";
@ -53,7 +53,7 @@
set -g -x NNN_OPTS H
set -g -x FONTCONFIG_FILE ${pkgs.fontconfig.out}/etc/fonts/fonts.conf
'';
plugins = [
plugins = [
{
name = "bang-bang";
src = pkgs.fetchFromGitHub {

6
users/desktops/common/default.nix
View file

@ -1,9 +1,5 @@
{ ... }:
{
imports = [
./home.nix
./programs.nix
./services.nix
];
imports = [ ./home.nix ./programs.nix ./services.nix ];
}

19
users/desktops/common/home.nix
View file

@ -10,13 +10,20 @@
package = pkgs.breeze-icons;
};
file = {
".config/wezterm/wezterm.lua".source = "${inputs.dotfiles}/.config/wezterm/wezterm.lua";
".config/MangoHud/MangoHud.conf".source = "${inputs.dotfiles}/.config/MangoHud/MangoHud.conf";
".config/solvespace/settings.json".source = "${inputs.dotfiles}/.config/solvespace/settings.json";
".local/share/color-schemes/CatppuccinLatte.colors".source = "${inputs.dotfiles}/.local/share/color-schemes/CatppuccinLatte.colors";
".local/share/color-schemes/CatppuccinMocha.colors".source = "${inputs.dotfiles}/.local/share/color-schemes/CatppuccinMocha.colors";
".config/wezterm/wezterm.lua".source =
"${inputs.dotfiles}/.config/wezterm/wezterm.lua";
".config/MangoHud/MangoHud.conf".source =
"${inputs.dotfiles}/.config/MangoHud/MangoHud.conf";
".config/solvespace/settings.json".source =
"${inputs.dotfiles}/.config/solvespace/settings.json";
".local/share/color-schemes/CatppuccinLatte.colors".source =
"${inputs.dotfiles}/.local/share/color-schemes/CatppuccinLatte.colors";
".local/share/color-schemes/CatppuccinMocha.colors".source =
"${inputs.dotfiles}/.local/share/color-schemes/CatppuccinMocha.colors";
# Autostart programs
".config/autostart/koi.desktop".source = config.lib.file.mkOutOfStoreSymlink "/var/run/current-system/sw/share/applications/koi.desktop";
".config/autostart/koi.desktop".source =
config.lib.file.mkOutOfStoreSymlink
"/var/run/current-system/sw/share/applications/koi.desktop";
};
};
}

27
users/desktops/common/programs.nix
View file

@ -5,9 +5,18 @@
gtk = {
enable = true;
font = { name = "Inter"; size = 10; };
theme = { package = pkgs.breeze-gtk; name = "Breeze"; };
iconTheme = { package = pkgs.breeze-icons; name = "Breeze"; };
font = {
name = "Inter";
size = 10;
};
theme = {
package = pkgs.breeze-gtk;
name = "Breeze";
};
iconTheme = {
package = pkgs.breeze-icons;
name = "Breeze";
};
};
programs = {
@ -30,10 +39,14 @@
interactiveShellInit = "nix-your-shell fish | source";
loginShellInit = "nix-your-shell fish | source";
functions = {
rebuild = "rm ~/.gtkrc-2.0; sudo nixos-rebuild switch --flake '/home/user/Projects/personal/nix-config#'";
rebuild-boot = "rm ~/.gtkrc-2.0; sudo nixos-rebuild boot --flake '/home/user/Projects/personal/nix-config#'";
upgrade = "rm ~/.gtkrc-2.0; nix flake lock --update-input nixpkgs --commit-lock-file /home/user/Projects/personal/nix-config; sudo nixos-rebuild switch --upgrade --flake '/home/user/Projects/personal/nix-config#'";
upgrade-boot = "rm ~/.gtkrc-2.0; nix flake lock --update-input nixpkgs --commit-lock-file /home/user/Projects/personal/nix-config; sudo nixos-rebuild boot --upgrade --flake '/home/user/Projects/personal/nix-config#'";
rebuild =
"rm ~/.gtkrc-2.0; sudo nixos-rebuild switch --flake '/home/user/Projects/personal/nix-config#'";
rebuild-boot =
"rm ~/.gtkrc-2.0; sudo nixos-rebuild boot --flake '/home/user/Projects/personal/nix-config#'";
upgrade =
"rm ~/.gtkrc-2.0; nix flake lock --update-input nixpkgs --commit-lock-file /home/user/Projects/personal/nix-config; sudo nixos-rebuild switch --upgrade --flake '/home/user/Projects/personal/nix-config#'";
upgrade-boot =
"rm ~/.gtkrc-2.0; nix flake lock --update-input nixpkgs --commit-lock-file /home/user/Projects/personal/nix-config; sudo nixos-rebuild boot --upgrade --flake '/home/user/Projects/personal/nix-config#'";
};
};
};

4
users/desktops/common/services.nix
View file

@ -1,7 +1,5 @@
{ specialArgs, inputs, config, pkgs, lib, ... }:
{
services = {
kdeconnect.enable = true;
};
services = { kdeconnect.enable = true; };
}