push for nixos install?
This commit is contained in:
Mr Hedgehog
parent
d10ce8ce1b
commit
98f2680d07
6 changed files with 90 additions and 71 deletions
14
flake.lock
14
flake.lock
|
|
@ -741,11 +741,11 @@
|
|||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1648219316,
|
||||
"narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=",
|
||||
"owner": "NixOS",
|
||||
"lastModified": 1648632716,
|
||||
"narHash": "sha256-kCmnDeiaMsdhfnNKjxdOzwRh2H6eQb8yWAL+nNabC/Y=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634",
|
||||
"rev": "710fed5a2483f945b14f4a58af2cd3676b42d8c8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1004,11 +1004,11 @@
|
|||
"nixpkgs": "nixpkgs_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1648667571,
|
||||
"narHash": "sha256-tXyxJjTNMeCM0IeMFlY46o9RciIdad01XzDP3Q+FeMI=",
|
||||
"lastModified": 1648737319,
|
||||
"narHash": "sha256-jb9Ksmu9FD2H/dliKkjK8qH0O6bwPNqFeE4JCoiLgDg=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs-wayland",
|
||||
"rev": "4998b3b9605660e7f7594b3719830d9394d732df",
|
||||
"rev": "04dbab5c81e00fe8cb4270b653caf821895d546d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@
|
|||
vim-plugins.url = "github:m15a/nixpkgs-vim-extra-plugins";
|
||||
vim-plugins.inputs.nixpkgs.follows = "nixpkgs";
|
||||
wayland.url = "github:nix-community/nixpkgs-wayland";
|
||||
wayland.inputs.nixpkgs.url = "nixpkgs";
|
||||
};
|
||||
|
||||
outputs = inputs @ {
|
||||
|
|
|
|||
9
home.nix
9
home.nix
|
|
@ -2,19 +2,19 @@
|
|||
pkgs,
|
||||
inputs,
|
||||
config,
|
||||
doom-emacs,
|
||||
# doom-emacs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
# # Nix Doom Emacs
|
||||
# inputs.doom-emacs.hmModule
|
||||
# Nix Doom Emacs
|
||||
# doom-emacs.hmModule
|
||||
|
||||
# Wayland
|
||||
# ./home/wayland/sway.nix
|
||||
# Home-manager programs
|
||||
./home/programs/atuin.nix
|
||||
# ./home/programs/chromium.nix
|
||||
./home/programs/emacs.nix
|
||||
# ./home/programs/emacs.nix
|
||||
./home/programs/firefox.nix
|
||||
./home/programs/fish
|
||||
./home/programs/git.nix
|
||||
|
|
@ -31,6 +31,7 @@
|
|||
./home/programs/ssh.nix
|
||||
./home/programs/starship.nix
|
||||
./home/programs/taskwarrior.nix
|
||||
./home/programs/waybar.nix
|
||||
./home/programs/zoxide.nix
|
||||
# ./home/programs/zsh.nix
|
||||
|
||||
|
|
|
|||
|
|
@ -2,63 +2,63 @@
|
|||
programs.waybar = {
|
||||
enable = true;
|
||||
systemd.enable = true;
|
||||
settings = {
|
||||
mainBar = {
|
||||
layer = "top";
|
||||
position = "top";
|
||||
height = 32;
|
||||
modules-left = ["sway/workspaces" "sway/mode"];
|
||||
modules-center = ["custom/media"];
|
||||
modules-right = [
|
||||
"idle_inhibitor"
|
||||
"pulseaudio"
|
||||
"network"
|
||||
"cpu"
|
||||
"memory"
|
||||
"temperature"
|
||||
"backlight"
|
||||
"battery"
|
||||
"clock"
|
||||
"tray"
|
||||
];
|
||||
"sway/workspaces" = {
|
||||
disable-scroll = true;
|
||||
enable-bar-scroll = false;
|
||||
active-only = false;
|
||||
all-outputs = false;
|
||||
format = "{icon}";
|
||||
format-icons = {
|
||||
"1" = "";
|
||||
"2" = "";
|
||||
"3" = "ﭮ";
|
||||
"4" = "ﱘ";
|
||||
"5" = "";
|
||||
};
|
||||
};
|
||||
"idle_inhibitor" = {
|
||||
format = "{icon}";
|
||||
format-icons = {
|
||||
"activated" = "";
|
||||
"deactivated" = "";
|
||||
};
|
||||
};
|
||||
"tray" = {
|
||||
icon-size = 25;
|
||||
spacing = 12;
|
||||
};
|
||||
"clock" = {
|
||||
tooltip-format = "<big>{%R:%S}</big>\n<tt><small>{calendar}</small></tt>";
|
||||
format-alt = "{%d %b %Y}";
|
||||
};
|
||||
"cpu" = {
|
||||
format = "{usage}% ";
|
||||
interval = 5;
|
||||
tooltip = false;
|
||||
# states = {
|
||||
# ""
|
||||
# };
|
||||
};
|
||||
};
|
||||
};
|
||||
# settings = {
|
||||
# mainBar = {
|
||||
# layer = "top";
|
||||
# position = "top";
|
||||
# height = 32;
|
||||
# modules-left = ["sway/workspaces" "sway/mode"];
|
||||
# modules-center = ["custom/media"];
|
||||
# modules-right = [
|
||||
# "idle_inhibitor"
|
||||
# "pulseaudio"
|
||||
# "network"
|
||||
# "cpu"
|
||||
# "memory"
|
||||
# "temperature"
|
||||
# "backlight"
|
||||
# "battery"
|
||||
# "clock"
|
||||
# "tray"
|
||||
# ];
|
||||
# "sway/workspaces" = {
|
||||
# disable-scroll = true;
|
||||
# enable-bar-scroll = false;
|
||||
# active-only = false;
|
||||
# all-outputs = false;
|
||||
# format = "{icon}";
|
||||
# format-icons = {
|
||||
# "1" = "";
|
||||
# "2" = "";
|
||||
# "3" = "ﭮ";
|
||||
# "4" = "ﱘ";
|
||||
# "5" = "";
|
||||
# };
|
||||
# };
|
||||
# "idle_inhibitor" = {
|
||||
# format = "{icon}";
|
||||
# format-icons = {
|
||||
# "activated" = "";
|
||||
# "deactivated" = "";
|
||||
# };
|
||||
# };
|
||||
# "tray" = {
|
||||
# icon-size = 25;
|
||||
# spacing = 12;
|
||||
# };
|
||||
# "clock" = {
|
||||
# tooltip-format = "<big>{%R:%S}</big>\n<tt><small>{calendar}</small></tt>";
|
||||
# format-alt = "{%d %b %Y}";
|
||||
# };
|
||||
# "cpu" = {
|
||||
# format = "{usage}% ";
|
||||
# interval = 5;
|
||||
# tooltip = false;
|
||||
# # states = {
|
||||
# # ""
|
||||
# # };
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,2 +1,21 @@
|
|||
{
|
||||
services.gpg-agent = {
|
||||
enable = true;
|
||||
enableExtraSocket = true;
|
||||
enableScDaemon = true;
|
||||
enableSshSupport = true;
|
||||
defaultCacheTtl = 60;
|
||||
maxCacheTtl = 120;
|
||||
pinentryFlavor = "qt";
|
||||
sshKeys = [
|
||||
"0473DE36B65F21FF4575C9D5CE1D72E8DA82FA41"
|
||||
"299421C6640F65F73658B37100305AB10397CC98"
|
||||
"CD0386CDF06EEBFB7BF5045B54E51925EE7C29E7"
|
||||
"9207EB49332FC3B64CDC012AAE0BFD11CF120FED"
|
||||
"4474E9BFC13AB8437A28C9A6909F6810BE051074"
|
||||
];
|
||||
extraConfig = ''
|
||||
ttyname $GPG_TTY
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{...}: {
|
||||
{pkgs, lib, ...}: {
|
||||
boot = {
|
||||
loader = {
|
||||
systemd-boot.enable = false;
|
||||
|
|
|
|||
Loading…
Reference in a new issue