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

Compare commits

base: nix:88b0d8bc417dbf37b87414e8be2256ea46cf133e
Branches Tags
nix:trunk
..
compare: nix:b0c75e803212a771f074d3cb5351b4269fa71e50
Branches Tags
nix:trunk

No commits in common. "88b0d8bc417dbf37b87414e8be2256ea46cf133e" and "b0c75e803212a771f074d3cb5351b4269fa71e50" have entirely different histories.
88b0d8bc41 ... b0c75e8032

3 changed files with 34 additions and 62 deletions
Show Stats Expand all files Collapse all files

78
flake.lock
View File

@ -27,11 +27,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1683396944, "lastModified": 1682871454,
"narHash": "sha256-4hDwgwijwsviqwSmtUEZHtrCAoMGLfNpGxtyd+33G/s=", "narHash": "sha256-NiozRbgHVHg5WXmcQVOABzKGTVgsLPE2k9VTudd+LoY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "1f1b95c4fca959fac6dad0e0a7156bd9f0b2071e", "rev": "ff0f8af5d4f511adf3a3252d1c09bfdc1912e8c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -48,11 +48,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1683354017, "lastModified": 1682835640,
"narHash": "sha256-r0BrHDaljUKyQS5FgA4P9xgK+dGa8L0XDL0vBdriEM8=", "narHash": "sha256-rAYEOd4nZFLjDlrF9KNlcopPKNVtr1svSXcEValVRMY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "65fdcbdc0bf35510a013d8a0883b0fa7a4ecd2a8", "rev": "006b429d3c493f4c5b1743a94f71ad961c7693ab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -156,15 +156,12 @@
} }
}, },
"flake-utils_6": { "flake-utils_6": {
"inputs": {
"systems": "systems_2"
},
"locked": { "locked": {
"lastModified": 1681202837, "lastModified": 1678901627,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401", "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -220,11 +217,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1683381134, "lastModified": 1682423965,
"narHash": "sha256-hHZTG6RfBOozK0zEFHFrnvzxgiY6M1Vn9LtvBjbcT5c=", "narHash": "sha256-Ry3fRc6eI4EuhreJikD6A8O+PSEqvsQwrub+jERKrAU=",
"owner": "idris-lang", "owner": "idris-lang",
"repo": "idris2", "repo": "idris2",
"rev": "3c9393e5a86fb2999217164d5194ddff749cf29f", "rev": "55efd7dd7b505846d8109b9f72e53827ab2744a7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -348,11 +345,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1683189539, "lastModified": 1682332772,
"narHash": "sha256-dqeE6PM1SSNCB9BSBgh/9dJPLn3sf7P4uay8/CymMlQ=", "narHash": "sha256-GMoWhChQdeNM2FFqVbEZgBABSdi/+JgSP6v+jUz5b24=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "104ca15b0019bf461639050daeaa18e25642ccee", "rev": "d774aeedc0685e5871be1e1ee0511900deeb21c2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -363,11 +360,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1683269598, "lastModified": 1682836095,
"narHash": "sha256-KNsb+nBbB1Fmxd07dt4E0KXMT4YeKJB7gQaA6Xfk+mo=", "narHash": "sha256-PdzpJhuXBz71AgWNWMMYLbB8GMMce6QguhQY/6HOOcc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "51559e691f1493a26f94f1df1aaf516bb507e78b", "rev": "e4a21ddcb45ee5f5c85a5d9e9698debf77fb98c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -426,11 +423,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1683286087, "lastModified": 1682786779,
"narHash": "sha256-xseOd7W7xwF5GOF2RW8qhjmVGrKoBz+caBlreaNzoeI=", "narHash": "sha256-m7QFzPS/CE8hbkbIVK4UStihAQMtczr0vSpOgETOM1g=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3e313808bd2e0a0669430787fb22e43b2f4bf8bf", "rev": "08e4dc3a907a6dfec8bb3bbf1540d8abbffea22b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -442,11 +439,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1683207485, "lastModified": 1682817260,
"narHash": "sha256-gs+PHt/y/XQB7S8+YyBLAM8LjgYpPZUVFQBwpFSmJro=", "narHash": "sha256-kFMXzKNj4d/0Iqbm5l57rHSLyUeyCLMuvlROZIuuhvk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cc45a3f8c98e1c33ca996e3504adefbf660a72d1", "rev": "db1e4eeb0f9a9028bcb920e00abbc1409dd3ef36",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -580,11 +577,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1683321754, "lastModified": 1682792082,
"narHash": "sha256-qvyrgObeXw+h+P0VAvaARjRUWn5Ey1ckbs+1El2dc0Y=", "narHash": "sha256-1nuP2rqipsdB8IJ3N5ws3FQm4dX3mKIueIrCUSu1bWw=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "a4966c92829f945d3846eb0ca0e240ac7f7c8c60", "rev": "7bcb4c2ef23e151a639ff918fbb8ab9d521eabb9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -671,21 +668,6 @@
"type": "github" "type": "github"
} }
}, },
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"utils": { "utils": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1667395993,
@ -740,11 +722,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1682982995, "lastModified": 1681581389,
"narHash": "sha256-PK0pSY48JkcLDFphafjpLqeTDs0XUqGMHjsiNuEq5s0=", "narHash": "sha256-+ygySqlQy0ejwE1aOF6i6Tiu63V0jxXik0aLlvmqioo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "c5d7db84c422be515dac8fc26420900c349374e8", "rev": "f3b6f6b04728416c64fc5ef52199fd9b9843c47d",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
home-manager/common/programs/emacs.nix
View File

@ -45,11 +45,6 @@
epkgs.pdf-tools epkgs.pdf-tools
]; ];
}; };
# Set emacs as the editor
home.sessionVariables = {
EDITOR = "emacsclient -c";
VISUAL = "emacsclient -c";
};
})) }))
(lib.mkIf (config.nathan.programs.emacs.enable && pkgs.stdenv.isLinux) { (lib.mkIf (config.nathan.programs.emacs.enable && pkgs.stdenv.isLinux) {
home.packages = with pkgs; home.packages = with pkgs;

13
home-manager/linux/programs/sway.nix
View File

@ -7,7 +7,6 @@ in with lib; {
swaylock-command = '' swaylock-command = ''
${swaylock-package}/bin/swaylock --screenshots --grace 30 --indicator --clock --timestr "%-I:%M:%S %p" --datestr "%A %Y-%M-%d" --effect-blur 20x3''; ${swaylock-package}/bin/swaylock --screenshots --grace 30 --indicator --clock --timestr "%-I:%M:%S %p" --datestr "%A %Y-%M-%d" --effect-blur 20x3'';
layman-package = inputs.self.packages.${pkgs.system}.layman; layman-package = inputs.self.packages.${pkgs.system}.layman;
wob-package = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.wob;
in { in {
home.packages = with pkgs; [ home.packages = with pkgs; [
# Locking and display management # Locking and display management
@ -50,9 +49,9 @@ in with lib; {
swayest-workstyle swayest-workstyle
font-awesome font-awesome
layman-package layman-package
wob-package inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.wob
# For fancy x11 scaling # For fancy x11 scaling
sommelier inputs.self.packages.${pkgs.system}.sommelier
# Polkit # Polkit
polkit_gnome polkit_gnome
]; ];
@ -70,12 +69,8 @@ in with lib; {
extraSessionCommands = '' extraSessionCommands = ''
# Make qt theming work # Make qt theming work
export QT_QPA_PLATFORMTHEME="qt5ct" export QT_QPA_PLATFORMTHEME="qt5ct"
# Prepare for wob
export WOBSOCK $XDG_RUNTIME_DIR/wob.sock
''; '';
config = { config = {
# Startup wob
startup = [{ command = "tail -f $WOBSOCK | wob"; }];
# Setup gaps # Setup gaps
gaps = { gaps = {
smartGaps = true; smartGaps = true;
@ -177,9 +172,9 @@ in with lib; {
"XF86AudioMute" = "exec pactl set-sink-mute @DEFAULT_SINK@ toggle"; "XF86AudioMute" = "exec pactl set-sink-mute @DEFAULT_SINK@ toggle";
# Make the volume keys work # Make the volume keys work
"XF86AudioRaiseVolume" = "XF86AudioRaiseVolume" =
"exec pactl set-sink-volume @DEFAULT_SINK@ +5% && pactl get-sink-volume @DEFAULT_SINK@ | head -n 1| awk '{print substr($5, 1, length($5)-1)}' > $WOBSOCK"; "exec pactl set-sink-volume @DEFAULT_SINK@ +5%";
"XF86AudioLowerVolume" = "XF86AudioLowerVolume" =
"bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5% && pactl get-sink-volume @DEFAULT_SINK@ | head -n 1 | awk '{print substr($5, 1, length($5)-1)}' > $WOBSOCK"; "exec pactl set-sink-volume @DEFAULT_SINK@ -5%";
# Play/pause and next song # Play/pause and next song
"XF86AudioPlay" = "exec mpc toggle"; "XF86AudioPlay" = "exec mpc toggle";
"XF86AudioNext" = "exec mpc next"; "XF86AudioNext" = "exec mpc next";