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

Compare commits

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

4 Commits
54eb81ed34 ... 43e24ecbd1

Author SHA1 Message Date
mir
43e24ecbd1 favorite apps in gnome, disable gpg patch again 2024-03-13 08:53:07 -08:00
mir
574ae45426 galvatron: emulate x86 (broken), add sound 2024-03-13 08:51:58 -08:00
mir
bbac9f448b try out plasma 6 (broken), add tlp 2024-03-13 08:51:23 -08:00
mir
5b0ee6617a update flake 2024-03-13 08:50:57 -08:00
4 changed files with 32 additions and 19 deletions
Show Stats Expand all files Collapse all files

3
configuration.nix
View File

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

18
flake.lock
View File

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

7
flake.nix
View File

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

23
home.nix
View File

@ -93,6 +93,15 @@ with lib.hm.gvariant;
sha256 = "0vrcn44aibdsl1hc6n0jbp0znpwhcb4hyhbzs5690i1nrapcmyka"; sha256 = "0vrcn44aibdsl1hc6n0jbp0znpwhcb4hyhbzs5690i1nrapcmyka";
}; };
dconf.settings = { 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" = { "org/gnome/desktop/interface" = {
"color-scheme" = "prefer-dark"; "color-scheme" = "prefer-dark";
}; };
@ -135,13 +144,13 @@ with lib.hm.gvariant;
programs.gpg = { programs.gpg = {
enable = true; enable = true;
package = pkgs.gnupg.overrideAttrs (orig: { # package = pkgs.gnupg.overrideAttrs (orig: {
version = "2.4.0"; # version = "2.4.0";
src = pkgs.fetchurl { # src = pkgs.fetchurl {
url = "mirror://gnupg/gnupg/gnupg-2.4.0.tar.bz2"; # url = "mirror://gnupg/gnupg/gnupg-2.4.0.tar.bz2";
hash = "sha256-HXkVjdAdmSQx3S4/rLif2slxJ/iXhOosthDGAPsMFIM="; # hash = "sha256-HXkVjdAdmSQx3S4/rLif2slxJ/iXhOosthDGAPsMFIM=";
}; # };
}); # });
# agent = { # agent = {
# pinentryFlavor = "gnome3"; # pinentryFlavor = "gnome3";
# }; # };