mir/nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: mir:b5efafcb45c72929c3f404c340bdf04aea31bf56
Branches Tags
mir:main
..
compare: mir:2e00cc5a32e05fbbdc5e4850061b3ed670af426a
Branches Tags
mir:main

No commits in common. "b5efafcb45c72929c3f404c340bdf04aea31bf56" and "2e00cc5a32e05fbbdc5e4850061b3ed670af426a" have entirely different histories.
b5efafcb45 ... 2e00cc5a32

5 changed files with 186 additions and 298 deletions
Show Stats Expand all files Collapse all files

4
configuration.nix
View File

@ -101,10 +101,6 @@
sg3_utils
nfs-utils
fontconfig
openssl
openssl.dev
openssl.out
sbcl
# cmake
# harfbuzz
# freetype

122
flake.lock
View File

@ -9,11 +9,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1714264490,
"narHash": "sha256-5hKsAO7ZLwOLCXeI5+jDmDr7t4zBezk0xidVWghoBB0=",
"lastModified": 1711325419,
"narHash": "sha256-dKZUWMB4py9rhefu1lsrCrwksK4WX/dtW8Ma807KyPA=",
"owner": "tpwrules",
"repo": "nixos-apple-silicon",
"rev": "4fac534b775aa0c40611257fa19ab8ab3243f4dc",
"rev": "93e85575f63b32b9996676513d95288fc1c87ca9",
"type": "github"
},
"original": {
@ -66,39 +66,6 @@
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"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"
}
},
"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"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@ -106,11 +73,11 @@
]
},
"locked": {
"lastModified": 1714043624,
"narHash": "sha256-Xn2r0Jv95TswvPlvamCC46wwNo8ALjRCMBJbGykdhcM=",
"lastModified": 1710888565,
"narHash": "sha256-s9Hi4RHhc6yut4EcYD50sZWRDKsugBJHSbON8KFwoTw=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "86853e31dc1b62c6eeed11c667e8cdd0285d4411",
"rev": "f33900124c23c4eca5831b9b5eb32ea5894375ce",
"type": "github"
},
"original": {
@ -127,11 +94,11 @@
]
},
"locked": {
"lastModified": 1714343445,
"narHash": "sha256-OzD1P0o46uD3Ix4ZI/g9z3YAeg+4g+W3qctB6bNOReo=",
"lastModified": 1711133180,
"narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "9fe79591c1005ce6f93084ae7f7dab0a2891440d",
"rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb",
"type": "github"
},
"original": {
@ -162,48 +129,6 @@
"type": "github"
}
},
"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",
"flakey-profile": "flakey-profile",
"lix": [
"lix"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1714868057,
"narHash": "sha256-Q9vGkxmuarySjPKO6yixjZ0tkaVIQS2wU9FpCpDA7+I=",
"ref": "refs/heads/main",
"rev": "e31baf57680bab449ab5b40179cc4a08a99f5314",
"revCount": 62,
"type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module"
},
"original": {
"type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module"
}
},
"mir-home": {
"inputs": {
"home-manager": "home-manager_2",
@ -242,11 +167,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1714253743,
"narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
"lastModified": 1711163522,
"narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
"rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
"type": "github"
},
"original": {
@ -274,11 +199,11 @@
},
"nur": {
"locked": {
"lastModified": 1714340308,
"narHash": "sha256-2uX/VxxNTvxa0FZ5yY2BZDmMCtQVocqa6wdOC8YmzDE=",
"lastModified": 1711657659,
"narHash": "sha256-kdMlKb5nWzi+EUNdpyEBKjKL/ZY75T2cngH+zfKN+Vo=",
"owner": "nix-community",
"repo": "NUR",
"rev": "53a8759e2675301db38ae5cc17aa9b954a936e9c",
"rev": "7d11a87bb73d00d9fd5829b9eac36107bcdc2e28",
"type": "github"
},
"original": {
@ -294,8 +219,6 @@
"emacs-config": "emacs-config",
"home-manager": "home-manager",
"home-manager-unstable": "home-manager-unstable",
"lix": "lix",
"lix-module": "lix-module",
"mir-home": "mir-home",
"nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable",
@ -317,21 +240,6 @@
"repo": "rust-overlay",
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",

11
flake.nix
View File

@ -8,15 +8,6 @@
url = "github:tpwrules/nixos-apple-silicon";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
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";
};
nur.url = github:nix-community/NUR;
home-manager = {
url = "github:nix-community/home-manager/release-23.11";
@ -42,7 +33,6 @@
self,
nixpkgs,
nixpkgs-unstable,
lix-module,
home-manager,
nur,
... }: {
@ -160,7 +150,6 @@
specialArgs = { inherit inputs; };
modules = [
# inputs.nur.nixosModules.nur
lix-module.nixosModules.default
./configuration.nix {
services.xserver.videoDrivers = [ "modesetting" "displaylink" ];
boot.loader.efi.canTouchEfiVariables = true;

1
home.nix
View File

@ -25,6 +25,7 @@ with lib.hm.gvariant;
pkgs.eza
pkgs.python3
pkgs.unzip
pkgs.devenv
# pkgs.gnupg
# pkgs.python3
# (pkgs.python3.withPackages(

6
modules/nix-settings.nix
View File

@ -4,12 +4,6 @@
nix.settings.extra-experimental-features = [ "nix-command" "flakes" ];
nix.settings.cores = 2;
nix.settings.max-jobs = 4;
nix.settings.extra-substituters = [
"https://cache.lix.systems"
];
nix.settings.trusted-public-keys = [
"cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
];
nix.buildMachines = [{
hostName = "unicron";
system = "x86_64-linux";