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

Format using nixfmt

Browse source
This commit is contained in:
Oliver Davies 2024-03-18 20:33:28 +00:00
parent a33c74c580
commit b1421c97e1
30 changed files with 184 additions and 265 deletions

66
lib/nixos/home-manager/default.nix
View file

@ -1,44 +1,38 @@
{
config,
desktop,
inputs,
pkgs,
self,
username,
...
}: let
desktop-config = import ./desktop.nix {inherit config inputs pkgs username;};
shared-config = import "${self}/lib/shared/home-manager.nix" {inherit inputs pkgs self username;};
shared-packages = import "${self}/lib/shared/home-manager-packages.nix" {inherit inputs pkgs;};
{ config, desktop, inputs, pkgs, self, username, ... }:
let
desktop-config =
import ./desktop.nix { inherit config inputs pkgs username; };
shared-config = import "${self}/lib/shared/home-manager.nix" {
inherit inputs pkgs self username;
};
shared-packages = import "${self}/lib/shared/home-manager-packages.nix" {
inherit inputs pkgs;
};
pkgs-2311 = inputs.nixpkgs-2311.legacyPackages.${pkgs.system};
in {
imports =
if desktop
then [desktop-config shared-config]
else [shared-config];
if desktop then [ desktop-config shared-config ] else [ shared-config ];
home.packages =
shared-packages
++ pkgs.lib.optionals desktop [
pkgs.discord
pkgs.gimp
pkgs.gscan2pdf
pkgs-2311.kdenlive
pkgs.meslo-lg
pkgs.obs-studio
pkgs.okular
pkgs.pamixer
pkgs.pass
pkgs.pavucontrol
pkgs.pinentry
pkgs.slack
pkgs.via
pkgs.vlc
pkgs.xsel
pkgs.xcape
pkgs.zoom-us
];
home.packages = shared-packages ++ pkgs.lib.optionals desktop [
pkgs.discord
pkgs.gimp
pkgs.gscan2pdf
pkgs-2311.kdenlive
pkgs.meslo-lg
pkgs.obs-studio
pkgs.okular
pkgs.pamixer
pkgs.pass
pkgs.pavucontrol
pkgs.pinentry
pkgs.slack
pkgs.via
pkgs.vlc
pkgs.xsel
pkgs.xcape
pkgs.zoom-us
];
home.sessionVariables = {
EDITOR = "nvim";

7
lib/nixos/home-manager/desktop.nix
View file

@ -1,9 +1,4 @@
{
config,
inputs,
pkgs,
username,
}: {
{ config, inputs, pkgs, username, }: {
imports = [
./modules/alacritty.nix
./modules/autorandr.nix

12
lib/nixos/home-manager/modules/alacritty.nix
View file

@ -1,13 +1,9 @@
{
lib,
pkgs,
self,
...
}: let
{ lib, pkgs, self, ... }:
let
inherit (lib) strings;
inherit (strings) toInt;
theme = import "${self}/lib/theme" {inherit pkgs;};
theme = import "${self}/lib/theme" { inherit pkgs; };
in {
programs.alacritty = {
enable = true;
@ -30,7 +26,7 @@ in {
glyph_offset.y = 6;
};
shell = {program = "zsh";};
shell = { program = "zsh"; };
};
};
}

8
lib/nixos/home-manager/modules/autorandr.nix
View file

@ -1,4 +1,4 @@
{username, ...}: {
{ username, ... }: {
services.autorandr.enable = true;
xdg.configFile."autorandr/postswitch" = {
@ -14,8 +14,10 @@
enable = true;
profiles = let
laptop = "00ffffffffffff000daef21400000000161c0104a51f117802ee95a3544c99260f505400000001010101010101010101010101010101363680a0703820402e1e240035ad10000018000000fe004e3134304843472d4751320a20000000fe00434d4e0a202020202020202020000000fe004e3134304843472d4751320a2000bb";
monitor = "00ffffffffffff004c2d1710424e58432b1f0103803f24782ac8b5ad50449e250f5054bfef80714f810081c081809500a9c0b300010108e80030f2705a80b0588a0078682100001e000000fd00324b1e873c000a202020202020000000fc004c5532385235350a2020202020000000ff0048345a524130303132380a20200183020335f04961120313041f10605f2309070783010000e305c0006b030c002000b83c2000200167d85dc401788003e20f81e3060501023a801871382d40582c450078682100001e023a80d072382d40102c458078682100001e04740030f2705a80b0588a0078682100001e565e00a0a0a029503020350078682100001a000049";
laptop =
"00ffffffffffff000daef21400000000161c0104a51f117802ee95a3544c99260f505400000001010101010101010101010101010101363680a0703820402e1e240035ad10000018000000fe004e3134304843472d4751320a20000000fe00434d4e0a202020202020202020000000fe004e3134304843472d4751320a2000bb";
monitor =
"00ffffffffffff004c2d1710424e58432b1f0103803f24782ac8b5ad50449e250f5054bfef80714f810081c081809500a9c0b300010108e80030f2705a80b0588a0078682100001e000000fd00324b1e873c000a202020202020000000fc004c5532385235350a2020202020000000ff0048345a524130303132380a20200183020335f04961120313041f10605f2309070783010000e305c0006b030c002000b83c2000200167d85dc401788003e20f81e3060501023a801871382d40582c450078682100001e023a80d072382d40102c458078682100001e04740030f2705a80b0588a0078682100001e565e00a0a0a029503020350078682100001a000049";
in {
laptop = {
config.eDP-1 = {

4
lib/nixos/home-manager/modules/copyq.nix
View file

@ -1,3 +1 @@
{
services.copyq.enable = true;
}
{ services.copyq.enable = true; }

6
lib/nixos/home-manager/modules/dunst.nix
View file

@ -2,10 +2,6 @@
services.dunst = {
enable = true;
settings = {
global = {
follow = "keyboard";
};
};
settings = { global = { follow = "keyboard"; }; };
};
}

9
lib/nixos/home-manager/modules/espanso.nix
View file

@ -1,14 +1,9 @@
let
baseUrl = "https://www.oliverdavies.uk";
let baseUrl = "https://www.oliverdavies.uk";
in {
services.espanso = {
enable = true;
configs = {
default = {
show_notifications = false;
};
};
configs = { default = { show_notifications = false; }; };
matches = {
base = {

4
lib/nixos/home-manager/modules/feh.nix
View file

@ -1,3 +1 @@
{
programs.feh.enable = true;
}
{ programs.feh.enable = true; }

2
lib/nixos/home-manager/modules/flameshot.nix
View file

@ -1,4 +1,4 @@
{username, ...}: {
{ username, ... }: {
services.flameshot = {
enable = true;

42
lib/nixos/home-manager/modules/i3.nix
View file

@ -1,11 +1,7 @@
{
config,
inputs,
self,
username,
pkgs,
...
}: let
{ config, inputs, pkgs, self, username, ... }:
let
theme = import "${self}/lib/theme" { inherit pkgs; };
modifier = "Mod4";
in {
xsession.windowManager.i3 = {
@ -13,12 +9,9 @@ in {
config = {
assigns = {
"7" = [{class = "vlc";}];
"8" = [{class = "0ad";}];
"9" = [
{class = "Slack";}
{class = "discord";}
];
"7" = [{ class = "vlc"; }];
"8" = [{ class = "0ad"; }];
"9" = [ { class = "Slack"; } { class = "discord"; } ];
};
defaultWorkspace = "workspace number 1";
@ -52,10 +45,13 @@ in {
"XF86AudioRaiseVolume" = "exec pamixer -ui 2 && pamixer --get-volume";
"XF86AudioLowerVolume" = "exec pamixer -ud 2 && pamixer --get-volume";
"XF86AudioMute" = "exec pamixer --toggle-mute && ( [ \"$(pamixer --get-mute)\" = \"true\" ] && echo 0";
"XF86AudioMute" = ''
exec pamixer --toggle-mute && ( [ "$(pamixer --get-mute)" = "true" ] && echo 0'';
"XF86MonBrightnessDown" = "exec brightnessctl set 5%- | sed -En 's/.*\(([0-9]+)%\).*/\1/p'";
"XF86MonBrightnessUp" = "exec brightnessctl set +5% | sed -En 's/.*\(([0-9]+)%\).*/\1/p'";
"XF86MonBrightnessDown" =
"exec brightnessctl set 5%- | sed -En 's/.*(([0-9]+)%).*/1/p'";
"XF86MonBrightnessUp" =
"exec brightnessctl set +5% | sed -En 's/.*(([0-9]+)%).*/1/p'";
};
terminal = "alacritty";
@ -80,14 +76,12 @@ in {
'';
config = {
bars = [
{
position = "bottom";
statusCommand = "${pkgs.i3status}/bin/i3status";
}
];
bars = [{
position = "bottom";
statusCommand = "${pkgs.i3status}/bin/i3status";
}];
fonts.names = ["GeistMono"];
fonts.names = [ "${theme.fonts.monospace.name}" ];
gaps = {
smartBorders = "on";

4
lib/nixos/home-manager/modules/rofi.nix
View file

@ -1,3 +1 @@
{
programs.rofi.enable = true;
}
{ programs.rofi.enable = true; }