Compare commits

..

No commits in common. "752fc1d40a6ece6db2c07afa5860666597b2f06e" and "15fffe63922dce29f806d70c429609747b1378c2" have entirely different histories.

4 changed files with 10 additions and 56 deletions

1
.gitignore vendored
View File

@ -1,2 +1 @@
**/*.bak **/*.bak
*.swp

View File

@ -20,23 +20,6 @@
"type": "github" "type": "github"
} }
}, },
"emacs-config": {
"flake": false,
"locked": {
"lastModified": 1708892603,
"narHash": "sha256-cHFK+z3RLeqRwdRtY9c8fE+djt93FiHY19uOJitKZWY=",
"ref": "main",
"rev": "315694498a6400a3bee71d660d65f62e27e65dcf",
"revCount": 519,
"type": "git",
"url": "https://git.marq42.xyz/mir/emacs"
},
"original": {
"ref": "main",
"type": "git",
"url": "https://git.marq42.xyz/mir/emacs"
}
},
"flake-compat": { "flake-compat": {
"locked": { "locked": {
"lastModified": 1688025799, "lastModified": 1688025799,
@ -86,22 +69,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": {
"locked": {
"lastModified": 1709237383,
"narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1708118438, "lastModified": 1708118438,
@ -120,16 +87,16 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1701282334, "lastModified": 1709237383,
"narHash": "sha256-MxCVrXY6v4QmfTwIysjjaX0XUhqBbxTWWB4HXtDYsdk=", "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "057f9aecfb71c4437d2b27d3323df7f93c010b7e", "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "23.11", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -137,10 +104,8 @@
"root": { "root": {
"inputs": { "inputs": {
"apple-silicon": "apple-silicon", "apple-silicon": "apple-silicon",
"emacs-config": "emacs-config",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3"
"nixpkgs-unstable": "nixpkgs-unstable"
} }
}, },
"rust-overlay": { "rust-overlay": {

View File

@ -1,8 +1,8 @@
{ {
description = "NixOS configuration with Home Manager"; description = "NixOS configuration with Home Manager";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/23.11"; # nixpkgs.url = "github:nixos/nixpkgs/23.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
apple-silicon = { apple-silicon = {
url = "github:tpwrules/nixos-apple-silicon"; url = "github:tpwrules/nixos-apple-silicon";
}; };
@ -10,16 +10,8 @@
url = "github:nix-community/home-manager"; #/release-23.11"; url = "github:nix-community/home-manager"; #/release-23.11";
# inputs.nixpkgs.follows = "nixpkgs"; # inputs.nixpkgs.follows = "nixpkgs";
}; };
emacs-config = {
url = "git+https://git.marq42.xyz/mir/emacs?ref=main";
flake = false;
}; };
}; outputs = inputs@{ nixpkgs, home-manager, ... }: {
outputs = inputs@{
self,
nixpkgs,
nixpkgs-unstable,
home-manager, ... }: {
nixosConfigurations = { nixosConfigurations = {
galvatron = nixpkgs.lib.nixosSystem { galvatron = nixpkgs.lib.nixosSystem {
system = "aarch64-linux"; system = "aarch64-linux";

View File

@ -1,6 +1,5 @@
{ lib, config, pkgs, ... }: { config, pkgs, ... }:
with lib.hm.gvariant;
{ {
# Home Manager needs a bit of information about you and the # Home Manager needs a bit of information about you and the
# paths it should manage. # paths it should manage.
@ -82,7 +81,6 @@ with lib.hm.gvariant;
# programs.gdb = { # programs.gdb = {
# enable = true; # enable = true;
# }; # };
# home.file.".local/src/emacs".source = inputs.emacs-config;
# programs.dconf.enable = true; # programs.dconf.enable = true;
home.file.".local/share/backgrounds/mojave.jpg".source = builtins.fetchurl { home.file.".local/share/backgrounds/mojave.jpg".source = builtins.fetchurl {
url = "https://www.teahub.io/photos/full/154-1542362_mac-os-mojave-screenshot.jpg"; url = "https://www.teahub.io/photos/full/154-1542362_mac-os-mojave-screenshot.jpg";
@ -114,7 +112,7 @@ with lib.hm.gvariant;
"show-battery-percentage" = true; "show-battery-percentage" = true;
}; };
"org/gnome/desktop/session" = { "org/gnome/desktop/session" = {
"idle-delay" = mkUint32 0; "idle-delay" = 0;
}; };
}; };