Compare commits
6 Commits
b327a80bfb
...
440c536baa
Author | SHA1 | Date | |
---|---|---|---|
440c536baa | |||
b007730ce8 | |||
5e6cbe0bc0 | |||
2e1698bb09 | |||
660a78ae49 | |||
dd2339d34b |
@ -51,6 +51,7 @@
|
|||||||
# Enable the X11 windowing system.
|
# Enable the X11 windowing system.
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
# enable = false;
|
||||||
xkb = {
|
xkb = {
|
||||||
layout = "us";
|
layout = "us";
|
||||||
variant = "";
|
variant = "";
|
||||||
|
61
flake.lock
61
flake.lock
@ -107,6 +107,48 @@
|
|||||||
"type": "github"
|
"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": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1701282334,
|
"lastModified": 1701282334,
|
||||||
@ -139,6 +181,22 @@
|
|||||||
"type": "github"
|
"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": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"apple-silicon": "apple-silicon",
|
"apple-silicon": "apple-silicon",
|
||||||
@ -146,7 +204,8 @@
|
|||||||
"emacs-config": "emacs-config",
|
"emacs-config": "emacs-config",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"home-manager-unstable": "home-manager-unstable",
|
"home-manager-unstable": "home-manager-unstable",
|
||||||
"nixpkgs": "nixpkgs",
|
"mir-home": "mir-home",
|
||||||
|
"nixpkgs": "nixpkgs_2",
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable"
|
"nixpkgs-unstable": "nixpkgs-unstable"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -15,6 +15,9 @@
|
|||||||
url = "github:nix-community/home-manager"; #/release-23.11";
|
url = "github:nix-community/home-manager"; #/release-23.11";
|
||||||
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||||
};
|
};
|
||||||
|
mir-home = {
|
||||||
|
url = "git+https://git.marq42.xyz/mir/home?ref=main";
|
||||||
|
};
|
||||||
emacs-config = {
|
emacs-config = {
|
||||||
url = "git+https://git.marq42.xyz/mir/emacs?ref=main";
|
url = "git+https://git.marq42.xyz/mir/emacs?ref=main";
|
||||||
flake = false;
|
flake = false;
|
||||||
@ -74,8 +77,7 @@
|
|||||||
}
|
}
|
||||||
./galvatron/hardware-configuration.nix
|
./galvatron/hardware-configuration.nix
|
||||||
inputs.apple-silicon.nixosModules.apple-silicon-support
|
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.useGlobalPkgs = true;
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
home-manager.users.mir = import ./home.nix;
|
home-manager.users.mir = import ./home.nix;
|
||||||
|
14
home.nix
14
home.nix
@ -20,6 +20,7 @@ with lib.hm.gvariant;
|
|||||||
pkgs.fzf
|
pkgs.fzf
|
||||||
pkgs.nerdfonts
|
pkgs.nerdfonts
|
||||||
pkgs.eza
|
pkgs.eza
|
||||||
|
pkgs.python3
|
||||||
# pkgs.gnupg
|
# pkgs.gnupg
|
||||||
# pkgs.python3
|
# pkgs.python3
|
||||||
# (pkgs.python3.withPackages(
|
# (pkgs.python3.withPackages(
|
||||||
@ -79,7 +80,10 @@ with lib.hm.gvariant;
|
|||||||
package = pkgs.gitFull;
|
package = pkgs.gitFull;
|
||||||
userName = "mir";
|
userName = "mir";
|
||||||
userEmail = "mirmarq428@gmail.com";
|
userEmail = "mirmarq428@gmail.com";
|
||||||
extraConfig.credential.helper = "store";
|
extraConfig = {
|
||||||
|
credential.helper = "store";
|
||||||
|
init.defaultBranch = "main";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
programs.firefox = {
|
programs.firefox = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@ -93,10 +97,10 @@ with lib.hm.gvariant;
|
|||||||
# programs.gdb = {
|
# programs.gdb = {
|
||||||
# enable = true;
|
# enable = true;
|
||||||
# };
|
# };
|
||||||
home.file.".emacs.d" = {
|
# home.file.".emacs.d" = {
|
||||||
source = inputs.emacs-config;
|
# source = inputs.emacs-config;
|
||||||
recursive = true;
|
# recursive = true;
|
||||||
};
|
# };
|
||||||
home.file.".face".source = builtins.fetchurl {
|
home.file.".face".source = builtins.fetchurl {
|
||||||
url = "https://marq42.xyz/rena.webp";
|
url = "https://marq42.xyz/rena.webp";
|
||||||
sha256 = "10x3qvfdp79fmbbi7ljnqx419xmwpiyyr4pfxhynh3xq7fd0laz2";
|
sha256 = "10x3qvfdp79fmbbi7ljnqx419xmwpiyyr4pfxhynh3xq7fd0laz2";
|
||||||
|
Loading…
Reference in New Issue
Block a user