diff options
| -rw-r--r-- | flake.lock | 98 | ||||
| -rw-r--r-- | flake.nix | 6 | ||||
| -rw-r--r-- | hosts/microwave/configuration.nix | 1 | ||||
| -rw-r--r-- | modules/sway.nix | 1 |
4 files changed, 27 insertions, 79 deletions
@@ -1,24 +1,5 @@ { "nodes": { - "emacs-overlay": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1669290739, - "narHash": "sha256-0QT6o7lv4UZDR3qaneCsN51erLFpLhsTVrYJLv9JDlE=", - "owner": "nix-community", - "repo": "emacs-overlay", - "rev": "fa293d98210547e943c1e64df8d0e0aa24174eab", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "emacs-overlay", - "type": "github" - } - }, "fenix": { "inputs": { "nixpkgs": [ @@ -27,11 +8,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1669271123, - "narHash": "sha256-Ak8fAoNvpkw3NloGt3q+te0VFoeCj1HvHTG5v42ttrg=", + "lastModified": 1669443859, + "narHash": "sha256-LwFb2WmvGE+gwI2DBNNjNB/9xbrvXlfTMsVsrFaxB5U=", "owner": "nix-community", "repo": "fenix", - "rev": "50e42c7e4495a8a26a3373c3a0b0e9e4e8c0f799", + "rev": "684adee4d90fdd48994fd52a6ce145f89411173f", "type": "github" }, "original": { @@ -57,21 +38,6 @@ }, "flake-utils_2": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", @@ -87,17 +53,17 @@ }, "microvm": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1668998330, - "narHash": "sha256-kJu7lwmNBQqIcM/vhlFDkByC0VF4vwLjVeg+E9aWlyc=", + "lastModified": 1669306943, + "narHash": "sha256-F6xVWFJkcCXp5IcnpRlECT10H2ps8RO1yM4W0OXiXPs=", "owner": "astro", "repo": "microvm.nix", - "rev": "682b1e76e7fefdf350f3dc9e84002a8488e2b86d", + "rev": "c21a70fe1ac05ccdfceff6506625e9d44cd91da5", "type": "github" }, "original": { @@ -108,15 +74,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1669152211, - "narHash": "sha256-mBLiTNTzrtlYPHF0bL8NeGA4n8K5b35fYVdqaTIIkgc=", - "path": "/nix/store/qpqssbnnsf84lzm72hg2bgcsd457cqv4-source", - "rev": "56ca700ceabcfa15396bcf581a1296e8e27ad677", - "type": "path" + "lastModified": 1669378442, + "narHash": "sha256-nm+4PN0A4SnV0SzEchxrMyKPvI3Ld/aoom4PnHeHucs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0faaf0a9bb6dedb69bfd43ac06fb27fadc476c51", + "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-22.05", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-22_05": { @@ -137,11 +106,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1669140675, - "narHash": "sha256-npzfyfLECsJWgzK/M4gWhykP2DNAJTYjgY2BWkz/oEQ=", + "lastModified": 1669320964, + "narHash": "sha256-EBFw+ge12Pcr3qCk8If3/eMBAoQLR7ytndXZoRevUtM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2788904d26dda6cfa1921c5abb7a2466ffe3cb8c", + "rev": "27ccd29078f974ddbdd7edc8e38c8c8ae003c877", "type": "github" }, "original": { @@ -151,29 +120,12 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1669196918, - "narHash": "sha256-st3uS3X/qIdyleFN3HUmDJkqIhHfkgxuDK3J8XyQwls=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f10cdcf31dd2a436edbf7f0ad82c44b911804bc8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.05", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { - "emacs-overlay": "emacs-overlay", "fenix": "fenix", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "microvm": "microvm", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix" } @@ -181,11 +133,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1668974383, - "narHash": "sha256-ULEwMFhcr+0z4r//BSZVFV5Nh1+opwwYBk/ZzEptjqw=", + "lastModified": 1669415612, + "narHash": "sha256-LLsbCxUf36eyF3R8ulN0eqKj6ixfaLdBtetR8TdUAOo=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "26562973b3482a635416b2b663a13016d4d90e20", + "rev": "d2281f0367ba85c34ee9bce07d3cca40e1424721", "type": "github" }, "original": { @@ -20,13 +20,10 @@ url = github:nix-community/fenix; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; - - emacs-overlay.url = github:nix-community/emacs-overlay; }; outputs = inputs@{ self - , emacs-overlay , fenix , flake-utils , microvm @@ -62,9 +59,8 @@ ./modules/binary-caches.nix ./modules/chromium.nix ./modules/devtools.nix - ./modules/emacs.nix ./modules/gnupg.nix - ./modules/gnome.nix + ./modules/sway.nix ./modules/hw-accel-intel.nix ./modules/mail ./modules/radio.nix diff --git a/hosts/microwave/configuration.nix b/hosts/microwave/configuration.nix index 53abd1c..04ea8d6 100644 --- a/hosts/microwave/configuration.nix +++ b/hosts/microwave/configuration.nix @@ -18,7 +18,6 @@ kicad gimp inkscape - #(xfce.thunar.override { thunarPlugins = with xfce; [ thunar-volman thunar-archive-plugin ];}) ]; diff --git a/modules/sway.nix b/modules/sway.nix index 550b01e..19f854c 100644 --- a/modules/sway.nix +++ b/modules/sway.nix @@ -22,6 +22,7 @@ foot qt5.qtwayland bashmount + (xfce.thunar.override { thunarPlugins = with xfce; [ thunar-volman thunar-archive-plugin ];}) ]; #on the desktop, we need nice fonts ^^ |