0xa/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

nix flake update, small cleanup

Browse source
This commit is contained in:
Grigory Shipunov 2022-11-26 12:24:23 +01:00
parent c1ffb0c102
commit 9cc55c5d0f
Signed by: 0xa
GPG key ID: 91FA5E5BF9AA901C
4 changed files with 27 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
flake.lock generated
View file

@ -1,24 +1,5 @@
{ {
"nodes": { "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": { "fenix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -27,11 +8,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1669271123, "lastModified": 1669443859,
"narHash": "sha256-Ak8fAoNvpkw3NloGt3q+te0VFoeCj1HvHTG5v42ttrg=", "narHash": "sha256-LwFb2WmvGE+gwI2DBNNjNB/9xbrvXlfTMsVsrFaxB5U=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "50e42c7e4495a8a26a3373c3a0b0e9e4e8c0f799", "rev": "684adee4d90fdd48994fd52a6ce145f89411173f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -56,21 +37,6 @@
} }
}, },
"flake-utils_2": { "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": { "locked": {
"lastModified": 1659877975, "lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
@ -87,17 +53,17 @@
}, },
"microvm": { "microvm": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1668998330, "lastModified": 1669306943,
"narHash": "sha256-kJu7lwmNBQqIcM/vhlFDkByC0VF4vwLjVeg+E9aWlyc=", "narHash": "sha256-F6xVWFJkcCXp5IcnpRlECT10H2ps8RO1yM4W0OXiXPs=",
"owner": "astro", "owner": "astro",
"repo": "microvm.nix", "repo": "microvm.nix",
"rev": "682b1e76e7fefdf350f3dc9e84002a8488e2b86d", "rev": "c21a70fe1ac05ccdfceff6506625e9d44cd91da5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -108,15 +74,18 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1669152211, "lastModified": 1669378442,
"narHash": "sha256-mBLiTNTzrtlYPHF0bL8NeGA4n8K5b35fYVdqaTIIkgc=", "narHash": "sha256-nm+4PN0A4SnV0SzEchxrMyKPvI3Ld/aoom4PnHeHucs=",
"path": "/nix/store/qpqssbnnsf84lzm72hg2bgcsd457cqv4-source", "owner": "NixOS",
"rev": "56ca700ceabcfa15396bcf581a1296e8e27ad677", "repo": "nixpkgs",
"type": "path" "rev": "0faaf0a9bb6dedb69bfd43ac06fb27fadc476c51",
"type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "NixOS",
"type": "indirect" "ref": "nixos-22.05",
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs-22_05": { "nixpkgs-22_05": {
@ -137,11 +106,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1669140675, "lastModified": 1669320964,
"narHash": "sha256-npzfyfLECsJWgzK/M4gWhykP2DNAJTYjgY2BWkz/oEQ=", "narHash": "sha256-EBFw+ge12Pcr3qCk8If3/eMBAoQLR7ytndXZoRevUtM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2788904d26dda6cfa1921c5abb7a2466ffe3cb8c", "rev": "27ccd29078f974ddbdd7edc8e38c8c8ae003c877",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -151,29 +120,12 @@
"type": "github" "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": { "root": {
"inputs": { "inputs": {
"emacs-overlay": "emacs-overlay",
"fenix": "fenix", "fenix": "fenix",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils",
"microvm": "microvm", "microvm": "microvm",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
} }
@ -181,11 +133,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1668974383, "lastModified": 1669415612,
"narHash": "sha256-ULEwMFhcr+0z4r//BSZVFV5Nh1+opwwYBk/ZzEptjqw=", "narHash": "sha256-LLsbCxUf36eyF3R8ulN0eqKj6ixfaLdBtetR8TdUAOo=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "26562973b3482a635416b2b663a13016d4d90e20", "rev": "d2281f0367ba85c34ee9bce07d3cca40e1424721",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
flake.nix
View file

@ -20,13 +20,10 @@
url = github:nix-community/fenix; url = github:nix-community/fenix;
inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs-unstable";
}; };
emacs-overlay.url = github:nix-community/emacs-overlay;
}; };
outputs = outputs =
inputs@{ self inputs@{ self
, emacs-overlay
, fenix , fenix
, flake-utils , flake-utils
, microvm , microvm
@ -62,9 +59,8 @@
./modules/binary-caches.nix ./modules/binary-caches.nix
./modules/chromium.nix ./modules/chromium.nix
./modules/devtools.nix ./modules/devtools.nix
./modules/emacs.nix
./modules/gnupg.nix ./modules/gnupg.nix
./modules/gnome.nix ./modules/sway.nix
./modules/hw-accel-intel.nix ./modules/hw-accel-intel.nix
./modules/mail ./modules/mail
./modules/radio.nix ./modules/radio.nix

1
hosts/microwave/configuration.nix
View file

@ -18,7 +18,6 @@
kicad kicad
gimp gimp
inkscape inkscape
#(xfce.thunar.override { thunarPlugins = with xfce; [ thunar-volman thunar-archive-plugin ];})
]; ];

1
modules/sway.nix
View file

@ -22,6 +22,7 @@
foot foot
qt5.qtwayland qt5.qtwayland
bashmount bashmount
(xfce.thunar.override { thunarPlugins = with xfce; [ thunar-volman thunar-archive-plugin ];})
]; ];
#on the desktop, we need nice fonts ^^ #on the desktop, we need nice fonts ^^