AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update installation

Browse Source
This commit is contained in:
Dmitriy Kholkin 2020-11-28 05:07:18 +04:00
parent 5b3bebe963
commit 2c078c583a
5 changed files with 46 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
flake.lock generated
View File

@ -39,11 +39,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1603662906, "lastModified": 1606046962,
"narHash": "sha256-d9Ww4Fa9WB00JLaqXN/cp41rVxF/MXGr3SbhMY5f11k=", "narHash": "sha256-244JrrVFht/VMRItDcDlrcwejqpqJInDUWA/x6mucW4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "28eb093a1e6999d52e60811008b4bfc7e20cc591", "rev": "a3a0f1289acac24ce2ffe0481bf8cabd3a6ccc64",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -55,11 +55,11 @@
"i3lock-fancy-rapid": { "i3lock-fancy-rapid": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1570642358, "lastModified": 1604870111,
"narHash": "sha256-hs1MHGVN/xysUdkg9NxfQocvSOtyvpuGAKdzs42kG0o=", "narHash": "sha256-5D/8FXX6au9NPzaCS0u5Lv4zSBLGNb3EO/bIR2VDNtQ=",
"owner": "yvbbrjdr", "owner": "yvbbrjdr",
"repo": "i3lock-fancy-rapid", "repo": "i3lock-fancy-rapid",
"rev": "c67f09bc8a48798c7c820d7d4749240b10865ce0", "rev": "c70ecfa8a529cb71f21f475f31d748ce9b154a8b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -117,11 +117,11 @@
}, },
"nixpkgs-old": { "nixpkgs-old": {
"locked": { "locked": {
"lastModified": 1605220118, "lastModified": 1606344557,
"narHash": "sha256-Und10ixH1WuW0XHYMxxuHRohKYb45R/T8CwZuLd2D2Q=", "narHash": "sha256-IVIMVKWNNt6VODiLfINaW6sfrWPw5ZT91GQMgLUl7ZA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3090c65041104931adda7625d37fa874b2b5c124", "rev": "ffb3aab257e8851b558cdc6079241a7eb0c7239e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -133,11 +133,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1603910308, "lastModified": 1606518375,
"narHash": "sha256-cfD63yk3bkXKTfWT7SfkB7FvBBavzcDCDvvDBocIJ/4=", "narHash": "sha256-foO4ZgJa4YnKG3limxeCT6DeLr249XkUdGJx6fORaNc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ca45bb574ddd7c4e4a855bc41a7154f0b6edddd9", "rev": "da8bd7747d143d81718ea4fdff971479ad027b94",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -147,11 +147,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1603758576, "lastModified": 1605988311,
"narHash": "sha256-xKFmWVx+rFInBao3gtmvXcd0LjHD1+0c1Ef5PJDrbuM=", "narHash": "sha256-PA+kgq46NApOAJlmBNJHs5DwsIrY+jodM0e4g7VtXyY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1dc37370c489b610f8b91d7fdd40633163ffbafd", "rev": "2247d824fe07f16325596acc7faa286502faffd1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -173,6 +173,7 @@
"nixpkgs-old": "nixpkgs-old", "nixpkgs-old": "nixpkgs-old",
"spotify-tui": "spotify-tui", "spotify-tui": "spotify-tui",
"zsh-autosuggestions": "zsh-autosuggestions", "zsh-autosuggestions": "zsh-autosuggestions",
"zsh-cod": "zsh-cod",
"zsh-nix-shell": "zsh-nix-shell", "zsh-nix-shell": "zsh-nix-shell",
"zsh-you-should-use": "zsh-you-should-use" "zsh-you-should-use": "zsh-you-should-use"
} }
@ -180,11 +181,11 @@
"spotify-tui": { "spotify-tui": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1603791861, "lastModified": 1606232808,
"narHash": "sha256-sDsUa5tx2/XM8hcusapnEgKVcOsaExG00b6dVuL2pSM=", "narHash": "sha256-Xf8wOyjceEXpCJuaQcTH586QLBwej4blndzq3u8IkbY=",
"owner": "Rigellute", "owner": "Rigellute",
"repo": "spotify-tui", "repo": "spotify-tui",
"rev": "c8603131e8635030ae23a47d63ddb3cc741f2a34", "rev": "5bbc0848bfaa4a63b744f5cd045874d87d87c7ac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -209,6 +210,22 @@
"type": "github" "type": "github"
} }
}, },
"zsh-cod": {
"flake": false,
"locked": {
"lastModified": 1604780773,
"narHash": "sha256-FNtM2D7ALBWE3rNFiXfixKpXgT51jXMjUD3OpHShpuU=",
"owner": "dim-an",
"repo": "cod",
"rev": "e08812e3568d91dac7b0f71870893b8c73a694b2",
"type": "github"
},
"original": {
"owner": "dim-an",
"repo": "cod",
"type": "github"
}
},
"zsh-nix-shell": { "zsh-nix-shell": {
"flake": false, "flake": false,
"locked": { "locked": {

5
flake.nix
View File

@ -3,6 +3,7 @@
inputs = { inputs = {
nixpkgs.url = github:nixos/nixpkgs/nixos-unstable; nixpkgs.url = github:nixos/nixpkgs/nixos-unstable;
# nixpkgs-old.url = github:nixos/nixpkgs/nixos-20.09;
nixpkgs-old.url = github:nixos/nixpkgs/nixos-20.09; nixpkgs-old.url = github:nixos/nixpkgs/nixos-20.09;
# nix.url = github:nixos/nix/6ff9aa8df7ce8266147f74c65e2cc529a1e72ce0; # nix.url = github:nixos/nix/6ff9aa8df7ce8266147f74c65e2cc529a1e72ce0;
home-manager.url = github:nix-community/home-manager; home-manager.url = github:nix-community/home-manager;
@ -28,6 +29,10 @@
url = github:MichaelAquilina/zsh-you-should-use; url = github:MichaelAquilina/zsh-you-should-use;
flake = false; flake = false;
}; };
zsh-cod = {
url = github:dim-an/cod;
flake = false;
};
i3lock-fancy-rapid = { i3lock-fancy-rapid = {
url = github:yvbbrjdr/i3lock-fancy-rapid; url = github:yvbbrjdr/i3lock-fancy-rapid;
flake = false; flake = false;

8
hardware-configuration/Dell-Laptop.nix
View File

@ -39,20 +39,20 @@
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/2FA1-8DA6"; { device = "/dev/disk/by-uuid/4F6D-537A";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = [ swapDevices = [
{ {
device = "/dev/disk/by-partuuid/96ef04e6-4537-453c-a75d-f4184fe9a54e"; device = "/dev/disk/by-partuuid/3043db40-1d67-47f0-b6d6-d8f1a68b47c6";
randomEncryption.enable = true; randomEncryption.enable = true;
} }
]; ];
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
networking.hostId = "7c725ef4"; networking.hostId = "d107d6c6";
boot.zfs.devNodes = "/dev/disk/by-partuuid/69b0df60-36a2-4aa3-864b-d17cf95e6387"; boot.zfs.devNodes = "/dev/disk/by-partuuid/8454c73b-e50a-407c-86d7-e970d0fdb09e";
boot.supportedFilesystems = [ "zfs" ]; boot.supportedFilesystems = [ "zfs" ];
boot.kernelParams = [ "zfs.zfs_arc_max=4294967296" ]; boot.kernelParams = [ "zfs.zfs_arc_max=4294967296" ];
} }

2
install/install.sh
View File

@ -157,7 +157,7 @@ if [[ "$SWAP" != "NONE" ]]; then
fi fi
pprint "Create ZFS pool on $ZFS" pprint "Create ZFS pool on $ZFS"
zpool create -f -m none -o ashift=$ZFS_ASHIFT -O compression=lz4 -O normalization=formD -O atime=on -O relatime=on -O dedup=off -R /mnt rpool "$ZFS" zpool create -f -m none -o ashift=$ZFS_ASHIFT -O compression=lz4 -O normalization=formD -O atime=on -O relatime=on -O dedup=off -O com.sun:auto-snapshot=true -R /mnt rpool "$ZFS"
pprint "Create ZFS datasets" pprint "Create ZFS datasets"

1
modules/applications/packages.nix
View File

@ -14,6 +14,7 @@ with deviceSpecific; {
# cli # cli
advance-touch advance-touch
curl curl
ddgr
exa exa
fd fd
git-crypt git-crypt