Compare commits
6 commits
a346131bb5
...
45e402d44d
Author | SHA1 | Date | |
---|---|---|---|
45e402d44d | |||
9a7c2b11ad | |||
d72e11cebe | |||
0c7daf7530 | |||
105fe00a81 | |||
18f336cbd6 |
29
flake.lock
29
flake.lock
|
@ -327,6 +327,22 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixos-hardware": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1672644464,
|
||||||
|
"narHash": "sha256-RYlvRMcQNT7FDoDkViijQBHg9g+blsB+U6AvL/gAsPI=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixos-hardware",
|
||||||
|
"rev": "ca29e25c39b8e117d4d76a81f1e229824a9b3a26",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "master",
|
||||||
|
"repo": "nixos-hardware",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1662099760,
|
"lastModified": 1662099760,
|
||||||
|
@ -345,11 +361,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1670193339,
|
"lastModified": 1672844754,
|
||||||
"narHash": "sha256-oHTAhX4p6+uxcabq0rKL4EyKWPbDLGKec88ocPIU/2Y=",
|
"narHash": "sha256-o26WabuHABQsaHxxmIrR3AQRqDFUEdLckLXkVCpIjSU=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "e169cf5b3b1e6cc4a25ff15087c2621605f83409",
|
"rev": "e9ade2c8240e00a4784fac282a502efff2786bdc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -419,6 +435,7 @@
|
||||||
"hardware": "hardware",
|
"hardware": "hardware",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"nix-matrix-appservices": "nix-matrix-appservices",
|
"nix-matrix-appservices": "nix-matrix-appservices",
|
||||||
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nixpkgs": "nixpkgs_2",
|
"nixpkgs": "nixpkgs_2",
|
||||||
"nur": "nur",
|
"nur": "nur",
|
||||||
"poonam": "poonam",
|
"poonam": "poonam",
|
||||||
|
@ -510,11 +527,11 @@
|
||||||
},
|
},
|
||||||
"unstable": {
|
"unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1670152712,
|
"lastModified": 1672791794,
|
||||||
"narHash": "sha256-LJttwIvJqsZIj8u1LxVRv82vwUtkzVqQVi7Wb8gxPS4=",
|
"narHash": "sha256-mqGPpGmwap0Wfsf3o2b6qHJW1w2kk/I6cGCGIU+3t6o=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "14ddeaebcbe9a25748221d1d7ecdf98e20e2325e",
|
"rev": "9813adc7f7c0edd738c6bdd8431439688bb0cb3d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
# Nixpkgs
|
# Nixpkgs
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
|
||||||
unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
|
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||||
|
|
||||||
# Home manager
|
# Home manager
|
||||||
home-manager.url = "github:nix-community/home-manager";
|
home-manager.url = "github:nix-community/home-manager";
|
||||||
|
@ -52,6 +53,7 @@
|
||||||
{ self
|
{ self
|
||||||
, nixpkgs
|
, nixpkgs
|
||||||
, unstable
|
, unstable
|
||||||
|
, nixos-hardware
|
||||||
, home-manager
|
, home-manager
|
||||||
, deploy-rs
|
, deploy-rs
|
||||||
, agenix
|
, agenix
|
||||||
|
@ -145,6 +147,7 @@
|
||||||
agenix.nixosModules.age
|
agenix.nixosModules.age
|
||||||
self.nixosModules.backup
|
self.nixosModules.backup
|
||||||
self.nixosModules.wireguard
|
self.nixosModules.wireguard
|
||||||
|
nixos-hardware.nixosModules.lenovo-thinkpad-x270
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
{
|
{
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
|
|
|
@ -57,6 +57,8 @@
|
||||||
#ssb-patchwork
|
#ssb-patchwork
|
||||||
fontconfig
|
fontconfig
|
||||||
pandoc
|
pandoc
|
||||||
|
taskwarrior-tui
|
||||||
|
|
||||||
(pkgs.writeScriptBin "jq-repl" ''
|
(pkgs.writeScriptBin "jq-repl" ''
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
if [[ -z $1 ]] || [[ $1 == "-" ]]; then
|
if [[ -z $1 ]] || [[ $1 == "-" ]]; then
|
||||||
|
@ -133,15 +135,6 @@
|
||||||
TERMINFO_DIRS = "${pkgs.kitty.terminfo.outPath}/share/terminfo"; # Needed to run home-manager switch on non-nixOS
|
TERMINFO_DIRS = "${pkgs.kitty.terminfo.outPath}/share/terminfo"; # Needed to run home-manager switch on non-nixOS
|
||||||
};
|
};
|
||||||
plugins = [
|
plugins = [
|
||||||
{
|
|
||||||
name = "zsh-autocomplete";
|
|
||||||
src = pkgs.fetchFromGitHub {
|
|
||||||
owner = "marlonrichert";
|
|
||||||
repo = "zsh-autocomplete";
|
|
||||||
rev = "22.01.21";
|
|
||||||
sha256 = "+UziTYsjgpiumSulrLojuqHtDrgvuG91+XNiaMD7wIs=";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
{
|
{
|
||||||
name = "zsh-autopair";
|
name = "zsh-autopair";
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
|
@ -273,10 +266,10 @@
|
||||||
nepl = "n repl '<nixpkgs>'";
|
nepl = "n repl '<nixpkgs>'";
|
||||||
srch = "ns nixpkgs";
|
srch = "ns nixpkgs";
|
||||||
orch = "ns override";
|
orch = "ns override";
|
||||||
nrb = "cd /tmp; sudo nixos-rebuild switch --flake '/etc/nixos/#curve'; cd $OLDPWD";
|
nrb = "cd /tmp; sudo nixos-rebuild switch --flake '/home/anish/usr/helm#curve'; cd $OLDPWD";
|
||||||
nrt = "cd /tmp; sudo nixos-rebuild test --flake '/etc/nixos/#curve'; cd $OLDPWD";
|
nrt = "cd /tmp; sudo nixos-rebuild test --flake '/home/anish/usr/helm#curve'; cd $OLDPWD";
|
||||||
ned = "cd /etc/nixos; vim; cd $OLDPWD";
|
ned = "cd /home/anish/usr/helm; vim; cd $OLDPWD";
|
||||||
ncd = "cd /etc/nixos";
|
ncd = "cd /home/anish/usr/helm";
|
||||||
mn = ''
|
mn = ''
|
||||||
manix "" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | sk --preview="manix '{}'" | xargs manix
|
manix "" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | sk --preview="manix '{}'" | xargs manix
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -29,7 +29,7 @@ taskd.credentials=mossnet\/anish\/1647259c-e340-405c-a38b-11ac18e34688
|
||||||
#include /nix/store/nv662d85k32kkpqidrj64qy1lnihac4c-taskwarrior-2.5.3/share/doc/task/rc/dark-green-256.theme
|
#include /nix/store/nv662d85k32kkpqidrj64qy1lnihac4c-taskwarrior-2.5.3/share/doc/task/rc/dark-green-256.theme
|
||||||
#include /nix/store/nv662d85k32kkpqidrj64qy1lnihac4c-taskwarrior-2.5.3/share/doc/task/rc/dark-blue-256.theme
|
#include /nix/store/nv662d85k32kkpqidrj64qy1lnihac4c-taskwarrior-2.5.3/share/doc/task/rc/dark-blue-256.theme
|
||||||
# TODO this needs to be not a hardlink but a nix link
|
# TODO this needs to be not a hardlink but a nix link
|
||||||
include /nix/store/64nvv0ac2dr8rdz2414f53x97j3msiz0-taskwarrior-2.6.2/share/doc/task/rc/dark-violets-256.theme
|
# include /nix/store/64nvv0ac2dr8rdz2414f53x97j3msiz0-taskwarrior-2.6.2/share/doc/task/rc/dark-violets-256.theme
|
||||||
#include /nix/store/nv662d85k32kkpqidrj64qy1lnihac4c-taskwarrior-2.5.3/share/doc/task/rc/dark-yellow-green.theme
|
#include /nix/store/nv662d85k32kkpqidrj64qy1lnihac4c-taskwarrior-2.5.3/share/doc/task/rc/dark-yellow-green.theme
|
||||||
#include /nix/store/nv662d85k32kkpqidrj64qy1lnihac4c-taskwarrior-2.5.3/share/doc/task/rc/dark-gray-256.theme
|
#include /nix/store/nv662d85k32kkpqidrj64qy1lnihac4c-taskwarrior-2.5.3/share/doc/task/rc/dark-gray-256.theme
|
||||||
#include /nix/store/nv662d85k32kkpqidrj64qy1lnihac4c-taskwarrior-2.5.3/share/doc/task/rc/dark-gray-blue-256.theme
|
#include /nix/store/nv662d85k32kkpqidrj64qy1lnihac4c-taskwarrior-2.5.3/share/doc/task/rc/dark-gray-blue-256.theme
|
||||||
|
|
|
@ -14,38 +14,38 @@
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
|
fileSystems."/boot" =
|
||||||
|
{
|
||||||
|
device = "/dev/disk/by-uuid/2C41-3DAA";
|
||||||
|
fsType = "vfat";
|
||||||
|
};
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" =
|
||||||
{
|
{
|
||||||
device = "/dev/disk/by-uuid/74ba39ee-35cd-4b87-9ee9-651384fa55bd";
|
device = "/dev/disk/by-uuid/a4ae2855-10b9-49f3-adb0-acd82b74eeb9";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [ "subvol=root" ];
|
options = [ "subvol=root" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/home" =
|
fileSystems."/home" =
|
||||||
{
|
{
|
||||||
device = "/dev/disk/by-uuid/74ba39ee-35cd-4b87-9ee9-651384fa55bd";
|
device = "/dev/disk/by-uuid/a4ae2855-10b9-49f3-adb0-acd82b74eeb9";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [ "subvol=home" ];
|
options = [ "subvol=home" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
|
||||||
{
|
|
||||||
device = "/dev/disk/by-uuid/87DA-98E7";
|
|
||||||
fsType = "vfat";
|
|
||||||
};
|
|
||||||
|
|
||||||
swapDevices =
|
swapDevices =
|
||||||
[{ device = "/dev/disk/by-uuid/c36e3ba9-8eee-4fbf-837c-7e1cfda33f09"; }];
|
[{ device = "/dev/disk/by-uuid/23658926-6ffa-42dc-8915-a6479c385e0b"; }];
|
||||||
|
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||||
# still possible to use this option, but it's recommended to use it in conjunction
|
# still possible to use this option, but it's recommended to use it in conjunction
|
||||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||||
# networking.useDHCP = lib.mkDefault true;
|
networking.useDHCP = lib.mkDefault true;
|
||||||
# networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
|
# networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
|
||||||
# networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
|
# networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
|
||||||
|
|
||||||
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
|
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
|
||||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
# hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
nixpkgs.hostPlatform = "x86_64-linux";
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -170,16 +170,16 @@ in
|
||||||
lightdm = {
|
lightdm = {
|
||||||
enable = true;
|
enable = true;
|
||||||
background = "/etc/nixos/users/profiles/desktop/background.jpg";
|
background = "/etc/nixos/users/profiles/desktop/background.jpg";
|
||||||
greeters.mini = {
|
# greeters.mini = {
|
||||||
enable = true;
|
# enable = true;
|
||||||
user = "anish";
|
# user = "anish";
|
||||||
extraConfig = ''
|
# extraConfig = ''
|
||||||
text-color = "#ff79c6"
|
# text-color = "#ff79c6"
|
||||||
password-background-color = "#1E2029"
|
# password-background-color = "#1E2029"
|
||||||
window-color = "#181a23"
|
# window-color = "#181a23"
|
||||||
border-color = "#181a23"
|
# border-color = "#181a23"
|
||||||
'';
|
# '';
|
||||||
};
|
# };
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
windowManager.bspwm.enable = true;
|
windowManager.bspwm.enable = true;
|
||||||
|
|
|
@ -1,11 +1,9 @@
|
||||||
age-encryption.org/v1
|
age-encryption.org/v1
|
||||||
-> ssh-ed25519 0Digeg AOQZQPRozBRQA5FmG0LRaJL1jldrvnqJdnLxLftm0Gw
|
-> ssh-ed25519 H6uv4Q Whar4hMPZxYi9ejXjeUyE7KPHQXD1/zQys5FAjBixmE
|
||||||
Snz6MGd/KZfvk4ZxFn7xEeSQg7xNZelDwDsRRBOvdC8
|
3D54HvIgnrVbTrcGy+ZItRrZYGsh5gVoh8Fnumf8RAc
|
||||||
-> ssh-ed25519 iQshAw FUyM7P2B9+gXi7XkehToM/0bQmf4HfuUk5azNvbfmDA
|
-> ssh-ed25519 AiezdQ mGj7r1PZhpmuh0Qbu8YHzQ9ivUbxXZFAjmu0xUz7L3o
|
||||||
FkD+7klQ1TlTeqnzK0j1bCd814A8c9ostTlRMtZji38
|
8xP3MDQEkvZCixQIbF5Rpo303RSj/61uXnGhOYtgeGM
|
||||||
-> sT2qSf;g-grease 5X|? UsL&L>qQ Li
|
-> |-grease 5t*+"`dV Y_s"p 4<v%R'\x
|
||||||
VpBYf+9n9HkrchvrwOV4xXJEKuA0rozU9VvnGytKkGQMPvBKauqF3jPgbRL7PuIE
|
FtPL6uRW7Jds3YzMFtKHAKmHmYlv/ggGDJKhSsj2cg
|
||||||
7rOBN8gSlaC2GjSpT0jIQbVWKCGEJF9JCGZ/lMNspG9lXdGKKWgD
|
--- SScbLeVK8pi0WGwUIKfIThDOpFOIiOAKBBKyl6ZSc44
|
||||||
--- SOtnnr/Al0QpvMWVE3fx7CvdGuKdy++JCz/jiG1VZEY
|
n©Èî…\\ÄQäÄ/2±± Ý^jNÆŒzjóáèÑ…<C391>u8ÍÞÇ!ÕÕ!¦ž½¥èz„Wgð\p³¡å¡·<~y˜£‰…»
|
||||||
ţ=(‚J"ŞĂÄ~c'<27>x
®†˛#]ńy”Gë™îÇáĂ €sž.*Č<Hjp
|
|
||||||
ą>€Aóoź%]z1ŹWz}Čţ®R6sÖV7v)ĂŞ
|
|
|
@ -12,7 +12,7 @@ in
|
||||||
{
|
{
|
||||||
"fastmail.age".publicKeys = allUserKeys;
|
"fastmail.age".publicKeys = allUserKeys;
|
||||||
"mossnet.age".publicKeys = allUserKeys;
|
"mossnet.age".publicKeys = allUserKeys;
|
||||||
# "curve-wg.age".publicKeys = curve;
|
"curve-wg.age".publicKeys = curve;
|
||||||
"box-wg.age".publicKeys = [ mossnet ];
|
"box-wg.age".publicKeys = [ mossnet ];
|
||||||
"wallabag-password.age".publicKeys = [ mossnet ];
|
"wallabag-password.age".publicKeys = [ mossnet ];
|
||||||
"wallabag-secret.age".publicKeys = [ mossnet ];
|
"wallabag-secret.age".publicKeys = [ mossnet ];
|
||||||
|
|
Loading…
Reference in a new issue