ar
/
nibylandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: ar:ed51b019f3eacc419fec7f6f82e3f28cd06fe04b
Branches Tags
ar:main
...
compare: ar:2dc96f189f1ebfa3c704629144335f938ec3c914
Branches Tags
ar:main

4 Commits
ed51b019f3 ... 2dc96f189f

Author SHA1 Message Date
Ari Gato 2dc96f189f chore: flake lock updates
CI / x86_64-linux (push) Successful in 59s Details
CI / aarch64-linux (push) Successful in 1m26s Details
2024-05-07 14:39:07 +02:00
Ari Gato 85d9d23582 chore: fmt, renames 2024-05-07 00:19:20 +02:00
Ari Gato 271a372056 we lix now 2024-05-06 19:13:43 +02:00
Ari Gato 938df5d6a2 m/graphical: displaymanager options have been moved 2024-05-06 19:12:10 +02:00
4 changed files with 139 additions and 34 deletions
Show Stats Expand all files Collapse all files

132
flake.lock
View File

@ -240,6 +240,24 @@
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"inputs": {
"systems": "systems_5"
},
"locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
@ -254,6 +272,21 @@
"type": "github"
}
},
"flakey-profile": {
"locked": {
"lastModified": 1712898590,
"narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
"owner": "lf-",
"repo": "flakey-profile",
"rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
"type": "github"
},
"original": {
"owner": "lf-",
"repo": "flakey-profile",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
@ -304,11 +337,11 @@
]
},
"locked": {
"lastModified": 1714377222,
"narHash": "sha256-UsDsjWCKlWn8vbXi8Zza9Hkq3xyk8fpvFNo2VM5S74E=",
"lastModified": 1715077503,
"narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2af7c78b7bb9cf18406a193eba13ef9f99388f49",
"rev": "6e277d9566de9976f47228dd8c580b97488734d4",
"type": "github"
},
"original": {
@ -340,11 +373,11 @@
]
},
"locked": {
"lastModified": 1714235105,
"narHash": "sha256-QCEp+JZOQzFWsNSs3KMCAMf4Ik+YglNdrQJXq10yYaw=",
"lastModified": 1714803703,
"narHash": "sha256-4m9wG6mZR0I2d7itErhpY0JqSHomNnUdoKfkjnYp+wI=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "03448a4e169d4590d21138f0ac65ab64bd1a2d85",
"rev": "d0799ebebfb37fd2df6409dc8da622738c5930bb",
"type": "github"
},
"original": {
@ -379,20 +412,62 @@
"type": "github"
}
},
"microvm": {
"lix": {
"flake": false,
"locked": {
"lastModified": 1714955862,
"narHash": "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=",
"ref": "refs/tags/2.90-beta.1",
"rev": "b6799ab0374a8e1907a48915d3187e07da41d88c",
"revCount": 15501,
"type": "git",
"url": "https://git@git.lix.systems/lix-project/lix"
},
"original": {
"ref": "refs/tags/2.90-beta.1",
"type": "git",
"url": "https://git@git.lix.systems/lix-project/lix"
}
},
"lix-module": {
"inputs": {
"flake-utils": "flake-utils_3",
"flakey-profile": "flakey-profile",
"lix": [
"lix"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1715038983,
"narHash": "sha256-DCZbFoNM8sx6YhEtu/xkNZfRwEt7RucJr3zuVVkugIw=",
"ref": "refs/heads/main",
"rev": "aaf759cd93d1946336247808e7551df714cfd332",
"revCount": 70,
"type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module"
},
"original": {
"type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module"
}
},
"microvm": {
"inputs": {
"flake-utils": "flake-utils_4",
"nixpkgs": [
"nixpkgs"
],
"spectrum": "spectrum"
},
"locked": {
"lastModified": 1714072181,
"narHash": "sha256-MOxTGzM8lgq8uo6zAy6e4ZUdzUpF/eSQPBXeH5G5BtE=",
"lastModified": 1714764302,
"narHash": "sha256-MmIZR67wOP3Nr9b3XpsvHSZSTDcTmd9cQn2Z8pW1/Hw=",
"owner": "astro",
"repo": "microvm.nix",
"rev": "ac28e21ac336dbe01b1f1bcab01fd31db3855e40",
"rev": "e9977efbe34b554c3e393dc9a18509905a4080e5",
"type": "github"
},
"original": {
@ -469,11 +544,11 @@
]
},
"locked": {
"lastModified": 1714273701,
"narHash": "sha256-bmoeZ5zMSSO/e8P51yjrzaxA9uzA3SZAEFvih6S3LFo=",
"lastModified": 1714878592,
"narHash": "sha256-E68C03sYRsYFsK7wiGHUIJm8IsyPRALOrFoTL0glXnI=",
"owner": "Mic92",
"repo": "nix-index-database",
"rev": "941c4973c824509e0356be455d89613611f76c8a",
"rev": "a362555e9dbd4ecff3bb98969bbdb8f79fe87f10",
"type": "github"
},
"original": {
@ -484,11 +559,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1714201532,
"narHash": "sha256-nk0W4rH7xYdDeS7k1SqqNtBaNrcgIBYNmOVc8P2puEY=",
"lastModified": 1715010655,
"narHash": "sha256-FmdhvR/hgBkPDvIv/HOEIQsSMaVXh8wvTrnep8dF3Jc=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "53db5e1070d07e750030bf65f1b9963df8f0c678",
"rev": "d1659c9eb8af718118fb4bbe2c86797c8b8623eb",
"type": "github"
},
"original": {
@ -665,6 +740,8 @@
"impermanence": "impermanence",
"jovian-nixos": "jovian-nixos",
"lanzaboote": "lanzaboote",
"lix": "lix",
"lix-module": "lix-module",
"microvm": "microvm",
"nix-colors": "nix-colors",
"nix-formatter-pack": "nix-formatter-pack",
@ -709,11 +786,11 @@
"utils": "utils_2"
},
"locked": {
"lastModified": 1714298568,
"narHash": "sha256-HzgySE+n7Ri8faGo+uxYdjlCicgVGV0eJT86cWYIvo4=",
"lastModified": 1714720456,
"narHash": "sha256-e0WFe1BHqX23ADpGBc4ZRu38Mg+GICCZCqyS6EWCbHc=",
"owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver",
"rev": "ef4756bcfc8a6791adbcae2b32f87e2f0a00525d",
"rev": "41059fc548088e49e3ddb3a2b4faeb5de018e60f",
"type": "gitlab"
},
"original": {
@ -829,6 +906,21 @@
"type": "github"
}
},
"systems_6": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"utils": {
"inputs": {
"systems": "systems_2"
@ -849,7 +941,7 @@
},
"utils_2": {
"inputs": {
"systems": "systems_5"
"systems": "systems_6"
},
"locked": {
"lastModified": 1709126324,

11
flake.nix
View File

@ -34,6 +34,16 @@
inputs.nixpkgs.follows = "nixpkgs";
};
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
lix = {
url =
"git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1";
flake = false;
};
lix-module = {
url = "git+https://git.lix.systems/lix-project/nixos-module";
inputs.lix.follows = "lix";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = { self, nixpkgs, deploy-rs, ... }@inputs:
@ -88,6 +98,7 @@
inherit (value) system;
modules = [
(./nixos/. + "/${name}")
inputs.lix-module.nixosModules.default
{
nixpkgs.system = value.system;
} # need to set this explicitly for colmena

4
modules/common.nix
View File

@ -67,7 +67,6 @@ in {
lib.mkDefault meta.hosts.${config.networking.hostName}.targetHost;
nix = {
package = pkgs.nixUnstable;
extraOptions = ''
experimental-features = nix-command flakes
'';
@ -85,6 +84,9 @@ in {
else
[ ]);
trusted-substituters = config.nix.settings.substituters;
extra-substituters = [ "https://cache.lix.systems" ];
trusted-public-keys =
[ "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" ];
};
};
nixpkgs.config.allowUnfree = true;

26
modules/graphical.nix
View File

@ -82,20 +82,20 @@ in {
services.xserver = {
enable = true;
displayManager = {
sddm = {
enable = lib.mkDefault true;
wayland.enable = true;
settings.Wayland.SessionDir =
"/run/current-system/sw/share/wayland-sessions";
settings.X11.SessionDir = lib.mkForce "";
};
defaultSession = "plasma";
};
xkb.layout = "pl";
xkb.options = "ctrl:nocaps";
libinput.enable = true;
};
services.libinput.enable = true;
services.displayManager = {
sddm = {
enable = lib.mkDefault true;
wayland.enable = true;
settings.Wayland.SessionDir =
"/run/current-system/sw/share/wayland-sessions";
settings.X11.SessionDir = lib.mkForce "";
};
defaultSession = "plasma";
};
boot = {
@ -186,7 +186,7 @@ in {
kate
keybase-gui
kolourpaint
nixfmt
nixfmt-classic
okular
paprefs
pavucontrol