rilla
/
nix-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moved to flakes

feat/kile-v2
Ricard Illa 2022-02-23 12:40:21 +01:00
parent 118f9f0bff
commit 5558a65a50
No known key found for this signature in database
GPG Key ID: F69A672B72E54902
9 changed files with 141 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
capibara.nix
View File

@ -2,22 +2,13 @@
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’).
{ config, pkgs, ... }:
{ config, inputs, pkgs, ... }:
let
home-manager = builtins.fetchTarball {
url =
# "https://github.com/nix-community/home-manager/archive/release-21.11.tar.gz";
"https://github.com/nix-community/home-manager/archive/master.tar.gz";
};
in {
imports = [
./nixos/hardware-configuration/capibara.nix
./nixos/common.nix
"${home-manager}/nixos"
];
{
imports = [ ./nixos/hardware-configuration/capibara.nix ./nixos/common.nix ];
home-manager.users.rilla = import home/capibara.nix;
home-manager.users.rilla.imports =
[ home/capibara.nix "${inputs.impermanence}/home-manager.nix" ];
#fileSystems = {
# "/home/rilla/Music" = {

63
flake.lock Normal file
View File

@ -0,0 +1,63 @@
{
"nodes": {
"home-manager": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1645557328,
"narHash": "sha256-7PCAESO8HxuSk1hH1J2ld+kK6fugFqNd+vqIXSGz1ag=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "838d40d61a91e3807836545c4b420572ab2d62eb",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"impermanence": {
"locked": {
"lastModified": 1644791231,
"narHash": "sha256-iDihsF1fUMK4xXiUudPnDM3veH1LXbbxfP9Lzekw9iU=",
"owner": "nix-community",
"repo": "impermanence",
"rev": "635bcd2d88739197a0b584aa9fadaa53c717a853",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "impermanence",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1645433236,
"narHash": "sha256-4va4MvJ076XyPp5h8sm5eMQvCrJ6yZAbBmyw95dGyw4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7f9b6e2babf232412682c09e57ed666d8f84ac2d",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-unstable",
"type": "indirect"
}
},
"root": {
"inputs": {
"home-manager": "home-manager",
"impermanence": "impermanence",
"nixpkgs": "nixpkgs"
}
}
},
"root": "root",
"version": 7
}

35
flake.nix Normal file
View File

@ -0,0 +1,35 @@
{
inputs = {
nixpkgs.url = "nixpkgs/nixos-unstable";
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
impermanence.url = "github:nix-community/impermanence";
};
outputs = { self, nixpkgs, home-manager, impermanence }@inputs: {
nixosConfigurations = {
trantor = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs.inputs = inputs;
modules = [
./trantor.nix
home-manager.nixosModules.home-manager
impermanence.nixosModules.impermanence
];
};
capibara = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs.inputs = inputs;
modules = [
./capibara.nix
home-manager.nixosModules.home-manager
impermanence.nixosModules.impermanence
];
};
};
};
}

47
home/browsers/firefox/default.nix
View File

