diff --git a/configuration.nix b/configuration.nix index 6dcfaa0..314b7fb 100644 --- a/configuration.nix +++ b/configuration.nix @@ -13,35 +13,35 @@ ./fonts.nix ]; - nix = { - daemonNiceLevel = 5; - daemonIONiceLevel = 1; - autoOptimiseStore = true; - gc = { - automatic = true; - dates = "00:00"; - options = "--delete-older-than 14d"; + nix = { + daemonNiceLevel = 5; + daemonIONiceLevel = 1; + autoOptimiseStore = true; + gc = { + automatic = true; + dates = "00:00"; + options = "--delete-older-than 14d"; + }; + trustedUsers = [ "artemis" ]; }; - trustedUsers = [ "artemis" ]; - }; - console = { - keyMap = "us"; - earlySetup = true; - }; + console = { + keyMap = "us"; + earlySetup = true; + }; - i18n.defaultLocale = "de_DE.UTF-8"; + i18n.defaultLocale = "de_DE.UTF-8"; - nixpkgs = { - config.allowUnfree = true; - }; + nixpkgs = { + config.allowUnfree = true; + }; - time.timeZone = "Etc/UTC"; + time.timeZone = "Etc/UTC"; - environment = { - variables = { - EDITOR = "nvim"; - TERMINAL = "alacritty"; + environment = { + variables = { + EDITOR = "nvim"; + TERMINAL = "alacritty"; # for Sway MOZ_USE_XINPUT2 = "1"; @@ -92,9 +92,16 @@ user = "artemis"; dataDir = "/home/artemis"; }; + udev.packages = [ pkgs.openocd ]; printing = { enable = true; - drivers = with pkgs; [ brlaser ]; + drivers = [ (pkgs.brlaser.overrideAttrs (old: { + patches = [ (pkgs.fetchpatch { + name = "l2300d-fix.patch"; + url = "https://patch-diff.githubusercontent.com/raw/pdewacht/brlaser/pull/68.patch"; + sha256 = "07iqv048q0iplghn0aamjslyixw1p5jbk004i20xnl1vs95nyqzy"; + }) ]; + })) ]; }; }; xdg.portal = { diff --git a/packages.nix b/packages.nix index df5b4c3..d4d0590 100644 --- a/packages.nix +++ b/packages.nix @@ -2,14 +2,7 @@ let llvm = pkgs.llvmPackages_10; - go = pkgs.go_1_14; - unwrappedFirefox = pkgs.firefox-bin-unwrapped.override { systemLocale = "de-DE"; }; - fullFirefox = (pkgs.wrapFirefox unwrappedFirefox { - browserName = "firefox"; - desktopName = "Firefox"; - forceWayland = true; - pname = "firefox-bin"; - }); + go = pkgs.go_1_15; in { environment.systemPackages = (with pkgs; [ @@ -51,11 +44,9 @@ in # Virtualization docker-compose - gnome3.gnome-boxes qemu # Linux tools - cachix dmidecode efibootmgr efitools @@ -102,7 +93,7 @@ in xsettingsd # Useful CLI tools - (callPackage ./externals/packages/borgmatic/requirements.nix {}).packages.borgmatic + # (callPackage ./externals/packages/borgmatic/requirements.nix {}).packages.borgmatic age appimage-run bat @@ -123,6 +114,7 @@ in neovim nix-index openssl + p7zip pandoc parallel pciutils @@ -185,16 +177,9 @@ in vscode yarn - # Hardware - arachne-pnr - eagle - icestorm + # Embedded kicad - nextpnr - tinyprog - verilator - verilog - yosys + openocd # Radio gr-limesdr @@ -222,11 +207,6 @@ in yubikey-manager yubioath-desktop - # Syncing - dropbox - syncthing-cli - syncthing-gtk - # GUI tools alacritty evince @@ -238,8 +218,7 @@ in # Web chromium - fullFirefox - tor-browser-bundle-bin + firefox-wayland # Communication discord diff --git a/private b/private index 3438df0..f12ddf8 160000 --- a/private +++ b/private @@ -1 +1 @@ -Subproject commit 3438df01384ba25989ad720b2b703acf408ad949 +Subproject commit f12ddf899e104e1203e29880a0d2cb9172183edb diff --git a/system/starlight/default.nix b/system/starlight/default.nix index 5cf180c..39f2636 100644 --- a/system/starlight/default.nix +++ b/system/starlight/default.nix @@ -18,6 +18,8 @@ }; }; + boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; + environment.systemPackages = with pkgs; [ steam