Compare commits
No commits in common. "417ef5a74603f87a0c5641c77420fd62a3e605f1" and "c25996ed8f74d564307c32c124c3432904f1213a" have entirely different histories.
417ef5a746
...
c25996ed8f
|
@ -85,7 +85,7 @@ in
|
|||
mountOptions = [
|
||||
"rw"
|
||||
"relatime"
|
||||
# "stripe=4" # For some reason doesn't work on NixOS
|
||||
"stripe=4"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
frogeye = {
|
||||
desktop = {
|
||||
xorg = true;
|
||||
x11_screens = [ "HDMI-1-0" "eDP-1" ];
|
||||
x11_screens = [ "HDMI-1-0" "eDP1" ];
|
||||
maxVideoHeight = 1440;
|
||||
numlock = true;
|
||||
phasesBrightness = {
|
||||
|
|
|
@ -54,13 +54,13 @@ in
|
|||
TIME_STYLE = "+%Y-%m-%d %H:%M:%S";
|
||||
# Less colors
|
||||
LESS = "-R";
|
||||
LESS_TERMCAP_mb = "$(echo $'\\E[1;31m')"; # begin blink
|
||||
LESS_TERMCAP_md = "$(echo $'\\E[1;36m')"; # begin bold
|
||||
LESS_TERMCAP_me = "$(echo $'\\E[0m')"; # reset bold/blink
|
||||
LESS_TERMCAP_so = "$(echo $'\\E[01;44;33m')"; # begin reverse video
|
||||
LESS_TERMCAP_se = "$(echo $'\\E[0m')"; # reset reverse video
|
||||
LESS_TERMCAP_us = "$(echo $'\\E[1;32m')"; # begin underline
|
||||
LESS_TERMCAP_ue = "$(echo $'\\E[0m')"; # reset underline
|
||||
LESS_TERMCAP_mb = "$'\E[1;31m'"; # begin blink
|
||||
LESS_TERMCAP_md = "$'\E[1;36m'"; # begin bold
|
||||
LESS_TERMCAP_me = "$'\E[0m'"; # reset bold/blink
|
||||
LESS_TERMCAP_so = "$'\E[01;44;33m'"; # begin reverse video
|
||||
LESS_TERMCAP_se = "$'\E[0m'"; # reset reverse video
|
||||
LESS_TERMCAP_us = "$'\E[1;32m'"; # begin underline
|
||||
LESS_TERMCAP_ue = "$'\E[0m'"; # reset underline
|
||||
# Fzf
|
||||
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
|
||||
# Could also accept my fate... Home-manager doesn't necessarily make it easy to put things out of the home directory
|
||||
historySize = 100000;
|
||||
historyFile = "${config.xdg.stateHome}/shell_history";
|
||||
historyFile = "${config.xdg.cacheHome}/shell_history";
|
||||
in
|
||||
{
|
||||
|
||||
|
|
|
@ -79,13 +79,9 @@ in
|
|||
mode_pres_sec = "Presentation (secondary display)";
|
||||
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";
|
||||
fonts = config.stylix.fonts;
|
||||
in
|
||||
{
|
||||
modifier = "Mod4";
|
||||
fonts = {
|
||||
names = [ fonts.sansSerif.name ];
|
||||
};
|
||||
terminal = "alacritty";
|
||||
colors = let ignore = "#ff00ff"; in
|
||||
with config.lib.stylix.colors.withHashtag; lib.mkForce {
|
||||
|
@ -587,7 +583,6 @@ in
|
|||
};
|
||||
};
|
||||
services = {
|
||||
blueman-applet.enable = true;
|
||||
unclutter.enable = true;
|
||||
dunst =
|
||||
{
|
||||
|
|
|
@ -19,9 +19,6 @@
|
|||
# android tools
|
||||
android-tools
|
||||
|
||||
# Communication
|
||||
signal-desktop
|
||||
|
||||
# downloading
|
||||
# transmission TODO Collision if both transmissions are active?
|
||||
|
||||
|
|
|
@ -3,9 +3,7 @@
|
|||
config = lib.mkIf config.frogeye.desktop.xorg {
|
||||
# Enable the X11 windowing system
|
||||
|
||||
services = {
|
||||
blueman.enable = true;
|
||||
xserver = {
|
||||
services.xserver = {
|
||||
enable = true;
|
||||
windowManager.i3.enable = true;
|
||||
displayManager.defaultSession = "none+i3";
|
||||
|
@ -32,14 +30,10 @@
|
|||
};
|
||||
layout = "qwerty-fr";
|
||||
};
|
||||
};
|
||||
|
||||
# Enable sound & bluetooth
|
||||
# Enable sound
|
||||
sound.enable = true;
|
||||
hardware = {
|
||||
bluetooth.enable = true;
|
||||
pulseaudio.enable = true;
|
||||
};
|
||||
hardware.pulseaudio.enable = true;
|
||||
|
||||
# UPST
|
||||
# TODO Find a way to override packages either at NixOS level or HM level depending on what is used
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -i python3
|
||||
#! nix-shell -p python3 python3Packages.pyaml
|
||||
#!/usr/bin/env python3
|
||||
|
||||
"""
|
||||
Exports Wi-Fi networks configuration stored in pass into a format readable by Nix.
|
||||
|
@ -21,7 +19,7 @@ import yaml
|
|||
|
||||
# passpy doesn't handle encoding properly, so doing this with calls
|
||||
|
||||
PASSWORD_STORE = os.path.expanduser("~/.local/share/pass")
|
||||
PASSWORD_STORE = os.path.expanduser("~/.password-store")
|
||||
SUBFOLDER = "wifi"
|
||||
SEPARATE_PASSWORDS = False
|
||||
# TODO Find a way to make then env file available at whatever time it is needed
|
||||
|
|
Loading…
Reference in a new issue