@ -1,37 +1,29 @@
{ config, pkgs, ... }:
{
nixpkgs.config = {
packageOverrides = pkgs: {
nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") {
inherit pkgs;
};
};
};
# nix-env -f '<nixpkgs>' -qaP -A nur.repos.rycee.firefox-addons
programs.firefox = {
enable = true;
# maybe enable tridactyl?
# nix-env -f '<nixpkgs>' -qaP -A nur.repos.rycee.firefox-addons
extensions = with pkgs.nur.repos.rycee.firefox-addons; [
browserpass
canvasblocker
clearurls
cookie-autodelete
darkreader
floccus
foxyproxy-standard
https-everywhere
i-dont-care-about-cookies
localcdn
noscript
privacy-possum
privacy-redirect
ublock-origin
vimium
# todo: AdNauseam, wallabagger, DownThemAll! Wayback Machine
];
# extensions = with pkgs.nur.repos.rycee.firefox-addons; [
# browserpass
# canvasblocker
# clearurls
# cookie-autodelete
# darkreader
# floccus
# foxyproxy-standard
# https-everywhere
# i-dont-care-about-cookies
# localcdn
# noscript
# privacy-possum
# privacy-redirect
# ublock-origin
# vimium
# # todo: AdNauseam, wallabagger, DownThemAll! Wayback Machine
# ];
profiles = {
default = {
id = 0;
@ -40,7 +32,8 @@
# settings = import ./arkenfox // {
settings = {
# change some values from arkenfox's defaults
"privacy.resistFingerprinting" = false; # if true, this would the window size to rounded dimensions, which is too annoying on a tiling window manager
"privacy.resistFingerprinting" =
false; # if true, this would the window size to rounded dimensions, which is too annoying on a tiling window manager
"extensions.pocket.enabled" = false;
"identity.fxaccounts.enabled" = false;
"browser.search.suggest.enabled" = true;

3
home/mail/default.nix
View File

@ -6,5 +6,6 @@ in {
home.packages = [ mailsync pkgs.urlscan pkgs.abook ];
programs.neomutt.settings.query_command =
''"${pkgs.abook}/bin/abook --mutt-query '%s'"'';
programs.alot.enable = true;
# programs.alot.enable = true;
programs.alot.enable = false;
}

4
home/maker/default.nix
View File

@ -3,8 +3,8 @@
{
home.packages = [
pkgs.esphome
pkgs.freecad
pkgs.kicad-small
# pkgs.freecad
# pkgs.kicad-small
pkgs.meshlab
pkgs.openscad
pkgs.slic3r

11
home/nixos-common.nix
View File

@ -1,11 +1,6 @@
{ config, pkgs, ... }:
{ config, inputs, pkgs, ... }:
let
impermanence = builtins.fetchTarball {
url = "https://github.com/nix-community/impermanence/archive/master.tar.gz";
};
in {
{
# Let Home Manager install and manage itself.
# programs.home-manager.enable = true;
@ -15,7 +10,6 @@ in {
home.homeDirectory = "/home/rilla";
imports = [
"${impermanence}/home-manager.nix"
./arduino
./barrier
./browsers
@ -59,6 +53,7 @@ in {
".local/share/mpd"
".local/share/webkitgtk"
".mozilla"
".librewolf"
".newsboat"
".vdirsyncer"
];

20
nixos/common.nix
View File

@ -1,19 +1,11 @@
{ config, pkgs, ... }:
let
impermanence = builtins.fetchTarball {
url = "https://github.com/nix-community/impermanence/archive/master.tar.gz";
};
in {
imports = [ "${impermanence}/nixos.nix" ];
nixpkgs.config = {
packageOverrides = pkgs: {
nur = import (builtins.fetchTarball
"https://github.com/nix-community/NUR/archive/master.tar.gz") {
inherit pkgs;
};
};
{
nix = {
package = pkgs.nixUnstable;
extraOptions = ''
experimental-features = nix-command flakes
'';
};
# boot.binfmt.emulatedSystems = [ "aarch64-linux" "qemu-aarch64" ];

19
trantor.nix
View File

@ -2,22 +2,13 @@
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’).
{ config, pkgs, ... }:
{ config, inputs, pkgs, ... }:
let
home-manager = builtins.fetchTarball {
url =
# "https://github.com/nix-community/home-manager/archive/release-21.11.tar.gz";
"https://github.com/nix-community/home-manager/archive/master.tar.gz";
};
in {
imports = [
./nixos/hardware-configuration/trantor.nix
./nixos/common.nix
"${home-manager}/nixos"
];
{
imports = [ ./nixos/hardware-configuration/trantor.nix ./nixos/common.nix ];
home-manager.users.rilla = import home/trantor.nix;
home-manager.users.rilla.imports =
[ home/trantor.nix "${inputs.impermanence}/home-manager.nix" ];
fileSystems = {
"/boot/efi" = {