gerg-l/nixos
1
0
Fork 0
mirror of https://github.com/Gerg-L/nixos.git synced 2025-12-10 00:43:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

moved systems to their own folders

Browse source 
reworked sxhkd
moved images to /misc
This commit is contained in:
Gerg-L 2023-02-20 21:56:14 -05:00
parent 9d887fc79c
commit 32bf78aa36
13 changed files with 66 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

6
flake.nix
View file

@ -59,7 +59,7 @@
(import ./modules inputs)
(import ./common.nix inputs)
(import ./nix.nix inputs)
(import ./systems/desktop.nix inputs)
(import ./systems/gerg-desktop inputs)
{
nixpkgs.overlays = [
(import ./pkgs)
@ -81,7 +81,7 @@
(import ./modules inputs)
(import ./common.nix inputs)
(import ./nix.nix inputs)
(import ./systems/laptop.nix inputs)
(import ./systems/game-laptop inputs)
];
};
moms-laptop = unstable.lib.nixosSystem {
@ -97,7 +97,7 @@
(import ./modules inputs)
(import ./common.nix inputs)
(import ./nix.nix inputs)
(import ./systems/mom.nix inputs)
(import ./systems/mom-laptop inputs)
];
};
};

2
imports/boot.nix
View file

@ -13,7 +13,7 @@ _: {lib, ...}: {
plymouth = {
enable = true;
theme = "breeze";
logo = ../images/nixos.png;
logo = ../misc/nixos.png;
};
loader = {
systemd-boot = {

4
imports/dwm.nix
View file

@ -18,12 +18,12 @@
};
displayManager = {
sessionCommands = ''
feh --bg-scale ${../images/recursion.png}
feh --bg-scale ${../misc/recursion.png}
'';
defaultSession = "none+dwm";
lightdm = {
enable = true;
background = ../images/recursion.png;
background = ../misc/recursion.png;
extraConfig = "minimum-vt=1";
greeters.mini = {
enable = true;

2
imports/gnome.nix
View file

@ -53,7 +53,7 @@ _: {
lightdm = {
enable = true;
extraConfig = "minimum-vt=1";
background = ../images/recursion.png;
background = ../misc/recursion.png;
greeters.mini = {
enable = true;
user = settings.username;

1
imports/shells.nix
View file

@ -1,5 +1,4 @@
{
nvim-flake,
fetch-rs,
suckless,
...

31
imports/sxhkd.nix
View file

@ -1,31 +0,0 @@
_: {pkgs, ...}: {
environment.systemPackages = [
pkgs.maim #screenshooter
pkgs.brightnessctl #brightness control for laptop
pkgs.playerctl #music control
pkgs.xclip
pkgs.coreutils
];
services.sxhkd = {
enable = true;
keybindings = {
#media keybindings
"XF86AudioPlay" = "playerctl play-pause";
"XF86AudioPause" = "playerctl play-pause";
"XF86AudioStop" = "playerctl stop";
"XF86AudioNext" = "playerctl next";
"XF86AudioPrev" = "playerctl previous";
"XF86AudioRaiseVolume" = "amixer sset Master 40+";
"XF86AudioLowerVolume" = "amixer sset Master 40-";
"XF86AudioMute" = "amixer sset Master toggle ";
"XF86MonBrightnessUp" = "brightnessctl s 20+";
"XF86MonBrightnessDown" = "brightnessctl s 20-";
#screenshot stuff
"Print" = "maim $HOME/Screenshots/$(date +%Y-%m-%d_%H-%m-%s).jpg";
"Print + shift" = "maim | xclip -selection clipboard -t image/png";
"super + Print" = "maim -s $HOME/Screenshots/$(date +%Y-%m-%d_%H-%m-%s).jpg";
"super + Print + shift" = "maim -s | xclip -selection clipboard -t image/png";
};
};
}

2
imports/xfce.nix
View file

@ -21,7 +21,7 @@ _: {
lightdm = {
enable = true;
extraConfig = "minimum-vt=1";
background = ../images/recursion.png;
background = ../misc/recursion.png;
greeters.mini = {
enable = true;
user = settings.username;

0
images/nixos.png → misc/nixos.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 40 KiB

Before After
Before After

0
images/recursion.png → misc/recursion.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8 MiB

After

Width:  |  Height:  |  Size: 8 MiB

Before After
Before After

87
modules/sxhkd.nix
View file

@ -6,61 +6,56 @@ _: {
...
}:
with lib; let
cfg = config.services.sxhkd;
keybindingsStr = concatStringsSep "\n" (mapAttrsToList (hotkey: command:
optionalString (command != null) ''
${hotkey}
${command}
'')
cfg.keybindings);
configFile = pkgs.writeText "sxhkdrc" (concatStringsSep "\n" [keybindingsStr cfg.extraConfig]);
cfg = config.localModules.sxhkd;
keybindingsStr = ''
XF86AudioPlay
playerctl play-pause
XF86AudioPause
playerctl play-pause
XF86AudioStop
playerctl stop
XF86AudioNext
playerctl next
XF86AudioPrev
playerctl previous
XF86AudioRaiseVolume
amixer sset Master 40+
XF86AudioLowerVolume
amixer sset Master 40-
XF86AudioMute
amixer sset Master toggle
XF86MonBrightnessUp
brightnessctl s 20+
XF86MonBrightnessDown
brightnessctl s 20-
Print
maim $HOME/Screenshots/$(date +%Y-%m-%d_%H-%m-%s).jpg
Print + shift
maim | xclip -selection clipboard -t image/png
super + Print
maim -s $HOME/Screenshots/$(date +%Y-%m-%d_%H-%m-%s).jpg
super + Print + shift
maim -s | xclip -selection clipboard -t image/png
'';
configFile = pkgs.writeText "sxhkdrc" keybindingsStr;
in {
options.services.sxhkd = {
options.localModules.sxhkd = {
enable = mkEnableOption "simple X hotkey daemon";
package = mkOption {
type = types.package;
default = pkgs.sxhkd;
defaultText = "pkgs.sxhkd";
description = "Package containing the <command>sxhkd</command> executable.";
};
extraOptions = mkOption {
type = types.listOf types.str;
default = [];
description = "Command line arguments to invoke <command>sxhkd</command> with.";
example = literalExpression ''[ "-m 1" ]'';
};
keybindings = mkOption {
type = types.attrsOf (types.nullOr types.str);
default = {};
description = "An attribute set that assigns hotkeys to commands.";
example = literalExpression ''
{
"super + shift + {r,c}" = "i3-msg {restart,reload}";
"super + {s,w}" = "i3-msg {stacking,tabbed}";
}
'';
};
extraConfig = mkOption {
default = "";
type = types.lines;
description = "Additional configuration to add.";
example = literalExpression ''
super + {_,shift +} {1-9,0}
i3-msg {workspace,move container to workspace} {1-10}
'';
};
};
config = mkIf cfg.enable {
environment.systemPackages = [cfg.package];
environment.systemPackages = [
pkgs.maim #screenshooter
pkgs.brightnessctl #brightness control for laptop
pkgs.playerctl #music control
pkgs.xclip
pkgs.coreutils
];
systemd.user.services.sxhkd = {
description = "sxhkd hotkey daemon";
wantedBy = ["graphical-session.target"];
partOf = ["graphical-session.target"];
serviceConfig = {
ExecStart = "${cfg.package}/bin/sxhkd -c ${configFile} ${toString cfg.extraOptions}";
ExecStart = "${pkgs.sxhkd}/bin/sxhkd -c ${configFile}";
RestartSec = 3;
Restart = "always";
};

1
systems/laptop.nix → systems/game-laptop/default.nix
View file

@ -1,7 +1,6 @@
inputs: {
pkgs,
settings,
lib,
...
}: {
imports = [

30
systems/desktop.nix → systems/gerg-desktop/default.nix
View file

@ -6,21 +6,25 @@ inputs: {
}: {
imports = [
# (import ../imports/boot.nix inputs)
(import ../imports/dwm.nix inputs)
(import ../imports/fonts.nix inputs)
(import ../imports/git.nix inputs)
(import ../imports/packages.nix inputs)
(import ../imports/parrot.nix inputs)
(import ../imports/picom.nix inputs)
(import ../imports/refreshrate.nix inputs)
(import ../imports/shells.nix inputs)
(import ../imports/sxhkd.nix inputs)
(import ../imports/theme.nix inputs)
(import ../imports/vfio.nix inputs)
# (import ../imports/mining.nix inputs)
(import ../imports/spicetify.nix inputs)
(import ../../imports/dwm.nix inputs)
(import ../../imports/fonts.nix inputs)
(import ../../imports/git.nix inputs)
(import ../../imports/packages.nix inputs)
(import ../../imports/parrot.nix inputs)
(import ../../imports/picom.nix inputs)
(import ../../imports/refreshrate.nix inputs)
(import ../../imports/shells.nix inputs)
(import ../../imports/theme.nix inputs)
(import ../../imports/vfio.nix inputs)
# (import ../../imports/mining.nix inputs)
(import ../../imports/spicetify.nix inputs)
];
system.stateVersion = "23.05";
localModules = {
sxhkd.enable = true;
};
environment.systemPackages = with pkgs; [
webcord # talk to people (gross)
bitwarden #store stuff

0
systems/mom.nix → systems/mom-laptop/default.nix
View file