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

Compare commits

base: mir:43e24ecbd1d9ca9335289c0ccc2b7bbe97f0f358
Branches Tags
mir:main
..
compare: mir:54eb81ed3494866d540f7afb98d85f6cfa687f57
Branches Tags
mir:main

No commits in common. "43e24ecbd1d9ca9335289c0ccc2b7bbe97f0f358" and "54eb81ed3494866d540f7afb98d85f6cfa687f57" have entirely different histories.
43e24ecbd1 ... 54eb81ed34

4 changed files with 19 additions and 32 deletions
Show Stats Expand all files Collapse all files

3
configuration.nix
View File

@ -54,10 +54,8 @@
desktopManager = {
xterm.enable = false;
gnome.enable = true;
# plasma6.enable = true;
};
displayManager.gdm.enable = true;
# displayManager.defaultSession = "plasmax11";
};
# console.useXkbConfig = true;
console.keyMap = ./galvatron/keys.map;
@ -132,7 +130,6 @@
zsh
gparted
ntfs3g
tlp
];
};

18
flake.lock
View File

@ -9,11 +9,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1710209440,
"narHash": "sha256-1JwFo3u2aVrvpz12OotjCK51EQ0hEDI7xSG7CEvTSk8=",
"lastModified": 1709186902,
"narHash": "sha256-0gMwtZDBSJEG23R/84XRLJNydRCwOYAg6ola2bYqSv8=",
"owner": "tpwrules",
"repo": "nixos-apple-silicon",
"rev": "bdc68b494d6a26c9457f4841ab1a6109b12a33e6",
"rev": "9ccf1cb93bdaa96294598bef8a7ffaa72226b0fb",
"type": "github"
},
"original": {
@ -94,11 +94,11 @@
]
},
"locked": {
"lastModified": 1710336510,
"narHash": "sha256-mT/Z1AseVhhiFooCu2J7wudx+FivkRrlRBW0iBC2V/o=",
"lastModified": 1709204054,
"narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "383296ffa45b539c28bf79ec2a272f652838ddd1",
"rev": "2f3367769a93b226c467551315e9e270c3f78b15",
"type": "github"
},
"original": {
@ -125,11 +125,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1710272261,
"narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
"lastModified": 1709237383,
"narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2",
"rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
"type": "github"
},
"original": {

7
flake.nix
View File

@ -38,7 +38,6 @@
modules = [
./configuration.nix {
services.xserver.videoDrivers = [ "modesetting" ];
boot.binfmt.emulatedSystems = ["x86_64-linux"];
hardware.asahi = {
peripheralFirmwareDirectory = ./galvatron/firmware;
# useExperimentalGPUDriver = true;
@ -47,11 +46,11 @@
};
boot.loader.efi.canTouchEfiVariables = false;
networking.hostName = "galvatron";
sound.enable = true; # only on unstable?
sound.enable = false;
}
./galvatron/hardware-configuration.nix
inputs.apple-silicon.nixosModules.apple-silicon-support
inputs.home-manager-unstable.nixosModules.home-manager
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
@ -60,7 +59,7 @@
}
]; # end of modules
in
nixpkgs-unstable.lib.nixosSystem {inherit system modules specialArgs; };
nixpkgs.lib.nixosSystem {inherit system modules specialArgs; };
breakdown =
let
system = "x86_64-linux";

23
home.nix
View File

@ -93,15 +93,6 @@ with lib.hm.gvariant;
sha256 = "0vrcn44aibdsl1hc6n0jbp0znpwhcb4hyhbzs5690i1nrapcmyka";
};
dconf.settings = {
"org/gnome/shell" = {
"favorite-apps" = [
"org.gnome.Console.desktop"
"emacs.desktop"
"org.gnome.Settings.desktop"
"org.gnome.Nautilus.desktop"
"btop.desktop"
];
};
"org/gnome/desktop/interface" = {
"color-scheme" = "prefer-dark";
};
@ -144,13 +135,13 @@ with lib.hm.gvariant;
programs.gpg = {
enable = true;
# package = pkgs.gnupg.overrideAttrs (orig: {
# version = "2.4.0";
# src = pkgs.fetchurl {
# url = "mirror://gnupg/gnupg/gnupg-2.4.0.tar.bz2";
# hash = "sha256-HXkVjdAdmSQx3S4/rLif2slxJ/iXhOosthDGAPsMFIM=";
# };
# });
package = pkgs.gnupg.overrideAttrs (orig: {
version = "2.4.0";
src = pkgs.fetchurl {
url = "mirror://gnupg/gnupg/gnupg-2.4.0.tar.bz2";
hash = "sha256-HXkVjdAdmSQx3S4/rLif2slxJ/iXhOosthDGAPsMFIM=";
};
});
# agent = {
# pinentryFlavor = "gnome3";
# };