From c5e3e39e97b62d0ff784cb3a157e6e931b84d832 Mon Sep 17 00:00:00 2001 From: Matei Adriel Date: Sun, 21 Nov 2021 13:55:12 +0200 Subject: [PATCH] feat: final commit before major rewrite --- default.nix | 4 ++-- modules/applications/misc.nix | 4 ++++ modules/dev/purescript.nix | 2 ++ modules/xserver.nix | 8 +++++--- nix/sources.json | 24 ++++++++++++------------ 5 files changed, 25 insertions(+), 17 deletions(-) diff --git a/default.nix b/default.nix index 54773b8..701306d 100644 --- a/default.nix +++ b/default.nix @@ -3,8 +3,8 @@ let sources = import ./nix/sources.nix; in { imports = [ "${sources.home-manager}/nixos" ./modules ]; + nixpkgs.config.allowBroken = true; boot.loader.systemd-boot.enable = true; - # boot.loader.efi.canTouchEfiVariables = true; boot.loader = { efi = { @@ -91,7 +91,7 @@ in { # Install.WantedBy = [ "default.target" ]; # }; - system.stateVersion = "20.03"; + system.stateVersion = "21.05"; } diff --git a/modules/applications/misc.nix b/modules/applications/misc.nix index cb8a02b..612e629 100644 --- a/modules/applications/misc.nix +++ b/modules/applications/misc.nix @@ -28,6 +28,7 @@ okular zathura cmake + kdeconnect # editors # vscodium @@ -68,5 +69,8 @@ # zsnes # higan # fceux + + # games + mindustry ]; } diff --git a/modules/dev/purescript.nix b/modules/dev/purescript.nix index d0be113..45c493c 100644 --- a/modules/dev/purescript.nix +++ b/modules/dev/purescript.nix @@ -6,5 +6,7 @@ pscid pulp zephyr + psa + purs-tidy ]; } diff --git a/modules/xserver.nix b/modules/xserver.nix index 46d3e97..c3d6394 100644 --- a/modules/xserver.nix +++ b/modules/xserver.nix @@ -12,10 +12,12 @@ # Enable touchpad support. enable = true; - naturalScrolling = true; - accelSpeed = "3.5"; + touchpad = { + naturalScrolling = true; + accelSpeed = "3.5"; - tappingDragLock = false; + tappingDragLock = false; + }; }; }; diff --git a/nix/sources.json b/nix/sources.json index 7e07a50..842e1a3 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -5,10 +5,10 @@ "homepage": "", "owner": "nix-community", "repo": "NUR", - "rev": "cfe9e2e5ae53250337b0ffb3f39b477ca09cd232", - "sha256": "1zr8mcxp6gpiv7hy7g94giry0gfak8rbvmsi4f8vrry0jvvhp8x7", + "rev": "a6d41ad68b659457e0dea467479ea5e617f83786", + "sha256": "1j12bccakyz00vlac7qjpl0bd7il6rgw48yzc014pji03alhh4y7", "type": "tarball", - "url": "https://github.com/nix-community/NUR/archive/cfe9e2e5ae53250337b0ffb3f39b477ca09cd232.tar.gz", + "url": "https://github.com/nix-community/NUR/archive/a6d41ad68b659457e0dea467479ea5e617f83786.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "agnoster": { @@ -53,10 +53,10 @@ "homepage": "", "owner": "justinwoo", "repo": "easy-dhall-nix", - "rev": "1f6eecab5c276a59858a10bbfcbbc5611187da03", - "sha256": "07n7y93xfiwr82yx2v8r5mxcafsxgs1hdl1ghq6xah5v827fb6q0", + "rev": "9bd1bea0dcebe1d1d120c0fd1ba76683dc4a62e3", + "sha256": "1gdx1iqhr3ih3f2v304yjnpjqydpl0x4ngrg58qa4x5wlcr5rdhl", "type": "tarball", - "url": "https://github.com/justinwoo/easy-dhall-nix/archive/1f6eecab5c276a59858a10bbfcbbc5611187da03.tar.gz", + "url": "https://github.com/justinwoo/easy-dhall-nix/archive/9bd1bea0dcebe1d1d120c0fd1ba76683dc4a62e3.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "easy-purescript-nix": { @@ -65,10 +65,10 @@ "homepage": "", "owner": "justinwoo", "repo": "easy-purescript-nix", - "rev": "47bdc016c7d56e987ca1aca690b1d6c9816a8584", - "sha256": "051fzxd03y0c63sll2bhn0h66dywy9lw6ylyh5vq8fymvix20q94", + "rev": "eb64583e3e15749b3ae56573b2aebbaa9cbab4eb", + "sha256": "0hr7smk7avdgc5nm1r3drq91j1hf8wimp7sg747832345c8vq19a", "type": "tarball", - "url": "https://github.com/justinwoo/easy-purescript-nix/archive/47bdc016c7d56e987ca1aca690b1d6c9816a8584.tar.gz", + "url": "https://github.com/justinwoo/easy-purescript-nix/archive/eb64583e3e15749b3ae56573b2aebbaa9cbab4eb.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "home-manager": { @@ -113,10 +113,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7e567a3d092b7de69cdf5deaeb8d9526de230916", - "sha256": "0gnbxg435pnp727gbakifqkjnf2pm7qsq2b6767rj4si4w60v96v", + "rev": "fe01052444c1d66ed6ef76df2af798c9769e9e79", + "sha256": "0z99hwxgrvlf0psicwd97kdqqcc3qngfzmcz7k68q6q868y8582y", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/7e567a3d092b7de69cdf5deaeb8d9526de230916.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/fe01052444c1d66ed6ef76df2af798c9769e9e79.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "snack": {