Compare commits
8 commits
c25996ed8f
...
417ef5a746
Author | SHA1 | Date | |
---|---|---|---|
Geoffrey Frogeye | 417ef5a746 | ||
Geoffrey Frogeye | a6f706d088 | ||
Geoffrey Frogeye | c59ee11696 | ||
Geoffrey Frogeye | 88ef6925a4 | ||
Geoffrey Frogeye | 064ff2e9ab | ||
Geoffrey Frogeye | 1840ed67c9 | ||
Geoffrey Frogeye | 405a25e2ab | ||
Geoffrey Frogeye | 8596d5809f |
|
@ -85,7 +85,7 @@ in
|
||||||
mountOptions = [
|
mountOptions = [
|
||||||
"rw"
|
"rw"
|
||||||
"relatime"
|
"relatime"
|
||||||
"stripe=4"
|
# "stripe=4" # For some reason doesn't work on NixOS
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
frogeye = {
|
frogeye = {
|
||||||
desktop = {
|
desktop = {
|
||||||
xorg = true;
|
xorg = true;
|
||||||
x11_screens = [ "HDMI-1-0" "eDP1" ];
|
x11_screens = [ "HDMI-1-0" "eDP-1" ];
|
||||||
maxVideoHeight = 1440;
|
maxVideoHeight = 1440;
|
||||||
numlock = true;
|
numlock = true;
|
||||||
phasesBrightness = {
|
phasesBrightness = {
|
||||||
|
|
|
@ -54,13 +54,13 @@ in
|
||||||
TIME_STYLE = "+%Y-%m-%d %H:%M:%S";
|
TIME_STYLE = "+%Y-%m-%d %H:%M:%S";
|
||||||
# Less colors
|
# Less colors
|
||||||
LESS = "-R";
|
LESS = "-R";
|
||||||
LESS_TERMCAP_mb = "$'\E[1;31m'"; # begin blink
|
LESS_TERMCAP_mb = "$(echo $'\\E[1;31m')"; # begin blink
|
||||||
LESS_TERMCAP_md = "$'\E[1;36m'"; # begin bold
|
LESS_TERMCAP_md = "$(echo $'\\E[1;36m')"; # begin bold
|
||||||
LESS_TERMCAP_me = "$'\E[0m'"; # reset bold/blink
|
LESS_TERMCAP_me = "$(echo $'\\E[0m')"; # reset bold/blink
|
||||||
LESS_TERMCAP_so = "$'\E[01;44;33m'"; # begin reverse video
|
LESS_TERMCAP_so = "$(echo $'\\E[01;44;33m')"; # begin reverse video
|
||||||
LESS_TERMCAP_se = "$'\E[0m'"; # reset reverse video
|
LESS_TERMCAP_se = "$(echo $'\\E[0m')"; # reset reverse video
|
||||||
LESS_TERMCAP_us = "$'\E[1;32m'"; # begin underline
|
LESS_TERMCAP_us = "$(echo $'\\E[1;32m')"; # begin underline
|
||||||
LESS_TERMCAP_ue = "$'\E[0m'"; # reset underline
|
LESS_TERMCAP_ue = "$(echo $'\\E[0m')"; # reset underline
|
||||||
# Fzf
|
# Fzf
|
||||||
FZF_COMPLETION_OPTS = "${lib.strings.concatStringsSep " " config.programs.fzf.fileWidgetOptions}";
|
FZF_COMPLETION_OPTS = "${lib.strings.concatStringsSep " " config.programs.fzf.fileWidgetOptions}";
|
||||||
};
|
};
|
||||||
|
@ -138,7 +138,7 @@ in
|
||||||
# TODO Maybe make nixpkg wrapper instead? So it also works from dmenu
|
# TODO Maybe make nixpkg wrapper instead? So it also works from dmenu
|
||||||
# Could also accept my fate... Home-manager doesn't necessarily make it easy to put things out of the home directory
|
# Could also accept my fate... Home-manager doesn't necessarily make it easy to put things out of the home directory
|
||||||
historySize = 100000;
|
historySize = 100000;
|
||||||
historyFile = "${config.xdg.cacheHome}/shell_history";
|
historyFile = "${config.xdg.stateHome}/shell_history";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
|
@ -79,9 +79,13 @@ in
|
||||||
mode_pres_sec = "Presentation (secondary display)";
|
mode_pres_sec = "Presentation (secondary display)";
|
||||||
mode_screen = "Screen setup [A] Auto [L] Load [S] Save [R] Remove [D] Default";
|
mode_screen = "Screen setup [A] Auto [L] Load [S] Save [R] Remove [D] Default";
|
||||||
mode_temp = "Temperature [R] Red [D] Dust storm [C] Campfire [O] Normal [A] All nighter [B] Blue";
|
mode_temp = "Temperature [R] Red [D] Dust storm [C] Campfire [O] Normal [A] All nighter [B] Blue";
|
||||||
|
fonts = config.stylix.fonts;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
modifier = "Mod4";
|
modifier = "Mod4";
|
||||||
|
fonts = {
|
||||||
|
names = [ fonts.sansSerif.name ];
|
||||||
|
};
|
||||||
terminal = "alacritty";
|
terminal = "alacritty";
|
||||||
colors = let ignore = "#ff00ff"; in
|
colors = let ignore = "#ff00ff"; in
|
||||||
with config.lib.stylix.colors.withHashtag; lib.mkForce {
|
with config.lib.stylix.colors.withHashtag; lib.mkForce {
|
||||||
|
@ -512,7 +516,7 @@ in
|
||||||
autorandr = {
|
autorandr = {
|
||||||
enable = true;
|
enable = true;
|
||||||
hooks.postswitch = {
|
hooks.postswitch = {
|
||||||
background = "${pkgs.feh}/bin/feh --no-fehbg --bg-fill ${config.stylix.image}";
|
background = "${pkgs.feh}/bin/feh --no-fehbg --bg-fill ${config.stylix.image}";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
mpv = {
|
mpv = {
|
||||||
|
@ -583,6 +587,7 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
services = {
|
services = {
|
||||||
|
blueman-applet.enable = true;
|
||||||
unclutter.enable = true;
|
unclutter.enable = true;
|
||||||
dunst =
|
dunst =
|
||||||
{
|
{
|
||||||
|
|
|
@ -19,6 +19,9 @@
|
||||||
# android tools
|
# android tools
|
||||||
android-tools
|
android-tools
|
||||||
|
|
||||||
|
# Communication
|
||||||
|
signal-desktop
|
||||||
|
|
||||||
# downloading
|
# downloading
|
||||||
# transmission TODO Collision if both transmissions are active?
|
# transmission TODO Collision if both transmissions are active?
|
||||||
|
|
||||||
|
|
|
@ -3,16 +3,18 @@
|
||||||
config = lib.mkIf config.frogeye.desktop.xorg {
|
config = lib.mkIf config.frogeye.desktop.xorg {
|
||||||
# Enable the X11 windowing system
|
# Enable the X11 windowing system
|
||||||
|
|
||||||
services.xserver = {
|
services = {
|
||||||
enable = true;
|
blueman.enable = true;
|
||||||
windowManager.i3.enable = true;
|
xserver = {
|
||||||
displayManager.defaultSession = "none+i3";
|
enable = true;
|
||||||
|
windowManager.i3.enable = true;
|
||||||
|
displayManager.defaultSession = "none+i3";
|
||||||
|
|
||||||
# Keyboard layout
|
# Keyboard layout
|
||||||
extraLayouts.qwerty-fr = {
|
extraLayouts.qwerty-fr = {
|
||||||
description = "QWERTY-fr";
|
description = "QWERTY-fr";
|
||||||
languages = [ "fr" ];
|
languages = [ "fr" ];
|
||||||
symbolsFile = "${pkgs.stdenv.mkDerivation {
|
symbolsFile = "${pkgs.stdenv.mkDerivation {
|
||||||
name = "qwerty-fr-keypad";
|
name = "qwerty-fr-keypad";
|
||||||
src = builtins.fetchGit {
|
src = builtins.fetchGit {
|
||||||
url = "https://github.com/qwerty-fr/qwerty-fr.git";
|
url = "https://github.com/qwerty-fr/qwerty-fr.git";
|
||||||
|
@ -27,13 +29,17 @@
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
}}/linux/us_qwerty-fr";
|
}}/linux/us_qwerty-fr";
|
||||||
|
};
|
||||||
|
layout = "qwerty-fr";
|
||||||
};
|
};
|
||||||
layout = "qwerty-fr";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Enable sound
|
# Enable sound & bluetooth
|
||||||
sound.enable = true;
|
sound.enable = true;
|
||||||
hardware.pulseaudio.enable = true;
|
hardware = {
|
||||||
|
bluetooth.enable = true;
|
||||||
|
pulseaudio.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
# UPST
|
# UPST
|
||||||
# TODO Find a way to override packages either at NixOS level or HM level depending on what is used
|
# TODO Find a way to override packages either at NixOS level or HM level depending on what is used
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
#!/usr/bin/env python3
|
#!/usr/bin/env nix-shell
|
||||||
|
#! nix-shell -i python3
|
||||||
|
#! nix-shell -p python3 python3Packages.pyaml
|
||||||
|
|
||||||
"""
|
"""
|
||||||
Exports Wi-Fi networks configuration stored in pass into a format readable by Nix.
|
Exports Wi-Fi networks configuration stored in pass into a format readable by Nix.
|
||||||
|
@ -19,7 +21,7 @@ import yaml
|
||||||
|
|
||||||
# passpy doesn't handle encoding properly, so doing this with calls
|
# passpy doesn't handle encoding properly, so doing this with calls
|
||||||
|
|
||||||
PASSWORD_STORE = os.path.expanduser("~/.password-store")
|
PASSWORD_STORE = os.path.expanduser("~/.local/share/pass")
|
||||||
SUBFOLDER = "wifi"
|
SUBFOLDER = "wifi"
|
||||||
SEPARATE_PASSWORDS = False
|
SEPARATE_PASSWORDS = False
|
||||||
# TODO Find a way to make then env file available at whatever time it is needed
|
# TODO Find a way to make then env file available at whatever time it is needed
|
||||||
|
|
Loading…
Reference in a new issue