This commit is contained in:
dusk 2021-07-05 00:01:15 +03:00
parent 50e2128184
commit 2c893256c7
Signed by: dusk
GPG Key ID: 1D8F8FAF2294D6EA
3 changed files with 171 additions and 274 deletions

View File

@ -31,11 +31,11 @@
"pre-commit-hooks-nix": "pre-commit-hooks-nix" "pre-commit-hooks-nix": "pre-commit-hooks-nix"
}, },
"locked": { "locked": {
"lastModified": 1624345263, "lastModified": 1624885917,
"narHash": "sha256-km/ig4jYNZ0Ru0sN9/3jzMpIeNPGBREx5sJKu55INec=", "narHash": "sha256-CaAEhMKzuTyN9krTLZ1jWW3C5HzvKRZY/doVOezZZx0=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "hercules-ci-agent", "repo": "hercules-ci-agent",
"rev": "0e07d0e926ffd822ce882c2f2514613dce772cf3", "rev": "5eba6597af97e358542c6f968f6ef680ffd2a401",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -100,21 +100,6 @@
"type": "github" "type": "github"
} }
}, },
"devshell_2": {
"locked": {
"lastModified": 1622711433,
"narHash": "sha256-rGjXz7FA7HImAT3TtoqwecByLO5yhVPSwPdaYPBFRQw=",
"owner": "numtide",
"repo": "devshell",
"rev": "1f4fb67b662b65fa7cfe696fc003fcc1e8f7cc36",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "devshell",
"type": "github"
}
},
"digga": { "digga": {
"inputs": { "inputs": {
"deploy": "deploy", "deploy": "deploy",
@ -199,44 +184,6 @@
"type": "github" "type": "github"
} }
}, },
"flakeCompat": {
"flake": false,
"locked": {
"lastModified": 1606424373,
"narHash": "sha256-oq8d4//CJOrVj+EcOaSXvMebvuTkmBJuT5tzlfewUnQ=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "99f1c2157fba4bfe6211a321fd0ee43199025dbf",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"helix": {
"inputs": {
"flakeCompat": "flakeCompat",
"nixCargoIntegration": "nixCargoIntegration",
"nixpkgs": [
"nixos"
]
},
"locked": {
"lastModified": 1624871120,
"narHash": "sha256-Z12RGXJ11o74HtWm2ypjppfBGwMUUHGRqWSTX1QaAF4=",
"owner": "helix-editor",
"repo": "helix",
"rev": "51162ae6b2f57a38b5878670bf6524b24b5604e6",
"type": "github"
},
"original": {
"owner": "helix-editor",
"repo": "helix",
"type": "github"
}
},
"home": { "home": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -244,11 +191,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1624863040, "lastModified": 1625384440,
"narHash": "sha256-BeV2TDf0nBB4IituD4JhT5ZWRlPrIvu3Z4P0q0XbQOQ=", "narHash": "sha256-WnDK+LZioER6eeC8Sm7GPvbiS6XPyUqn+qtc2lvjLHo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "dc4337d9fed5b437913e51722fa150b9eae7d91c", "rev": "ac319fd3149b23a3ad8ee24cb2def6e67acf194c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -259,10 +206,10 @@
}, },
"latest": { "latest": {
"locked": { "locked": {
"lastModified": 1624626397, "lastModified": 1625281901,
"narHash": "sha256-+h0ulo5//RqStx6g6MDqD9MzgmBfeZ1VYxwEaSmw/Zs=", "narHash": "sha256-DkZDtTIPzhXATqIps2ifNFpnI+PTcfMYdcrx/oFm00Q=",
"path": "/nix/store/nanws06l7r1avkvjjga5vlv01y2v4n8d-source", "path": "/nix/store/wsfwxm10shvi4yr0ll8p4v1dp7l7wqfl-source",
"rev": "e1f8852faac7638e88d5e8a5b9ee2a7568685e3f", "rev": "09c38c29f2c719cd76ca17a596c2fdac9e186ceb",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -311,28 +258,6 @@
"type": "github" "type": "github"
} }
}, },
"nixCargoIntegration": {
"inputs": {
"devshell": "devshell_2",
"nixpkgs": [
"nixpkgs"
],
"rustOverlay": "rustOverlay"
},
"locked": {
"lastModified": 1624244973,
"narHash": "sha256-h+b4CwPjyibgwMYAeBaT5qBnxI0fsmGf66k23FqEH5Y=",
"owner": "yusdacra",
"repo": "nix-cargo-integration",
"rev": "00f5df6d8e7eeeac2764b7fa2c57e2e81f5d47cd",
"type": "github"
},
"original": {
"owner": "yusdacra",
"repo": "nix-cargo-integration",
"type": "github"
}
},
"nixEvalLsp": { "nixEvalLsp": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
@ -371,11 +296,11 @@
}, },
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1624626397, "lastModified": 1625281901,
"narHash": "sha256-+h0ulo5//RqStx6g6MDqD9MzgmBfeZ1VYxwEaSmw/Zs=", "narHash": "sha256-DkZDtTIPzhXATqIps2ifNFpnI+PTcfMYdcrx/oFm00Q=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e1f8852faac7638e88d5e8a5b9ee2a7568685e3f", "rev": "09c38c29f2c719cd76ca17a596c2fdac9e186ceb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -386,11 +311,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1624713701, "lastModified": 1625333638,
"narHash": "sha256-miYoO9/M+ZYlNPknRF9VYh6bQEQCPPz6lM0Pb60jbPk=", "narHash": "sha256-M6J9RN60XJyv6nUfDFCwnz5aVjhe8+GJnV8Q9VpdQQQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "03c60a2db286bcd8ecfac9a8739c50626ca0fd8e", "rev": "41775780a0b6b32b3d32dcc32bb9bc6df809062d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -438,11 +363,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1624611910, "lastModified": 1625046037,
"narHash": "sha256-sbf/mDcG2E0lhAYwDxoL53kWD72XRD5FLUi7Ft4LN/k=", "narHash": "sha256-I+qqRcSNFHa+xrF5LLl8vrU4R0Uouj052gl17gTNRaQ=",
"owner": "colemickens", "owner": "colemickens",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "2b079c65ee4ee4dc557b5f2428f1644fc1c868e6", "rev": "03f164c2a5344768c8186989c30045b7c8c7ebf7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -516,7 +441,6 @@
"ci-agent": "ci-agent", "ci-agent": "ci-agent",
"darwin": "darwin", "darwin": "darwin",
"digga": "digga", "digga": "digga",
"helix": "helix",
"home": "home", "home": "home",
"latest": "latest", "latest": "latest",
"naersk": "naersk_2", "naersk": "naersk_2",
@ -532,22 +456,6 @@
"pkgs": "pkgs" "pkgs": "pkgs"
} }
}, },
"rustOverlay": {
"flake": false,
"locked": {
"lastModified": 1624242197,
"narHash": "sha256-J0+j4DYFaE0O0marb4QN/S1bUhpGwAjQ4O04kIYKcb8=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "df5d330f34b64194d64dcbafb91e82e01a89a229",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"utils": { "utils": {
"locked": { "locked": {
"lastModified": 1610051610, "lastModified": 1610051610,

View File

@ -27,17 +27,13 @@
url = "github:aaronjanse/nix-eval-lsp"; url = "github:aaronjanse/nix-eval-lsp";
inputs.nixpkgs.follows = "nixos"; inputs.nixpkgs.follows = "nixos";
}; };
helix = {
url = "github:helix-editor/helix";
inputs.nixpkgs.follows = "nixos";
};
nixpkgsWayland = { nixpkgsWayland = {
url = "github:colemickens/nixpkgs-wayland"; url = "github:colemickens/nixpkgs-wayland";
inputs.nixpkgs.follows = "nixos"; inputs.nixpkgs.follows = "nixos";
}; };
}; };
outputs = inputs@{ self, pkgs, digga, nixos, ci-agent, home, nixos-hardware, nur, nixosPersistence, nixpkgsWayland, nixEvalLsp, helix, ... }: outputs = inputs@{ self, pkgs, digga, nixos, ci-agent, home, nixos-hardware, nur, nixosPersistence, nixpkgsWayland, nixEvalLsp, ... }:
digga.lib.mkFlake { digga.lib.mkFlake {
inherit self inputs; inherit self inputs;
@ -45,9 +41,6 @@
channelsConfig = { channelsConfig = {
allowUnfree = true; allowUnfree = true;
permittedInsecurePackages = [
"swftools-0.9.2"
];
}; };
channels = { channels = {
@ -60,7 +53,6 @@
nixpkgsWayland.overlay nixpkgsWayland.overlay
(final: prev: { (final: prev: {
inherit (nixEvalLsp.packages.${prev.system}) nix-eval-lsp; inherit (nixEvalLsp.packages.${prev.system}) nix-eval-lsp;
inherit (helix.packages.${prev.system}) helix;
}) })
]; ];
}; };

