Compare commits

...

6 Commits

Author SHA1 Message Date
mir
440c536baa update flake and stuff 2024-03-23 12:39:01 -08:00
mir
b007730ce8 add my home flake to inputs; not using yet 2024-03-23 12:38:47 -08:00
mir
5e6cbe0bc0 add disabled xorg disabling 2024-03-23 12:38:13 -08:00
mir
2e1698bb09 spacing 2024-03-23 12:36:51 -08:00
mir
660a78ae49 make emacs config manual :( 2024-03-23 12:36:27 -08:00
mir
dd2339d34b fix git default branch 2024-03-23 12:36:08 -08:00
4 changed files with 74 additions and 8 deletions

View File

@ -51,6 +51,7 @@
# Enable the X11 windowing system.
services.xserver = {
enable = true;
# enable = false;
xkb = {
layout = "us";
variant = "";

View File

@ -107,6 +107,48 @@
"type": "github"
}
},
"home-manager_2": {
"inputs": {
"nixpkgs": [
"mir-home",
"nixpkgs"
]
},
"locked": {
"lastModified": 1706981411,
"narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "652fda4ca6dafeb090943422c34ae9145787af37",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-23.11",
"repo": "home-manager",
"type": "github"
}
},
"mir-home": {
"inputs": {
"home-manager": "home-manager_2",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1710884109,
"narHash": "sha256-yvA99Zk063TILHMRfbqmU0gHdFJ6vsRK9Ihefs9Edt0=",
"ref": "main",
"rev": "9aedd27579787ae9b94ffab2db688c3440c1fa70",
"revCount": 1,
"type": "git",
"url": "https://git.marq42.xyz/mir/home"
},
"original": {
"ref": "main",
"type": "git",
"url": "https://git.marq42.xyz/mir/home"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1701282334,
@ -139,6 +181,22 @@
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1701282334,
"narHash": "sha256-MxCVrXY6v4QmfTwIysjjaX0XUhqBbxTWWB4HXtDYsdk=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "057f9aecfb71c4437d2b27d3323df7f93c010b7e",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"apple-silicon": "apple-silicon",
@ -146,7 +204,8 @@
"emacs-config": "emacs-config",
"home-manager": "home-manager",
"home-manager-unstable": "home-manager-unstable",
"nixpkgs": "nixpkgs",
"mir-home": "mir-home",
"nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable"
}
},

View File

@ -15,6 +15,9 @@
url = "github:nix-community/home-manager"; #/release-23.11";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
mir-home = {
url = "git+https://git.marq42.xyz/mir/home?ref=main";
};
emacs-config = {
url = "git+https://git.marq42.xyz/mir/emacs?ref=main";
flake = false;
@ -74,8 +77,7 @@
}
./galvatron/hardware-configuration.nix
inputs.apple-silicon.nixosModules.apple-silicon-support
inputs.home-manager-unstable.nixosModules.home-manager
{
inputs.home-manager-unstable.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.mir = import ./home.nix;

View File

@ -20,6 +20,7 @@ with lib.hm.gvariant;
pkgs.fzf
pkgs.nerdfonts
pkgs.eza
pkgs.python3
# pkgs.gnupg
# pkgs.python3
# (pkgs.python3.withPackages(
@ -79,7 +80,10 @@ with lib.hm.gvariant;
package = pkgs.gitFull;
userName = "mir";
userEmail = "mirmarq428@gmail.com";
extraConfig.credential.helper = "store";
extraConfig = {
credential.helper = "store";
init.defaultBranch = "main";
};
};
programs.firefox = {
enable = true;
@ -93,10 +97,10 @@ with lib.hm.gvariant;
# programs.gdb = {
# enable = true;
# };
home.file.".emacs.d" = {
source = inputs.emacs-config;
recursive = true;
};
# home.file.".emacs.d" = {
# source = inputs.emacs-config;
# recursive = true;
# };
home.file.".face".source = builtins.fetchurl {
url = "https://marq42.xyz/rena.webp";
sha256 = "10x3qvfdp79fmbbi7ljnqx419xmwpiyyr4pfxhynh3xq7fd0laz2";