This commit is contained in:
dusk 2021-06-23 19:49:50 +03:00
parent 08e8fe9c28
commit c354d48fda
Signed by: dusk
GPG Key ID: 1D8F8FAF2294D6EA
3 changed files with 41 additions and 45 deletions

View File

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"cachix": { "cachix": {
"locked": { "locked": {
"lastModified": 1624097864, "lastModified": 1624361040,
"narHash": "sha256-TGayVqD42Hze4gg5Eurfd7W4zINdHp81JZAyR8q+Oos=", "narHash": "sha256-VMovD7IrT4UUWH8vV8RP7N1gLLiL4V0w9gChV1rMTlM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "69f3a9705014ce75b0489404210995fb6f29836e", "rev": "d6a5be86b6adf99d0c853331460c6736785bfaaf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -31,11 +31,11 @@
"pre-commit-hooks-nix": "pre-commit-hooks-nix" "pre-commit-hooks-nix": "pre-commit-hooks-nix"
}, },
"locked": { "locked": {
"lastModified": 1620750556, "lastModified": 1624345263,
"narHash": "sha256-J+z8oduu9u1FZ8spSowrgyAmtnBUIUDImqfQCZ58heo=", "narHash": "sha256-km/ig4jYNZ0Ru0sN9/3jzMpIeNPGBREx5sJKu55INec=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "hercules-ci-agent", "repo": "hercules-ci-agent",
"rev": "f62ce85aed4c4a7fca9e5da2b00340bbcdc92f88", "rev": "0e07d0e926ffd822ce882c2f2514613dce772cf3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -224,16 +224,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1624298636, "lastModified": 1624466282,
"narHash": "sha256-v+ZdsMjHR+YabpgLJD23CXMBTN7rkFRp+yp0oAXczxo=", "narHash": "sha256-deNfOauNi5XRcBgaGgnkGfPYhDq0Mg5cJKAfx2KhnF0=",
"owner": "yusdacra", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "e9c764809950443baa0689c568ade55bb0ee17db", "rev": "7f6265ecf3380dea4179f49a8cc8e5734b4df174",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "yusdacra", "owner": "helix-editor",
"ref": "build/nix/lazy-submodules",
"repo": "helix", "repo": "helix",
"type": "github" "type": "github"
} }
@ -245,11 +244,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1624214437, "lastModified": 1624417001,
"narHash": "sha256-BtB6k1mQXG/P8MUlNVcuboQqlxlks2H6i5vj2pbGa3Y=", "narHash": "sha256-IQZwbBBmvtNZGz1dogf2TcaMALqQJG6YSRJiUMw6hhY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "cd11c02c286a996ff55010146baecae4c413634f", "rev": "b42fce7aaae71bbf5160d88b1772cd9167b03d1a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -260,10 +259,10 @@
}, },
"latest": { "latest": {
"locked": { "locked": {
"lastModified": 1622966049, "lastModified": 1624271441,
"narHash": "sha256-6g+28v94ISkVk9TBSsITVOnB2slK8plieWPIF2jo/l0=", "narHash": "sha256-26QNDCdRE5mPOWYJrPGpVzgrJ3ZxqvWOONfeMsjryz4=",
"path": "/nix/store/wfn9j2a5499gmfrms3l366r839918g2h-source", "path": "/nix/store/g43aqq4h3qfcw0i2fhcn6scg60hr6yj2-source",
"rev": "fbfb79400a08bf754e32b4d4fc3f7d8f8055cf94", "rev": "7e567a3d092b7de69cdf5deaeb8d9526de230916",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -321,11 +320,11 @@
"rustOverlay": "rustOverlay" "rustOverlay": "rustOverlay"
}, },
"locked": { "locked": {
"lastModified": 1624070370, "lastModified": 1624244973,
"narHash": "sha256-sfFqfmerCYvk0jDeP1gfuskz7AaqDsgV8aiQrEUGdsc=", "narHash": "sha256-h+b4CwPjyibgwMYAeBaT5qBnxI0fsmGf66k23FqEH5Y=",
"owner": "yusdacra", "owner": "yusdacra",
"repo": "nix-cargo-integration", "repo": "nix-cargo-integration",
"rev": "85e6c1ba4c0e3e6dec5a7d1f65bcc036d2ea6ae3", "rev": "00f5df6d8e7eeeac2764b7fa2c57e2e81f5d47cd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -372,11 +371,11 @@
}, },
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1624024598, "lastModified": 1624271441,
"narHash": "sha256-X++38oH5MKEmPW4/2WdMaHQvwJzO8pJfbnzMD7DbG1E=", "narHash": "sha256-26QNDCdRE5mPOWYJrPGpVzgrJ3ZxqvWOONfeMsjryz4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "33d42ad7cf2769ce6364ed4e52afa8e9d1439d58", "rev": "7e567a3d092b7de69cdf5deaeb8d9526de230916",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -439,11 +438,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1624286382, "lastModified": 1624462102,
"narHash": "sha256-AgdOyWI9MGXRoh1hnwm2OAuEj6at7rmV+G7fx9vz84M=", "narHash": "sha256-OVfNlYFkU4Ud3cE5/76ohwd/FELWFx/9AJL9plb9Hr8=",
"owner": "colemickens", "owner": "colemickens",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "06dae5ae8fd0eb1de6bc7efce69c972362108387", "rev": "87ee159b0f98754e638253b0a0a3016fefa695b0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -499,11 +498,11 @@
"pre-commit-hooks-nix": { "pre-commit-hooks-nix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1617783930, "lastModified": 1622650193,
"narHash": "sha256-SigoU2LWM1fMggqfM9H8XEIvjOjBVQ/wj/zrn02J28c=", "narHash": "sha256-qSzUpJDv04ajS9FXoCq6NjVF3qOt9IiGIiGh0P8amyw=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "2d169bb1b23f3b71a894a66ea81f45c788943248", "rev": "0398f0649e0a741660ac5e8216760bae5cc78579",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -536,11 +535,11 @@
"rustOverlay": { "rustOverlay": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1624069337, "lastModified": 1624242197,
"narHash": "sha256-9mTcx7osE4biF2Hm/GU19s1T3+KvphWj4QaUcJh39lU=", "narHash": "sha256-J0+j4DYFaE0O0marb4QN/S1bUhpGwAjQ4O04kIYKcb8=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "67dc2a9543a7c24591e6cb102ad0121c3a704aab", "rev": "df5d330f34b64194d64dcbafb91e82e01a89a229",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -28,7 +28,7 @@
inputs.nixpkgs.follows = "nixos"; inputs.nixpkgs.follows = "nixos";
}; };
helix = { helix = {
url = "github:yusdacra/helix/build/nix/lazy-submodules"; url = "github:helix-editor/helix";
inputs.nixpkgs.follows = "nixos"; inputs.nixpkgs.follows = "nixos";
}; };
nixpkgsWayland = { nixpkgsWayland = {

View File

@ -91,7 +91,7 @@ in
email = personal.emails.primary; email = personal.emails.primary;
font = "Iosevka Term"; font = "Iosevka Term";
fontSize = 10; fontSize = 12;
fontComb = "${font} ${toString fontSize}"; fontComb = "${font} ${toString fontSize}";
fontPackage = pkgs.iosevka; fontPackage = pkgs.iosevka;
@ -396,6 +396,7 @@ in
phantomstyle phantomstyle
papirus-icon-theme papirus-icon-theme
pcmanfm-qt pcmanfm-qt
wl-clipboard
]; ];
}; };
@ -628,9 +629,6 @@ in
eval "$(zoxide init zsh)" eval "$(zoxide init zsh)"
''; '';
shellAliases = nixosConfig.environment.shellAliases // { shellAliases = nixosConfig.environment.shellAliases // {
rember = ''
${pkgs.kakoune-unwrapped}/bin/kak -e "try %(gtd-jump-today)" "${config.home.homeDirectory}/rember/stuff$(date '+_%m_%Y').gtd"
'';
harmony-ssh = '' harmony-ssh = ''
${pkgs.mosh}/bin/mosh yusuf@chat.harmonyapp.io ${pkgs.mosh}/bin/mosh yusuf@chat.harmonyapp.io
''; '';
@ -724,7 +722,7 @@ in
border-radius: 0; border-radius: 0;
/* `otf-font-awesome` is required to be installed for icons */ /* `otf-font-awesome` is required to be installed for icons */
font-family: ${font}; font-family: ${font};
font-size: 13px; font-size: ${toString fontSize}px;
min-height: 0; min-height: 0;
} }
@ -825,8 +823,8 @@ in
in in
(pkgs.vscode-utils.extensionsFromVscodeMarketplace [ (pkgs.vscode-utils.extensionsFromVscodeMarketplace [
# Rust # Rust
(mkExt "rust-analyzer" "0.2.612" "matklad" "sha256-XxmuI9JQlUq8fn+5ajNCOWIQXZy6wTEWipb++6GlByk=") (mkExt "rust-analyzer" "0.2.646" "matklad" "sha256-GL+0R2KuycvHs/+yKVfK1H89sKA+H41DLUsJwy4ngyc=")
(mkExt "even-better-toml" "0.12.2" "tamasfe" "sha256-etPWeshSDbw9u92Ecl1gGYZ7ic9Nfu4+sRoS8WbX4e8=") (mkExt "even-better-toml" "0.12.3" "tamasfe" "sha256-nDmmzVuADieNX9bcS3YQiemg27S4O02Pjj+rthkBAZw=")
(mkExt "crates" "0.5.9" "serayuzgur" "sha256-YHIbnl2R7lqwJHi8qUQImClx9MWm+5Pc12vYw7e/RlA=") (mkExt "crates" "0.5.9" "serayuzgur" "sha256-YHIbnl2R7lqwJHi8qUQImClx9MWm+5Pc12vYw7e/RlA=")
# Nix # Nix
(mkExt "nix-env-selector" "1.0.7" "arrterian" "sha256-DnaIXJ27bcpOrIp1hm7DcrlIzGSjo4RTJ9fD72ukKlc=") (mkExt "nix-env-selector" "1.0.7" "arrterian" "sha256-DnaIXJ27bcpOrIp1hm7DcrlIzGSjo4RTJ9fD72ukKlc=")
@ -850,13 +848,12 @@ in
userSettings = { userSettings = {
"workbench.iconTheme" = "material-icon-theme"; "workbench.iconTheme" = "material-icon-theme";
"workbench.colorTheme" = "GitHub Dark"; "workbench.colorTheme" = "GitHub Dark";
"rust-analyzer.cargo.allFeatures" = true;
"rust-analyzer.cargo.loadOutDirsFromCheck" = true; "rust-analyzer.cargo.loadOutDirsFromCheck" = true;
"rust-analyzer.procMacro.enable" = true; "rust-analyzer.procMacro.enable" = true;
"editor.fontFamily" = "'${font}'"; "editor.fontFamily" = "'${font}'";
"debug.console.fontFamily" = "${font}"; "debug.console.fontFamily" = "${font}";
"debug.console.fontSize" = 12; "debug.console.fontSize" = toString fontSize;
"terminal.integrated.fontSize" = 12; "terminal.integrated.fontSize" = toString fontSize;
"go.useLanguageServer" = true; "go.useLanguageServer" = true;
"rust-analyzer.checkOnSave.command" = "clippy"; "rust-analyzer.checkOnSave.command" = "clippy";
"nix.enableLanguageServer" = true; "nix.enableLanguageServer" = true;