View File

@ -360,10 +360,8 @@ in
font-awesome font-awesome
(nerdfonts.override { fonts = [ "Iosevka" ]; }) (nerdfonts.override { fonts = [ "Iosevka" ]; })
# Programs # Programs
discord-canary-system # discord-canary-system
# lightcord # element-desktop
# discord-canary
element-desktop
audacity audacity
krita krita
gimp gimp
@ -666,28 +664,93 @@ in
separator = "none"; separator = "none";
terminal = pkgBin "alacritty"; terminal = pkgBin "alacritty";
}; };
waybar = vscode = {
enable = true;
package = pkgs.vscodium;
extensions =
let let
swayEnabled = config.wayland.windowManager.sway.enable; mkExt = n: v: p: s: { name = n; version = v; publisher = p; sha256 = s; };
in
(pkgs.vscode-utils.extensionsFromVscodeMarketplace [
# Rust
(mkExt "rust-analyzer" "0.2.654" "matklad" "sha256-WTwk71/A2RDEY0X+h5lwujL/OmYtf6FAQTJy6PB9ZzM=")
(mkExt "even-better-toml" "0.12.3" "tamasfe" "sha256-nDmmzVuADieNX9bcS3YQiemg27S4O02Pjj+rthkBAZw=")
(mkExt "crates" "0.5.9" "serayuzgur" "sha256-YHIbnl2R7lqwJHi8qUQImClx9MWm+5Pc12vYw7e/RlA=")
# Nix
(mkExt "nix-env-selector" "1.0.7" "arrterian" "sha256-DnaIXJ27bcpOrIp1hm7DcrlIzGSjo4RTJ9fD72ukKlc=")
# Go
(mkExt "Go" "0.25.1" "golang" "sha256-ZDUWN9lzDnR77W7xcMFQaaFl/6Lf/x1jgaBkwZPqGGw=")
# Flutter and dart
(mkExt "flutter" "3.22.0" "Dart-Code" "sha256-woygN6hOWlP2UayqwDhJh9KcZk1GzH7mDF5IueDRxs4=")
(mkExt "dart-code" "3.22.0" "Dart-Code" "sha256-1nTewVmlrxbXdRR1EPts46u24LHdnP5BblFsMaGlNYg=")
# protobuf
(mkExt "vscode-proto3" "0.5.4" "zxh404" "sha256-S89qRRlfiTsJ+fJuwdNkZywe6mei48KxIEWbGWChriE=")
# git
(mkExt "gitlens" "11.4.1" "eamodio" "sha256-OjMozzOjwZDAexVfKlu3XTDxJPf8acx7LqlAEMRmE78=")
(mkExt "vscode-commitizen" "0.14.1" "KnisterPeter" "sha256-yw8XKGL7Ul9wV+C0yL1LFJCE3+E8u/sR9s3TjkGJPZM=")
# Customization
# (mkExt "dance" "0.3.2" "gregoire" "sha256-+g8EXeCkPOPvZ60JoXkGTeSXYWrXmKrcbUaEfDppdgA=")
(mkExt "material-icon-theme" "4.6.0" "PKief" "sha256-i+3lrw3mDqK2vTMDhJYTACW5JleA+lN1XAC2imgQLUo=")
(mkExt "github-vscode-theme" "4.1.1" "GitHub" "sha256-yLySHOx6pe7w2cyi95pQlKkn/o4VMCTkrTYHu8ASn5M=")
(mkExt "koka" "0.0.1" "maelvalais" "sha256-ty8Mql19HgUWForggeZuHQpzTbmmB/eBFHqof5ZMKr0=")
(mkExt "vscode-rhai" "0.6.3" "rhaiscript" "sha256-gEdpM/TkkiZ50bG9qDU6BH04AJLRDcHLquniRs6m0mg=")
]) ++ (with pkgs.vscode-extensions; [ a5huynh.vscode-ron vadimcn.vscode-lldb jnoortheen.nix-ide ]);
userSettings = {
"workbench.iconTheme" = "material-icon-theme";
"workbench.colorTheme" = "GitHub Dark";
"rust-analyzer.cargo.loadOutDirsFromCheck" = true;
"rust-analyzer.procMacro.enable" = true;
"editor.fontFamily" = "'${font}'";
"debug.console.fontFamily" = "${font}";
"debug.console.fontSize" = toString fontSize;
"terminal.integrated.fontSize" = toString fontSize;
"go.useLanguageServer" = true;
"rust-analyzer.checkOnSave.command" = "clippy";
"nix.enableLanguageServer" = true;
"nix.serverPath" = pkgBin "rnix-lsp";
};
};
};
services = {
gpg-agent =
let
defaultCacheTtl = 3600 * 6;
maxCacheTtl = 3600 * 24;
in in
{ {
enable = swayEnabled || config.wayland.windowManager.hikari.enable; inherit defaultCacheTtl maxCacheTtl;
settings = [{
enable = true;
enableSshSupport = true;
sshKeys = [ "8369D9CA26C3EAAAB8302A88CEE6FD14B58AA965" ];
defaultCacheTtlSsh = defaultCacheTtl;
maxCacheTtlSsh = maxCacheTtl;
grabKeyboardAndMouse = false;
pinentryFlavor = "qt";
};
};
xdg = {
enable = true;
configFile = {
"waybar/config".text =
let swayEnabled = config.wayland.windowManager.sway.enable; in
builtins.toJSON {
layer = "top"; layer = "top";
position = "top"; position = "top";
modules-left = if swayEnabled then [ "sway/workspaces" ] else [ ]; modules-left = if swayEnabled then [ "sway/workspaces" ] else [ ];
modules-center = if swayEnabled then [ "sway/window" ] else [ ]; modules-center = if swayEnabled then [ "sway/window" ] else [ ];
modules-right = modules-right =
[ "pulseaudio" "cpu" "memory" "temperature" "clock" "tray" ]; [ "pulseaudio" "cpu" "memory" "temperature" "clock" "tray" ];
modules = { tray = { spacing = 8; };
"tray" = { spacing = 8; }; cpu = { format = "/cpu {usage}/"; };
"cpu" = { format = "/cpu {usage}/"; }; memory = { format = "/mem {}/"; };
"memory" = { format = "/mem {}/"; }; temperature = {
"temperature" = {
hwmon-path = "/sys/class/hwmon/hwmon1/temp2_input"; hwmon-path = "/sys/class/hwmon/hwmon1/temp2_input";
format = "/tmp {temperatureC}C/"; format = "/tmp {temperatureC}C/";
}; };
"pulseaudio" = { pulseaudio = {
format = "/vol {volume}/ {format_source}"; format = "/vol {volume}/ {format_source}";
format-bluetooth = "/volb {volume}/ {format_source}"; format-bluetooth = "/volb {volume}/ {format_source}";
format-bluetooth-muted = "/volb/ {format_source}"; format-bluetooth-muted = "/volb/ {format_source}";
@ -696,8 +759,7 @@ in
format-source-muted = "/mic/"; format-source-muted = "/mic/";
}; };
}; };
}]; "waybar/style.css".text =
style =
let let
makeBorder = color: "border-bottom: 3px solid #${color};"; makeBorder = color: "border-bottom: 3px solid #${color};";
makeInfo = color: '' makeInfo = color: ''
@ -815,71 +877,6 @@ in
} }
''; '';
}; };
vscode = {
enable = true;
package = pkgs.vscodium;
extensions =
let
mkExt = n: v: p: s: { name = n; version = v; publisher = p; sha256 = s; };
in
(pkgs.vscode-utils.extensionsFromVscodeMarketplace [
# Rust
(mkExt "rust-analyzer" "0.2.646" "matklad" "sha256-GL+0R2KuycvHs/+yKVfK1H89sKA+H41DLUsJwy4ngyc=")
(mkExt "even-better-toml" "0.12.3" "tamasfe" "sha256-nDmmzVuADieNX9bcS3YQiemg27S4O02Pjj+rthkBAZw=")
(mkExt "crates" "0.5.9" "serayuzgur" "sha256-YHIbnl2R7lqwJHi8qUQImClx9MWm+5Pc12vYw7e/RlA=")
# Nix
(mkExt "nix-env-selector" "1.0.7" "arrterian" "sha256-DnaIXJ27bcpOrIp1hm7DcrlIzGSjo4RTJ9fD72ukKlc=")
# Go
(mkExt "Go" "0.25.1" "golang" "sha256-ZDUWN9lzDnR77W7xcMFQaaFl/6Lf/x1jgaBkwZPqGGw=")
# Flutter and dart
(mkExt "flutter" "3.22.0" "Dart-Code" "sha256-woygN6hOWlP2UayqwDhJh9KcZk1GzH7mDF5IueDRxs4=")
(mkExt "dart-code" "3.22.0" "Dart-Code" "sha256-1nTewVmlrxbXdRR1EPts46u24LHdnP5BblFsMaGlNYg=")
# protobuf
(mkExt "vscode-proto3" "0.5.4" "zxh404" "sha256-S89qRRlfiTsJ+fJuwdNkZywe6mei48KxIEWbGWChriE=")
# git
(mkExt "gitlens" "11.4.1" "eamodio" "sha256-OjMozzOjwZDAexVfKlu3XTDxJPf8acx7LqlAEMRmE78=")
(mkExt "vscode-commitizen" "0.14.1" "KnisterPeter" "sha256-yw8XKGL7Ul9wV+C0yL1LFJCE3+E8u/sR9s3TjkGJPZM=")
# Customization
# (mkExt "dance" "0.3.2" "gregoire" "sha256-+g8EXeCkPOPvZ60JoXkGTeSXYWrXmKrcbUaEfDppdgA=")
(mkExt "material-icon-theme" "4.6.0" "PKief" "sha256-i+3lrw3mDqK2vTMDhJYTACW5JleA+lN1XAC2imgQLUo=")
(mkExt "github-vscode-theme" "4.1.1" "GitHub" "sha256-yLySHOx6pe7w2cyi95pQlKkn/o4VMCTkrTYHu8ASn5M=")
(mkExt "koka" "0.0.1" "maelvalais" "sha256-ty8Mql19HgUWForggeZuHQpzTbmmB/eBFHqof5ZMKr0=")
(mkExt "vscode-rhai" "0.6.3" "rhaiscript" "sha256-gEdpM/TkkiZ50bG9qDU6BH04AJLRDcHLquniRs6m0mg=")
]) ++ (with pkgs.vscode-extensions; [ a5huynh.vscode-ron vadimcn.vscode-lldb jnoortheen.nix-ide ]);
userSettings = {
"workbench.iconTheme" = "material-icon-theme";
"workbench.colorTheme" = "GitHub Dark";
"rust-analyzer.cargo.loadOutDirsFromCheck" = true;
"rust-analyzer.procMacro.enable" = true;
"editor.fontFamily" = "'${font}'";
"debug.console.fontFamily" = "${font}";
"debug.console.fontSize" = toString fontSize;
"terminal.integrated.fontSize" = toString fontSize;
"go.useLanguageServer" = true;
"rust-analyzer.checkOnSave.command" = "clippy";
"nix.enableLanguageServer" = true;
"nix.serverPath" = pkgBin "rnix-lsp";
};
};
};
services = {
gpg-agent =
let
defaultCacheTtl = 3600 * 6;
maxCacheTtl = 3600 * 24;
in
{
inherit defaultCacheTtl maxCacheTtl;
enable = true;
enableSshSupport = true;
sshKeys = [ "8369D9CA26C3EAAAB8302A88CEE6FD14B58AA965" ];
defaultCacheTtlSsh = defaultCacheTtl;
maxCacheTtlSsh = maxCacheTtl;
grabKeyboardAndMouse = false;
pinentryFlavor = "qt";
};
}; };
}; };
} }