nix
/
System
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: nix:7bfd69a3eed1f1c1a527c960eb76a4d84d6d3237
Branches Tags
nix:trunk
..
compare: nix:33a5c582e672a03b9316a34d4be4a5a8f6e30bd3
Branches Tags
nix:trunk

No commits in common. "7bfd69a3eed1f1c1a527c960eb76a4d84d6d3237" and "33a5c582e672a03b9316a34d4be4a5a8f6e30bd3" have entirely different histories.
7bfd69a3ee ... 33a5c582e6

4 changed files with 44 additions and 25 deletions
Show Stats Expand all files Collapse all files

43
flake.lock
View File

@ -27,16 +27,17 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1681842970, "lastModified": 1678526395,
"narHash": "sha256-9A+RKQp3hA4WKLeU4bnstf+650d6b5JOf3XvHyQ/4SQ=", "narHash": "sha256-ZPqJVulMfFx3gXk1/ttRz1JPO5sDLOuhl5rGoic6TUc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "7f4b90040296ed6faacbcd9933927852d020df75", "rev": "8be50d27360b033539b45cd3606a4278a55f69ec",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "8be50d27360b033539b45cd3606a4278a55f69ec",
"type": "github" "type": "github"
} }
}, },
@ -48,11 +49,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1681798941, "lastModified": 1681649143,
"narHash": "sha256-mulagyF3gLDcGNhZXGigSJ55JJXa68XHjqUCMlk9UJU=", "narHash": "sha256-1dbxmdAjsGxwPrEc0o9U6ZRmXKWdlMxk398cVRmrrpg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "b8ecf873298667ef981781d762608e11390725a9", "rev": "930adedd6087df3c324e380b0b4804cf13323eb2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -375,11 +376,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1673540789, "lastModified": 1681648924,
"narHash": "sha256-xqnxBOK3qctIeUVxecydrEDbEXjsvHCPGPbvsl63M/U=", "narHash": "sha256-pzi3HISK8+7mpEtv08Yr80wswyHKsz+RP1CROG1Qf6s=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0f213d0fee84280d8c3a97f7469b988d6fe5fcdf", "rev": "f294325aed382b66c7a188482101b0f336d1d7db",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -423,11 +424,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1681737997, "lastModified": 1681648924,
"narHash": "sha256-pHhjgsIkRMu80LmVe8QoKIZB6VZGRRxFmIvsC5S89k4=", "narHash": "sha256-pzi3HISK8+7mpEtv08Yr80wswyHKsz+RP1CROG1Qf6s=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f00994e78cd39e6fc966f0c4103f908e63284780", "rev": "f294325aed382b66c7a188482101b0f336d1d7db",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -439,11 +440,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1681759395, "lastModified": 1681482634,
"narHash": "sha256-7aaRtLxLAy8qFVIA26ulB+Q5nDVzuQ71qi0s0wMjAws=", "narHash": "sha256-cT/nr3L8khEYZSGp8qqwxFH+/q4/547MfyOdSj6MhBk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cd749f58ba83f7155b7062dd49d08e5e47e44d50", "rev": "fda0d99c2cbbb5c89d8855d258cb0821bd9113ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -577,11 +578,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1681758042, "lastModified": 1681589490,
"narHash": "sha256-2ljT/3NR4aECG3Uj5T0Tr+RqRUQe00G8CocbpTLZnhM=", "narHash": "sha256-/3h/z1u8WifIRmYOCnJxDGY7VpE0YgCjHF4G0aZRUAw=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "9b835f334f2c61d66c8c6554ec90325992752ce3", "rev": "c28f538568290ac34a36d5a2b81250a3621bcf88",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -620,11 +621,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1681821695, "lastModified": 1681613729,
"narHash": "sha256-uwyBGo/9IALi97AfMuzkJroQQhV6hkybaZVdw6pRNG4=", "narHash": "sha256-9Qb0tHW8l1hgFkuB76n4VT9UNUaR7QL3CgmJ5hcVYEg=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "5698b06b0731a2c15ff8c2351644427f8ad33993", "rev": "b7a6670a28b01cd1f62879921e36be2c69c4137a",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
flake.nix
View File

@ -25,7 +25,10 @@
url = "github:nix-community/fenix"; url = "github:nix-community/fenix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
emacs = { url = "github:nix-community/emacs-overlay"; }; emacs = {
url =
"github:nix-community/emacs-overlay/8be50d27360b033539b45cd3606a4278a55f69ec";
};
sops-nix = { sops-nix = {
url = "github:Mic92/sops-nix"; url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

2
home-manager/linux/default.nix
View File

@ -92,7 +92,7 @@ with nLib; {
package = pkgs.firefox-beta-bin; package = pkgs.firefox-beta-bin;
}; };
nathan.programs.emacs.package = nathan.programs.emacs.package =
lib.mkDefault inputs.emacs.packages."${pkgs.system}".emacsUnstablePgtk; lib.mkDefault inputs.emacs.packages."${pkgs.system}".emacsPgtk;
# We should be managing xdg stuff # We should be managing xdg stuff
xdg = { xdg = {
enable = true; enable = true;

19
machines/levitation/home.nix
View File

@ -16,19 +16,34 @@
# Sway outputs # Sway outputs
wayland.windowManager.sway.config = { wayland.windowManager.sway.config = {
output = { output = {
# DP-1 = {
# pos = "0 140";
# scale = "1";
# subpixel = "rgb";
# max_render_time = "6";
# };
DP-3 = { disable = ""; };
DP-1 = { DP-1 = {
pos = "2560 0";
scale = "1.25"; scale = "1.25";
subpixel = "rgb"; subpixel = "rgb";
max_render_time = "6"; max_render_time = "6";
adaptive_sync = "on"; };
HDMI-A-1 = {
pos = "5632 140";
scale = "1";
subpixel = "rgb";
max_render_time = "6";
}; };
}; };
input = { "type:pointer" = { pointer_accel = "-0.3"; }; }; input = { "type:pointer" = { pointer_accel = "-0.3"; }; };
startup = [ startup = [
# GLPaper # GLPaper
# { command = "glpaper DP-1 ${../../custom-files/sway/selen.frag} --fork"; } # { command = "glpaper DP-1 ${../../custom-files/sway/selen.frag} --fork"; }
{ command = "glpaper DP-1 ${../../custom-files/sway/selen.frag} --fork"; }
{ {
command = "glpaper DP-1 ${../../custom-files/sway/selen.frag} --fork"; command =
"glpaper HDMI-A-1 ${../../custom-files/sway/selen.frag} --fork";
} }
# Up the mouse dpi # Up the mouse dpi
{ command = "solaar config 1 dpi 4000"; } { command = "solaar config 1 dpi 4000"; }