Compare commits

...

10 Commits

6 changed files with 40 additions and 19 deletions

View File

@ -1,8 +1,8 @@
{ config, lib, pkgs, modulesPath, ... }: { config, lib, pkgs, modulesPath, ... }:
let systemInformation = import ../system/system-information.nix; in let systemInformation = import ../system/system-information.nix; in
{ {
boot.tmpOnTmpfs = true; boot.tmp.useTmpfs = true;
boot.tmpOnTmpfsSize = "75%"; boot.tmp.tmpfsSize = "75%";
boot.initrd.luks.devices = { boot.initrd.luks.devices = {
cryptoroot = { cryptoroot = {
device = systemInformation.rootPartition; device = systemInformation.rootPartition;

View File

@ -23,7 +23,7 @@
bubblewrap bubblewrap
termdown termdown
youtube-dl youtube-dl
magic-wormhole magic-wormhole-rs
] ++ (import ../system/home-manager.nix).extraPackages pkgs; ] ++ (import ../system/home-manager.nix).extraPackages pkgs;
editorconfig = { editorconfig = {
enable = true; enable = true;
@ -39,7 +39,7 @@
settings."{*.{md,gmi,adoc},COMMIT_EDITMSG}" = { settings."{*.{md,gmi,adoc},COMMIT_EDITMSG}" = {
max_line_length = 0; max_line_length = 0;
}; };
settings."*.{elm,lisp,yml,purs}" = { settings."*.{elm,lisp,yml,purs,hs}" = {
indent_style = "space"; indent_style = "space";
indent_size = 2; indent_size = 2;
}; };

View File

@ -18,7 +18,7 @@ if exists("syntax_on")
syntax reset syntax reset
endif endif
hi Normal guibg=#201b27 hi Normal guifg=#ffffff guibg=#201b27
hi Comment guifg=#91889b hi Comment guifg=#91889b
hi Constant guifg=#ffe261 hi Constant guifg=#ffe261
hi String guifg=#acdfef hi String guifg=#acdfef

View File

@ -9,6 +9,7 @@ let paths = [
"**/.clj-kondo/" "**/.clj-kondo/"
"**/.lsp/" "**/.lsp/"
"**/target/" "**/target/"
"/home/ember/Audiobooks/"
"/home/ember/.cabal/" "/home/ember/.cabal/"
"/home/ember/.cache/" "/home/ember/.cache/"
"/home/ember/.clojure/" "/home/ember/.clojure/"
@ -19,10 +20,14 @@ let paths = [
"/home/ember/.config/archivewebpage/**/Cache*/" "/home/ember/.config/archivewebpage/**/Cache*/"
"/home/ember/.ghcup/" "/home/ember/.ghcup/"
"/home/ember/.lein" "/home/ember/.lein"
"/home/ember/.local/share/gnome-boxes/"
"/home/ember/.local/share/gvfs-metadata/" "/home/ember/.local/share/gvfs-metadata/"
"/home/ember/.local/share/lutris/"
"/home/ember/.local/share/tts/"
"/home/ember/.m2/" "/home/ember/.m2/"
"/home/ember/.mozilla" "/home/ember/.mozilla"
"/home/ember/.npm/" "/home/ember/.npm/"
"/home/ember/.opam/"
"/home/ember/.pki/" "/home/ember/.pki/"
"/home/ember/.pub-cache/" "/home/ember/.pub-cache/"
"/home/ember/.rustup/" "/home/ember/.rustup/"
@ -33,6 +38,7 @@ let paths = [
"/home/ember/.var/app/org.gnome.Geary/data/" "/home/ember/.var/app/org.gnome.Geary/data/"
"/home/ember/.var/app/app.organicmaps.desktop/" "/home/ember/.var/app/app.organicmaps.desktop/"
"/home/ember/.var/app/com.valvesoftware.Steam/" "/home/ember/.var/app/com.valvesoftware.Steam/"
"/home/ember/.var/app/org.gnome.Boxes/"
"/home/ember/.var/app/org.gnome.Lollypop" "/home/ember/.var/app/org.gnome.Lollypop"
"/home/ember/.var/app/org.gnome.Podcasts/cache/" "/home/ember/.var/app/org.gnome.Podcasts/cache/"
"/home/ember/.var/app/org.gnome.Podcasts/data/" "/home/ember/.var/app/org.gnome.Podcasts/data/"
@ -43,9 +49,11 @@ let paths = [
"/home/ember/.local/state/wireplumber/" "/home/ember/.local/state/wireplumber/"
"/home/ember/.local/lib/" "/home/ember/.local/lib/"
"/home/ember/.TinyTeX/" "/home/ember/.TinyTeX/"
"/home/ember/.wine/"
"/home/ember/Development/mystic-stack/**/data/" "/home/ember/Development/mystic-stack/**/data/"
"/home/ember/Annex" "/home/ember/Annex"
"/home/ember/Temp" "/home/ember/Temp"
"/home/ember/Torrents"
]; ];
in in
builtins.toFile "excludes.txt" (builtins.concatStringsSep "\n" paths) builtins.toFile "excludes.txt" (builtins.concatStringsSep "\n" paths)

View File

@ -98,11 +98,12 @@ let systemInformation = import ./system/system-information.nix; in
uid = 1312; uid = 1312;
isNormalUser = true; isNormalUser = true;
description = "Ember"; description = "Ember";
extraGroups = [ "networkmanager" "wheel" ]; extraGroups = [ "networkmanager" "wheel" "dialout"];
shell = pkgs.fish; shell = pkgs.fish;
openssh.authorizedKeys.keys = import ./configs/programs/ssh/authorizedKeys.nix; openssh.authorizedKeys.keys = import ./configs/programs/ssh/authorizedKeys.nix;
}; };
home-manager.users.ember = import ./configs/home.full.nix; home-manager.users.ember = import ./configs/home.full.nix;
programs.fish.enable = true;
# Allow unfree packages # Allow unfree packages
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
@ -128,15 +129,23 @@ let systemInformation = import ./system/system-information.nix; in
gnome-software gnome-software
gnome-music gnome-music
gedit gedit
geary
totem totem
]; ];
fonts.fonts = with pkgs; with import packages/all-packages.nix nixpkgs; [ fonts = {
justseeds fonts = with pkgs; with import packages/all-packages.nix nixpkgs; [
manrope justseeds
google-fonts manrope
comic-mono google-fonts
]; comic-mono
atkinson-hyperlegible
];
fontDir.enable = true;
enableDefaultFonts = true;
fontconfig.defaultFonts = {
sansSerif = ["Atkinson Hyperlegible"];
monospace = ["Comic Mono:style=Normal"];
};
};
# List services that you want to enable: # List services that you want to enable:
@ -170,7 +179,7 @@ let systemInformation = import ./system/system-information.nix; in
openssh = { openssh = {
# Disable by default # Disable by default
banner = "Welcome to ${systemInformation.prettyHostname}!\n"; banner = "Welcome to ${systemInformation.prettyHostname}!\n";
passwordAuthentication = false; settings.PasswordAuthentication = false;
}; };
}; };
@ -213,8 +222,13 @@ let systemInformation = import ./system/system-information.nix; in
hardware.cpu.intel.updateMicrocode = systemInformation.isIntel; hardware.cpu.intel.updateMicrocode = systemInformation.isIntel;
hardware.cpu.amd.updateMicrocode = systemInformation.isAmd; hardware.cpu.amd.updateMicrocode = systemInformation.isAmd;
# high-resolution display
hardware.video.hidpi.enable = systemInformation.isHiDPI;
nix.settings.auto-optimise-store = true; nix.settings.auto-optimise-store = true;
nix.settings.experimental-features = ["nix-command" "flakes"];
# Needed for Gnome Boxes
virtualisation.libvirtd.enable = true;
virtualisation.spiceUSBRedirection.enable = true;
# Needed for Anbox
virtualisation.waydroid.enable = true;
} }

View File

@ -6,7 +6,6 @@
swapPartition = "/dev/disk/by-uuid/6144d426-6c5f-4a8a-ac16-d4d5eecbf7a0"; swapPartition = "/dev/disk/by-uuid/6144d426-6c5f-4a8a-ac16-d4d5eecbf7a0";
efiPartition = "/dev/disk/by-uuid/E5A8-38EA"; efiPartition = "/dev/disk/by-uuid/E5A8-38EA";
isHiDPI = true;
isIntel = true; isIntel = true;
isAmd = false; isAmd = false;
} }