nix #11

Manually merged
geoffrey merged 113 commits from nix into main 2023-12-09 21:43:01 +01:00
7 changed files with 48 additions and 13 deletions
Showing only changes of commit 9243536c5f - Show all commits

View file

@ -1,7 +1,4 @@
{ pkgs, config, ... }: { pkgs, config, ... }:
let
gnupghome = "${config.xdg.dataHome}/gnupg";
in
{ {
home.stateVersion = "23.05"; home.stateVersion = "23.05";
@ -22,7 +19,7 @@ in
}; };
gpg = { gpg = {
enable = true; enable = true;
homedir = gnupghome; homedir = "${config.xdg.dataHome}/gnupg";
settings = { settings = {
# Remove fluff # Remove fluff
no-greeting = true; no-greeting = true;

View file

@ -1,6 +1,19 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
xsession.windowManager.i3.enable = true; xsession.windowManager.i3 = {
enable = true;
config = {
terminal = "alacritty";
};
};
programs = {
# Browser
qutebrowser.enable = true;
# Terminal
alacritty.enable = true;
};
home.packages = with pkgs; [ home.packages = with pkgs; [
# remote # remote
@ -24,7 +37,6 @@
# browsers # browsers
firefox firefox
qutebrowser
# fonts # fonts
dejavu_fonts dejavu_fonts
@ -61,10 +73,10 @@
xorg.xinit xorg.xinit
xorg.xbacklight xorg.xbacklight
alacritty
# organisation # organisation
rofi-pass # TODO Try autopass.cr rofi-pass # TODO Try autopass.cr
thunderbird thunderbird
]; ];
} }

View file

@ -2,8 +2,9 @@
{ {
imports = [ imports = [
./common.nix ./common.nix
./desktop.nix
./dev.nix ./dev.nix
./extra.nix ./extra.nix
./desktop.nix ./style.nix
]; ];
} }

22
config/nix/hm/style.nix Normal file
View file

@ -0,0 +1,22 @@
{ pkgs, config, ... }:
let
stylix = builtins.fetchGit {
url = "https://github.com/danth/stylix.git";
ref = "release-23.05";
};
in
{
imports = [ (import stylix).homeManagerModules.stylix ];
stylix = {
base16Scheme = "${pkgs.base16-schemes}/share/themes/solarized-dark.yaml";
image = builtins.fetchurl {
url = "https://get.wallhere.com/photo/sunlight-abstract-minimalism-green-simple-circle-light-leaf-wave-material-line-wing-computer-wallpaper-font-close-up-macro-photography-124350.png";
sha256 = "sha256:1zfq3f3v34i45mi72pkfqphm8kbhczsg260xjfl6dbydy91d7y93";
};
# FIXME This doesn't work
};
# Fix https://nix-community.github.io/home-manager/index.html#_why_do_i_get_an_error_message_about_literal_ca_desrt_dconf_literal_or_literal_dconf_service_literal
home.packages = [ pkgs.dconf ];
}

View file

@ -43,7 +43,6 @@
services = { services = {
# Enable the OpenSSH daemon # Enable the OpenSSH daemon
openssh.enable = true; openssh.enable = true;
getty.autologinUser = "geoffrey"; # DEBUG
# Time sychronisation # Time sychronisation
chrony = { chrony = {

View file

@ -4,6 +4,11 @@
services.xserver.enable = true; services.xserver.enable = true;
services.xserver = { services.xserver = {
windowManager.i3.enable = true;
desktopManager.gnome.enable = true;
displayManager.defaultSession = "none+i3";
# Keyboard layout
extraLayouts.qwerty-fr = { extraLayouts.qwerty-fr = {
description = "QWERTY-fr"; description = "QWERTY-fr";
languages = [ "fr" ]; languages = [ "fr" ];
@ -30,7 +35,4 @@
sound.enable = true; sound.enable = true;
hardware.pulseaudio.enable = true; hardware.pulseaudio.enable = true;
environment.systemPackages = with pkgs; [ pavucontrol ]; environment.systemPackages = with pkgs; [ pavucontrol ];
services.xserver.displayManager.startx.enable = true;
} }

View file

@ -9,7 +9,6 @@
extraGroups = [ "wheel" ]; # Enable sudo for the user. extraGroups = [ "wheel" ]; # Enable sudo for the user.
shell = pkgs.zsh; shell = pkgs.zsh;
initialPassword = "cartable"; # DEBUG
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPE41gxrO8oZ5n3saapSwZDViOQphm6RzqgsBUyA88pU geoffrey@frogeye.fr" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPE41gxrO8oZ5n3saapSwZDViOQphm6RzqgsBUyA88pU geoffrey@frogeye.fr"
]; ];
@ -30,4 +29,7 @@
# Adds consistency # Adds consistency
useGlobalPkgs = true; useGlobalPkgs = true;
}; };
# FIXME Make sure I'm the only user & everything is encrypted
services.xserver.displayManager.autoLogin.user = "geoffrey";
} }