diff --git a/flake.lock b/flake.lock index 4f2cd86..8b5752a 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1659853578, - "narHash": "sha256-W9j4Pur9til2lB2XD/aHAm8yen2hqbs3Os19OxM4aJM=", + "lastModified": 1659940224, + "narHash": "sha256-FZRcZu4eOz3WCe/RroMFPfvZmje83zKYlY+mydXjAJQ=", "owner": "nix-community", "repo": "fenix", - "rev": "b94c35e0d375540691411639458c21dd508ef3ed", + "rev": "cfcc0eb48484890882e83372db1d5fdc6a0e0f67", "type": "github" }, "original": { @@ -43,11 +43,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1656928814, - "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { @@ -94,11 +94,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1659782844, - "narHash": "sha256-tM/qhHFE61puBxh9ebP3BIG1fkRAT4rHqD3jCM0HXGY=", + "lastModified": 1659931296, + "narHash": "sha256-MYLvZ1pN2DC79uYoPAoqs7PT5jLaA/I0vTtUUyhdE44=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c85e56bb060291eac3fb3c75d4e0e64f6836fcfe", + "rev": "053fb00690945ab06650c4508b98659c6a2343b6", "type": "github" }, "original": { @@ -124,11 +124,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1659713809, - "narHash": "sha256-M4aHuXXVnfprM8xPH2lLkYkkR0fmaG5QmvIc0DT/d4E=", + "lastModified": 1659889440, + "narHash": "sha256-O8+FsHZzQIqjQjuh+VXbJtGrpPswm5ta2Z/eo72Lz2U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "93c57a988470c1948976b1bb70abbd5855c5b810", + "rev": "4bdf4169ad2896236895ca607a843f30c9680345", "type": "github" }, "original": { @@ -140,11 +140,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1659768833, - "narHash": "sha256-G1T3le1SfZ0AIsWu4SnWr46A34OEiwFcHDKWHtBfBtg=", + "lastModified": 1659859897, + "narHash": "sha256-jAppjCqvzi5O1ODp8K8p4Kql1YgtnAnO3iAsbW3622U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "72f492e275fc29d44b3a4daf952fbeffc4aed5b8", + "rev": "3c8a5fa9a699d6910bbe70490918f1a4adc1e462", "type": "github" }, "original": { @@ -167,11 +167,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1659798150, - "narHash": "sha256-jx1faxOzIPf/kxafSqNVE5qBA6ioyUiynCKMpY7rlz4=", + "lastModified": 1659862223, + "narHash": "sha256-+VlLW8nru2hhd/sRUT0lBHZMMgAa/LDcdOF59nXFnAA=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "d9e462fd97fe56a63da62d11bb5c4d2132e4c74a", + "rev": "634cfe3d72e785c843ca5d412b12be137b2e14fb", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d78e4fd..3544791 100644 --- a/flake.nix +++ b/flake.nix @@ -36,8 +36,6 @@ ./hosts/microwave ./modules/basic-tools.nix ./modules/binary-caches.nix - ./modules/chromium.nix - ./modules/emacs.nix ./modules/gnupg.nix ./modules/graphical.nix ./modules/hw-accel-intel.nix diff --git a/hosts/microwave/configuration.nix b/hosts/microwave/configuration.nix index c3814a5..4197c9f 100644 --- a/hosts/microwave/configuration.nix +++ b/hosts/microwave/configuration.nix @@ -19,6 +19,7 @@ gimp inkscape element-desktop-wayland + factorio ]; diff --git a/modules/basic-tools.nix b/modules/basic-tools.nix index ee970dc..05fd298 100644 --- a/modules/basic-tools.nix +++ b/modules/basic-tools.nix @@ -55,10 +55,10 @@ ll = "lsd -lah"; lt = "lsd --tree"; vim = "nvim"; - vi = "nvim"; vf = "$EDITOR $(fzf)"; vff = "$EDITOR $(ls|fzf)"; mutt = "neomutt"; + grep = "grep --color=auto"; }; users.defaultUserShell = pkgs.zsh; @@ -70,10 +70,7 @@ bindkey -e ''; promptInit = '' - source /run/current-system/sw/share/zsh/plugins/liquidprompt/liquidprompt - if [[ -n "$IN_NIX_SHELL" ]]; then - prompt_tag "(nix-shell)" - fi + source /run/current-system/sw/share/zsh/plugins/liquidprompt/liquidprompt ''; }; diff --git a/modules/graphical.nix b/modules/graphical.nix index 64cd881..817fbd2 100644 --- a/modules/graphical.nix +++ b/modules/graphical.nix @@ -21,6 +21,7 @@ nextcloud-client foot qt5.qtwayland + bashmount ]; #on the desktop, we need nice fonts ^^